* objfiles.h (struct objfile): New GDBARCH member.

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

diff --git a/gdb/somread.c b/gdb/somread.c
index 338d0c60500323b830aa2bf6a83fce853fe7bc65..a3389d9d2b2104b8b12d15c38fec143a3e4f2f6e 100644 (file)
--- a/gdb/somread.c
+++ b/gdb/somread.c
@@ -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;