diff --git a/llvm/include/llvm/TargetParser/Triple.h b/llvm/include/llvm/TargetParser/Triple.h --- a/llvm/include/llvm/TargetParser/Triple.h +++ b/llvm/include/llvm/TargetParser/Triple.h @@ -175,7 +175,6 @@ MipsTechnologies, NVIDIA, CSR, - Myriad, AMD, Mesa, SUSE, @@ -203,7 +202,6 @@ Win32, ZOS, Haiku, - Minix, RTEMS, NaCl, // Native Client AIX, @@ -217,7 +215,6 @@ WatchOS, // Apple watchOS DriverKit, // Apple DriverKit Mesa3D, - Contiki, AMDPAL, // AMD PAL Runtime HermitCore, // HermitCore Unikernel/Multikernel Hurd, // GNU/Hurd @@ -572,10 +569,6 @@ Env == Triple::GNUX32; } - bool isOSContiki() const { - return getOS() == Triple::Contiki; - } - /// Tests whether the OS is Haiku. bool isOSHaiku() const { return getOS() == Triple::Haiku; diff --git a/llvm/lib/Support/Unix/Path.inc b/llvm/lib/Support/Unix/Path.inc --- a/llvm/lib/Support/Unix/Path.inc +++ b/llvm/lib/Support/Unix/Path.inc @@ -126,10 +126,10 @@ const file_t kInvalidFile = -1; -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \ - defined(__minix) || defined(__FreeBSD_kernel__) || defined(__linux__) || \ - defined(__CYGWIN__) || defined(__DragonFly__) || defined(_AIX) || \ - defined(__GNU__) || (defined(__sun__) && defined(__svr4__)) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \ + defined(__FreeBSD_kernel__) || defined(__linux__) || defined(__CYGWIN__) || \ + defined(__DragonFly__) || defined(_AIX) || defined(__GNU__) || \ + (defined(__sun__) && defined(__svr4__)) static int test_dir(char ret[PATH_MAX], const char *dir, const char *bin) { struct stat sb; char fullpath[PATH_MAX]; @@ -233,8 +233,8 @@ // Fall back to argv[0] if auxiliary vectors are not available. if (getprogpath(exe_path, argv0) != NULL) return exe_path; -#elif defined(__NetBSD__) || defined(__OpenBSD__) || defined(__minix) || \ - defined(__DragonFly__) || defined(__FreeBSD_kernel__) || defined(_AIX) +#elif defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || \ + defined(__FreeBSD_kernel__) || defined(_AIX) const char *curproc = "/proc/curproc/file"; char exe_path[PATH_MAX]; if (sys::fs::exists(curproc)) { diff --git a/llvm/lib/Support/raw_ostream.cpp b/llvm/lib/Support/raw_ostream.cpp --- a/llvm/lib/Support/raw_ostream.cpp +++ b/llvm/lib/Support/raw_ostream.cpp @@ -845,8 +845,7 @@ if (IsWindowsConsole) return 0; return raw_ostream::preferred_buffer_size(); -#elif !defined(__minix) - // Minix has no st_blksize. +#else assert(FD >= 0 && "File not yet open!"); struct stat statbuf; if (fstat(FD, &statbuf) != 0) @@ -859,8 +858,6 @@ return 0; // Return the preferred block size. return statbuf.st_blksize; -#else - return raw_ostream::preferred_buffer_size(); #endif } diff --git a/llvm/lib/Target/X86/X86ISelLoweringCall.cpp b/llvm/lib/Target/X86/X86ISelLoweringCall.cpp --- a/llvm/lib/Target/X86/X86ISelLoweringCall.cpp +++ b/llvm/lib/Target/X86/X86ISelLoweringCall.cpp @@ -659,9 +659,6 @@ Value * X86TargetLowering::getSafeStackPointerLocation(IRBuilderBase &IRB) const { - if (Subtarget.getTargetTriple().isOSContiki()) - return getDefaultSafeStackPointerLocation(IRB, false); - // Android provides a fixed TLS slot for the SafeStack pointer. See the // definition of TLS_SLOT_SAFESTACK in // https://android.googlesource.com/platform/bionic/+/master/libc/private/bionic_tls.h diff --git a/llvm/lib/TargetParser/Triple.cpp b/llvm/lib/TargetParser/Triple.cpp --- a/llvm/lib/TargetParser/Triple.cpp +++ b/llvm/lib/TargetParser/Triple.cpp @@ -190,7 +190,6 @@ case ImaginationTechnologies: return "img"; case Mesa: return "mesa"; case MipsTechnologies: return "mti"; - case Myriad: return "myriad"; case NVIDIA: return "nvidia"; case OpenEmbedded: return "oe"; case PC: return "pc"; @@ -211,7 +210,6 @@ case Ananas: return "ananas"; case CUDA: return "cuda"; case CloudABI: return "cloudabi"; - case Contiki: return "contiki"; case Darwin: return "darwin"; case DragonFly: return "dragonfly"; case DriverKit: return "driverkit"; @@ -228,7 +226,6 @@ case Lv2: return "lv2"; case MacOSX: return "macosx"; case Mesa3D: return "mesa3d"; - case Minix: return "minix"; case NVCL: return "nvcl"; case NaCl: return "nacl"; case NetBSD: return "netbsd"; @@ -565,7 +562,6 @@ .Case("mti", Triple::MipsTechnologies) .Case("nvidia", Triple::NVIDIA) .Case("csr", Triple::CSR) - .Case("myriad", Triple::Myriad) .Case("amd", Triple::AMD) .Case("mesa", Triple::Mesa) .Case("suse", Triple::SUSE) @@ -594,7 +590,6 @@ .StartsWith("windows", Triple::Win32) .StartsWith("zos", Triple::ZOS) .StartsWith("haiku", Triple::Haiku) - .StartsWith("minix", Triple::Minix) .StartsWith("rtems", Triple::RTEMS) .StartsWith("nacl", Triple::NaCl) .StartsWith("aix", Triple::AIX) @@ -608,7 +603,6 @@ .StartsWith("watchos", Triple::WatchOS) .StartsWith("driverkit", Triple::DriverKit) .StartsWith("mesa3d", Triple::Mesa3D) - .StartsWith("contiki", Triple::Contiki) .StartsWith("amdpal", Triple::AMDPAL) .StartsWith("hermit", Triple::HermitCore) .StartsWith("hurd", Triple::Hurd) diff --git a/llvm/test/Transforms/SafeStack/X86/array.ll b/llvm/test/Transforms/SafeStack/X86/array.ll --- a/llvm/test/Transforms/SafeStack/X86/array.ll +++ b/llvm/test/Transforms/SafeStack/X86/array.ll @@ -1,12 +1,10 @@ ; RUN: opt -safe-stack -S -mtriple=i386-pc-linux-gnu < %s -o - | FileCheck %s -; RUN: opt -safe-stack -S -mtriple=i386-pc-contiki-unknown < %s -o - | FileCheck -check-prefix=SINGLE-THREAD %s ; RUN: opt -safe-stack -S -mtriple=x86_64-pc-linux-gnu < %s -o - | FileCheck %s ; array [4 x i8] ; Requires protector. ; CHECK: @__safestack_unsafe_stack_ptr = external thread_local(initialexec) global ptr -; SINGLE-THREAD: @__safestack_unsafe_stack_ptr = external global ptr define void @foo(ptr %a) nounwind uwtable safestack { entry: diff --git a/llvm/unittests/TargetParser/TripleTest.cpp b/llvm/unittests/TargetParser/TripleTest.cpp --- a/llvm/unittests/TargetParser/TripleTest.cpp +++ b/llvm/unittests/TargetParser/TripleTest.cpp @@ -87,12 +87,6 @@ EXPECT_EQ(Triple::ELFIAMCU, T.getOS()); EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment()); - T = Triple("i386-pc-contiki-unknown"); - EXPECT_EQ(Triple::x86, T.getArch()); - EXPECT_EQ(Triple::PC, T.getVendor()); - EXPECT_EQ(Triple::Contiki, T.getOS()); - EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment()); - T = Triple("i386-pc-hurd-gnu"); EXPECT_EQ(Triple::x86, T.getArch()); EXPECT_EQ(Triple::PC, T.getVendor());