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
This commit is contained in:
Erich Keane 2017-07-21 22:48:47 +00:00
parent a021743cfd
commit d8f61f8f7e
7 changed files with 8 additions and 25 deletions

View File

@ -206,10 +206,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
exit ;; exit ;;
*:Bitrig:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
exit ;;
*:ekkoBSD:*:*) *:ekkoBSD:*:*)
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
exit ;; exit ;;

View File

@ -167,7 +167,6 @@ public:
RTEMS, RTEMS,
NaCl, // Native Client NaCl, // Native Client
CNK, // BG/P Compute-Node Kernel CNK, // BG/P Compute-Node Kernel
Bitrig,
AIX, AIX,
CUDA, // NVIDIA CUDA CUDA, // NVIDIA CUDA
NVCL, // NVIDIA OpenCL NVCL, // NVIDIA OpenCL
@ -489,10 +488,6 @@ public:
return getOS() == Triple::Solaris; return getOS() == Triple::Solaris;
} }
bool isOSBitrig() const {
return getOS() == Triple::Bitrig;
}
bool isOSIAMCU() const { bool isOSIAMCU() const {
return getOS() == Triple::ELFIAMCU; return getOS() == Triple::ELFIAMCU;
} }

View File

@ -194,7 +194,6 @@ StringRef Triple::getOSTypeName(OSType Kind) {
case RTEMS: return "rtems"; case RTEMS: return "rtems";
case NaCl: return "nacl"; case NaCl: return "nacl";
case CNK: return "cnk"; case CNK: return "cnk";
case Bitrig: return "bitrig";
case AIX: return "aix"; case AIX: return "aix";
case CUDA: return "cuda"; case CUDA: return "cuda";
case NVCL: return "nvcl"; case NVCL: return "nvcl";
@ -477,7 +476,6 @@ static Triple::OSType parseOS(StringRef OSName) {
.StartsWith("rtems", Triple::RTEMS) .StartsWith("rtems", Triple::RTEMS)
.StartsWith("nacl", Triple::NaCl) .StartsWith("nacl", Triple::NaCl)
.StartsWith("cnk", Triple::CNK) .StartsWith("cnk", Triple::CNK)
.StartsWith("bitrig", Triple::Bitrig)
.StartsWith("aix", Triple::AIX) .StartsWith("aix", Triple::AIX)
.StartsWith("cuda", Triple::CUDA) .StartsWith("cuda", Triple::CUDA)
.StartsWith("nvcl", Triple::NVCL) .StartsWith("nvcl", Triple::NVCL)

View File

@ -108,10 +108,9 @@ using namespace llvm;
namespace llvm { namespace llvm {
namespace sys { namespace sys {
namespace fs { namespace fs {
#if defined(__FreeBSD__) || defined (__NetBSD__) || defined(__Bitrig__) || \ #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \
defined(__OpenBSD__) || defined(__minix) || defined(__FreeBSD_kernel__) || \ defined(__minix) || defined(__FreeBSD_kernel__) || defined(__linux__) || \
defined(__linux__) || defined(__CYGWIN__) || defined(__DragonFly__) || \ defined(__CYGWIN__) || defined(__DragonFly__) || defined(_AIX)
defined(_AIX)
static int static int
test_dir(char ret[PATH_MAX], const char *dir, const char *bin) 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)) if (realpath(exe_path, link_path))
return link_path; return link_path;
} }
#elif defined(__FreeBSD__) || defined (__NetBSD__) || defined(__Bitrig__) || \ #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \
defined(__OpenBSD__) || defined(__minix) || defined(__DragonFly__) || \ defined(__minix) || defined(__DragonFly__) || \
defined(__FreeBSD_kernel__) || defined(_AIX) defined(__FreeBSD_kernel__) || defined(_AIX)
char exe_path[PATH_MAX]; char exe_path[PATH_MAX];
if (getprogpath(exe_path, argv0) != NULL) if (getprogpath(exe_path, argv0) != NULL)

View File

@ -32,10 +32,10 @@
#if HAVE_SIGNAL_H #if HAVE_SIGNAL_H
#include <signal.h> #include <signal.h>
#endif #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. // <stdlib.h> instead. Unix.h includes this for us already.
#if defined(HAVE_MALLOC_H) && !defined(__DragonFly__) && \ #if defined(HAVE_MALLOC_H) && !defined(__DragonFly__) && \
!defined(__OpenBSD__) && !defined(__Bitrig__) !defined(__OpenBSD__)
#include <malloc.h> #include <malloc.h>
#endif #endif
#if defined(HAVE_MALLCTL) #if defined(HAVE_MALLCTL)

View File

@ -58,7 +58,6 @@ ARMELFMCAsmInfo::ARMELFMCAsmInfo(const Triple &TheTriple) {
// Exceptions handling // Exceptions handling
switch (TheTriple.getOS()) { switch (TheTriple.getOS()) {
case Triple::Bitrig:
case Triple::NetBSD: case Triple::NetBSD:
ExceptionsType = ExceptionHandling::DwarfCFI; ExceptionsType = ExceptionHandling::DwarfCFI;
break; break;

View File

@ -2,10 +2,6 @@
; RUN: FileCheck %s ; RUN: FileCheck %s
; RUN: llc -mtriple=arm-netbsd-eabi -o - -filetype=asm %s \ ; RUN: llc -mtriple=arm-netbsd-eabi -o - -filetype=asm %s \
; RUN: -relocation-model=pic | FileCheck -check-prefix=CHECK-PIC %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' ; 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" 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"