diff options
| -rw-r--r-- | lld/lib/ReaderWriter/ELF/ELFLinkingContext.cpp | 6 | ||||
| -rw-r--r-- | lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/lld/lib/ReaderWriter/ELF/ELFLinkingContext.cpp b/lld/lib/ReaderWriter/ELF/ELFLinkingContext.cpp index faa4395ee3e..e6b655d55f5 100644 --- a/lld/lib/ReaderWriter/ELF/ELFLinkingContext.cpp +++ b/lld/lib/ReaderWriter/ELF/ELFLinkingContext.cpp @@ -22,9 +22,7 @@ #include "llvm/Support/FileSystem.h" #include "llvm/Support/Path.h" -// 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) #include <cxxabi.h> #endif @@ -274,7 +272,7 @@ std::string ELFLinkingContext::demangle(StringRef symbolName) const { if (!symbolName.startswith("_Z")) return symbolName; -#if defined(HAVE_CXXABI_H) || defined (__FreeBSD__) +#if defined(HAVE_CXXABI_H) 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 cbadcfcda74..b99ecc8548e 100644 --- a/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp +++ b/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp @@ -27,9 +27,7 @@ #include "llvm/Support/Path.h" #include <algorithm> -// 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) #include <cxxabi.h> #endif @@ -761,7 +759,7 @@ std::string MachOLinkingContext::demangle(StringRef symbolName) const { if (!symbolName.startswith("__Z")) return symbolName; -#if defined(HAVE_CXXABI_H) || defined(__FreeBSD__) +#if defined(HAVE_CXXABI_H) SmallString<256> symBuff; StringRef nullTermSym = Twine(symbolName).toNullTerminatedStringRef(symBuff); // Mach-O has extra leading underscore that needs to be removed. |
