public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Alexandre Oliva <aoliva@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r14-6204] Revert "libsupc++: try cxa_thread_atexit_impl at runtime"
Date: Wed,  6 Dec 2023 01:17:50 +0000 (GMT)	[thread overview]
Message-ID: <20231206011750.45A363858C2F@sourceware.org> (raw)

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 ())
     {

                 reply	other threads:[~2023-12-06  1:17 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231206011750.45A363858C2F@sourceware.org \
    --to=aoliva@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    --cc=libstdc++-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).