public inbox for libstdc++-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(refs/users/aoliva/heads/testme)] libsupc++: try cxa_thread_atexit_impl at runtime
Date: Wed, 15 Nov 2023 02:26:14 +0000 (GMT)	[thread overview]
Message-ID: <20231115022614.A4DAD3858C78@sourceware.org> (raw)

https://gcc.gnu.org/g:59e9da3e33dc56c8aade694b4d24842bd5b09ca9

commit 59e9da3e33dc56c8aade694b4d24842bd5b09ca9
Author: Alexandre Oliva <oliva@adacore.com>
Date:   Tue Nov 14 22:16:31 2023 -0300

    libsupc++: try cxa_thread_atexit_impl at runtime
    
    g++.dg/tls/thread_local-order2.C fails when the toolchain is built for
    a platform that lacks __cxa_thread_atexit_impl, even if the program is
    built and run using that toolchain on a (later) platform that offers
    __cxa_thread_atexit_impl.
    
    This patch adds runtime testing for __cxa_thread_atexit_impl on
    platforms that support weak symbols.
    
    
    for  libstdc++-v3/ChangeLog
    
            * libsupc++/atexit_thread.cc [__GXX_WEAK__]: Add dynamic
            detection of __cxa_thread_atexit_impl.

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

diff --git a/libstdc++-v3/libsupc++/atexit_thread.cc b/libstdc++-v3/libsupc++/atexit_thread.cc
index 9346d50f5da..cabd7c0a4a0 100644
--- a/libstdc++-v3/libsupc++/atexit_thread.cc
+++ b/libstdc++-v3/libsupc++/atexit_thread.cc
@@ -138,11 +138,24 @@ 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-11-15  2:26 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-15  2:26 Alexandre Oliva [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-12-06 22:47 Alexandre Oliva
2023-12-06 20:01 Alexandre Oliva
2023-12-06  2:31 Alexandre Oliva
2023-12-01 23:42 Alexandre Oliva
2023-11-09  1:58 Alexandre Oliva
2023-11-08 23:48 Alexandre Oliva
2023-11-08 23:48 Alexandre Oliva

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=20231115022614.A4DAD3858C78@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).