From 823143c6ca8ef4267e67ba03771991e08d09fabd Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Wed, 31 Jan 2018 05:10:40 -0800
Subject: [PATCH] Check if __start/__stop symbols are referenced by shared
 objects

Define  __start/__stop symbols if they are referenced by shared objects,
not if they are also defined in shared objects.

bfd/

	PR ld/21964
	* elflink.c (bfd_elf_define_start_stop): Check if __start and
	__stop symbols are referenced by shared objects.

ld/

	PR ld/21964
	* testsuite/ld-elf/pr21964-4.c: New file.
	* testsuite/ld-elf/shared.exp: Run pr21964-4 test on Linux.
---
 bfd/ChangeLog                   |  6 ++++++
 bfd/elflink.c                   |  4 ++--
 ld/ChangeLog                    |  6 ++++++
 ld/testsuite/ld-elf/pr21964-4.c | 22 ++++++++++++++++++++++
 ld/testsuite/ld-elf/shared.exp  | 12 ++++++++++++
 5 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 ld/testsuite/ld-elf/pr21964-4.c

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index fb93985b71..2a0330c8a8 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2018-01-31  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/21964
+	* elflink.c (bfd_elf_define_start_stop): Check if __start and
+	__stop symbols are referenced by shared objects.
+
 2018-01-30  Alan Modra  <amodra@gmail.com>
 
 	PR 22758
diff --git a/bfd/elflink.c b/bfd/elflink.c
index f1ec880f98..3787c85e49 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -14338,7 +14338,7 @@ bfd_elf_define_start_stop (struct bfd_link_info *info,
   if (h != NULL
       && (h->root.type == bfd_link_hash_undefined
 	  || h->root.type == bfd_link_hash_undefweak
-	  || ((h->ref_regular || h->def_dynamic) && !h->def_regular)))
+	  || ((h->ref_regular || h->ref_dynamic) && !h->def_regular)))
     {
       h->root.type = bfd_link_hash_defined;
       h->root.u.def.section = sec;
@@ -14358,7 +14358,7 @@ bfd_elf_define_start_stop (struct bfd_link_info *info,
 	{
 	  if (ELF_ST_VISIBILITY (h->other) == STV_DEFAULT)
 	    h->other = (h->other & ~ELF_ST_VISIBILITY (-1)) | STV_PROTECTED;
-	  if (h->ref_dynamic || h->def_dynamic)
+	  if (h->ref_dynamic)
 	    bfd_elf_link_record_dynamic_symbol (info, h);
 	}
       return &h->root;
diff --git a/ld/ChangeLog b/ld/ChangeLog
index f29d51ada0..67e29b9653 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2018-01-31  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/21964
+	* testsuite/ld-elf/pr21964-4.c: New file.
+	* testsuite/ld-elf/shared.exp: Run pr21964-4 test on Linux.
+
 2018-01-30  Alan Modra  <amodra@gmail.com>
 
 	* testsuite/ld-gc/stop.d,
diff --git a/ld/testsuite/ld-elf/pr21964-4.c b/ld/testsuite/ld-elf/pr21964-4.c
new file mode 100644
index 0000000000..d50c148027
--- /dev/null
+++ b/ld/testsuite/ld-elf/pr21964-4.c
@@ -0,0 +1,22 @@
+#define _GNU_SOURCE
+#include <dlfcn.h>
+#include <stdio.h>
+
+extern int __start___verbose[];
+int bar (void)
+{
+  static int my_var __attribute__ ((section("__verbose"), used)) = 6;
+  int *ptr;
+  ptr = (int*) dlsym (RTLD_DEFAULT, "__start___verbose");
+  if (ptr != NULL || __start___verbose[0] != 6)
+    return -1;
+  return 0;
+}
+
+int
+main ()
+{
+  if (bar () == 0)
+    printf ("PASS\n");
+  return 0;
+}
diff --git a/ld/testsuite/ld-elf/shared.exp b/ld/testsuite/ld-elf/shared.exp
index 8223d3df01..833a428055 100644
--- a/ld/testsuite/ld-elf/shared.exp
+++ b/ld/testsuite/ld-elf/shared.exp
@@ -1099,6 +1099,18 @@ if { [istarget *-*-linux*]
 	    "pr22393-2-static" \
 	    "pass.out" \
 	] \
+	[list \
+	    "Run pr21964-4" \
+	    "" \
+	    "" \
+	    {pr21964-4.c} \
+	    "pr21964-4" \
+	    "pass.out" \
+	    "" \
+	    "" \
+	    "" \
+	    "-ldl" \
+	] \
     ]
 }