Use __cxa_demangle on FreeBSD to fix buildbots.

llvm-svn: 220326

diff --git a/lld/lib/ReaderWriter/ELF/ELFLinkingContext.cpp b/lld/lib/ReaderWriter/ELF/ELFLinkingContext.cpp
index f542ac9..faa4395 100644 (file)
--- a/lld/lib/ReaderWriter/ELF/ELFLinkingContext.cpp
+++ b/lld/lib/ReaderWriter/ELF/ELFLinkingContext.cpp
@@ -274,7 +274,7 @@ std::string ELFLinkingContext::demangle(StringRef symbolName) const {
   if (!symbolName.startswith("_Z"))
     return symbolName;
 
-#if HAVE_CXXABI_H
+#if defined(HAVE_CXXABI_H) || defined (__FreeBSD__)
   SmallString<256> symBuff;
   StringRef nullTermSym = Twine(symbolName).toNullTerminatedStringRef(symBuff);
   const char *cstr = nullTermSym.data();

diff --git a/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp b/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp
index f762aa5..3026957 100644 (file)
--- a/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp
+++ b/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp
@@ -29,7 +29,7 @@
 
 // FreeBSD 10.0 has cxxabi.h but fails to define HAVE_CXXABI_H due to
 // header dependency issues.
-#if defined(HAVE_CXXABI_H) || defined (__FreeBSD__)
+#if defined(HAVE_CXXABI_H) || defined(__FreeBSD__)
 #include <cxxabi.h>
 #endif
 
@@ -741,7 +741,7 @@ std::string MachOLinkingContext::demangle(StringRef symbolName) const {
   if (!symbolName.startswith("__Z"))
     return symbolName;
 
-#if HAVE_CXXABI_H
+#if defined(HAVE_CXXABI_H) || defined(__FreeBSD__)
   SmallString<256> symBuff;
   StringRef nullTermSym = Twine(symbolName).toNullTerminatedStringRef(symBuff);
   // Mach-O has extra leading underscore that needs to be removed.