[gcc r14-6204] Revert "libsupc++: try cxa_thread_atexit_impl at runtime"

Alexandre Oliva aoliva@gcc.gnu.org
Wed Dec 6 01:17:50 GMT 2023


https://gcc.gnu.org/g:953a9302d19d16dfd58c5f8d89ad15cb76a84d53

commit r14-6204-g953a9302d19d16dfd58c5f8d89ad15cb76a84d53
Author: Alexandre Oliva <oliva@gnu.org>
Date:   Tue Dec 5 22:16:37 2023 -0300

    Revert "libsupc++: try cxa_thread_atexit_impl at runtime"
    
    This reverts commit f4dd9416843308d4ae519983415fe62212662536.

Diff:
---
 libstdc++-v3/libsupc++/atexit_thread.cc | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/libstdc++-v3/libsupc++/atexit_thread.cc b/libstdc++-v3/libsupc++/atexit_thread.cc
index cabd7c0a4a0..9346d50f5da 100644
--- a/libstdc++-v3/libsupc++/atexit_thread.cc
+++ b/libstdc++-v3/libsupc++/atexit_thread.cc
@@ -138,24 +138,11 @@ namespace {
   }
 }
 
-#if __GXX_WEAK__
-extern "C"
-int __attribute__ ((__weak__))
-__cxa_thread_atexit_impl (void (_GLIBCXX_CDTOR_CALLABI *func) (void *),
-			  void *arg, void *d);
-#endif
-
-// ??? We can't make it an ifunc, can we?
 extern "C" int
 __cxxabiv1::__cxa_thread_atexit (void (_GLIBCXX_CDTOR_CALLABI *dtor)(void *),
-				 void *obj, void *dso_handle)
+				 void *obj, void */*dso_handle*/)
   _GLIBCXX_NOTHROW
 {
-#if __GXX_WEAK__
-  if (__cxa_thread_atexit_impl)
-    return __cxa_thread_atexit_impl (dtor, obj, dso_handle);
-#endif
-
   // Do this initialization once.
   if (__gthread_active_p ())
     {


More information about the Gcc-cvs mailing list