Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions llvm/include/llvm/TargetParser/Triple.h
Original file line number Diff line number Diff line change
Expand Up @@ -554,15 +554,29 @@ class Triple {
return getOSVersion() < VersionTuple(Major, Minor, Micro);
}

bool isOSVersionGE(unsigned Major, unsigned Minor = 0,
unsigned Micro = 0) const {
return !isOSVersionLT(Major, Minor, Micro);
}

bool isOSVersionLT(const Triple &Other) const {
return getOSVersion() < Other.getOSVersion();
}

bool isOSVersionGE(const Triple &Other) const {
return getOSVersion() >= Other.getOSVersion();
}

/// Comparison function for checking OS X version compatibility, which handles
/// supporting skewed version numbering schemes used by the "darwin" triples.
LLVM_ABI bool isMacOSXVersionLT(unsigned Major, unsigned Minor = 0,
unsigned Micro = 0) const;

bool isMacOSXVersionGE(unsigned Major, unsigned Minor = 0,
unsigned Micro = 0) const {
return !isMacOSXVersionLT(Major, Minor, Micro);
}

/// Is this a Mac OS X triple. For legacy reasons, we support both "darwin"
/// and "osx" as OS X triples.
bool isMacOSX() const {
Expand Down
11 changes: 11 additions & 0 deletions llvm/unittests/TargetParser/TripleTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2630,6 +2630,17 @@ TEST(TripleTest, isMacOSVersionLT) {
EXPECT_FALSE(T.isMacOSXVersionLT(10, 15, 0));
}

TEST(TripleTest, isMacOSVersionGE) {
Triple T = Triple("x86_64-apple-macos11");
EXPECT_FALSE(T.isMacOSXVersionGE(11, 1, 0));
EXPECT_TRUE(T.isMacOSXVersionGE(10, 15, 0));

T = Triple("x86_64-apple-darwin20");
EXPECT_FALSE(T.isMacOSXVersionGE(11, 1, 0));
EXPECT_TRUE(T.isMacOSXVersionGE(11, 0, 0));
EXPECT_TRUE(T.isMacOSXVersionGE(10, 15, 0));
}

TEST(TripleTest, CanonicalizeOSVersion) {
EXPECT_EQ(VersionTuple(10, 15, 4),
Triple::getCanonicalVersionForOS(Triple::MacOSX,
Expand Down
Loading