Index: cmake/config.guess =================================================================== --- cmake/config.guess +++ cmake/config.guess @@ -206,10 +206,6 @@ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} exit ;; - *:Bitrig:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} - exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; Index: include/llvm/ADT/Triple.h =================================================================== --- include/llvm/ADT/Triple.h +++ include/llvm/ADT/Triple.h @@ -167,7 +167,6 @@ RTEMS, NaCl, // Native Client CNK, // BG/P Compute-Node Kernel - Bitrig, AIX, CUDA, // NVIDIA CUDA NVCL, // NVIDIA OpenCL @@ -489,10 +488,6 @@ return getOS() == Triple::Solaris; } - bool isOSBitrig() const { - return getOS() == Triple::Bitrig; - } - bool isOSIAMCU() const { return getOS() == Triple::ELFIAMCU; } Index: lib/Support/Triple.cpp =================================================================== --- lib/Support/Triple.cpp +++ lib/Support/Triple.cpp @@ -194,7 +194,6 @@ 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 @@ .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) Index: lib/Support/Unix/Path.inc =================================================================== --- lib/Support/Unix/Path.inc +++ lib/Support/Unix/Path.inc @@ -108,10 +108,9 @@ 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 @@ 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) Index: lib/Support/Unix/Process.inc =================================================================== --- lib/Support/Unix/Process.inc +++ lib/Support/Unix/Process.inc @@ -32,10 +32,10 @@ #if HAVE_SIGNAL_H #include #endif -// DragonFlyBSD, OpenBSD, and Bitrig have deprecated for +// DragonFlyBSD, and OpenBSD have deprecated for // instead. Unix.h includes this for us already. #if defined(HAVE_MALLOC_H) && !defined(__DragonFly__) && \ - !defined(__OpenBSD__) && !defined(__Bitrig__) + !defined(__OpenBSD__) #include #endif #if defined(HAVE_MALLCTL) Index: lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp =================================================================== --- lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp +++ lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp @@ -58,7 +58,6 @@ // Exceptions handling switch (TheTriple.getOS()) { - case Triple::Bitrig: case Triple::NetBSD: ExceptionsType = ExceptionHandling::DwarfCFI; break; Index: test/CodeGen/ARM/dwarf-eh.ll =================================================================== --- test/CodeGen/ARM/dwarf-eh.ll +++ test/CodeGen/ARM/dwarf-eh.ll @@ -2,10 +2,6 @@ ; RUN: FileCheck %s ; RUN: llc -mtriple=arm-netbsd-eabi -o - -filetype=asm %s \ ; RUN: -relocation-model=pic | FileCheck -check-prefix=CHECK-PIC %s -; RUN: llc -mtriple=armv7-bitrig-gnueabihf -o - -filetype=asm %s | \ -; RUN: FileCheck %s -; RUN: llc -mtriple=armv7-bitrig-gnueabihf -o - -filetype=asm %s \ -; RUN: -relocation-model=pic | FileCheck -check-prefix=CHECK-PIC %s ; ModuleID = 'test.cc' target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:64:128-a0:0:64-n32-S64"