llvm.org GIT mirror llvm / 255ffb6
[triple] Use 'macabi' environment name for the Mac Catalyst triples The 'macabi' environment name is preferred instead of 'maccatalyst'. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@364988 91177308-0d34-0410-b5e6-96231b3b80d8 Alex Lorenz a month ago
5 changed file(s) with 9 addition(s) and 9 deletion(s). Raw diff Collapse all Expand all
214214 Cygnus,
215215 CoreCLR,
216216 Simulator, // Simulator variants of other systems, e.g., Apple's iOS
217 MacCatalyst,
218 LastEnvironmentType = MacCatalyst
217 MacABI, // Mac Catalyst variant of Apple's iOS deployment target.
218 LastEnvironmentType = MacABI
219219 };
220220 enum ObjectFormatType {
221221 UnknownObjectFormat,
486486 }
487487
488488 bool isMacCatalystEnvironment() const {
489 return getEnvironment() == Triple::MacCatalyst;
489 return getEnvironment() == Triple::MacABI;
490490 }
491491
492492 bool isOSNetBSD() const {
238238 case Cygnus: return "cygnus";
239239 case CoreCLR: return "coreclr";
240240 case Simulator: return "simulator";
241 case MacCatalyst: return "maccatalyst";
241 case MacABI: return "macabi";
242242 }
243243
244244 llvm_unreachable("Invalid EnvironmentType!");
541541 .StartsWith("cygnus", Triple::Cygnus)
542542 .StartsWith("coreclr", Triple::CoreCLR)
543543 .StartsWith("simulator", Triple::Simulator)
544 .StartsWith("maccatalyst", Triple::MacCatalyst)
544 .StartsWith("macabi", Triple::MacABI)
545545 .Default(Triple::UnknownEnvironment);
546546 }
547547
0 ; RUN: llc %s -o - | FileCheck %s
1 target triple="x86_64-apple-ios13.0-maccatalyst"
1 target triple="x86_64-apple-ios13.0-macabi"
22 ; CHECK: .build_version maccatalyst, 13, 0
0 // RUN: llvm-mc -triple x86_64-apple-macosx10.10.0 %s -filetype=obj -o - | llvm-objdump -macho -private-headers - | FileCheck %s
11 // RUN: llvm-mc -triple x86_64-apple-ios8.0.0 %s -filetype=obj -o - | llvm-objdump -macho -private-headers - | FileCheck %s --check-prefix=CHECK-IOS
22 // RUN: llvm-mc -triple x86_64-apple-darwin %s -filetype=obj -o - | llvm-objdump -macho -private-headers - | FileCheck %s --check-prefix=CHECK-DARWIN
3 // RUN: llvm-mc -triple x86_64-apple-ios13.0-maccatalyst %s -filetype=obj -o - | llvm-objdump -macho -private-headers - | FileCheck %s --check-prefix=CHECK-MACCATALYST
3 // RUN: llvm-mc -triple x86_64-apple-ios13.0-macabi %s -filetype=obj -o - | llvm-objdump -macho -private-headers - | FileCheck %s --check-prefix=CHECK-MACCATALYST
44
55 // Test version-min load command should be inferred from triple and should always be generated on Darwin
66 // CHECK: Load command
12381238 EXPECT_TRUE(T.isSimulatorEnvironment());
12391239 EXPECT_FALSE(T.isMacCatalystEnvironment());
12401240
1241 T = Triple("x86_64-apple-ios13.0-maccatalyst");
1241 T = Triple("x86_64-apple-ios13.0-macabi");
12421242 EXPECT_TRUE(T.isiOS());
12431243 T.getiOSVersion(Major, Minor, Micro);
12441244 EXPECT_EQ((unsigned)13, Major);
12451245 EXPECT_EQ((unsigned)0, Minor);
12461246 EXPECT_EQ((unsigned)0, Micro);
1247 EXPECT_TRUE(T.getEnvironment() == Triple::MacCatalyst);
1247 EXPECT_TRUE(T.getEnvironment() == Triple::MacABI);
12481248 EXPECT_TRUE(T.isMacCatalystEnvironment());
12491249 EXPECT_FALSE(T.isSimulatorEnvironment());
12501250 }