Remove Bitrig: LLVM Changes

[erichkeane]

Summary

Bitrig code has been merged back to OpenBSD, thus the OS has been abandoned.

[krytarowski]

cmake/config.guess

209 ↗

(On Diff #107602)

Is this 3rd party file? If so, it should be leaved as it is.

[echristo]

LGTM.

[echristo]

cmake/config.guess

209 ↗

(On Diff #107602)

I added this as part of the Bitrig support and while it's still there in the upstream sources we don't sync other than as necessary with the upstream sources. It can probably just be deleted.

[krytarowski]

cmake/config.guess

209 ↗

(On Diff #107602)

Nobody cares any more about this entry, I'm fine either way.

[hans]

Want to add a mention of this in docs/ReleaseNotes.rst?

[erichkeane]

In D35707#821776, @hans wrote:

Want to add a mention of this in docs/ReleaseNotes.rst?

I can definitely do that. Can I target the trunk, or is there a 5.0 release branch already? Additionally, is there any good spot for it? I looked and don't really see a good section for it.

[hans]

In D35707#821790, @erichkeane wrote:

In D35707#821776, @hans wrote:

Want to add a mention of this in docs/ReleaseNotes.rst?

I can definitely do that. Can I target the trunk, or is there a 5.0 release branch already? Additionally, is there any good spot for it? I looked and don't really see a good section for it.

There is a 5.0 release branch, but that was created before your changes, so I believe this should go in the trunk release notes.

I'd just put the note in the "Non-comprehensive list of changes in this release" section.

llvm/trunk/cmake/config.guess

case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
   # contains redundant information, the shorter form:
   # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
   echo "${machine}-${os}${release}"
   exit ;;
     *:OpenBSD:*:*)
   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 ;;
     *:SolidBSD:*:*)
   echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
   exit ;;
     macppc:MirBSD:*:*)
   echo powerpc-unknown-mirbsd${UNAME_RELEASE}

llvm/trunk/include/llvm/ADT/Triple.h

enum OSType {
     OpenBSD,
     Solaris,
     Win32,
     Haiku,
     Minix,
     RTEMS,
     NaCl,       // Native Client
     CNK,        // BG/P Compute-Node Kernel
-    Bitrig,
     AIX,
     CUDA,       // NVIDIA CUDA
     NVCL,       // NVIDIA OpenCL
     AMDHSA,     // AMD HSA Runtime
     PS4,
     ELFIAMCU,
     TvOS,       // Apple tvOS
     WatchOS,    // Apple watchOS
public:
   }
 
   bool isOSDragonFly() const { return getOS() == Triple::DragonFly; }
 
   bool isOSSolaris() const {
     return getOS() == Triple::Solaris;
   }
 
-  bool isOSBitrig() const {
-    return getOS() == Triple::Bitrig;
-  }
-
   bool isOSIAMCU() const {
     return getOS() == Triple::ELFIAMCU;
   }
 
   bool isGNUEnvironment() const {
     EnvironmentType Env = getEnvironment();
     return Env == Triple::GNU || Env == Triple::GNUABI64 ||
            Env == Triple::GNUEABI || Env == Triple::GNUEABIHF ||

llvm/trunk/lib/Support/Triple.cpp

StringRef Triple::getOSTypeName(OSType Kind) {
   case OpenBSD: return "openbsd";
   case Solaris: return "solaris";
   case Win32: return "windows";
   case Haiku: return "haiku";
   case Minix: return "minix";
   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";
   case AMDHSA: return "amdhsa";
   case PS4: return "ps4";
   case ELFIAMCU: return "elfiamcu";
   case TvOS: return "tvos";
   case WatchOS: return "watchos";
return StringSwitch<Triple::OSType>(OSName)
     .StartsWith("solaris", Triple::Solaris)
     .StartsWith("win32", Triple::Win32)
     .StartsWith("windows", Triple::Win32)
     .StartsWith("haiku", Triple::Haiku)
     .StartsWith("minix", Triple::Minix)
     .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)
     .StartsWith("amdhsa", Triple::AMDHSA)
     .StartsWith("ps4", Triple::PS4)
     .StartsWith("elfiamcu", Triple::ELFIAMCU)
     .StartsWith("tvos", Triple::TvOS)
     .StartsWith("watchos", Triple::WatchOS)

llvm/trunk/lib/Support/Unix/Path.inc

 #define STATVFS_F_FLAG(vfs) (vfs).f_flags
 #endif
 
 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)
 {
   struct stat sb;
   char fullpath[PATH_MAX];
 
   snprintf(fullpath, PATH_MAX, "%s/%s", dir, bin);
   if (!realpath(fullpath, ret))
#if defined(__APPLE__)
   // binaries with symbols.
   char exe_path[MAXPATHLEN];
   uint32_t size = sizeof(exe_path);
   if (_NSGetExecutablePath(exe_path, &size) == 0) {
     char link_path[MAXPATHLEN];
     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__) ||                              \
   char exe_path[PATH_MAX];
 
   if (getprogpath(exe_path, argv0) != NULL)
     return exe_path;
 #elif defined(__linux__) || defined(__CYGWIN__)
   char exe_path[MAXPATHLEN];
   StringRef aPath("/proc/self/exe");
   if (sys::fs::exists(aPath)) {

llvm/trunk/lib/Support/Unix/Process.inc

 #include <sys/resource.h>
 #endif
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
 #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)
 #include <malloc_np.h>
 #endif
 #ifdef HAVE_MALLOC_MALLOC_H
 #include <malloc/malloc.h>
 #endif

llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCAsmInfo.cpp

ARMELFMCAsmInfo::ARMELFMCAsmInfo(const Triple &TheTriple) {
   CommentString = "@";
   Code16Directive = ".code\t16";
   Code32Directive = ".code\t32";
 
   SupportsDebugInformation = true;
 
   // Exceptions handling
   switch (TheTriple.getOS()) {
-  case Triple::Bitrig:
   case Triple::NetBSD:
     ExceptionsType = ExceptionHandling::DwarfCFI;
     break;
   default:
     ExceptionsType = ExceptionHandling::ARM;
     break;
   }
 

llvm/trunk/test/CodeGen/ARM/dwarf-eh.ll

 ; RUN: llc -mtriple=arm-netbsd-eabi -o - -filetype=asm %s | \
 ; 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"
 target triple = "armv5e--netbsd-eabi"
 
 %struct.exception = type { i8 }
 
 @_ZTVN10__cxxabiv117__class_type_infoE = external global i8*