[llvm] 24eaf78 - Cleanup remaining bits for Minix, Contiki and Myriad
Brad Smith via llvm-commits
llvm-commits at lists.llvm.org
Fri Aug 25 13:38:09 PDT 2023
Author: Brad Smith
Date: 2023-08-25T16:37:55-04:00
New Revision: 24eaf7858b46b8a3a0bf36e05cab8e206f9514c0
URL: https://github.com/llvm/llvm-project/commit/24eaf7858b46b8a3a0bf36e05cab8e206f9514c0
DIFF: https://github.com/llvm/llvm-project/commit/24eaf7858b46b8a3a0bf36e05cab8e206f9514c0.diff
LOG: Cleanup remaining bits for Minix, Contiki and Myriad
Reviewed By: MaskRay
Differential Revision: https://reviews.llvm.org/D158806
Added:
Modified:
llvm/include/llvm/TargetParser/Triple.h
llvm/lib/Support/Unix/Path.inc
llvm/lib/Support/raw_ostream.cpp
llvm/lib/Target/X86/X86ISelLoweringCall.cpp
llvm/lib/TargetParser/Triple.cpp
llvm/test/Transforms/SafeStack/X86/array.ll
llvm/unittests/TargetParser/TripleTest.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/TargetParser/Triple.h b/llvm/include/llvm/TargetParser/Triple.h
index 79ccd644a50b0c..d6f034b7ae44d5 100644
--- a/llvm/include/llvm/TargetParser/Triple.h
+++ b/llvm/include/llvm/TargetParser/Triple.h
@@ -175,7 +175,6 @@ class Triple {
MipsTechnologies,
NVIDIA,
CSR,
- Myriad,
AMD,
Mesa,
SUSE,
@@ -203,7 +202,6 @@ class Triple {
Win32,
ZOS,
Haiku,
- Minix,
RTEMS,
NaCl, // Native Client
AIX,
@@ -217,7 +215,6 @@ class Triple {
WatchOS, // Apple watchOS
DriverKit, // Apple DriverKit
Mesa3D,
- Contiki,
AMDPAL, // AMD PAL Runtime
HermitCore, // HermitCore Unikernel/Multikernel
Hurd, // GNU/Hurd
@@ -572,10 +569,6 @@ class Triple {
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
index e2aece49cbc52a..a907efbf5506ff 100644
--- a/llvm/lib/Support/Unix/Path.inc
+++ b/llvm/lib/Support/Unix/Path.inc
@@ -126,10 +126,10 @@ namespace fs {
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 @@ std::string getMainExecutable(const char *argv0, void *MainAddr) {
// 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
index a4fc605019c211..8908e7b6a150ca 100644
--- a/llvm/lib/Support/raw_ostream.cpp
+++ b/llvm/lib/Support/raw_ostream.cpp
@@ -845,8 +845,7 @@ size_t raw_fd_ostream::preferred_buffer_size() const {
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 @@ size_t raw_fd_ostream::preferred_buffer_size() const {
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
index fef1fb0d11b785..a9f84d1fb61223 100644
--- a/llvm/lib/Target/X86/X86ISelLoweringCall.cpp
+++ b/llvm/lib/Target/X86/X86ISelLoweringCall.cpp
@@ -659,9 +659,6 @@ Function *X86TargetLowering::getSSPStackGuardCheck(const Module &M) const {
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
index a3d6a06af97632..d56ed2d0f18d6f 100644
--- a/llvm/lib/TargetParser/Triple.cpp
+++ b/llvm/lib/TargetParser/Triple.cpp
@@ -190,7 +190,6 @@ StringRef Triple::getVendorTypeName(VendorType Kind) {
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 @@ StringRef Triple::getOSTypeName(OSType Kind) {
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 @@ StringRef Triple::getOSTypeName(OSType Kind) {
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 @@ static Triple::VendorType parseVendor(StringRef VendorName) {
.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 @@ static Triple::OSType parseOS(StringRef OSName) {
.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 @@ static Triple::OSType parseOS(StringRef OSName) {
.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
index 45b43f676feb0a..2bc57be3dd6a29 100644
--- 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
index a63bd092d40c0b..90e728b84c530e 100644
--- a/llvm/unittests/TargetParser/TripleTest.cpp
+++ b/llvm/unittests/TargetParser/TripleTest.cpp
@@ -87,12 +87,6 @@ TEST(TripleTest, ParsedIDs) {
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());
More information about the llvm-commits
mailing list