[lld] r220666 - Remove #ifdef __FreeBSD

[Rui Ueyama]

Author: ruiu
Date: Mon Oct 27 02:44:40 2014
New Revision: 220666

URL: http://llvm.org/viewvc/llvm-project?rev=220666&view=rev
Log:
Remove #ifdef __FreeBSD

r220665 makes configure or CMake to set HAVE_CXXABI_H on FreeBSD 10.0.
We don't need this ugly ifdef condition anymore.

Modified:
    lld/trunk/lib/ReaderWriter/ELF/ELFLinkingContext.cpp
    lld/trunk/lib/ReaderWriter/MachO/MachOLinkingContext.cpp

Modified: lld/trunk/lib/ReaderWriter/ELF/ELFLinkingContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/ELFLinkingContext.cpp?rev=220666&r1=220665&r2=220666&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/ELFLinkingContext.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/ELFLinkingContext.cpp Mon Oct 27 02:44:40 2014
@@ -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(
   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();

Modified: lld/trunk/lib/ReaderWriter/MachO/MachOLinkingContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/MachO/MachOLinkingContext.cpp?rev=220666&r1=220665&r2=220666&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/MachO/MachOLinkingContext.cpp (original)
+++ lld/trunk/lib/ReaderWriter/MachO/MachOLinkingContext.cpp Mon Oct 27 02:44:40 2014
@@ -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::demangl
   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.