mirrors/binutils-gdb
1
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-23 10:03:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Generic ELF target group signature symbol

Browse Source 
Even though the generic ELF target doesn't handle groups correctly,
this helps avoid a segfault in bfd_elf_set_group_contents seen on
d30v-elf, dlx-elf, pj-elf, and xgate-elf when linking the pr22836
testcase.

	PR 24596
bfd/
	* linker.c (_bfd_generic_link_output_symbols): Heed BSF_KEEP.
ld/
	* emultempl/genelf.em (gld${EMULATION_NAME}_after_open): Set
	BFS_KEEP on group signature symbol.
This commit is contained in:
Alan Modra 2019-05-27 09:38:42 +09:30
parent d5b7ce35a1
commit 3d7d6a6ff4
4 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bfd/ChangeLog
View File

@ -1,3 +1,8 @@
2019-05-27 Alan Modra <amodra@gmail.com>
PR 24596
* linker.c (_bfd_generic_link_output_symbols): Heed BSF_KEEP.
2019-05-24 Szabolcs Nagy <szabolcs.nagy@arm.com>
* elfnn-aarch64.c (elfNN_aarch64_merge_symbol_attribute): New function.

13
bfd/linker.c
View File

@ -2112,12 +2112,11 @@ _bfd_generic_link_output_symbols (bfd *output_bfd,
}
}
/* This switch is straight from the old code in
write_file_locals in ldsym.c. */
if (info->strip == strip_all
|| (info->strip == strip_some
&& bfd_hash_lookup (info->keep_hash, bfd_asymbol_name (sym),
FALSE, FALSE) == NULL))
if ((sym->flags & BSF_KEEP) == 0
&& (info->strip == strip_all
|| (info->strip == strip_some
&& bfd_hash_lookup (info->keep_hash, bfd_asymbol_name (sym),
FALSE, FALSE) == NULL)))
output = FALSE;
else if ((sym->flags & (BSF_GLOBAL | BSF_WEAK | BSF_GNU_UNIQUE)) != 0)
{
@ -2131,6 +2130,8 @@ _bfd_generic_link_output_symbols (bfd *output_bfd,
else
output = FALSE;
}
else if ((sym->flags & BSF_KEEP) != 0)
output = TRUE;
else if (bfd_is_ind_section (sym->section))
output = FALSE;
else if ((sym->flags & BSF_DEBUGGING) != 0)

6
ld/ChangeLog
View File

@ -1,3 +1,9 @@
2019-05-27 Alan Modra <amodra@gmail.com>
PR 24596
* emultempl/genelf.em (gld${EMULATION_NAME}_after_open): Set
BFS_KEEP on group signature symbol.
2019-04-24 Szabolcs Nagy <szabolcs.nagy@arm.com>
* testsuite/ld-aarch64/aarch64-elf.exp: Add new tests.

4
ld/emultempl/genelf.em
View File

@ -45,7 +45,9 @@ gld${EMULATION_NAME}_after_open (void)
if ((sec->flags & (SEC_GROUP | SEC_LINKER_CREATED)) == SEC_GROUP)
{
struct bfd_elf_section_data *sec_data = elf_section_data (sec);
elf_group_id (sec) = syms[sec_data->this_hdr.sh_info - 1];
struct bfd_symbol *sym = syms[sec_data->this_hdr.sh_info - 1];
elf_group_id (sec) = sym;
sym->flags |= BSF_KEEP;
}
}