darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Skip an archive element if not added by linker

Browse source 
During archive rescan to resolve symbol references for files added by
LTO, linker add_archive_element callback is called to check if an
archive element should added.  After all IR symbols have been claimed,
linker won't claim new IR symbols and shouldn't add the LTO archive
element.  This patch updates linker add_archive_element callback to
return FALSE when seeing an LTO archive element during rescan and
changes ELF linker to skip such archive element.

bfd/

	PR ld/20103
	* cofflink.c (coff_link_check_archive_element): Return TRUE if
	linker add_archive_element callback returns FALSE.
	* ecoff.c (ecoff_link_check_archive_element): Likewise.
	* elf64-ia64-vms.c (elf64_vms_link_add_archive_symbols): Skip
	archive element if linker add_archive_element callback returns
	FALSE.
	* elflink.c (elf_link_add_archive_symbols): Likewise.
	* pdp11.c (aout_link_check_ar_symbols): Likewise.
	* vms-alpha.c (alpha_vms_link_add_archive_symbols): Likewise.
	* xcofflink.c (xcoff_link_check_dynamic_ar_symbols): Likewise.
	(xcoff_link_check_ar_symbols): Likewise.

ld/

	PR ld/20103
	* ldmain.c (add_archive_element): Don't claim new IR symbols
	after all IR symbols have been claimed.
	* plugin.c (plugin_call_claim_file): Remove no_more_claiming
	check.
	* testsuite/ld-plugin/lto.exp (pr20103): New proc.
	Run PR ld/20103 tests.
	* testsuite/ld-plugin/pr20103a.c: New file.
	* testsuite/ld-plugin/pr20103b.c: Likewise.
	* testsuite/ld-plugin/pr20103c.c: Likewise.
This commit is contained in:
H.J. Lu 2016-05-25 08:40:52 -07:00
parent 7bd787e877
commit b95a0a3177
15 changed files with 151 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
bfd/ChangeLog
View file

@ -1,3 +1,18 @@
2016-05-25 H.J. Lu <hongjiu.lu@intel.com>
PR ld/20103
* cofflink.c (coff_link_check_archive_element): Return TRUE if
linker add_archive_element callback returns FALSE.
* ecoff.c (ecoff_link_check_archive_element): Likewise.
* elf64-ia64-vms.c (elf64_vms_link_add_archive_symbols): Skip
archive element if linker add_archive_element callback returns
FALSE.
* elflink.c (elf_link_add_archive_symbols): Likewise.
* pdp11.c (aout_link_check_ar_symbols): Likewise.
* vms-alpha.c (alpha_vms_link_add_archive_symbols): Likewise.
* xcofflink.c (xcoff_link_check_dynamic_ar_symbols): Likewise.
(xcoff_link_check_ar_symbols): Likewise.
2016-05-24 Maciej W. Rozycki <macro@imgtec.com>
* elfxx-mips.c (_bfd_mips_elf_relocate_section)

3
bfd/cofflink.c
View file

@ -212,8 +212,9 @@ coff_link_check_archive_element (bfd *abfd,
if (h->type != bfd_link_hash_undefined)
return TRUE;
/* Include this element? */
if (!(*info->callbacks->add_archive_element) (info, abfd, name, &abfd))
return FALSE;
return TRUE;
*pneeded = TRUE;
return coff_link_add_object_symbols (abfd, info);

4
bfd/ecoff.c
View file

@ -3544,9 +3544,9 @@ ecoff_link_check_archive_element (bfd *abfd,
if (h->type != bfd_link_hash_undefined)
return TRUE;
/* Include this element. */
/* Include this element? */
if (!(*info->callbacks->add_archive_element) (info, abfd, name, &abfd))
return FALSE;
return TRUE;
*pneeded = TRUE;
return ecoff_link_add_object_symbols (abfd, info);

2
bfd/elf64-ia64-vms.c
View file

@ -5361,7 +5361,7 @@ elf64_vms_link_add_archive_symbols (bfd *abfd, struct bfd_link_info *info)
to include it. We don't need to check anything. */
if (! (*info->callbacks->add_archive_element) (info, element,
h->root.string, &element))
return FALSE;
continue;
if (! elf64_vms_link_add_object_symbols (element, info))
return FALSE;

2
bfd/elflink.c
View file

@ -5283,7 +5283,7 @@ elf_link_add_archive_symbols (bfd *abfd, struct bfd_link_info *info)
if (!(*info->callbacks
->add_archive_element) (info, element, symdef->name, &element))
goto error_return;
continue;
if (!bfd_link_add_symbols (element, info))
goto error_return;

2
bfd/pdp11.c
View file

@ -2608,7 +2608,7 @@ aout_link_check_ar_symbols (bfd *abfd,
However, it might be correct. */
if (!(*info->callbacks
->add_archive_element) (info, abfd, name, subsbfd))
return FALSE;
continue;
*pneeded = TRUE;
return TRUE;
}

2
bfd/vms-alpha.c
View file

@ -8202,7 +8202,7 @@ alpha_vms_link_add_archive_symbols (bfd *abfd, struct bfd_link_info *info)
to include it. We don't need to check anything. */
if (!(*info->callbacks
->add_archive_element) (info, element, h->root.string, &element))
return FALSE;
continue;
if (!alpha_vms_link_add_object_symbols (element, info))
return FALSE;

4
bfd/xcofflink.c
View file

@ -2291,7 +2291,7 @@ xcoff_link_check_dynamic_ar_symbols (bfd *abfd,
{
if (!(*info->callbacks
->add_archive_element) (info, abfd, name, subsbfd))
return FALSE;
continue;
*pneeded = TRUE;
return TRUE;
}
@ -2363,7 +2363,7 @@ xcoff_link_check_ar_symbols (bfd *abfd,
{
if (!(*info->callbacks
->add_archive_element) (info, abfd, name, subsbfd))
return FALSE;
continue;
*pneeded = TRUE;
return TRUE;
}

13
ld/ChangeLog
View file

@ -1,3 +1,16 @@
2016-05-25 H.J. Lu <hongjiu.lu@intel.com>
PR ld/20103
* ldmain.c (add_archive_element): Don't claim new IR symbols
after all IR symbols have been claimed.
* plugin.c (plugin_call_claim_file): Remove no_more_claiming
check.
* testsuite/ld-plugin/lto.exp (pr20103): New proc.
Run PR ld/20103 tests.
* testsuite/ld-plugin/pr20103a.c: New file.
* testsuite/ld-plugin/pr20103b.c: Likewise.
* testsuite/ld-plugin/pr20103c.c: Likewise.
2016-05-24 Maciej W. Rozycki <macro@imgtec.com>
* testsuite/ld-mips-elf/jalx-local.d: New test.

12
ld/ldmain.c
View file

@ -796,12 +796,22 @@ add_archive_element (struct bfd_link_info *info,
BFD, but we still want to output the original BFD filename. */
orig_input = *input;
#ifdef ENABLE_PLUGINS
if (link_info.lto_plugin_active && !no_more_claiming)
if (link_info.lto_plugin_active)
{
/* We must offer this archive member to the plugins to claim. */
plugin_maybe_claim (input);
if (input->flags.claimed)
{
if (no_more_claiming)
{
/* Don't claim new IR symbols after all IR symbols have
been claimed. */
if (trace_files || verbose)
info_msg ("%I: no new IR symbols to claimi\n",
&orig_input);
input->flags.claimed = 0;
return FALSE;
}
input->flags.claim_archive = TRUE;
*subsbfd = input->the_bfd;
}

2
ld/plugin.c
View file

@ -1033,8 +1033,6 @@ plugin_call_claim_file (const struct ld_plugin_input_file *file, int *claimed)
{
plugin_t *curplug = plugins_list;
*claimed = FALSE;
if (no_more_claiming)
return 0;
while (curplug && !*claimed)
{
if (curplug->claim_file_handler)

85
ld/testsuite/ld-plugin/lto.exp
View file

@ -460,4 +460,89 @@ if { [is_elf_format] } {
run_ld_link_exec_tests [] $lto_run_elf_tests
}
proc pr20103 {cflags libs} {
global CC
set testname "PR ld/20103 ($cflags $libs)"
set exec_output [run_host_cmd "$CC" "$cflags $libs"]
if { [ regexp "undefined reference to `dead'" $exec_output ] } {
pass "$testname (1)"
} {
fail "$testname (1)"
}
if { [ regexp "plugin needed to handle lto object" $exec_output ] } {
fail "$testname (2)"
} {
pass "$testname (2)"
}
}
if { [check_lto_fat_available] } {
run_cc_link_tests [list \
[list \
"Build fatpr20103a.a" \
"$plug_opt" "-flto -ffat-lto-objects" \
{pr20103a.c} {} "fatpr20103a.a"
] \
[list \
"Build fatpr20103b.a" \
"$plug_opt" "-flto -ffat-lto-objects" \
{pr20103b.c} {} "fatpr20103b.a"
] \
[list \
"Build fatpr20103c.a" \
"$plug_opt" "-flto -ffat-lto-objects" \
{pr20103c.c} {} "fatpr20103c.a" \
] \
[list \
"Build thinpr20103a.a" \
"$plug_opt" "-flto -fno-fat-lto-objects" \
{pr20103a.c} {} "thinpr20103a.a"
] \
[list \
"Build thinpr20103b.a" \
"$plug_opt" "-flto -fno-fat-lto-objects" \
{pr20103b.c} {} "thinpr20103b.a"
] \
[list \
"Build thinpr20103c.a" \
"$plug_opt" "-flto -fno-fat-lto-objects" \
{pr20103c.c} {} "thinpr20103c.a" \
] \
[list \
"Build pr20103a" \
"-O2 -flto -Wl,--start-group tmpdir/thinpr20103a.a tmpdir/thinpr20103b.a tmpdir/thinpr20103c.a -Wl,--end-group" \
"-O2 -flto" \
{dummy.c} {} "pr20103a" \
] \
[list \
"Build pr20103b" \
"-O2 -flto -Wl,--start-group tmpdir/fatpr20103a.a tmpdir/fatpr20103b.a tmpdir/fatpr20103c.a -Wl,--end-group" \
"-O2 -flto" \
{dummy.c} {} "pr20103b" \
] \
[list \
"Build pr20103c" \
"-O2 -Wl,--start-group tmpdir/fatpr20103a.a tmpdir/fatpr20103b.a tmpdir/fatpr20103c.a -Wl,--end-group" \
"-O2" \
{dummy.c} {} "pr20103c" \
] \
]
pr20103 "-O2 -flto" "tmpdir/thinpr20103a.a tmpdir/thinpr20103b.a tmpdir/thinpr20103c.a"
pr20103 "-O2 -flto" "tmpdir/fatpr20103a.a tmpdir/fatpr20103b.a tmpdir/fatpr20103c.a"
pr20103 "-O2" "tmpdir/fatpr20103a.a tmpdir/fatpr20103b.a tmpdir/fatpr20103c.a"
if { [at_least_gcc_version 4 9] } {
run_cc_link_tests [list \
[list \
"Build pr20103d" \
"-O2 -Wl,--start-group tmpdir/thinpr20103a.a tmpdir/thinpr20103b.a tmpdir/thinpr20103c.a -Wl,--end-group" \
"-O2" \
{dummy.c} {} "pr20103d" \
] \
]
pr20103 "-O2" "tmpdir/thinpr20103a.a tmpdir/thinpr20103b.a tmpdir/thinpr20103c.a"
}
}
restore_notify

8
ld/testsuite/ld-plugin/pr20103a.c Normal file
View file

@ -0,0 +1,8 @@
void live();
int
main ()
{
live();
return 0;
}

3
ld/testsuite/ld-plugin/pr20103b.c Normal file
View file

@ -0,0 +1,3 @@
void dead()
{
}

6
ld/testsuite/ld-plugin/pr20103c.c Normal file
View file

@ -0,0 +1,6 @@
extern void dead ();
void live()
{
dead ();
}