* infrun.c (normal_stop): Don't call

[deliverable/binutils-gdb.git] / gdb / somread.c

diff --git a/gdb/somread.c b/gdb/somread.c
index b0b1615d818bada9d5c5cefdb0a1cf46802c838f..36a2b28d428a6e01403d19355c663e1c4bfc30ff 100644 (file)
--- a/gdb/somread.c
+++ b/gdb/somread.c
@@ -1,6 +1,6 @@
 /* Read HP PA/Risc object files for GDB.
    Copyright (C) 1991, 1992, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002,
-   2004, 2007 Free Software Foundation, Inc.
+   2004, 2007, 2008, 2009 Free Software Foundation, Inc.
    Written by Fred Fish at Cygnus Support.
 
    This file is part of GDB.
@@ -58,6 +58,7 @@ static void
 som_symtab_read (bfd *abfd, struct objfile *objfile,
                 struct section_offsets *section_offsets)
 {
+  struct gdbarch *gdbarch = get_objfile_arch (objfile);
   unsigned int number_of_symbols;
   int val, dynamic;
   char *stringtab;
@@ -132,7 +133,7 @@ som_symtab_read (bfd *abfd, struct objfile *objfile,
              ms_type = mst_text;
              bufp->symbol_value += text_offset;
              bufp->symbol_value = gdbarch_smash_text_address
-                                    (current_gdbarch, bufp->symbol_value);
+                                    (gdbarch, bufp->symbol_value);
              break;
 
            case ST_ENTRY:
@@ -146,7 +147,7 @@ som_symtab_read (bfd *abfd, struct objfile *objfile,
                ms_type = mst_text;
              bufp->symbol_value += text_offset;
              bufp->symbol_value = gdbarch_smash_text_address
-                                    (current_gdbarch, bufp->symbol_value);
+                                    (gdbarch, bufp->symbol_value);
              break;
 
            case ST_STUB:
@@ -154,7 +155,7 @@ som_symtab_read (bfd *abfd, struct objfile *objfile,
              ms_type = mst_solib_trampoline;
              bufp->symbol_value += text_offset;
              bufp->symbol_value = gdbarch_smash_text_address
-                                    (current_gdbarch, bufp->symbol_value);
+                                    (gdbarch, bufp->symbol_value);
              break;
 
            case ST_DATA:
@@ -183,7 +184,7 @@ som_symtab_read (bfd *abfd, struct objfile *objfile,
              ms_type = mst_file_text;
              bufp->symbol_value += text_offset;
              bufp->symbol_value = gdbarch_smash_text_address
-                                    (current_gdbarch, bufp->symbol_value);
+                                    (gdbarch, bufp->symbol_value);
 
            check_strange_names:
              /* Utah GCC 2.5, FSF GCC 2.6 and later generate correct local
@@ -215,7 +216,7 @@ som_symtab_read (bfd *abfd, struct objfile *objfile,
              ms_type = mst_file_text;
              bufp->symbol_value += text_offset;
              bufp->symbol_value = gdbarch_smash_text_address
-                                    (current_gdbarch, bufp->symbol_value);
+                                    (gdbarch, bufp->symbol_value);
              break;
 
            case ST_ENTRY:
@@ -227,7 +228,7 @@ som_symtab_read (bfd *abfd, struct objfile *objfile,
              ms_type = mst_file_text;
              bufp->symbol_value += text_offset;
              bufp->symbol_value = gdbarch_smash_text_address
-                                    (current_gdbarch, bufp->symbol_value);
+                                    (gdbarch, bufp->symbol_value);
              break;
 
            case ST_STUB:
@@ -235,7 +236,7 @@ som_symtab_read (bfd *abfd, struct objfile *objfile,
              ms_type = mst_solib_trampoline;
              bufp->symbol_value += text_offset;
              bufp->symbol_value = gdbarch_smash_text_address
-                                    (current_gdbarch, bufp->symbol_value);
+                                    (gdbarch, bufp->symbol_value);
              break;