diff options
| author | Rui Ueyama <ruiu@google.com> | 2014-10-21 21:05:01 +0000 |
|---|---|---|
| committer | Rui Ueyama <ruiu@google.com> | 2014-10-21 21:05:01 +0000 |
| commit | 1d6d08bb4d47ad036def8526edba47d8f7111d5d (patch) | |
| tree | 6b64fd18313c306c438ab692022fa4a547348b53 /lld | |
| parent | d7c21364a92a035e20d89928e2b0ee60e35e64a7 (diff) | |
| download | bcm5719-llvm-1d6d08bb4d47ad036def8526edba47d8f7111d5d.tar.gz bcm5719-llvm-1d6d08bb4d47ad036def8526edba47d8f7111d5d.zip | |
Use __cxa_demangle on FreeBSD to fix buildbots.
llvm-svn: 220326
Diffstat (limited to 'lld')
| -rw-r--r-- | lld/lib/ReaderWriter/ELF/ELFLinkingContext.cpp | 2 | ||||
| -rw-r--r-- | lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lld/lib/ReaderWriter/ELF/ELFLinkingContext.cpp b/lld/lib/ReaderWriter/ELF/ELFLinkingContext.cpp index f542ac9f783..faa4395ee3e 100644 --- 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 f762aa5e397..30269572ca7 100644 --- 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. |
