From 94d401b8b88a76b1372ce44e805516756a4f737b Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 4 Jul 2018 06:27:58 -0700 Subject: [PATCH] ld: Set non_ir_ref_regular for --undefined SYMBOL Set non_ir_ref_regular to TRUE for symbols forced into the output file so that they won't be removed by garbage collection with LTO. PR ld/23309 * ldlang.c (insert_undefined): Set non_ir_ref_regular to TRUE. * plugin.c (is_visible_from_outside): Don't scan entry_symbol. * testsuite/ld-plugin/pr23309.c: New file. * testsuite/ld-plugin/pr23309.d: Likewise. --- ld/ChangeLog | 8 ++++++++ ld/ldlang.c | 1 + ld/plugin.c | 7 ------- ld/testsuite/ld-plugin/lto.exp | 4 ++++ ld/testsuite/ld-plugin/pr23309.c | 10 ++++++++++ ld/testsuite/ld-plugin/pr23309.d | 3 +++ 6 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 ld/testsuite/ld-plugin/pr23309.c create mode 100644 ld/testsuite/ld-plugin/pr23309.d diff --git a/ld/ChangeLog b/ld/ChangeLog index 66960147b2..e28d55d27b 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,11 @@ +2018-07-04 H.J. Lu + + PR ld/23309 + * ldlang.c (insert_undefined): Set non_ir_ref_regular to TRUE. + * plugin.c (is_visible_from_outside): Don't scan entry_symbol. + * testsuite/ld-plugin/pr23309.c: New file. + * testsuite/ld-plugin/pr23309.d: Likewise. + 2018-07-04 H.J. Lu PR ld/23358 diff --git a/ld/ldlang.c b/ld/ldlang.c index 21ef9bea2b..350baf2912 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -3413,6 +3413,7 @@ insert_undefined (const char *name) { h->type = bfd_link_hash_undefined; h->u.undef.abfd = NULL; + h->non_ir_ref_regular = TRUE; if (is_elf_hash_table (link_info.hash)) ((struct elf_link_hash_entry *) h)->mark = 1; bfd_link_add_undef (link_info.hash, h); diff --git a/ld/plugin.c b/ld/plugin.c index 78f2e048bf..994eb6b626 100644 --- a/ld/plugin.c +++ b/ld/plugin.c @@ -625,8 +625,6 @@ static inline bfd_boolean is_visible_from_outside (struct ld_plugin_symbol *lsym, struct bfd_link_hash_entry *blhe) { - struct bfd_sym_chain *sym; - if (bfd_link_relocatable (&link_info)) return TRUE; if (blhe->non_ir_ref_dynamic @@ -658,11 +656,6 @@ is_visible_from_outside (struct ld_plugin_symbol *lsym, || lsym->visibility == LDPV_PROTECTED); } - for (sym = &entry_symbol; sym != NULL; sym = sym->next) - if (sym->name - && strcmp (sym->name, blhe->root.string) == 0) - return TRUE; - return FALSE; } diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp index 70274b3712..7c50b0f102 100644 --- a/ld/testsuite/ld-plugin/lto.exp +++ b/ld/testsuite/ld-plugin/lto.exp @@ -242,6 +242,10 @@ set lto_compile_elf_tests [list \ [list "Compile 8b" \ "" "-flto -O2" \ {lto-8b.c} {} ""] \ + [list "PR ld/23309" \ + "-O2 -flto -fuse-linker-plugin -fvisibility=hidden -ffunction-sections -Wl,--gc-sections,-u,KeepMe" \ + "-O2 -flto -fuse-linker-plugin -fvisibility=hidden -ffunction-sections" \ + {pr23309.c} {{"nm" {} "pr23309.d"}} "pr23309.exe" "c"] \ ] # Generate input files for complex LTO tests for ELF. diff --git a/ld/testsuite/ld-plugin/pr23309.c b/ld/testsuite/ld-plugin/pr23309.c new file mode 100644 index 0000000000..da8bb3a8b8 --- /dev/null +++ b/ld/testsuite/ld-plugin/pr23309.c @@ -0,0 +1,10 @@ +int +main (void) +{ + return 0; +} + +void +KeepMe (void) +{ +} diff --git a/ld/testsuite/ld-plugin/pr23309.d b/ld/testsuite/ld-plugin/pr23309.d new file mode 100644 index 0000000000..c353b66f18 --- /dev/null +++ b/ld/testsuite/ld-plugin/pr23309.d @@ -0,0 +1,3 @@ +#... +[0-9a-f]+ . _?KeepMe +#pass -- 2.34.1