Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

2005-09-28 H.J. Lu <hongjiu.lu@intel.com>

Browse Source 
PR binutils/1321
	* elf-bfd.h (_bfd_elf_setup_group_pointers): Renamed to ...
	(_bfd_elf_setup_sections): This.
	* elf.c: Likewise.
	* elfcode.h (elf_object_p): Likewise.

	* elf.c (_bfd_elf_setup_sections): Process SHF_LINK_ORDER.
	(_bfd_elf_copy_private_section_data): Likewise.
This commit is contained in:
H.J. Lu
2005-09-28 14:53:24 +00:00
parent d33cdfe369
commit dd86362472
4 changed files with 52 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bfd/ChangeLog
View File

@@ -1,3 +1,14 @@
2005-09-28 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/1321
* elf-bfd.h (_bfd_elf_setup_group_pointers): Renamed to ...
(_bfd_elf_setup_sections): This.
* elf.c: Likewise.
* elfcode.h (elf_object_p): Likewise.
* elf.c (_bfd_elf_setup_sections): Process SHF_LINK_ORDER.
(_bfd_elf_copy_private_section_data): Likewise.
2005-09-28 H.J. Lu <hongjiu.lu@intel.com>
* elflink.c (elf_fixup_link_order): Report locations for mixed

2
bfd/elf-bfd.h
View File

@@ -1675,7 +1675,7 @@ extern bfd_boolean _bfd_elf_symbol_refs_local_p
extern bfd_boolean bfd_elf_match_symbols_in_sections
(asection *sec1, asection *sec2);
extern bfd_boolean _bfd_elf_setup_group_pointers
extern bfd_boolean _bfd_elf_setup_sections
(bfd *);
extern const bfd_target *bfd_elf32_object_p

40
bfd/elf.c
View File

@@ -626,12 +626,41 @@ setup_group (bfd *abfd, Elf_Internal_Shdr *hdr, asection *newsect)
}
bfd_boolean
_bfd_elf_setup_group_pointers (bfd *abfd)
_bfd_elf_setup_sections (bfd *abfd)
{
unsigned int i;
unsigned int num_group = elf_tdata (abfd)->num_group;
bfd_boolean result = TRUE;
asection *s;
/* Process SHF_LINK_ORDER. */
for (s = abfd->sections; s != NULL; s = s->next)
{
Elf_Internal_Shdr *this_hdr = &elf_section_data (s)->this_hdr;
if ((this_hdr->sh_flags & SHF_LINK_ORDER) != 0)
{
unsigned int elfsec = this_hdr->sh_link;
/* FIXME: The old Intel compiler and old strip/objcopy may
not set the sh_link or sh_info fields. Hence we could
get the situation where elfsec is 0. */
if (elfsec == 0)
{
const struct elf_backend_data *bed
= get_elf_backend_data (abfd);
if (bed->link_order_error_handler)
bed->link_order_error_handler
(_("%B: warning: sh_link not set for section `%A'"),
abfd, s);
}
else
{
this_hdr = elf_elfsections (abfd)[elfsec];
elf_linked_to_section (s) = this_hdr->bfd_section;
}
}
}
/* Process section groups. */
if (num_group == (unsigned) -1)
return result;
@@ -5665,7 +5694,14 @@ _bfd_elf_copy_private_section_data (bfd *ibfd,
/* Set things up for objcopy. The output SHT_GROUP section will
have its elf_next_in_group pointing back to the input group
members. Ignore linker created group section. See
elfNN_ia64_object_p in elfxx-ia64.c. */
elfNN_ia64_object_p in elfxx-ia64.c. We also need to handle
elf_linked_to_section for SHF_LINK_ORDER. */
if ((ihdr->sh_flags & SHF_LINK_ORDER) != 0
&& elf_linked_to_section (isec) != 0)
elf_linked_to_section (osec)
= elf_linked_to_section (isec)->output_section;
if (elf_sec_group (isec) == NULL
|| (elf_sec_group (isec)->flags & SEC_LINKER_CREATED) == 0)
{

4
bfd/elfcode.h
View File

@@ -791,8 +791,8 @@ elf_object_p (bfd *abfd)
shindex += SHN_HIRESERVE + 1 - SHN_LORESERVE;
}
/* Set up group pointers. */
if (! _bfd_elf_setup_group_pointers (abfd))
/* Set up ELF sections for SHF_GROUP and SHF_LINK_ORDER. */
if (! _bfd_elf_setup_sections (abfd))
goto got_wrong_format_error;
}