Mark symbol in executables if it matches dynamic_list

bfd/

	PR gold/16530
	* elflink.c (bfd_elf_gc_mark_dynamic_ref_symbol): Mark symbol in
	executables if it matches dynamic_list.

ld/testsuite/

	PR gold/16530
	* ld-elf/dynamic-1.c: New file.
	* ld-elf/dynamic-1.rd: Likewise.
	* ld-elf/dynamic-1.syms: Likewise.

	* ld-elf/shared.exp (build_tests): Add dynamic-1.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index b73af549927ed26b3df1835d19e22b3c924c632c..cacf1584cfc69bb6c9f2f79ee58b54638677eb22 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,6 +1,11 @@
 2014-06-12  Alan Modra  <amodra@gmail.com>
 
        Backport mainline patches
+       2014-02-10  H.J. Lu  <hongjiu.lu@intel.com>
+       PR gold/16530
+       * elflink.c (bfd_elf_gc_mark_dynamic_ref_symbol): Mark symbol in
+       executables if it matches dynamic_list.
+
        2014-01-13  Alan Modra  <amodra@gmail.com>
        * elf32-ppc.c (ppc_elf_check_relocs): For @local call to ifunc,
        error when shared and force a plt call otherwise.

diff --git a/bfd/elflink.c b/bfd/elflink.c
index d1bc23440303c9e9f351f4151b11a49a16cebb4c..b8d357d678398be7decf5591f2516c1f2e96dab7 100644 (file)
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -12129,11 +12129,15 @@ bfd_boolean
 bfd_elf_gc_mark_dynamic_ref_symbol (struct elf_link_hash_entry *h, void *inf)
 {
   struct bfd_link_info *info = (struct bfd_link_info *) inf;
+  struct bfd_elf_dynamic_list *d = info->dynamic_list;
 
   if ((h->root.type == bfd_link_hash_defined
        || h->root.type == bfd_link_hash_defweak)
       && (h->ref_dynamic
-         || ((!info->executable || info->export_dynamic)
+         || ((!info->executable
+              || info->export_dynamic
+              || (d != NULL
+                  && (*d->match) (&d->head, NULL, h->root.root.string)))
              && h->def_regular
              && ELF_ST_VISIBILITY (h->other) != STV_INTERNAL
              && ELF_ST_VISIBILITY (h->other) != STV_HIDDEN

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index c1aa618c3d180e7a682645fb936b495a372fc544..e92ffe2d5eba18f746c7660ea511ef06f5f9f979 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2014-06-12  Alan Modra  <amodra@gmail.com>
+
+       Apply mainline patches
+       2014-02-10  H.J. Lu  <hongjiu.lu@intel.com>
+       PR gold/16530
+       * ld-elf/dynamic-1.c: New file.
+       * ld-elf/dynamic-1.rd: Likewise.
+       * ld-elf/dynamic-1.syms: Likewise.
+       * ld-elf/shared.exp (build_tests): Add dynamic-1.
+
 2014-04-16  Alan Modra  <amodra@gmail.com>
 
        * ld-bootstrap/bootstrap.exp: Add ppc476 workaround test.

diff --git a/ld/testsuite/ld-elf/dynamic-1.c b/ld/testsuite/ld-elf/dynamic-1.c
new file mode 100644 (file)
index 0000000..439ffd1
--- /dev/null
+++ b/ld/testsuite/ld-elf/dynamic-1.c
@@ -0,0 +1,10 @@
+void
+dynamic ()
+{
+}
+
+int
+main ()
+{
+  return 0;
+}

diff --git a/ld/testsuite/ld-elf/dynamic-1.rd b/ld/testsuite/ld-elf/dynamic-1.rd
new file mode 100644 (file)
index 0000000..2c2f23b
--- /dev/null
+++ b/ld/testsuite/ld-elf/dynamic-1.rd
@@ -0,0 +1,5 @@
+Symbol table '\.dynsym' contains [0-9]+ entries:
+ +Num: +Value +Size Type +Bind +Vis +Ndx Name
+#...
+ +[0-9]+: +[0-9a-f]+ +[0-9a-f]+ +FUNC +GLOBAL +DEFAULT +[0-9]+ +_?dynamic
+#...

diff --git a/ld/testsuite/ld-elf/dynamic-1.syms b/ld/testsuite/ld-elf/dynamic-1.syms
new file mode 100644 (file)
index 0000000..c9517f8
--- /dev/null
+++ b/ld/testsuite/ld-elf/dynamic-1.syms
@@ -0,0 +1,3 @@
+{
+  dynamic;
+};

diff --git a/ld/testsuite/ld-elf/shared.exp b/ld/testsuite/ld-elf/shared.exp
index 56c724f4b17d2b90f883da910b687961ae7bf442..cfb0accb047e453f71caf90a046938b0df995cc3 100644 (file)
--- a/ld/testsuite/ld-elf/shared.exp
+++ b/ld/testsuite/ld-elf/shared.exp
@@ -206,6 +206,9 @@ set build_tests {
   {"Build librel.so"
    "-shared" "-fPIC"
    {rel.c} {} "librel.so"}
+  {"Build dynamic-1"
+   "-Wl,--dynamic-list,dynamic-1.syms -Wl,--gc-sections" "-ffunction-sections"
+   {dynamic-1.c} {{readelf {-s} dynamic-1.rd}} "dynamic-1"}
 }
 
 run_cc_link_tests $build_tests