summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorAkira Hatanaka <ahatanaka@apple.com>2017-07-01 00:57:52 +0000
committerAkira Hatanaka <ahatanaka@apple.com>2017-07-01 00:57:52 +0000
commitdc9d8fb9ce8e7c4469259c04e05b2d0be9d34390 (patch)
tree5d140b4deb4921aeb5881197872e31bbb3fc96a7 /clang/lib
parent8cf805ae893b74f790d3a3701e89db8b7f8cba95 (diff)
downloadbcm5719-llvm-dc9d8fb9ce8e7c4469259c04e05b2d0be9d34390.tar.gz
bcm5719-llvm-dc9d8fb9ce8e7c4469259c04e05b2d0be9d34390.zip
[Driver] Check that the iOS deployment target is iOS 10 or earlier if
the target is 32-bit. The following changes are made to the driver since 32-bit apps do not run on iOS 11 or later: - If the deployment target is set explicitly, either with a command-line option or an environment variable, the driver should report an error if the version is greater than iOS 10. - In the case where the deployment target is not set explicitly and the default is inferred from the target triple or SDK version, it should use a maximum default of iOS 10.99.99. rdar://problem/32230613 Differential Revision: https://reviews.llvm.org/D34529 llvm-svn: 306922
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Driver/ToolChains/Darwin.cpp28
1 files changed, 26 insertions, 2 deletions
diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp
index b1f359e8a1f..589c4b7f90f 100644
--- a/clang/lib/Driver/ToolChains/Darwin.cpp
+++ b/clang/lib/Driver/ToolChains/Darwin.cpp
@@ -1150,6 +1150,17 @@ void Darwin::AddDeploymentTarget(DerivedArgList &Args) const {
Args.getLastArg(options::OPT_mwatchos_version_min_EQ,
options::OPT_mwatchos_simulator_version_min_EQ);
+ unsigned Major, Minor, Micro;
+ bool HadExtra;
+
+ // iOS 10 is the maximum deployment target for 32-bit targets.
+ if (iOSVersion && getTriple().isArch32Bit() &&
+ Driver::GetReleaseVersion(iOSVersion->getValue(), Major, Minor, Micro,
+ HadExtra) &&
+ Major > 10)
+ getDriver().Diag(diag::err_invalid_ios_deployment_target)
+ << iOSVersion->getAsString(Args);
+
// Add a macro to differentiate between m(iphone|tv|watch)os-version-min=X.Y and
// -m(iphone|tv|watch)simulator-version-min=X.Y.
if (Args.hasArg(options::OPT_mios_simulator_version_min_EQ) ||
@@ -1191,6 +1202,14 @@ void Darwin::AddDeploymentTarget(DerivedArgList &Args) const {
if (char *env = ::getenv("WATCHOS_DEPLOYMENT_TARGET"))
WatchOSTarget = env;
+ // iOS 10 is the maximum deployment target for 32-bit targets.
+ if (!iOSTarget.empty() && getTriple().isArch32Bit() &&
+ Driver::GetReleaseVersion(iOSTarget.c_str(), Major, Minor, Micro,
+ HadExtra) &&
+ Major > 10)
+ getDriver().Diag(diag::err_invalid_ios_deployment_target)
+ << std::string("IPHONEOS_DEPLOYMENT_TARGET=") + iOSTarget;
+
// If there is no command-line argument to specify the Target version and
// no environment variable defined, see if we can set the default based
// on -isysroot.
@@ -1308,8 +1327,6 @@ void Darwin::AddDeploymentTarget(DerivedArgList &Args) const {
llvm_unreachable("Unable to infer Darwin variant");
// Set the tool chain target information.
- unsigned Major, Minor, Micro;
- bool HadExtra;
if (Platform == MacOS) {
assert((!iOSVersion && !TvOSVersion && !WatchOSVersion) &&
"Unknown target platform!");
@@ -1325,6 +1342,13 @@ void Darwin::AddDeploymentTarget(DerivedArgList &Args) const {
HadExtra || Major >= 100 || Minor >= 100 || Micro >= 100)
getDriver().Diag(diag::err_drv_invalid_version_number)
<< iOSVersion->getAsString(Args);
+ // iOS 10 is the maximum deployment target for 32-bit targets. If the
+ // inferred deployment target is iOS 11 or later, set it to 10.99.
+ if (getTriple().isArch32Bit() && Major >= 11) {
+ Major = 10;
+ Minor = 99;
+ Micro = 99;
+ }
} else if (Platform == TvOS) {
if (!Driver::GetReleaseVersion(TvOSVersion->getValue(), Major, Minor,
Micro, HadExtra) || HadExtra ||
OpenPOWER on IntegriCloud