diff options
author | Nico Weber <nicolasweber@gmx.de> | 2014-06-25 23:55:37 +0000 |
---|---|---|
committer | Nico Weber <nicolasweber@gmx.de> | 2014-06-25 23:55:37 +0000 |
commit | 49f09fd88afbf04a2c661c1917665b46f96729fa (patch) | |
tree | 50807a6c82d4f7fb40aec3f76bc74514a8cbb11f /libcxxabi/src | |
parent | e9012b035cb0ba31ef00fa86f47f3fc27ce831bc (diff) | |
download | bcm5719-llvm-49f09fd88afbf04a2c661c1917665b46f96729fa.tar.gz bcm5719-llvm-49f09fd88afbf04a2c661c1917665b46f96729fa.zip |
Minor libc++abi changes to make things build better with gcc.
llvm-svn: 211748
Diffstat (limited to 'libcxxabi/src')
-rw-r--r-- | libcxxabi/src/cxa_default_handlers.cpp | 1 | ||||
-rw-r--r-- | libcxxabi/src/cxa_demangle.cpp | 2 | ||||
-rw-r--r-- | libcxxabi/src/cxa_handlers.cpp | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/libcxxabi/src/cxa_default_handlers.cpp b/libcxxabi/src/cxa_default_handlers.cpp index 27ffb719b05..a26ea2a05b6 100644 --- a/libcxxabi/src/cxa_default_handlers.cpp +++ b/libcxxabi/src/cxa_default_handlers.cpp @@ -13,6 +13,7 @@ #include <new> #include <exception> #include "abort_message.h" +#include "config.h" // For __sync_swap #include "cxxabi.h" #include "cxa_handlers.hpp" #include "cxa_exception.hpp" diff --git a/libcxxabi/src/cxa_demangle.cpp b/libcxxabi/src/cxa_demangle.cpp index c67e20fdf47..2d076863ac5 100644 --- a/libcxxabi/src/cxa_demangle.cpp +++ b/libcxxabi/src/cxa_demangle.cpp @@ -4893,8 +4893,8 @@ struct Db } // unnamed namespace -__attribute__ ((__visibility__("default"))) extern "C" +__attribute__ ((__visibility__("default"))) char* __cxa_demangle(const char* mangled_name, char* buf, size_t* n, int* status) { diff --git a/libcxxabi/src/cxa_handlers.cpp b/libcxxabi/src/cxa_handlers.cpp index 6c13fcd2c3c..674933bfefb 100644 --- a/libcxxabi/src/cxa_handlers.cpp +++ b/libcxxabi/src/cxa_handlers.cpp @@ -14,6 +14,7 @@ #include <new> #include <exception> #include "abort_message.h" +#include "config.h" #include "cxxabi.h" #include "cxa_handlers.hpp" #include "cxa_exception.hpp" |