From d8f61f8f7e1fa7475b42e7202303512cf53588bd Mon Sep 17 00:00:00 2001 From: Erich Keane Date: Fri, 21 Jul 2017 22:48:47 +0000 Subject: [PATCH] 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 --- llvm/cmake/config.guess | 4 ---- llvm/include/llvm/ADT/Triple.h | 5 ----- llvm/lib/Support/Triple.cpp | 2 -- llvm/lib/Support/Unix/Path.inc | 13 ++++++------- llvm/lib/Support/Unix/Process.inc | 4 ++-- llvm/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp | 1 - llvm/test/CodeGen/ARM/dwarf-eh.ll | 4 ---- 7 files changed, 8 insertions(+), 25 deletions(-) diff --git a/llvm/cmake/config.guess b/llvm/cmake/config.guess index 8bf4226db321..ccb30f4e75e8 100644 --- a/llvm/cmake/config.guess +++ b/llvm/cmake/config.guess @@ -206,10 +206,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in 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 ;; diff --git a/llvm/include/llvm/ADT/Triple.h b/llvm/include/llvm/ADT/Triple.h index cd560658ca4e..e4d3d5daa2d7 100644 --- a/llvm/include/llvm/ADT/Triple.h +++ b/llvm/include/llvm/ADT/Triple.h @@ -167,7 +167,6 @@ public: RTEMS, NaCl, // Native Client CNK, // BG/P Compute-Node Kernel - Bitrig, AIX, CUDA, // NVIDIA CUDA NVCL, // NVIDIA OpenCL @@ -489,10 +488,6 @@ public: return getOS() == Triple::Solaris; } - bool isOSBitrig() const { - return getOS() == Triple::Bitrig; - } - bool isOSIAMCU() const { return getOS() == Triple::ELFIAMCU; } diff --git a/llvm/lib/Support/Triple.cpp b/llvm/lib/Support/Triple.cpp index 2687a67556d3..b5b7a955fdc5 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 45097eb918b7..250a15dc5a7f 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 2d4662094682..e43650d707e3 100644 --- a/llvm/lib/Support/Unix/Process.inc +++ b/llvm/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) diff --git a/llvm/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp b/llvm/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp index 1e062ad45af5..608e1e01f8cd 100644 --- a/llvm/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp +++ b/llvm/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp @@ -58,7 +58,6 @@ ARMELFMCAsmInfo::ARMELFMCAsmInfo(const Triple &TheTriple) { // Exceptions handling switch (TheTriple.getOS()) { - case Triple::Bitrig: case Triple::NetBSD: ExceptionsType = ExceptionHandling::DwarfCFI; break; diff --git a/llvm/test/CodeGen/ARM/dwarf-eh.ll b/llvm/test/CodeGen/ARM/dwarf-eh.ll index 68f8e95b5e73..07a07148edb0 100644 --- a/llvm/test/CodeGen/ARM/dwarf-eh.ll +++ b/llvm/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"