diff options
| author | Nick Clifton <nickc@redhat.com> | 2007-12-31 11:01:54 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2007-12-31 11:01:54 +0000 |
| commit | 2ea37f1c66300870024a9a9393c4b19337363d8b (patch) | |
| tree | c2070f32ea83ec065ee9d1d41f4c2616feb185bc /bfd/elf-hppa.h | |
| parent | 4d21221c081329397e80596c246e03c8472a21e2 (diff) | |
| download | gdb-2ea37f1c66300870024a9a9393c4b19337363d8b.zip gdb-2ea37f1c66300870024a9a9393c4b19337363d8b.tar.gz gdb-2ea37f1c66300870024a9a9393c4b19337363d8b.tar.bz2 | |
* elf.c (_bfd_elf_find_segment_containing_section): New function:
Scan the segment map looking for the segment containing a
specified function.
* elf-bfd.h: Prototype the new function.
* elf-hppa.h (elf_hppa_osec_to_segment): Delete.
(elf_hppa_record_segment_addrs): Use new function.
* elf32-bfin.c (_bfdfdpic_osec_to_segment): Use new function.
* elf32-frv.c (_frvfdpic_osec_to_segment): Use new function.
* elf32-hppa.c (hppa_record_segment_addr): Use new function.
* elfxx-ia64.c (elfNN_ia64_relocate_section): Use new function.
Diffstat (limited to 'bfd/elf-hppa.h')
| -rw-r--r-- | bfd/elf-hppa.h | 37 |
1 files changed, 6 insertions, 31 deletions
diff --git a/bfd/elf-hppa.h b/bfd/elf-hppa.h index a7850ce..c82264b 100644 --- a/bfd/elf-hppa.h +++ b/bfd/elf-hppa.h @@ -1088,35 +1088,6 @@ elf_hppa_fake_sections (bfd *abfd, Elf_Internal_Shdr *hdr, asection *sec) return TRUE; } -/* Find the segment number in which OSEC, and output section, is - located. */ - -static unsigned -elf_hppa_osec_to_segment (bfd *output_bfd, asection *osec) -{ - struct elf_segment_map *m; - Elf_Internal_Phdr *p; - - /* Find the segment that contains the output_section. */ - for (m = elf_tdata (output_bfd)->segment_map, - p = elf_tdata (output_bfd)->phdr; - m != NULL; - m = m->next, p++) - { - int i; - - for (i = m->count - 1; i >= 0; i--) - if (m->sections[i] == osec) - break; - - if (i >= 0) - break; - } - - BFD_ASSERT (m); - return p - elf_tdata (output_bfd)->phdr; -} - static void elf_hppa_final_write_processing (bfd *abfd, bfd_boolean linker ATTRIBUTE_UNUSED) @@ -1337,8 +1308,12 @@ elf_hppa_record_segment_addrs (bfd *abfd, if ((section->flags & (SEC_ALLOC | SEC_LOAD)) == (SEC_ALLOC | SEC_LOAD)) { - unsigned seg = elf_hppa_osec_to_segment (abfd, section->output_section); - bfd_vma value = elf_tdata (abfd)->phdr[seg].p_vaddr; + bfd_vma value; + Elf_Internal_Phdr *p; + + p = _bfd_elf_find_segment_containing_section (abfd, section->output_section); + BFD_ASSERT (p != NULL); + value = p->p_vaddr; if (section->flags & SEC_READONLY) { |