diff options
| -rw-r--r-- | gdb/ChangeLog | 9 | ||||
| -rw-r--r-- | gdb/elfread.c | 6 | ||||
| -rw-r--r-- | gdb/solib.c | 35 |
3 files changed, 29 insertions, 21 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8ad0024..795486a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2000-05-10 Elena Zannoni <ezannoni@kwikemart.cygnus.com> + + * solib.c (symbol_add_stub): Remember the index and the name of + the section with the lowest address. Use this data (instead of + data from .text) to pass info into symbol_file_add. + + * elfread.c (record_minimal_symbol_and_info): Use the section + where the symbol lives to get the index, instead of guessing. + 2000-05-10 Michael Snyder <msnyder@seadog.cygnus.com> Make Sparc a Multi-Arch target. Discard PARAMS macro (require ANSI). * sparc-tdep.c: include arch-utils.h. diff --git a/gdb/elfread.c b/gdb/elfread.c index 85b04ec..60f7988 100644 --- a/gdb/elfread.c +++ b/gdb/elfread.c @@ -191,18 +191,16 @@ record_minimal_symbol_and_info (name, address, ms_type, info, bfd_section, { case mst_text: case mst_file_text: - section = SECT_OFF_TEXT (objfile); + section = bfd_section->index; #ifdef SMASH_TEXT_ADDRESS SMASH_TEXT_ADDRESS (address); #endif break; case mst_data: case mst_file_data: - section = SECT_OFF_DATA (objfile); - break; case mst_bss: case mst_file_bss: - section = SECT_OFF_BSS (objfile); + section = bfd_section->index; break; default: section = -1; diff --git a/gdb/solib.c b/gdb/solib.c index be007b1..1094277 100644 --- a/gdb/solib.c +++ b/gdb/solib.c @@ -1165,10 +1165,10 @@ symbol_add_stub (arg) PTR arg; { register struct so_list *so = (struct so_list *) arg; /* catch_errs bogon */ - CORE_ADDR text_addr = 0; struct section_addr_info *sap; - int i; - asection *text_section; + CORE_ADDR lowest_addr = 0; + int lowest_index; + asection *lowest_sect = NULL; /* Have we already loaded this shared object? */ ALL_OBJFILES (so->objfile) @@ -1179,32 +1179,33 @@ symbol_add_stub (arg) /* Find the shared object's text segment. */ if (so->textsection) - text_addr = so->textsection->addr; + { + lowest_addr = so->textsection->addr; + lowest_sect = bfd_get_section_by_name (so->abfd, ".text"); + lowest_index = lowest_sect->index; + } else if (so->abfd != NULL) { - asection *lowest_sect; - - /* If we didn't find a mapped non zero sized .text section, set up - text_addr so that the relocation in symbol_file_add does no harm. */ + /* If we didn't find a mapped non zero sized .text section, set + up lowest_addr so that the relocation in symbol_file_add does + no harm. */ lowest_sect = bfd_get_section_by_name (so->abfd, ".text"); if (lowest_sect == NULL) bfd_map_over_sections (so->abfd, find_lowest_section, (PTR) &lowest_sect); if (lowest_sect) - text_addr = bfd_section_vma (so->abfd, lowest_sect) - + LM_ADDR (so); + { + lowest_addr = bfd_section_vma (so->abfd, lowest_sect) + + LM_ADDR (so); + lowest_index = lowest_sect->index; + } } sap = build_section_addr_info_from_section_table (so->sections, so->sections_end); - /* Look for the index for the .text section in the sap structure. */ - text_section = bfd_get_section_by_name (so->abfd, ".text"); - for (i = 0; i < MAX_SECTIONS && sap->other[i].name; i++) - if (sap->other[i].sectindex == text_section->index) - break; - - sap->other[i].addr = text_addr; + sap->other[lowest_index].addr = lowest_addr; + so->objfile = symbol_file_add (so->so_name, so->from_tty, sap, 0, OBJF_SHARED); free_section_addr_info (sap); |