[lld] Adds support for xros. (#83031)
GitOrigin-RevId: b0bae445176d30a3fa577d30c21f36dad61003b8
diff --git a/MachO/Driver.cpp b/MachO/Driver.cpp
index a57f60c..018ceec 100644
--- a/MachO/Driver.cpp
+++ b/MachO/Driver.cpp
@@ -691,6 +691,8 @@
.Cases("tvos-simulator", "8", PLATFORM_TVOSSIMULATOR)
.Cases("watchos-simulator", "9", PLATFORM_WATCHOSSIMULATOR)
.Cases("driverkit", "10", PLATFORM_DRIVERKIT)
+ .Cases("xros", "11", PLATFORM_XROS)
+ .Cases("xros-simulator", "12", PLATFORM_XROS_SIMULATOR)
.Default(PLATFORM_UNKNOWN);
if (platformVersion.platform == PLATFORM_UNKNOWN)
error(Twine("malformed platform: ") + platformStr);
@@ -985,6 +987,8 @@
return PLATFORM_TVOS;
case PLATFORM_WATCHOSSIMULATOR:
return PLATFORM_WATCHOS;
+ case PLATFORM_XROS_SIMULATOR:
+ return PLATFORM_XROS;
default:
return platform;
}
@@ -1001,15 +1005,17 @@
return platform == PLATFORM_MACOS || platform == PLATFORM_IOSSIMULATOR ||
platform == PLATFORM_TVOSSIMULATOR ||
- platform == PLATFORM_WATCHOSSIMULATOR;
+ platform == PLATFORM_WATCHOSSIMULATOR ||
+ platform == PLATFORM_XROS_SIMULATOR;
}
static bool dataConstDefault(const InputArgList &args) {
- static const std::array<std::pair<PlatformType, VersionTuple>, 5> minVersion =
+ static const std::array<std::pair<PlatformType, VersionTuple>, 6> minVersion =
{{{PLATFORM_MACOS, VersionTuple(10, 15)},
{PLATFORM_IOS, VersionTuple(13, 0)},
{PLATFORM_TVOS, VersionTuple(13, 0)},
{PLATFORM_WATCHOS, VersionTuple(6, 0)},
+ {PLATFORM_XROS, VersionTuple(1, 0)},
{PLATFORM_BRIDGEOS, VersionTuple(4, 0)}}};
PlatformType platform = removeSimulator(config->platformInfo.target.Platform);
auto it = llvm::find_if(minVersion,
@@ -1045,11 +1051,12 @@
bool isRequested = arg != nullptr;
// Version numbers taken from the Xcode 13.3 release notes.
- static const std::array<std::pair<PlatformType, VersionTuple>, 4> minVersion =
+ static const std::array<std::pair<PlatformType, VersionTuple>, 5> minVersion =
{{{PLATFORM_MACOS, VersionTuple(11, 0)},
{PLATFORM_IOS, VersionTuple(13, 4)},
{PLATFORM_TVOS, VersionTuple(14, 0)},
- {PLATFORM_WATCHOS, VersionTuple(7, 0)}}};
+ {PLATFORM_WATCHOS, VersionTuple(7, 0)},
+ {PLATFORM_XROS, VersionTuple(1, 0)}}};
PlatformType platform = removeSimulator(config->platformInfo.target.Platform);
auto it = llvm::find_if(minVersion,
[&](const auto &p) { return p.first == platform; });
@@ -1688,8 +1695,8 @@
if (args.getLastArg(OPT_reproducible))
config->zeroModTime = true;
- std::array<PlatformType, 3> encryptablePlatforms{
- PLATFORM_IOS, PLATFORM_WATCHOS, PLATFORM_TVOS};
+ std::array<PlatformType, 4> encryptablePlatforms{
+ PLATFORM_IOS, PLATFORM_WATCHOS, PLATFORM_TVOS, PLATFORM_XROS};
config->emitEncryptionInfo =
args.hasFlag(OPT_encryptable, OPT_no_encryption,
is_contained(encryptablePlatforms, config->platform()));
diff --git a/MachO/Options.td b/MachO/Options.td
index 01e73b7..a524e4a 100644
--- a/MachO/Options.td
+++ b/MachO/Options.td
@@ -377,7 +377,7 @@
def platform_version : MultiArg<["-"], "platform_version", 3>,
MetaVarName<"<platform> <min_version> <sdk_version>">,
- HelpText<"Platform (e.g., macos, ios, tvos, watchos, bridgeos, mac-catalyst, ios-sim, tvos-sim, watchos-sim, driverkit) and version numbers">,
+ HelpText<"Platform (e.g., macos, ios, tvos, watchos, xros, bridgeos, mac-catalyst, ios-sim, tvos-sim, watchos-sim, xros-sim, driverkit) and version numbers">,
Group<grp_version>;
def sdk_version : Separate<["-"], "sdk_version">,
HelpText<"This option is undocumented in ld64">,
diff --git a/test/MachO/lc-build-version.s b/test/MachO/lc-build-version.s
index 7b78f80..1fd7078 100644
--- a/test/MachO/lc-build-version.s
+++ b/test/MachO/lc-build-version.s
@@ -64,6 +64,13 @@
# WATCHOS-4-0: cmd LC_VERSION_MIN_WATCHOS
+# RUN: %no-arg-lld -arch x86_64 -platform_version xros 1.0 1.1 -o %t.xros-1-0 %t.o
+# RUN: llvm-objdump --macho --all-headers %t.xros-1-0 | FileCheck %s --check-prefix=XROS-1-0
+# RUN: %no-arg-lld -arch x86_64 -platform_version xros-simulator 1.0 1.1 -o %t.xros-sim-1-0 %t.o
+# RUN: llvm-objdump --macho --all-headers %t.xros-sim-1-0 | FileCheck %s --check-prefix=XROS-1-0
+
+# XROS-1-0: cmd LC_BUILD_VERSION
+
.text
.global _main
_main:
diff --git a/test/MachO/platform-version.s b/test/MachO/platform-version.s
index 047aea0..57fbae6 100644
--- a/test/MachO/platform-version.s
+++ b/test/MachO/platform-version.s
@@ -55,7 +55,7 @@
# RUN: -platform_version 0 1 5 \
# RUN: | FileCheck --check-prefix=FAIL-PLATFORM %s
# RUN: not %no-arg-lld -arch x86_64 -o %t %t.o 2>&1 \
-# RUN: -platform_version 11 1 5 \
+# RUN: -platform_version 13 1 5 \
# RUN: | FileCheck --check-prefix=FAIL-PLATFORM %s
# FAIL-PLATFORM: malformed platform: {{.*}}
# FAIL-PLATFORM-NOT: malformed {{minimum|sdk}} version: {{.*}}
