PR symtab/8423:

[deliverable/binutils-gdb.git] / gdb / solib-som.c

diff --git a/gdb/solib-som.c b/gdb/solib-som.c
index ff7fbaa1ffb8699232810d5ab0c6a4ca4936a501..650e3dfead4c53448d791bf8f791e25be339843d 100644 (file)
--- a/gdb/solib-som.c
+++ b/gdb/solib-som.c
@@ -840,13 +840,12 @@ som_solib_section_offsets (struct objfile *objfile,
       if (strstr (objfile->name, so_list->so_name))
        {
          asection *private_section;
+         struct obj_section *sect;
 
          /* The text offset is easy.  */
          offsets->offsets[SECT_OFF_TEXT (objfile)]
            = (so_list->lm_info->text_addr
               - so_list->lm_info->text_link_addr);
-         offsets->offsets[SECT_OFF_RODATA (objfile)]
-           = ANOFFSET (offsets, SECT_OFF_TEXT (objfile));
 
          /* We should look at presumed_dp in the SOM header, but
             that's not easily available.  This should be OK though.  */
@@ -859,10 +858,28 @@ som_solib_section_offsets (struct objfile *objfile,
              offsets->offsets[SECT_OFF_BSS (objfile)] = 0;
              return 1;
            }
-         offsets->offsets[SECT_OFF_DATA (objfile)]
-           = (so_list->lm_info->data_start - private_section->vma);
-         offsets->offsets[SECT_OFF_BSS (objfile)]
-           = ANOFFSET (offsets, SECT_OFF_DATA (objfile));
+         if (objfile->sect_index_data != -1)
+           {
+             offsets->offsets[SECT_OFF_DATA (objfile)]
+               = (so_list->lm_info->data_start - private_section->vma);
+             if (objfile->sect_index_bss != -1)
+               offsets->offsets[SECT_OFF_BSS (objfile)]
+                 = ANOFFSET (offsets, SECT_OFF_DATA (objfile));
+           }
+
+         ALL_OBJFILE_OSECTIONS (objfile, sect)
+           {
+             flagword flags = bfd_get_section_flags (objfile->obfd,
+                                                     sect->the_bfd_section);
+
+             if ((flags & SEC_CODE) != 0)
+               offsets->offsets[sect->the_bfd_section->index]
+                 = offsets->offsets[SECT_OFF_TEXT (objfile)];
+             else
+               offsets->offsets[sect->the_bfd_section->index]
+                 = offsets->offsets[SECT_OFF_DATA (objfile)];
+           }
+
          return 1;
        }
       so_list = so_list->next;