From: Jonathan Wakely <jwakely@redhat.com>
Date: Tue, 5 Apr 2016 13:35:32 +0000 (+0100)
Subject: Ensure std::thread helpers have internal linkage
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=87cec93ee063f694b517bb276da4a06b73658a1d;p=gcc.git

Ensure std::thread helpers have internal linkage

	PR libstdc++/70503
	* src/c++11/thread.cc (execute_native_thread_routine,
	execute_native_thread_routine_compat): Give internal linkage.
	* testsuite/30_threads/thread/70503.cc: New test.

From-SVN: r234746
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2977bd0938a..c4356c9e594 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2016-04-05  Jonathan Wakely  <jwakely@redhat.com>
+
+	PR libstdc++/70503
+	* src/c++11/thread.cc (execute_native_thread_routine,
+	execute_native_thread_routine_compat): Give internal linkage.
+	* testsuite/30_threads/thread/70503.cc: New test.
+
 2016-04-05  Ville Voutilainen  <ville.voutilainen@gmail.com>
 
 	PR libstdc++/70437
diff --git a/libstdc++-v3/src/c++11/thread.cc b/libstdc++-v3/src/c++11/thread.cc
index d2a7dc3e1ee..a027fcf4bb2 100644
--- a/libstdc++-v3/src/c++11/thread.cc
+++ b/libstdc++-v3/src/c++11/thread.cc
@@ -71,9 +71,9 @@ static inline int get_nprocs()
 
 namespace std _GLIBCXX_VISIBILITY(default)
 {
-  namespace
+  extern "C"
   {
-    extern "C" void*
+    static void*
     execute_native_thread_routine(void* __p)
     {
       thread::_State_ptr __t{ static_cast<thread::_State*>(__p) };
@@ -95,7 +95,7 @@ namespace std _GLIBCXX_VISIBILITY(default)
     }
 
 #if _GLIBCXX_THREAD_ABI_COMPAT
-    extern "C" void*
+    static void*
     execute_native_thread_routine_compat(void* __p)
     {
       thread::_Impl_base* __t = static_cast<thread::_Impl_base*>(__p);
@@ -121,7 +121,7 @@ namespace std _GLIBCXX_VISIBILITY(default)
       return nullptr;
     }
 #endif
-  }
+  } // extern "C"
 
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
diff --git a/libstdc++-v3/testsuite/30_threads/thread/70503.cc b/libstdc++-v3/testsuite/30_threads/thread/70503.cc
new file mode 100644
index 00000000000..1763ac2dc0a
--- /dev/null
+++ b/libstdc++-v3/testsuite/30_threads/thread/70503.cc
@@ -0,0 +1,33 @@
+// Copyright (C) 2016 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// { dg-do link }
+// { dg-options " -std=gnu++11 -static" { target *-*-*gnu* } }
+// { dg-require-cstdint "" }
+// { dg-require-gthreads "" }
+
+extern "C" {
+  void execute_native_thread_routine(void);
+  void execute_native_thread_routine_compat(void);
+}
+
+int main()
+{
+  execute_native_thread_routine(); // { dg-error "undefined reference" }
+  execute_native_thread_routine_compat(); // { dg-error "undefined reference" }
+}
+// { dg-prune-output "collect2: error: ld returned" }