[libcxxabi] r235013 - Declare __cxa_new_handler as extern "C", or it declares a new variable
Reid Kleckner
reid at kleckner.net
Wed Apr 15 08:35:56 PDT 2015
Author: rnk
Date: Wed Apr 15 10:35:56 2015
New Revision: 235013
URL: http://llvm.org/viewvc/llvm-project?rev=235013&view=rev
Log:
Declare __cxa_new_handler as extern "C", or it declares a new variable
Reverts change from r219012 to fix ABI incompatibility. Let's not worry
about the GCC warning here.
Modified:
libcxxabi/trunk/src/cxa_handlers.cpp
Modified: libcxxabi/trunk/src/cxa_handlers.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/cxa_handlers.cpp?rev=235013&r1=235012&r2=235013&view=diff
==============================================================================
--- libcxxabi/trunk/src/cxa_handlers.cpp (original)
+++ libcxxabi/trunk/src/cxa_handlers.cpp Wed Apr 15 10:35:56 2015
@@ -102,7 +102,7 @@ terminate() _NOEXCEPT
__terminate(get_terminate());
}
-new_handler __cxa_new_handler = 0;
+extern "C" new_handler __cxa_new_handler = 0;
// In the future these will become:
// std::atomic<std::new_handler> __cxa_new_handler(0);
More information about the cfe-commits
mailing list