[libcxxabi] r310329 - [libc++abi] Use proper calling convention for TLS destructor

Shoaib Meenai via cfe-commits cfe-commits at lists.llvm.org
Mon Aug 7 17:54:34 PDT 2017


Author: smeenai
Date: Mon Aug  7 17:54:33 2017
New Revision: 310329

URL: http://llvm.org/viewvc/llvm-project?rev=310329&view=rev
Log:
[libc++abi] Use proper calling convention for TLS destructor

This is needed when using Windows threading.

Modified:
    libcxxabi/trunk/src/cxa_exception_storage.cpp

Modified: libcxxabi/trunk/src/cxa_exception_storage.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/cxa_exception_storage.cpp?rev=310329&r1=310328&r2=310329&view=diff
==============================================================================
--- libcxxabi/trunk/src/cxa_exception_storage.cpp (original)
+++ libcxxabi/trunk/src/cxa_exception_storage.cpp Mon Aug  7 17:54:33 2017
@@ -56,7 +56,7 @@ namespace {
     std::__libcpp_tls_key key_;
     std::__libcpp_exec_once_flag flag_ = _LIBCPP_EXEC_ONCE_INITIALIZER;
 
-    void destruct_ (void *p) {
+    void _LIBCPP_TLS_DESTRUCTOR_CC destruct_ (void *p) {
         __free_with_fallback ( p );
         if ( 0 != std::__libcpp_tls_set ( key_, NULL ) )
             abort_message("cannot zero out thread value for __cxa_get_globals()");




More information about the cfe-commits mailing list