mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-09-09 19:12:24 +08:00
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.
This commit is contained in:
Alan Modra
251
bfd/elf-m10200.c
251
bfd/elf-m10200.c
@ -30,7 +30,7 @@ static void mn10200_info_to_howto
|
||||
static boolean mn10200_elf_relax_delete_bytes
|
||||
PARAMS ((bfd *, asection *, bfd_vma, int));
|
||||
static boolean mn10200_elf_symbol_address_p
|
||||
PARAMS ((bfd *, asection *, Elf32_External_Sym *, bfd_vma));
|
||||
PARAMS ((bfd *, asection *, bfd_vma));
|
||||
static bfd_reloc_status_type mn10200_elf_final_link_relocate
|
||||
PARAMS ((reloc_howto_type *, bfd *, bfd *, asection *,
|
||||
bfd_byte *, bfd_vma, bfd_vma, bfd_vma,
|
||||
@ -525,6 +525,7 @@ mn10200_elf_relax_section (abfd, sec, link_info, again)
|
||||
boolean *again;
|
||||
{
|
||||
Elf_Internal_Shdr *symtab_hdr;
|
||||
Elf_Internal_Shdr *shndx_hdr;
|
||||
Elf_Internal_Rela *internal_relocs;
|
||||
Elf_Internal_Rela *free_relocs = NULL;
|
||||
Elf_Internal_Rela *irel, *irelend;
|
||||
@ -532,6 +533,7 @@ mn10200_elf_relax_section (abfd, sec, link_info, again)
|
||||
bfd_byte *free_contents = NULL;
|
||||
Elf32_External_Sym *extsyms = NULL;
|
||||
Elf32_External_Sym *free_extsyms = NULL;
|
||||
Elf_External_Sym_Shndx *shndx_buf = NULL;
|
||||
|
||||
/* Assume nothing changes. */
|
||||
*again = false;
|
||||
@ -551,6 +553,7 @@ mn10200_elf_relax_section (abfd, sec, link_info, again)
|
||||
sec->_cooked_size = sec->_raw_size;
|
||||
|
||||
symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
|
||||
shndx_hdr = &elf_tdata (abfd)->symtab_shndx_hdr;
|
||||
|
||||
/* Get a copy of the native relocations. */
|
||||
internal_relocs = (_bfd_elf32_link_read_relocs
|
||||
@ -603,29 +606,57 @@ mn10200_elf_relax_section (abfd, sec, link_info, again)
|
||||
else
|
||||
{
|
||||
/* Go get them off disk. */
|
||||
bfd_size_type amt = symtab_hdr->sh_size;
|
||||
bfd_size_type amt;
|
||||
|
||||
amt = symtab_hdr->sh_info;
|
||||
amt *= sizeof (Elf32_External_Sym);
|
||||
extsyms = (Elf32_External_Sym *) bfd_malloc (amt);
|
||||
if (extsyms == NULL)
|
||||
goto error_return;
|
||||
free_extsyms = extsyms;
|
||||
if (bfd_seek (abfd, symtab_hdr->sh_offset, SEEK_SET) != 0
|
||||
|| bfd_bread (extsyms, amt, abfd) != amt)
|
||||
|| bfd_bread ((PTR) extsyms, amt, abfd) != amt)
|
||||
goto error_return;
|
||||
symtab_hdr->contents = (bfd_byte *) extsyms;
|
||||
}
|
||||
|
||||
if (shndx_hdr->sh_size != 0)
|
||||
{
|
||||
bfd_size_type amt;
|
||||
|
||||
amt = symtab_hdr->sh_info;
|
||||
amt *= sizeof (Elf_External_Sym_Shndx);
|
||||
shndx_buf = (Elf_External_Sym_Shndx *) bfd_malloc (amt);
|
||||
if (shndx_buf == NULL)
|
||||
goto error_return;
|
||||
if (bfd_seek (abfd, shndx_hdr->sh_offset, SEEK_SET) != 0
|
||||
|| bfd_bread ((PTR) shndx_buf, amt, abfd) != amt)
|
||||
goto error_return;
|
||||
shndx_hdr->contents = (bfd_byte *) shndx_buf;
|
||||
}
|
||||
}
|
||||
|
||||
/* Get the value of the symbol referred to by the reloc. */
|
||||
if (ELF32_R_SYM (irel->r_info) < symtab_hdr->sh_info)
|
||||
{
|
||||
/* A local symbol. */
|
||||
Elf32_External_Sym *esym;
|
||||
Elf_External_Sym_Shndx *shndx;
|
||||
Elf_Internal_Sym isym;
|
||||
asection *sym_sec;
|
||||
|
||||
/* A local symbol. */
|
||||
bfd_elf32_swap_symbol_in (abfd,
|
||||
extsyms + ELF32_R_SYM (irel->r_info),
|
||||
&isym);
|
||||
esym = extsyms + ELF32_R_SYM (irel->r_info);
|
||||
shndx = shndx_buf + (shndx_buf ? ELF32_R_SYM (irel->r_info) : 0);
|
||||
bfd_elf32_swap_symbol_in (abfd, esym, shndx, &isym);
|
||||
|
||||
sym_sec = bfd_section_from_elf_index (abfd, isym.st_shndx);
|
||||
if (isym.st_shndx == SHN_UNDEF)
|
||||
sym_sec = bfd_und_section_ptr;
|
||||
else if (isym.st_shndx == SHN_ABS)
|
||||
sym_sec = bfd_abs_section_ptr;
|
||||
else if (isym.st_shndx == SHN_COMMON)
|
||||
sym_sec = bfd_com_section_ptr;
|
||||
else
|
||||
sym_sec = bfd_section_from_elf_index (abfd, isym.st_shndx);
|
||||
symval = (isym.st_value
|
||||
+ sym_sec->output_section->vma
|
||||
+ sym_sec->output_offset);
|
||||
@ -692,7 +723,6 @@ mn10200_elf_relax_section (abfd, sec, link_info, again)
|
||||
elf_section_data (sec)->this_hdr.contents = contents;
|
||||
free_contents = NULL;
|
||||
|
||||
symtab_hdr->contents = (bfd_byte *) extsyms;
|
||||
free_extsyms = NULL;
|
||||
|
||||
/* Fix the opcode. */
|
||||
@ -750,7 +780,6 @@ mn10200_elf_relax_section (abfd, sec, link_info, again)
|
||||
elf_section_data (sec)->this_hdr.contents = contents;
|
||||
free_contents = NULL;
|
||||
|
||||
symtab_hdr->contents = (bfd_byte *) extsyms;
|
||||
free_extsyms = NULL;
|
||||
|
||||
/* Fix the opcode. */
|
||||
@ -836,8 +865,7 @@ mn10200_elf_relax_section (abfd, sec, link_info, again)
|
||||
|
||||
/* We also have to be sure there is no symbol/label
|
||||
at the unconditional branch. */
|
||||
if (mn10200_elf_symbol_address_p (abfd, sec, extsyms,
|
||||
irel->r_offset + 1))
|
||||
if (mn10200_elf_symbol_address_p (abfd, sec, irel->r_offset + 1))
|
||||
continue;
|
||||
|
||||
/* Note that we've changed the relocs, section contents, etc. */
|
||||
@ -847,7 +875,6 @@ mn10200_elf_relax_section (abfd, sec, link_info, again)
|
||||
elf_section_data (sec)->this_hdr.contents = contents;
|
||||
free_contents = NULL;
|
||||
|
||||
symtab_hdr->contents = (bfd_byte *) extsyms;
|
||||
free_extsyms = NULL;
|
||||
|
||||
/* Reverse the condition of the first branch. */
|
||||
@ -971,7 +998,6 @@ mn10200_elf_relax_section (abfd, sec, link_info, again)
|
||||
elf_section_data (sec)->this_hdr.contents = contents;
|
||||
free_contents = NULL;
|
||||
|
||||
symtab_hdr->contents = (bfd_byte *) extsyms;
|
||||
free_extsyms = NULL;
|
||||
|
||||
/* Fix the opcode. */
|
||||
@ -1015,7 +1041,6 @@ mn10200_elf_relax_section (abfd, sec, link_info, again)
|
||||
elf_section_data (sec)->this_hdr.contents = contents;
|
||||
free_contents = NULL;
|
||||
|
||||
symtab_hdr->contents = (bfd_byte *) extsyms;
|
||||
free_extsyms = NULL;
|
||||
|
||||
if ((code & 0xfc) == 0x74)
|
||||
@ -1103,7 +1128,6 @@ mn10200_elf_relax_section (abfd, sec, link_info, again)
|
||||
elf_section_data (sec)->this_hdr.contents = contents;
|
||||
free_contents = NULL;
|
||||
|
||||
symtab_hdr->contents = (bfd_byte *) extsyms;
|
||||
free_extsyms = NULL;
|
||||
|
||||
/* Fix the opcode. */
|
||||
@ -1167,7 +1191,6 @@ mn10200_elf_relax_section (abfd, sec, link_info, again)
|
||||
elf_section_data (sec)->this_hdr.contents = contents;
|
||||
free_contents = NULL;
|
||||
|
||||
symtab_hdr->contents = (bfd_byte *) extsyms;
|
||||
free_extsyms = NULL;
|
||||
|
||||
bfd_put_8 (abfd, 0xcc + (code & 0x03),
|
||||
@ -1199,10 +1222,7 @@ mn10200_elf_relax_section (abfd, sec, link_info, again)
|
||||
}
|
||||
|
||||
if (free_relocs != NULL)
|
||||
{
|
||||
free (free_relocs);
|
||||
free_relocs = NULL;
|
||||
}
|
||||
free (free_relocs);
|
||||
|
||||
if (free_contents != NULL)
|
||||
{
|
||||
@ -1213,19 +1233,21 @@ mn10200_elf_relax_section (abfd, sec, link_info, again)
|
||||
/* Cache the section contents for elf_link_input_bfd. */
|
||||
elf_section_data (sec)->this_hdr.contents = contents;
|
||||
}
|
||||
free_contents = NULL;
|
||||
}
|
||||
|
||||
if (shndx_buf != NULL)
|
||||
{
|
||||
shndx_hdr->contents = NULL;
|
||||
free (shndx_buf);
|
||||
}
|
||||
|
||||
if (free_extsyms != NULL)
|
||||
{
|
||||
if (! link_info->keep_memory)
|
||||
free (free_extsyms);
|
||||
else
|
||||
{
|
||||
/* Cache the symbols for elf_link_input_bfd. */
|
||||
symtab_hdr->contents = (unsigned char *) extsyms;
|
||||
symtab_hdr->contents = NULL;
|
||||
free (free_extsyms);
|
||||
}
|
||||
free_extsyms = NULL;
|
||||
}
|
||||
|
||||
return true;
|
||||
@ -1235,8 +1257,17 @@ mn10200_elf_relax_section (abfd, sec, link_info, again)
|
||||
free (free_relocs);
|
||||
if (free_contents != NULL)
|
||||
free (free_contents);
|
||||
if (shndx_buf != NULL)
|
||||
{
|
||||
shndx_hdr->contents = NULL;
|
||||
free (shndx_buf);
|
||||
}
|
||||
if (free_extsyms != NULL)
|
||||
free (free_extsyms);
|
||||
{
|
||||
symtab_hdr->contents = NULL;
|
||||
free (free_extsyms);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -1250,19 +1281,23 @@ mn10200_elf_relax_delete_bytes (abfd, sec, addr, count)
|
||||
int count;
|
||||
{
|
||||
Elf_Internal_Shdr *symtab_hdr;
|
||||
Elf_Internal_Shdr *shndx_hdr;
|
||||
Elf32_External_Sym *extsyms;
|
||||
int shndx, index;
|
||||
unsigned int sec_shndx;
|
||||
bfd_byte *contents;
|
||||
Elf_Internal_Rela *irel, *irelend;
|
||||
Elf_Internal_Rela *irelalign;
|
||||
bfd_vma toaddr;
|
||||
Elf32_External_Sym *esym, *esymend;
|
||||
struct elf_link_hash_entry *sym_hash;
|
||||
Elf_External_Sym_Shndx *shndx;
|
||||
struct elf_link_hash_entry **sym_hashes;
|
||||
struct elf_link_hash_entry **end_hashes;
|
||||
unsigned int symcount;
|
||||
|
||||
symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
|
||||
extsyms = (Elf32_External_Sym *) symtab_hdr->contents;
|
||||
|
||||
shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
|
||||
sec_shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
|
||||
|
||||
contents = elf_section_data (sec)->this_hdr.contents;
|
||||
|
||||
@ -1290,40 +1325,41 @@ mn10200_elf_relax_delete_bytes (abfd, sec, addr, count)
|
||||
}
|
||||
|
||||
/* Adjust the local symbols defined in this section. */
|
||||
shndx_hdr = &elf_tdata (abfd)->symtab_shndx_hdr;
|
||||
shndx = (Elf_External_Sym_Shndx *) shndx_hdr->contents;
|
||||
esym = extsyms;
|
||||
esymend = esym + symtab_hdr->sh_info;
|
||||
for (; esym < esymend; esym++)
|
||||
for (; esym < esymend; esym++, shndx = (shndx ? shndx + 1 : NULL))
|
||||
{
|
||||
Elf_Internal_Sym isym;
|
||||
Elf_External_Sym_Shndx dummy;
|
||||
|
||||
bfd_elf32_swap_symbol_in (abfd, esym, &isym);
|
||||
bfd_elf32_swap_symbol_in (abfd, esym, shndx, &isym);
|
||||
|
||||
if (isym.st_shndx == shndx
|
||||
if (isym.st_shndx == sec_shndx
|
||||
&& isym.st_value > addr
|
||||
&& isym.st_value < toaddr)
|
||||
{
|
||||
isym.st_value -= count;
|
||||
bfd_elf32_swap_symbol_out (abfd, &isym, esym);
|
||||
bfd_elf32_swap_symbol_out (abfd, &isym, (PTR) esym, (PTR) &dummy);
|
||||
}
|
||||
}
|
||||
|
||||
/* Now adjust the global symbols defined in this section. */
|
||||
esym = extsyms + symtab_hdr->sh_info;
|
||||
esymend = extsyms + (symtab_hdr->sh_size / sizeof (Elf32_External_Sym));
|
||||
for (index = 0; esym < esymend; esym++, index++)
|
||||
symcount = (symtab_hdr->sh_size / sizeof (Elf32_External_Sym)
|
||||
- symtab_hdr->sh_info);
|
||||
sym_hashes = elf_sym_hashes (abfd);
|
||||
end_hashes = sym_hashes + symcount;
|
||||
for (; sym_hashes < end_hashes; sym_hashes++)
|
||||
{
|
||||
Elf_Internal_Sym isym;
|
||||
|
||||
bfd_elf32_swap_symbol_in (abfd, esym, &isym);
|
||||
sym_hash = elf_sym_hashes (abfd)[index];
|
||||
if (isym.st_shndx == shndx
|
||||
&& ((sym_hash)->root.type == bfd_link_hash_defined
|
||||
|| (sym_hash)->root.type == bfd_link_hash_defweak)
|
||||
&& (sym_hash)->root.u.def.section == sec
|
||||
&& (sym_hash)->root.u.def.value > addr
|
||||
&& (sym_hash)->root.u.def.value < toaddr)
|
||||
struct elf_link_hash_entry *sym_hash = *sym_hashes;
|
||||
if ((sym_hash->root.type == bfd_link_hash_defined
|
||||
|| sym_hash->root.type == bfd_link_hash_defweak)
|
||||
&& sym_hash->root.u.def.section == sec
|
||||
&& sym_hash->root.u.def.value > addr
|
||||
&& sym_hash->root.u.def.value < toaddr)
|
||||
{
|
||||
(sym_hash)->root.u.def.value -= count;
|
||||
sym_hash->root.u.def.value -= count;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1333,46 +1369,53 @@ mn10200_elf_relax_delete_bytes (abfd, sec, addr, count)
|
||||
/* Return true if a symbol exists at the given address, else return
|
||||
false. */
|
||||
static boolean
|
||||
mn10200_elf_symbol_address_p (abfd, sec, extsyms, addr)
|
||||
mn10200_elf_symbol_address_p (abfd, sec, addr)
|
||||
bfd *abfd;
|
||||
asection *sec;
|
||||
Elf32_External_Sym *extsyms;
|
||||
bfd_vma addr;
|
||||
{
|
||||
Elf_Internal_Shdr *symtab_hdr;
|
||||
int shndx;
|
||||
Elf_Internal_Shdr *shndx_hdr;
|
||||
unsigned int sec_shndx;
|
||||
Elf32_External_Sym *esym, *esymend;
|
||||
struct elf_link_hash_entry **sym_hash, **sym_hash_end;
|
||||
Elf_External_Sym_Shndx *shndx;
|
||||
struct elf_link_hash_entry **sym_hashes;
|
||||
struct elf_link_hash_entry **end_hashes;
|
||||
unsigned int symcount;
|
||||
|
||||
symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
|
||||
shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
|
||||
sec_shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
|
||||
|
||||
/* Examine all the symbols. */
|
||||
esym = extsyms;
|
||||
symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
|
||||
shndx_hdr = &elf_tdata (abfd)->symtab_shndx_hdr;
|
||||
shndx = (Elf_External_Sym_Shndx *) shndx_hdr->contents;
|
||||
esym = (Elf32_External_Sym *) symtab_hdr->contents;
|
||||
esymend = esym + symtab_hdr->sh_info;
|
||||
for (; esym < esymend; esym++)
|
||||
for (; esym < esymend; esym++, shndx = (shndx ? shndx + 1 : NULL))
|
||||
{
|
||||
Elf_Internal_Sym isym;
|
||||
|
||||
bfd_elf32_swap_symbol_in (abfd, esym, &isym);
|
||||
bfd_elf32_swap_symbol_in (abfd, esym, shndx, &isym);
|
||||
|
||||
if (isym.st_shndx == shndx
|
||||
if (isym.st_shndx == sec_shndx
|
||||
&& isym.st_value == addr)
|
||||
return true;
|
||||
}
|
||||
|
||||
sym_hash = elf_sym_hashes (abfd);
|
||||
sym_hash_end = (sym_hash
|
||||
+ (symtab_hdr->sh_size / sizeof (Elf32_External_Sym)
|
||||
- symtab_hdr->sh_info));
|
||||
for (; sym_hash < sym_hash_end; sym_hash++)
|
||||
symcount = (symtab_hdr->sh_size / sizeof (Elf32_External_Sym)
|
||||
- symtab_hdr->sh_info);
|
||||
sym_hashes = elf_sym_hashes (abfd);
|
||||
end_hashes = sym_hashes + symcount;
|
||||
for (; sym_hashes < end_hashes; sym_hashes++)
|
||||
{
|
||||
if (((*sym_hash)->root.type == bfd_link_hash_defined
|
||||
|| (*sym_hash)->root.type == bfd_link_hash_defweak)
|
||||
&& (*sym_hash)->root.u.def.section == sec
|
||||
&& (*sym_hash)->root.u.def.value == addr)
|
||||
struct elf_link_hash_entry *sym_hash = *sym_hashes;
|
||||
if ((sym_hash->root.type == bfd_link_hash_defined
|
||||
|| sym_hash->root.type == bfd_link_hash_defweak)
|
||||
&& sym_hash->root.u.def.section == sec
|
||||
&& sym_hash->root.u.def.value == addr)
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -1390,11 +1433,14 @@ mn10200_elf_get_relocated_section_contents (output_bfd, link_info, link_order,
|
||||
asymbol **symbols;
|
||||
{
|
||||
Elf_Internal_Shdr *symtab_hdr;
|
||||
Elf_Internal_Shdr *shndx_hdr;
|
||||
asection *input_section = link_order->u.indirect.section;
|
||||
bfd *input_bfd = input_section->owner;
|
||||
asection **sections = NULL;
|
||||
Elf_Internal_Rela *internal_relocs = NULL;
|
||||
Elf32_External_Sym *external_syms = NULL;
|
||||
Elf_External_Sym_Shndx *shndx_buf = NULL;
|
||||
Elf_External_Sym_Shndx *shndx;
|
||||
Elf_Internal_Sym *internal_syms = NULL;
|
||||
|
||||
/* We only need to handle the case of relaxing, or of having a
|
||||
@ -1407,6 +1453,7 @@ mn10200_elf_get_relocated_section_contents (output_bfd, link_info, link_order,
|
||||
symbols);
|
||||
|
||||
symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
|
||||
shndx_hdr = &elf_tdata (input_bfd)->symtab_shndx_hdr;
|
||||
|
||||
memcpy (data, elf_section_data (input_section)->this_hdr.contents,
|
||||
(size_t) input_section->_raw_size);
|
||||
@ -1417,19 +1464,31 @@ mn10200_elf_get_relocated_section_contents (output_bfd, link_info, link_order,
|
||||
Elf_Internal_Sym *isymp;
|
||||
asection **secpp;
|
||||
Elf32_External_Sym *esym, *esymend;
|
||||
bfd_size_type size;
|
||||
bfd_size_type amt;
|
||||
|
||||
if (symtab_hdr->contents != NULL)
|
||||
external_syms = (Elf32_External_Sym *) symtab_hdr->contents;
|
||||
else
|
||||
else if (symtab_hdr->sh_info != 0)
|
||||
{
|
||||
size = symtab_hdr->sh_info;
|
||||
size *= sizeof (Elf32_External_Sym);
|
||||
external_syms = (Elf32_External_Sym *) bfd_malloc (size);
|
||||
if (external_syms == NULL && size != 0)
|
||||
amt = symtab_hdr->sh_info;
|
||||
amt *= sizeof (Elf32_External_Sym);
|
||||
external_syms = (Elf32_External_Sym *) bfd_malloc (amt);
|
||||
if (external_syms == NULL)
|
||||
goto error_return;
|
||||
if (bfd_seek (input_bfd, symtab_hdr->sh_offset, SEEK_SET) != 0
|
||||
|| bfd_bread (external_syms, size, input_bfd) != size)
|
||||
|| bfd_bread ((PTR) external_syms, amt, input_bfd) != amt)
|
||||
goto error_return;
|
||||
}
|
||||
|
||||
if (symtab_hdr->sh_info != 0 && shndx_hdr->sh_size != 0)
|
||||
{
|
||||
amt = symtab_hdr->sh_info;
|
||||
amt *= sizeof (Elf_External_Sym_Shndx);
|
||||
shndx_buf = (Elf_External_Sym_Shndx *) bfd_malloc (amt);
|
||||
if (shndx_buf == NULL)
|
||||
goto error_return;
|
||||
if (bfd_seek (input_bfd, shndx_hdr->sh_offset, SEEK_SET) != 0
|
||||
|| bfd_bread ((PTR) shndx_buf, amt, input_bfd) != amt)
|
||||
goto error_return;
|
||||
}
|
||||
|
||||
@ -1439,41 +1498,35 @@ mn10200_elf_get_relocated_section_contents (output_bfd, link_info, link_order,
|
||||
if (internal_relocs == NULL)
|
||||
goto error_return;
|
||||
|
||||
size = symtab_hdr->sh_info;
|
||||
size *= sizeof (Elf_Internal_Sym);
|
||||
internal_syms = (Elf_Internal_Sym *) bfd_malloc (size);
|
||||
if (internal_syms == NULL && size != 0)
|
||||
amt = symtab_hdr->sh_info;
|
||||
amt *= sizeof (Elf_Internal_Sym);
|
||||
internal_syms = (Elf_Internal_Sym *) bfd_malloc (amt);
|
||||
if (internal_syms == NULL && amt != 0)
|
||||
goto error_return;
|
||||
|
||||
size = symtab_hdr->sh_info;
|
||||
size *= sizeof (asection *);
|
||||
sections = (asection **) bfd_malloc (size);
|
||||
if (sections == NULL && size != 0)
|
||||
amt = symtab_hdr->sh_info;
|
||||
amt *= sizeof (asection *);
|
||||
sections = (asection **) bfd_malloc (amt);
|
||||
if (sections == NULL && amt != 0)
|
||||
goto error_return;
|
||||
|
||||
isymp = internal_syms;
|
||||
secpp = sections;
|
||||
esym = external_syms;
|
||||
esymend = esym + symtab_hdr->sh_info;
|
||||
for (; esym < esymend; ++esym, ++isymp, ++secpp)
|
||||
for (isymp = internal_syms, secpp = sections, shndx = shndx_buf,
|
||||
esym = external_syms, esymend = esym + symtab_hdr->sh_info;
|
||||
esym < esymend;
|
||||
++esym, ++isymp, ++secpp, shndx = (shndx ? shndx + 1 : NULL))
|
||||
{
|
||||
asection *isec;
|
||||
|
||||
bfd_elf32_swap_symbol_in (input_bfd, esym, isymp);
|
||||
bfd_elf32_swap_symbol_in (input_bfd, esym, shndx, isymp);
|
||||
|
||||
if (isymp->st_shndx == SHN_UNDEF)
|
||||
isec = bfd_und_section_ptr;
|
||||
else if (isymp->st_shndx > 0 && isymp->st_shndx < SHN_LORESERVE)
|
||||
isec = bfd_section_from_elf_index (input_bfd, isymp->st_shndx);
|
||||
else if (isymp->st_shndx == SHN_ABS)
|
||||
isec = bfd_abs_section_ptr;
|
||||
else if (isymp->st_shndx == SHN_COMMON)
|
||||
isec = bfd_com_section_ptr;
|
||||
else
|
||||
{
|
||||
/* Who knows? */
|
||||
isec = NULL;
|
||||
}
|
||||
isec = bfd_section_from_elf_index (input_bfd, isymp->st_shndx);
|
||||
|
||||
*secpp = isec;
|
||||
}
|
||||
@ -1485,16 +1538,14 @@ mn10200_elf_get_relocated_section_contents (output_bfd, link_info, link_order,
|
||||
|
||||
if (sections != NULL)
|
||||
free (sections);
|
||||
sections = NULL;
|
||||
if (internal_syms != NULL)
|
||||
free (internal_syms);
|
||||
internal_syms = NULL;
|
||||
if (shndx_buf != NULL)
|
||||
free (shndx_buf);
|
||||
if (external_syms != NULL && symtab_hdr->contents == NULL)
|
||||
free (external_syms);
|
||||
external_syms = NULL;
|
||||
if (internal_relocs != elf_section_data (input_section)->relocs)
|
||||
free (internal_relocs);
|
||||
internal_relocs = NULL;
|
||||
}
|
||||
|
||||
return data;
|
||||
@ -1503,6 +1554,8 @@ mn10200_elf_get_relocated_section_contents (output_bfd, link_info, link_order,
|
||||
if (internal_relocs != NULL
|
||||
&& internal_relocs != elf_section_data (input_section)->relocs)
|
||||
free (internal_relocs);
|
||||
if (shndx_buf != NULL)
|
||||
free (shndx_buf);
|
||||
if (external_syms != NULL && symtab_hdr->contents == NULL)
|
||||
free (external_syms);
|
||||
if (internal_syms != NULL)
|
||||
|
||||
Reference in New Issue
Block a user