From 49f09fd88afbf04a2c661c1917665b46f96729fa Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Wed, 25 Jun 2014 23:55:37 +0000 Subject: [PATCH] Minor libc++abi changes to make things build better with gcc. llvm-svn: 211748 --- libcxxabi/src/cxa_default_handlers.cpp | 1 + libcxxabi/src/cxa_demangle.cpp | 2 +- libcxxabi/src/cxa_handlers.cpp | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libcxxabi/src/cxa_default_handlers.cpp b/libcxxabi/src/cxa_default_handlers.cpp index 27ffb719b05d..a26ea2a05b60 100644 --- a/libcxxabi/src/cxa_default_handlers.cpp +++ b/libcxxabi/src/cxa_default_handlers.cpp @@ -13,6 +13,7 @@ #include #include #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 c67e20fdf474..2d076863ac59 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 6c13fcd2c3cf..674933bfefb6 100644 --- a/libcxxabi/src/cxa_handlers.cpp +++ b/libcxxabi/src/cxa_handlers.cpp @@ -14,6 +14,7 @@ #include #include #include "abort_message.h" +#include "config.h" #include "cxxabi.h" #include "cxa_handlers.hpp" #include "cxa_exception.hpp"