diff options
| author | Reid Kleckner <reid@kleckner.net> | 2015-04-15 15:35:56 +0000 |
|---|---|---|
| committer | Reid Kleckner <reid@kleckner.net> | 2015-04-15 15:35:56 +0000 |
| commit | 3943f43a546ed6cdea2ad93fe9a1d162d3529047 (patch) | |
| tree | 37b6467b8f5d53ef5b6f11dc746e9485e84083da /src/cxa_handlers.cpp | |
| parent | 554d59ab0b989830273c9183f7bdfd12108cad7a (diff) | |
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.
git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@235013 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'src/cxa_handlers.cpp')
| -rw-r--r-- | src/cxa_handlers.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cxa_handlers.cpp b/src/cxa_handlers.cpp index 01207ff..9c1c302 100644 --- a/src/cxa_handlers.cpp +++ b/src/cxa_handlers.cpp @@ -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); |