summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libcxxabi/src/cxa_default_handlers.cpp1
-rw-r--r--libcxxabi/src/cxa_demangle.cpp2
-rw-r--r--libcxxabi/src/cxa_handlers.cpp1
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"
OpenPOWER on IntegriCloud