|
From: <sv...@va...> - 2016-04-02 22:08:13
|
Author: mjw Date: Sat Apr 2 23:07:59 2016 New Revision: 15842 Log: drd/tests/std_thread[2].cpp rename execute_native_thread_routine. Both tests define a execute_native_thread_routine function that we took from libstdc++. Unfortunately because of a bug this function is not local in some versions of libstdc++ and so our similar named function will clash when trying to link. https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70476#c2 Simply rename our version to work around this. Since we don't build this part of the test code for gcc >= 6, this issue only happens if the buggy libstdc++ thread code is used together with gcc 5. This is the case with for example devtoolset-4-gcc-5. Modified: trunk/drd/tests/std_thread.cpp trunk/drd/tests/std_thread2.cpp Modified: trunk/drd/tests/std_thread.cpp ============================================================================== --- trunk/drd/tests/std_thread.cpp (original) +++ trunk/drd/tests/std_thread.cpp Sat Apr 2 23:07:59 2016 @@ -26,7 +26,7 @@ // From libstdc++-v3/src/c++11/thread.cc // -extern "C" void* execute_native_thread_routine(void* __p) +extern "C" void* _v_execute_native_thread_routine(void* __p) { std::thread::_Impl_base* __t = static_cast<std::thread::_Impl_base*>(__p); std::thread::__shared_base_type __local; @@ -58,7 +58,7 @@ #endif __b->_M_this_ptr = __b; - int __e = __gthread_create(&_M_id._M_thread, execute_native_thread_routine, + int __e = __gthread_create(&_M_id._M_thread, _v_execute_native_thread_routine, __b.get()); if (__e) { __b->_M_this_ptr.reset(); Modified: trunk/drd/tests/std_thread2.cpp ============================================================================== --- trunk/drd/tests/std_thread2.cpp (original) +++ trunk/drd/tests/std_thread2.cpp Sat Apr 2 23:07:59 2016 @@ -31,7 +31,7 @@ // From libstdc++-v3/src/c++11/thread.cc // -extern "C" void* execute_native_thread_routine(void* __p) +extern "C" void* _v_execute_native_thread_routine(void* __p) { std::thread::_Impl_base* __t = static_cast<std::thread::_Impl_base*>(__p); std::thread::__shared_base_type __local; @@ -63,7 +63,7 @@ #endif __b->_M_this_ptr = __b; - int __e = __gthread_create(&_M_id._M_thread, execute_native_thread_routine, + int __e = __gthread_create(&_M_id._M_thread, _v_execute_native_thread_routine, __b.get()); if (__e) { __b->_M_this_ptr.reset(); |