1999-05-03 15:29:06 +08:00
|
|
|
/* ELF support for BFD.
|
include/elf/
PR 5900
* common.h (SHN_BAD): Delete.
(SHN_LORESERVE .. SHN_HIRESERVE): Move to..
* external.h: ..here.
* internal.h (SHN_LORESERVE, SHN_HIRESERVE): Define.
(SHN_LOPROC, SHN_HIPROC, SHN_LOOS, SHN_HIOS): Define.
(SHN_ABS, SHN_COMMON, SHN_XINDEX, SHN_BAD): Define.
bfd/
PR 5900
* elf-bfd.h: Include elf/internal.h after elf/external.h.
* elfcode.h (elf_swap_symbol_in): Map reserved shndx range.
(elf_swap_symbol_out): Adjust SHN_XINDEX test.
(elf_swap_ehdr_out): Mask SHN_LORESERVE and SHN_XINDEX to values
seen in external structs.
(valid_section_index_p): Delete.
(elf_object_p): Don't increment section numbers over reserved range.
Simplify test for valid sh_link, sh_info and e_shstrndx fields.
(elf_write_shdrs_and_ehdr): Mask SHN_LORESERVE and SHN_XINDEX to values
seen in external structs. Don't increment section numbers over
reserved range.
* elf.c (bfd_elf_sym_name): Remove redundant tests on st_shndx.
(bfd_section_from_shdr): Likewise.
(group_signature): Range check before accessing elf_elfsections.
(_bfd_elf_setup_sections): Likewise.
(bfd_section_from_shdr): Likewise.
(bfd_section_from_shdr): Don't increment section number over
reserved sections.
(assign_file_positions_for_non_load_sections): Likewise.
(assign_file_positions_except_relocs): Likewise.
(_bfd_elf_write_object_contents): Likewise.
(assign_section_numbers): Likewise. Adjust for changed SHN_*.
(prep_headers): Delete unused variable.
* elflink.c (bfd_elf_link_record_local_dynamic_symbol): Adjust
for changed SHN_* values.
(check_dynsym, elf_link_input_bfd): Likewise.
(bfd_elf_final_link): Likewise. Don't skip over reserved section
range.
(elf_fixup_link_order): Check that sh_link field is valid.
* elf-hppa.h (elf_hppa_add_symbol_hook): Make "index" unsigned.
* elf32-arm.c (elf32_arm_gc_mark_extra_sections): Range check before
accesssing elf_elfsections.
* elf32-avr.c (elf32_avr_size_stubs): Likewise.
* elf32-hppa.c (elf32_hppa_size_stubs): Likewise.
* elf32-m68hc1x.c (elf32_m68hc11_size_stubs): Likewise.
* elf64-hppa.c (elf64_hppa_check_relocs): Adjust for changed
SHN_* defines. Test for SHN_BAD return from
_bfd_elf_section_from_bfd_section
binutils/
PR 5900
* readelf.c (SECTION_HEADER_INDEX, SECTION_HEADER_NUM): Delete.
Remove use throughout file.
(SECTION_HEADER): Likewise.
(dump_relocations): Don't adjust st_shndx for reserved range.
(process_file_header): Mask SHN_XINDEX to values seen in external
elf structs. Simplify valid section index tests.
(get_32bit_elf_symbols, get_64bit_elf_symbols): Mask SHN_XINDEX.
Map reserved st_shndx to internal form.
(process_section_groups): Test that group symbol st_shndx is in
range, not just non-zero. Delete reserved range check.
(get_symbol_index_type): Mask "type" to 16 bits when printing PRC,
OS or RSV.
gdb/
PR 5900
* elfread.c (elf_symtab_read): Make shndx an unsigned int.
* mipsread.c: Include elf/internal.h.
(read_alphacoff_dynamic_symtab): Map external reserved sym_shndx
to internal range.
ld/testsuite/
PR 5900
* ld-elf/sec64k.exp: Update.
2008-03-12 16:36:58 +08:00
|
|
|
Copyright 1991, 1992, 1993, 1995, 1997, 1998, 1999, 2001, 2003, 2005,
|
|
|
|
2008 Free Software Foundation, Inc.
|
1999-05-03 15:29:06 +08:00
|
|
|
|
|
|
|
Written by Fred Fish @ Cygnus Support, from information published
|
|
|
|
in "UNIX System V Release 4, Programmers Guide: ANSI C and
|
|
|
|
Programming Support Tools".
|
|
|
|
|
|
|
|
This file is part of BFD, the Binary File Descriptor library.
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the Free Software
|
2005-05-10 18:21:13 +08:00
|
|
|
Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */
|
1999-05-03 15:29:06 +08:00
|
|
|
|
|
|
|
|
|
|
|
/* This file is part of ELF support for BFD, and contains the portions
|
|
|
|
that describe how ELF is represented externally by the BFD library.
|
|
|
|
I.E. it describes the in-file representation of ELF. It requires
|
2001-05-07 17:18:52 +08:00
|
|
|
the elf/common.h file which contains the portions that are common to
|
1999-05-03 15:29:06 +08:00
|
|
|
both the internal and external representations. */
|
|
|
|
|
|
|
|
/* The 64-bit stuff is kind of random. Perhaps someone will publish a
|
|
|
|
spec someday. */
|
|
|
|
|
|
|
|
#ifndef _ELF_EXTERNAL_H
|
|
|
|
#define _ELF_EXTERNAL_H
|
|
|
|
|
include/elf/
PR 5900
* common.h (SHN_BAD): Delete.
(SHN_LORESERVE .. SHN_HIRESERVE): Move to..
* external.h: ..here.
* internal.h (SHN_LORESERVE, SHN_HIRESERVE): Define.
(SHN_LOPROC, SHN_HIPROC, SHN_LOOS, SHN_HIOS): Define.
(SHN_ABS, SHN_COMMON, SHN_XINDEX, SHN_BAD): Define.
bfd/
PR 5900
* elf-bfd.h: Include elf/internal.h after elf/external.h.
* elfcode.h (elf_swap_symbol_in): Map reserved shndx range.
(elf_swap_symbol_out): Adjust SHN_XINDEX test.
(elf_swap_ehdr_out): Mask SHN_LORESERVE and SHN_XINDEX to values
seen in external structs.
(valid_section_index_p): Delete.
(elf_object_p): Don't increment section numbers over reserved range.
Simplify test for valid sh_link, sh_info and e_shstrndx fields.
(elf_write_shdrs_and_ehdr): Mask SHN_LORESERVE and SHN_XINDEX to values
seen in external structs. Don't increment section numbers over
reserved range.
* elf.c (bfd_elf_sym_name): Remove redundant tests on st_shndx.
(bfd_section_from_shdr): Likewise.
(group_signature): Range check before accessing elf_elfsections.
(_bfd_elf_setup_sections): Likewise.
(bfd_section_from_shdr): Likewise.
(bfd_section_from_shdr): Don't increment section number over
reserved sections.
(assign_file_positions_for_non_load_sections): Likewise.
(assign_file_positions_except_relocs): Likewise.
(_bfd_elf_write_object_contents): Likewise.
(assign_section_numbers): Likewise. Adjust for changed SHN_*.
(prep_headers): Delete unused variable.
* elflink.c (bfd_elf_link_record_local_dynamic_symbol): Adjust
for changed SHN_* values.
(check_dynsym, elf_link_input_bfd): Likewise.
(bfd_elf_final_link): Likewise. Don't skip over reserved section
range.
(elf_fixup_link_order): Check that sh_link field is valid.
* elf-hppa.h (elf_hppa_add_symbol_hook): Make "index" unsigned.
* elf32-arm.c (elf32_arm_gc_mark_extra_sections): Range check before
accesssing elf_elfsections.
* elf32-avr.c (elf32_avr_size_stubs): Likewise.
* elf32-hppa.c (elf32_hppa_size_stubs): Likewise.
* elf32-m68hc1x.c (elf32_m68hc11_size_stubs): Likewise.
* elf64-hppa.c (elf64_hppa_check_relocs): Adjust for changed
SHN_* defines. Test for SHN_BAD return from
_bfd_elf_section_from_bfd_section
binutils/
PR 5900
* readelf.c (SECTION_HEADER_INDEX, SECTION_HEADER_NUM): Delete.
Remove use throughout file.
(SECTION_HEADER): Likewise.
(dump_relocations): Don't adjust st_shndx for reserved range.
(process_file_header): Mask SHN_XINDEX to values seen in external
elf structs. Simplify valid section index tests.
(get_32bit_elf_symbols, get_64bit_elf_symbols): Mask SHN_XINDEX.
Map reserved st_shndx to internal form.
(process_section_groups): Test that group symbol st_shndx is in
range, not just non-zero. Delete reserved range check.
(get_symbol_index_type): Mask "type" to 16 bits when printing PRC,
OS or RSV.
gdb/
PR 5900
* elfread.c (elf_symtab_read): Make shndx an unsigned int.
* mipsread.c: Include elf/internal.h.
(read_alphacoff_dynamic_symtab): Map external reserved sym_shndx
to internal range.
ld/testsuite/
PR 5900
* ld-elf/sec64k.exp: Update.
2008-03-12 16:36:58 +08:00
|
|
|
/* Special section indices, which may show up in st_shndx fields, among
|
|
|
|
other places. */
|
|
|
|
|
|
|
|
#define SHN_LORESERVE 0xFF00 /* Begin range of reserved indices */
|
|
|
|
#define SHN_LOPROC 0xFF00 /* Begin range of appl-specific */
|
|
|
|
#define SHN_HIPROC 0xFF1F /* End range of appl-specific */
|
|
|
|
#define SHN_LOOS 0xFF20 /* OS specific semantics, lo */
|
|
|
|
#define SHN_HIOS 0xFF3F /* OS specific semantics, hi */
|
|
|
|
#define SHN_ABS 0xFFF1 /* Associated symbol is absolute */
|
|
|
|
#define SHN_COMMON 0xFFF2 /* Associated symbol is in common */
|
|
|
|
#define SHN_XINDEX 0xFFFF /* Section index is held elsewhere */
|
|
|
|
#define SHN_HIRESERVE 0xFFFF /* End range of reserved indices */
|
|
|
|
|
1999-05-03 15:29:06 +08:00
|
|
|
/* ELF Header (32-bit implementations) */
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
unsigned char e_ident[16]; /* ELF "magic number" */
|
|
|
|
unsigned char e_type[2]; /* Identifies object file type */
|
|
|
|
unsigned char e_machine[2]; /* Specifies required architecture */
|
|
|
|
unsigned char e_version[4]; /* Identifies object file version */
|
|
|
|
unsigned char e_entry[4]; /* Entry point virtual address */
|
|
|
|
unsigned char e_phoff[4]; /* Program header table file offset */
|
|
|
|
unsigned char e_shoff[4]; /* Section header table file offset */
|
|
|
|
unsigned char e_flags[4]; /* Processor-specific flags */
|
|
|
|
unsigned char e_ehsize[2]; /* ELF header size in bytes */
|
|
|
|
unsigned char e_phentsize[2]; /* Program header table entry size */
|
|
|
|
unsigned char e_phnum[2]; /* Program header table entry count */
|
|
|
|
unsigned char e_shentsize[2]; /* Section header table entry size */
|
|
|
|
unsigned char e_shnum[2]; /* Section header table entry count */
|
|
|
|
unsigned char e_shstrndx[2]; /* Section header string table index */
|
|
|
|
} Elf32_External_Ehdr;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
unsigned char e_ident[16]; /* ELF "magic number" */
|
|
|
|
unsigned char e_type[2]; /* Identifies object file type */
|
|
|
|
unsigned char e_machine[2]; /* Specifies required architecture */
|
|
|
|
unsigned char e_version[4]; /* Identifies object file version */
|
|
|
|
unsigned char e_entry[8]; /* Entry point virtual address */
|
|
|
|
unsigned char e_phoff[8]; /* Program header table file offset */
|
|
|
|
unsigned char e_shoff[8]; /* Section header table file offset */
|
|
|
|
unsigned char e_flags[4]; /* Processor-specific flags */
|
|
|
|
unsigned char e_ehsize[2]; /* ELF header size in bytes */
|
|
|
|
unsigned char e_phentsize[2]; /* Program header table entry size */
|
|
|
|
unsigned char e_phnum[2]; /* Program header table entry count */
|
|
|
|
unsigned char e_shentsize[2]; /* Section header table entry size */
|
|
|
|
unsigned char e_shnum[2]; /* Section header table entry count */
|
|
|
|
unsigned char e_shstrndx[2]; /* Section header string table index */
|
|
|
|
} Elf64_External_Ehdr;
|
|
|
|
|
|
|
|
/* Program header */
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
unsigned char p_type[4]; /* Identifies program segment type */
|
|
|
|
unsigned char p_offset[4]; /* Segment file offset */
|
|
|
|
unsigned char p_vaddr[4]; /* Segment virtual address */
|
|
|
|
unsigned char p_paddr[4]; /* Segment physical address */
|
|
|
|
unsigned char p_filesz[4]; /* Segment size in file */
|
|
|
|
unsigned char p_memsz[4]; /* Segment size in memory */
|
|
|
|
unsigned char p_flags[4]; /* Segment flags */
|
|
|
|
unsigned char p_align[4]; /* Segment alignment, file & memory */
|
|
|
|
} Elf32_External_Phdr;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
unsigned char p_type[4]; /* Identifies program segment type */
|
|
|
|
unsigned char p_flags[4]; /* Segment flags */
|
|
|
|
unsigned char p_offset[8]; /* Segment file offset */
|
|
|
|
unsigned char p_vaddr[8]; /* Segment virtual address */
|
|
|
|
unsigned char p_paddr[8]; /* Segment physical address */
|
|
|
|
unsigned char p_filesz[8]; /* Segment size in file */
|
|
|
|
unsigned char p_memsz[8]; /* Segment size in memory */
|
|
|
|
unsigned char p_align[8]; /* Segment alignment, file & memory */
|
|
|
|
} Elf64_External_Phdr;
|
|
|
|
|
|
|
|
/* Section header */
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
unsigned char sh_name[4]; /* Section name, index in string tbl */
|
|
|
|
unsigned char sh_type[4]; /* Type of section */
|
|
|
|
unsigned char sh_flags[4]; /* Miscellaneous section attributes */
|
|
|
|
unsigned char sh_addr[4]; /* Section virtual addr at execution */
|
|
|
|
unsigned char sh_offset[4]; /* Section file offset */
|
|
|
|
unsigned char sh_size[4]; /* Size of section in bytes */
|
|
|
|
unsigned char sh_link[4]; /* Index of another section */
|
|
|
|
unsigned char sh_info[4]; /* Additional section information */
|
|
|
|
unsigned char sh_addralign[4]; /* Section alignment */
|
|
|
|
unsigned char sh_entsize[4]; /* Entry size if section holds table */
|
|
|
|
} Elf32_External_Shdr;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
unsigned char sh_name[4]; /* Section name, index in string tbl */
|
|
|
|
unsigned char sh_type[4]; /* Type of section */
|
|
|
|
unsigned char sh_flags[8]; /* Miscellaneous section attributes */
|
|
|
|
unsigned char sh_addr[8]; /* Section virtual addr at execution */
|
|
|
|
unsigned char sh_offset[8]; /* Section file offset */
|
|
|
|
unsigned char sh_size[8]; /* Size of section in bytes */
|
|
|
|
unsigned char sh_link[4]; /* Index of another section */
|
|
|
|
unsigned char sh_info[4]; /* Additional section information */
|
|
|
|
unsigned char sh_addralign[8]; /* Section alignment */
|
|
|
|
unsigned char sh_entsize[8]; /* Entry size if section holds table */
|
|
|
|
} Elf64_External_Shdr;
|
|
|
|
|
|
|
|
/* Symbol table entry */
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
unsigned char st_name[4]; /* Symbol name, index in string tbl */
|
|
|
|
unsigned char st_value[4]; /* Value of the symbol */
|
|
|
|
unsigned char st_size[4]; /* Associated symbol size */
|
|
|
|
unsigned char st_info[1]; /* Type and binding attributes */
|
|
|
|
unsigned char st_other[1]; /* No defined meaning, 0 */
|
|
|
|
unsigned char st_shndx[2]; /* Associated section index */
|
|
|
|
} Elf32_External_Sym;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
unsigned char st_name[4]; /* Symbol name, index in string tbl */
|
|
|
|
unsigned char st_info[1]; /* Type and binding attributes */
|
|
|
|
unsigned char st_other[1]; /* No defined meaning, 0 */
|
|
|
|
unsigned char st_shndx[2]; /* Associated section index */
|
|
|
|
unsigned char st_value[8]; /* Value of the symbol */
|
|
|
|
unsigned char st_size[8]; /* Associated symbol size */
|
|
|
|
} Elf64_External_Sym;
|
|
|
|
|
Support for more than 64k ELF sections.
include/elf/ChangeLog
* external.h (Elf_External_Sym_Shndx): Declare.
* internal.h (struct elf_internal_sym <st_shndx>): Make it an
unsigned int.
* common.h (SHN_BAD): Define.
bfd/ChangeLog
* configure.in: Bump bfd version.
* configure: Regenerate.
* elf-bfd.h (elf_size_info <swap_symbol_out>): Add shndx param.
(bfd_elf32_swap_symbol_in): Likewise.
(bfd_elf32_swap_symbol_out): Likewise.
(bfd_elf64_swap_symbol_in): Likewise.
(bfd_elf64_swap_symbol_out): Likewise.
(elf_reloc_cookie): Add locsym_shndx field. Make locsyms a PTR.
(elf_obj_tdata): Add num_elf_sections, symtab_shndx_hdr and
symtab_shndx_section.
(elf_numsections): Define.
(elf_symtab_shndx): Define.
* elf.c (setup_group): Use elf_numsections rather than header e_shnum.
(bfd_elf_find_section): Likewise.
(bfd_section_from_elf_index): Likewise.
(bfd_section_from_shdr): Likewise. Handle SHT_SYMTAB_SHNDX.
(bfd_section_from_r_symndx): Read symbol shndx extension, and
translate st_shndx for > SHN_HIRESERVE.
(assign_section_numbers): Skip reserved sections. Assign
symtab_shndx_section and elf_numsections. Exclude reserved
sections from e_shnum. Set up symtab_shndx_hdr.
(_bfd_elf_compute_section_file_positions): Handle symtab_shndx_hdr.
(map_sections_to_segments): Don't map eh_frame_hdr unless required.
(assign_file_positions_except_relocs): Use elf_numsections rather
than header e_shnum. Skip reserved sections and symtab_shndx_section.
(prep_headers): Set name for symtab_shndx_hdr.
(_bfd_elf_assign_file_positions_for_relocs): Use elf_numsections.
(_bfd_elf_write_object_contents): Likewise. Skip reserved sections.
(_bfd_elf_section_from_bfd_section): Check bfd_{abs,com,und}_section
first. Use elf_section_data if available. Use elf_numsections.
Start scan at index 1.
(copy_private_bfd_data ): Comment fixes.
(MAP_ONESYMTAB): Define above SHN_HIOS.
(MAP_DYNSYMTAB): Likewise.
(MAP_STRTAB): Likewise.
(MAP_SHSTRTAB): Likewise.
(MAP_SYM_SHNDX): New define.
(_bfd_elf_copy_private_symbol_data): Handle symtab_shndx_section.
(swap_out_syms): Swap out SHT_SYMTAB_SHNDX section too.
* elfcode.h (elf_swap_symbol_in): Add shndx param, and handle shndx
extension.
(elf_swap_symbol_out): Likewise.
(elf_object_p): Set elf_numsections, and use instead of e_shnum.
Initialialise reserved elf_elfsections to point at shdr[0]. Remove
redundant bfd_release calls.
(elf_slurp_symbol_table): Read symbol shndx extension, and use with
elf_swap_symbol_in. Translate st_shndx for > SHN_HIRESERVE too.
* elflink.h (elf_link_is_defined_archive_symbol): Read symbol shndx
extension, and use with elf_swap_symbol_in.
(elf_link_record_local_dynamic_symbol): Likewise.
(elf_link_add_object_symbols): Likewise. Also translate st_shndx
for elf sections > SHN_HIRESERVE.
(NAME(bfd_elf,size_dynamic_sections)): Adjust elf_swap_symbol_out
call.
(struct elf_final_link_info): Add locsym_shndx and symshndxbuf.
(elf_bfd_final_link): Allocate the above, and tidy code allocating
other buffers. Use elf_numsections instead of e_shnum. Adjust
elf_swap_symbol_out calls.
(elf_link_output_sym): Swap out symbol shndx extension too.
(elf_link_flush_output_syms): And flush them to disk.
(elf_link_output_extsym): Use SHN_BAD. Adjust elf_swap_symbol_out
calls.
(elf_gc_mark): Read symbol shndx extension, and use with
elf_swap_symbol_in.
(elf_link_input_bfd): Likewise, Translate st_shndx for elf sections
> SHN_HIRESERVE too. Use SHN_BAD.
(elf_reloc_symbol_deleted_p): Use symbol shndx extensions with
elf_swap_symbol_in. Translate st_shndx > SHN_HIRESERVE too.
(elf_bfd_discard_info): Read symbol shndx extension. Don't attempt
to continue after a bfd error.
* elf-m10200.c (mn10200_elf_relax_section): Only read local syms.
Stash them immediately to symtab_hdr->contents rather than later
in multiple places. Clean up afterwards. Read symbol shndx
extension, and use with swap_symbol_in. Translate SHN_UNDEF,
SHN_ABS, SHN_COMMON and elf sections > SHN_HIRESERVE to bfd
sections too. Remove dead code.
(mn10200_elf_relax_delete_bytes): Use symbol shndx extension
when swapping in symbols. Tidy code adjusting global syms.
Don't swap in global syms.
(mn10200_elf_symbol_address_p): Likewise. Remove extsyms param.
(mn10200_elf_get_relocated_section_contents): Read symbol shndx
extension, and use with swap_symbol_in. Rename "size" -> "amt"
to maximize code in common with other files. Translate st_shndx
for > SHN_HIRESERVE too. Remove dead code.
* elf-m10300.c (mn10300_elf_relax_section): Only read local syms.
Stash them immediately to symtab_hdr->contents rather than later
in multiple places. Clean up afterwards. Read symbol shndx
extension, and use with swap_symbol_in. Remove dead code.
(mn10300_elf_relax_delete_bytes): As for elf-m10200.c.
(mn10300_elf_symbol_address_p): Likewise.
(mn10300_elf_get_relocated_section_contents): Likewise.
* elf32-h8300.c (elf32_h8_relax_section): As for elf-m10300.c.
(elf32_h8_relax_delete_bytes): Likewise.
(elf32_h8_symbol_address_p): Likewise.
(elf32_h8_get_relocated_section_contents): Likewise.
* elf32-hppa.c (elf32_hppa_size_stubs): Read symbol shndx
extension, and use with swap_symbol_in.
* elf64-hppa.c (elf64_hppa_check_relocs): Likewise.
* elf32-i370.c (i370_elf_finish_dynamic_sections): Adjust call to
bfd_elf32_swap_symbol_out.
* elf32-m32r.c (m32r_elf_get_relocated_section_contents): Translate
elf sections > SHN_HIRESERVE too.
* elf32-m68k.c (bfd_m68k_elf32_create_embedded_relocs): Only read
local syms. Read symbol shndx extension, and use with swap_symbol_in.
* elf32-mips.c (_bfd_mips_elf_final_write_processing): Use
elf_numsections rather than header e_shnum.
* elf32-sh.c (sh_elf_relax_section): As for elf-m10300.c.
(sh_elf_relax_delete_bytes): Likewise.
(sh_elf_get_relocated_section_contents): Likewise. Only read local
symbols.
* elf32-v850.c (v850_elf_symbol_processing): Use an unsigned int to
hold section index. Use elf_numsections rather than e_shnum.
Rename "index" -> "indx" to avoid shadowing warning.
(v850_elf_add_symbol_hook): Likewise.
* elf64-alpha.c (elf64_alpha_relax_section): Only read local syms.
Read symbol shndx extension, and use with swap_symbol_in.
* elf32-xstormy16.c (xstormy16_elf_relax_section): Likewise.
Translate SHN_COMMON and elf sections > SHN_HIRESERVE too.
* elfxx-ia64.c (elfNN_ia64_relax_section): Likewise.
(elfNN_ia64_aix_add_symbol_hook): Use elf_numsections.
* elf-m10300.c (mn10300_elf_gc_mark_hook): Remove unnecessary checks
before calling bfd_section_from_elf_index on local syms.
* elf32-arm.h (elf32_arm_gc_mark_hook): Likewise.
* elf32-avr.c (elf32_avr_gc_mark_hook): Likewise.
* elf32-cris.c (cris_elf_gc_mark_hook): Likewise.
* elf32-d10v.c (elf32_d10v_gc_mark_hook): Likewise.
* elf32-fr30.c (fr30_elf_gc_mark_hook): Likewise.
* elf32-hppa.c (elf32_hppa_gc_mark_hook): Likewise.
* elf32-i386.c (elf_i386_gc_mark_hook): Likewise.
* elf32-m32r.c (m32r_elf_gc_mark_hook): Likewise.
* elf32-m68k.c (elf_m68k_gc_mark_hook): Likewise.
* elf32-mcore.c (mcore_elf_gc_mark_hook): Likewise.
* elf32-mips.c (_bfd_mips_elf_gc_mark_hook): Likewise.
* elf32-openrisc.c (openrisc_elf_gc_mark_hook): Likewise.
* elf32-ppc.c (ppc_elf_gc_mark_hook): Likewise.
* elf32-s390.c (elf_s390_gc_mark_hook): Likewise.
* elf32-sh.c (sh_elf_gc_mark_hook): Likewise.
* elf32-sparc.c (elf32_sparc_gc_mark_hook): Likewise.
* elf32-v850.c (v850_elf_gc_mark_hook): Likewise.
* elf32-xstormy16.c (xstormy16_elf_gc_mark_hook): Likewise.
* elf64-mips.c (mips_elf64_gc_mark_hook): Likewise.
* elf64-mmix.c (mmix_elf_gc_mark_hook): Likewise.
* elf64-ppc.c (ppc64_elf_gc_mark_hook): Likewise.
* elf64-s390.c (elf_s390_gc_mark_hook): Likewise.
* elf64-x86-64.c (elf64_x86_64_gc_mark_hook): Likewise.
binutils/ChangeLog
* readelf.c (symtab_shndx_hdr): New global.
(SECTION_HEADER_INDEX): Define.
(SECTION_HEADER_NUM): Define.
(SECTION_HEADER): Define.
(GET_ELF_SYMBOLS): Pass two params rather than three.
(get_32bit_elf_symbols): Take file and section args. Read and
use SHT_SYMTAB_SHNDX.
(get_64bit_elf_symbols): Likewise.
(dump_relocations): Use SECTION_HEADER to index "section_headers".
(process_section_headers): Likewise. Use SECTION_HEADER_NUM too.
Remember symtab_shdx_hdr.
(process_program_headers): Scan from index 1 for segment map.
(slurp_ia64_unwind_table): Use SECTION_HEADER to index
"section_headers".
(process_relocs): Likewise. Also adjust call to GET_ELF_SYMBOLS.
(process_unwind): Likewise.
(process_version_sections): Likewise.
(process_symbol_table): Likewise.
(display_debug_info): Likewise.
(process_dynamic_segment): Fake up a symtab section for changed
GET_ELF_SYMBOLS.
(get_symbol_index_type): Check SHN_LOOS before SHN_LORESERVE.
(process_program_headers): Kill signed/unsigned warning.
(load_debug_str): Likewise.
(display_debug_info): Likewise.
2001-12-17 08:52:34 +08:00
|
|
|
typedef struct {
|
|
|
|
unsigned char est_shndx[4]; /* Section index */
|
|
|
|
} Elf_External_Sym_Shndx;
|
|
|
|
|
1999-05-03 15:29:06 +08:00
|
|
|
/* Note segments */
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
unsigned char namesz[4]; /* Size of entry's owner string */
|
|
|
|
unsigned char descsz[4]; /* Size of the note descriptor */
|
|
|
|
unsigned char type[4]; /* Interpretation of the descriptor */
|
|
|
|
char name[1]; /* Start of the name+desc data */
|
|
|
|
} Elf_External_Note;
|
|
|
|
|
|
|
|
/* Relocation Entries */
|
|
|
|
typedef struct {
|
|
|
|
unsigned char r_offset[4]; /* Location at which to apply the action */
|
|
|
|
unsigned char r_info[4]; /* index and type of relocation */
|
|
|
|
} Elf32_External_Rel;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
unsigned char r_offset[4]; /* Location at which to apply the action */
|
|
|
|
unsigned char r_info[4]; /* index and type of relocation */
|
|
|
|
unsigned char r_addend[4]; /* Constant addend used to compute value */
|
|
|
|
} Elf32_External_Rela;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
unsigned char r_offset[8]; /* Location at which to apply the action */
|
|
|
|
unsigned char r_info[8]; /* index and type of relocation */
|
|
|
|
} Elf64_External_Rel;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
unsigned char r_offset[8]; /* Location at which to apply the action */
|
|
|
|
unsigned char r_info[8]; /* index and type of relocation */
|
|
|
|
unsigned char r_addend[8]; /* Constant addend used to compute value */
|
|
|
|
} Elf64_External_Rela;
|
|
|
|
|
|
|
|
/* dynamic section structure */
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
unsigned char d_tag[4]; /* entry tag value */
|
|
|
|
union {
|
|
|
|
unsigned char d_val[4];
|
|
|
|
unsigned char d_ptr[4];
|
|
|
|
} d_un;
|
|
|
|
} Elf32_External_Dyn;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
unsigned char d_tag[8]; /* entry tag value */
|
|
|
|
union {
|
|
|
|
unsigned char d_val[8];
|
|
|
|
unsigned char d_ptr[8];
|
|
|
|
} d_un;
|
|
|
|
} Elf64_External_Dyn;
|
|
|
|
|
|
|
|
/* The version structures are currently size independent. They are
|
|
|
|
named without a 32 or 64. If that ever changes, these structures
|
|
|
|
will need to be renamed. */
|
|
|
|
|
|
|
|
/* This structure appears in a SHT_GNU_verdef section. */
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
unsigned char vd_version[2];
|
|
|
|
unsigned char vd_flags[2];
|
|
|
|
unsigned char vd_ndx[2];
|
|
|
|
unsigned char vd_cnt[2];
|
|
|
|
unsigned char vd_hash[4];
|
|
|
|
unsigned char vd_aux[4];
|
|
|
|
unsigned char vd_next[4];
|
|
|
|
} Elf_External_Verdef;
|
|
|
|
|
|
|
|
/* This structure appears in a SHT_GNU_verdef section. */
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
unsigned char vda_name[4];
|
|
|
|
unsigned char vda_next[4];
|
|
|
|
} Elf_External_Verdaux;
|
|
|
|
|
|
|
|
/* This structure appears in a SHT_GNU_verneed section. */
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
unsigned char vn_version[2];
|
|
|
|
unsigned char vn_cnt[2];
|
|
|
|
unsigned char vn_file[4];
|
|
|
|
unsigned char vn_aux[4];
|
|
|
|
unsigned char vn_next[4];
|
|
|
|
} Elf_External_Verneed;
|
|
|
|
|
|
|
|
/* This structure appears in a SHT_GNU_verneed section. */
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
unsigned char vna_hash[4];
|
|
|
|
unsigned char vna_flags[2];
|
|
|
|
unsigned char vna_other[2];
|
|
|
|
unsigned char vna_name[4];
|
|
|
|
unsigned char vna_next[4];
|
|
|
|
} Elf_External_Vernaux;
|
|
|
|
|
|
|
|
/* This structure appears in a SHT_GNU_versym section. This is not a
|
|
|
|
standard ELF structure; ELF just uses Elf32_Half. */
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
unsigned char vs_vers[2];
|
2006-12-06 22:36:41 +08:00
|
|
|
} ATTRIBUTE_PACKED Elf_External_Versym;
|
1999-05-03 15:29:06 +08:00
|
|
|
|
|
|
|
/* Structure for syminfo section. */
|
|
|
|
typedef struct
|
|
|
|
{
|
|
|
|
unsigned char si_boundto[2];
|
|
|
|
unsigned char si_flags[2];
|
|
|
|
} Elf_External_Syminfo;
|
|
|
|
|
2003-05-21 08:55:15 +08:00
|
|
|
|
|
|
|
/* This structure appears on the stack and in NT_AUXV core file notes. */
|
|
|
|
typedef struct
|
|
|
|
{
|
|
|
|
unsigned char a_type[4];
|
|
|
|
unsigned char a_val[4];
|
|
|
|
} Elf32_External_Auxv;
|
|
|
|
|
|
|
|
typedef struct
|
|
|
|
{
|
|
|
|
unsigned char a_type[8];
|
|
|
|
unsigned char a_val[8];
|
|
|
|
} Elf64_External_Auxv;
|
|
|
|
|
2005-06-17 21:37:23 +08:00
|
|
|
/* Size of SHT_GROUP section entry. */
|
|
|
|
|
|
|
|
#define GRP_ENTRY_SIZE 4
|
2003-05-21 08:55:15 +08:00
|
|
|
|
1999-05-03 15:29:06 +08:00
|
|
|
#endif /* _ELF_EXTERNAL_H */
|