git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure std::thread helpers have internal linkage 

Backport from mainline
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.

From-SVN: r235277
This commit is contained in:
Jonathan Wakely 2016-04-20 14:00:37 +01:00 committed by Jonathan Wakely
parent 47822deeff
commit 4cc8cffeb8
3 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View File

@ -1,5 +1,13 @@
2016-04-20 Jonathan Wakely <jwakely@redhat.com> 2016-04-20 Jonathan Wakely <jwakely@redhat.com>
Backport from mainline
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.
Backport from mainline Backport from mainline
2016-01-25 Jonathan Wakely <jwakely@redhat.com> 2016-01-25 Jonathan Wakely <jwakely@redhat.com>

6
libstdc++-v3/src/c++11/thread.cc
View File

@ -70,9 +70,9 @@ static inline int get_nprocs()
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
namespace extern "C"
{ {
extern "C" void* static void*
execute_native_thread_routine(void* __p) execute_native_thread_routine(void* __p)
{ {
thread::_Impl_base* __t = static_cast<thread::_Impl_base*>(__p); thread::_Impl_base* __t = static_cast<thread::_Impl_base*>(__p);
@ -94,7 +94,7 @@ namespace std _GLIBCXX_VISIBILITY(default)
return nullptr; return nullptr;
} }
} } // extern "C"
_GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_BEGIN_NAMESPACE_VERSION

38
libstdc++-v3/testsuite/30_threads/thread/70503.cc Normal file
View File

@ -0,0 +1,38 @@
// 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 "" }
// { dg-require-effective-target static }
#include <thread>
extern "C" {
// Should not get multiple definition errors from libstdc++.a(thread.o)
void execute_native_thread_routine(void) { }
void execute_native_thread_routine_compat(void) { }
}
int main()
{
execute_native_thread_routine();
execute_native_thread_routine_compat();
std::thread{}.detach(); // ensure libstdc++.a(thread.o) is linked in
}