diff options
| author | Erich Keane <erich.keane@intel.com> | 2017-07-21 22:48:47 +0000 |
|---|---|---|
| committer | Erich Keane <erich.keane@intel.com> | 2017-07-21 22:48:47 +0000 |
| commit | d8f61f8f7e1fa7475b42e7202303512cf53588bd (patch) | |
| tree | aa0b088c02fe59a02c6daa40ac5721d61267bd3c /llvm/lib/Support | |
| parent | a021743cfd92a8486df02821263f9f894baf9e26 (diff) | |
| download | bcm5719-llvm-d8f61f8f7e1fa7475b42e7202303512cf53588bd.tar.gz bcm5719-llvm-d8f61f8f7e1fa7475b42e7202303512cf53588bd.zip | |
Remove Bitrig: LLVM Changes
Bitrig code has been merged back to OpenBSD, thus the OS has been abandoned.
Differential Revision: https://reviews.llvm.org/D35707
llvm-svn: 308799
Diffstat (limited to 'llvm/lib/Support')
| -rw-r--r-- | llvm/lib/Support/Triple.cpp | 2 | ||||
| -rw-r--r-- | llvm/lib/Support/Unix/Path.inc | 13 | ||||
| -rw-r--r-- | llvm/lib/Support/Unix/Process.inc | 4 |
3 files changed, 8 insertions, 11 deletions
diff --git a/llvm/lib/Support/Triple.cpp b/llvm/lib/Support/Triple.cpp index 2687a67556d..b5b7a955fdc 100644 --- a/llvm/lib/Support/Triple.cpp +++ b/llvm/lib/Support/Triple.cpp @@ -194,7 +194,6 @@ StringRef Triple::getOSTypeName(OSType Kind) { case RTEMS: return "rtems"; case NaCl: return "nacl"; case CNK: return "cnk"; - case Bitrig: return "bitrig"; case AIX: return "aix"; case CUDA: return "cuda"; case NVCL: return "nvcl"; @@ -477,7 +476,6 @@ static Triple::OSType parseOS(StringRef OSName) { .StartsWith("rtems", Triple::RTEMS) .StartsWith("nacl", Triple::NaCl) .StartsWith("cnk", Triple::CNK) - .StartsWith("bitrig", Triple::Bitrig) .StartsWith("aix", Triple::AIX) .StartsWith("cuda", Triple::CUDA) .StartsWith("nvcl", Triple::NVCL) diff --git a/llvm/lib/Support/Unix/Path.inc b/llvm/lib/Support/Unix/Path.inc index 45097eb918b..250a15dc5a7 100644 --- a/llvm/lib/Support/Unix/Path.inc +++ b/llvm/lib/Support/Unix/Path.inc @@ -108,10 +108,9 @@ using namespace llvm; namespace llvm { namespace sys { namespace fs { -#if defined(__FreeBSD__) || defined (__NetBSD__) || defined(__Bitrig__) || \ - defined(__OpenBSD__) || defined(__minix) || defined(__FreeBSD_kernel__) || \ - defined(__linux__) || defined(__CYGWIN__) || defined(__DragonFly__) || \ - defined(_AIX) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \ + defined(__minix) || defined(__FreeBSD_kernel__) || defined(__linux__) || \ + defined(__CYGWIN__) || defined(__DragonFly__) || defined(_AIX) static int test_dir(char ret[PATH_MAX], const char *dir, const char *bin) { @@ -180,9 +179,9 @@ std::string getMainExecutable(const char *argv0, void *MainAddr) { if (realpath(exe_path, link_path)) return link_path; } -#elif defined(__FreeBSD__) || defined (__NetBSD__) || defined(__Bitrig__) || \ - defined(__OpenBSD__) || defined(__minix) || defined(__DragonFly__) || \ - defined(__FreeBSD_kernel__) || defined(_AIX) +#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \ + defined(__minix) || defined(__DragonFly__) || \ + defined(__FreeBSD_kernel__) || defined(_AIX) char exe_path[PATH_MAX]; if (getprogpath(exe_path, argv0) != NULL) diff --git a/llvm/lib/Support/Unix/Process.inc b/llvm/lib/Support/Unix/Process.inc index 2d466209468..e43650d707e 100644 --- a/llvm/lib/Support/Unix/Process.inc +++ b/llvm/lib/Support/Unix/Process.inc @@ -32,10 +32,10 @@ #if HAVE_SIGNAL_H #include <signal.h> #endif -// DragonFlyBSD, OpenBSD, and Bitrig have deprecated <malloc.h> for +// DragonFlyBSD, and OpenBSD have deprecated <malloc.h> for // <stdlib.h> instead. Unix.h includes this for us already. #if defined(HAVE_MALLOC_H) && !defined(__DragonFly__) && \ - !defined(__OpenBSD__) && !defined(__Bitrig__) + !defined(__OpenBSD__) #include <malloc.h> #endif #if defined(HAVE_MALLCTL) |
