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 | fa990f0338612ecc579eea473b33212253f89843 (patch) | |
| tree | 4ccbf49995392dfeb4659c9b2d4299ac327b84f2 /libcxxabi/src/cxa_handlers.cpp | |
| parent | 7024b8121a9e51d468302e43ed41aeb6e1fb7274 (diff) | |
| download | bcm5719-llvm-fa990f0338612ecc579eea473b33212253f89843.tar.gz bcm5719-llvm-fa990f0338612ecc579eea473b33212253f89843.zip | |
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.
llvm-svn: 235013
Diffstat (limited to 'libcxxabi/src/cxa_handlers.cpp')
| -rw-r--r-- | libcxxabi/src/cxa_handlers.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxxabi/src/cxa_handlers.cpp b/libcxxabi/src/cxa_handlers.cpp index 01207ff8de1..9c1c30291a6 100644 --- a/libcxxabi/src/cxa_handlers.cpp +++ b/libcxxabi/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); |
