<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class="">Forgot to mention there are three other patches that are needed to fix the bug introduced in r309607 (r<span style="font-family: Menlo; font-size: 11px; background-color: rgb(255, 255, 255);" class="">309633, r</span><span style="font-family: Menlo; font-size: 11px; background-color: rgb(255, 255, 255);" class="">309636 and r</span><span style="font-family: Menlo; font-size: 11px; background-color: rgb(255, 255, 255);" class="">309640)</span>.<br class=""><div class=""><br class=""><div><blockquote type="cite" class=""><div class="">On Aug 10, 2017, at 5:25 PM, Akira Hatanaka via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org" class="">cfe-commits@lists.llvm.org</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div class="">Can we merge this to 5.0?<br class=""><br class=""><blockquote type="cite" class="">On Jul 31, 2017, at 12:16 PM, Akira Hatanaka via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org" class="">cfe-commits@lists.llvm.org</a>> wrote:<br class=""><br class="">Author: ahatanak<br class="">Date: Mon Jul 31 12:16:40 2017<br class="">New Revision: 309607<br class=""><br class="">URL: <a href="http://llvm.org/viewvc/llvm-project?rev=309607&view=rev" class="">http://llvm.org/viewvc/llvm-project?rev=309607&view=rev</a><br class="">Log:<br class="">[Driver] Allow users to silence the warning that is issued when the<br class="">deployment target is earlier than iOS 11 and the target is 32-bit.<br class=""><br class="">This is a follow-up to r306922.<br class=""><br class=""><a href="rdar://problem/32230613" class="">rdar://problem/32230613</a><br class=""><br class="">Modified:<br class=""> cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td<br class=""> cfe/trunk/include/clang/Basic/DiagnosticGroups.td<br class=""> cfe/trunk/lib/Driver/ToolChains/Darwin.cpp<br class=""> cfe/trunk/test/Driver/darwin-version.c<br class=""><br class="">Modified: cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td<br class="">URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td?rev=309607&r1=309606&r2=309607&view=diff<br class="">==============================================================================<br class="">--- cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td (original)<br class="">+++ cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td Mon Jul 31 12:16:40 2017<br class="">@@ -138,9 +138,10 @@ def err_drv_cc_print_options_failure : E<br class="">def err_drv_lto_without_lld : Error<"LTO requires -fuse-ld=lld">;<br class="">def err_drv_preamble_format : Error<<br class=""> "incorrect format for -preamble-bytes=N,END">;<br class="">-def err_invalid_ios_deployment_target : Error<<br class="">+def warn_invalid_ios_deployment_target : Warning<<br class=""> "invalid iOS deployment version '%0', iOS 10 is the maximum deployment "<br class="">- "target for 32-bit targets">;<br class="">+ "target for 32-bit targets">, InGroup<InvalidIOSDeploymentTarget>,<br class="">+ DefaultError;<br class="">def err_drv_conflicting_deployment_targets : Error<<br class=""> "conflicting deployment targets, both '%0' and '%1' are present in environment">;<br class="">def err_arc_unsupported_on_runtime : Error<<br class=""><br class="">Modified: cfe/trunk/include/clang/Basic/DiagnosticGroups.td<br class="">URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticGroups.td?rev=309607&r1=309606&r2=309607&view=diff<br class="">==============================================================================<br class="">--- cfe/trunk/include/clang/Basic/DiagnosticGroups.td (original)<br class="">+++ cfe/trunk/include/clang/Basic/DiagnosticGroups.td Mon Jul 31 12:16:40 2017<br class="">@@ -153,6 +153,9 @@ def GNUFlexibleArrayUnionMember : DiagGr<br class="">def GNUFoldingConstant : DiagGroup<"gnu-folding-constant">;<br class="">def FormatExtraArgs : DiagGroup<"format-extra-args">;<br class="">def FormatZeroLength : DiagGroup<"format-zero-length">;<br class="">+<br class="">+def InvalidIOSDeploymentTarget : DiagGroup<"invalid-ios-deployment-target">;<br class="">+<br class="">def CXX1zCompatMangling : DiagGroup<"c++1z-compat-mangling">;<br class="">// Name of this warning in GCC.<br class="">def NoexceptType : DiagGroup<"noexcept-type", [CXX1zCompatMangling]>;<br class=""><br class="">Modified: cfe/trunk/lib/Driver/ToolChains/Darwin.cpp<br class="">URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/Darwin.cpp?rev=309607&r1=309606&r2=309607&view=diff<br class="">==============================================================================<br class="">--- cfe/trunk/lib/Driver/ToolChains/Darwin.cpp (original)<br class="">+++ cfe/trunk/lib/Driver/ToolChains/Darwin.cpp Mon Jul 31 12:16:40 2017<br class="">@@ -1179,7 +1179,7 @@ void Darwin::AddDeploymentTarget(Derived<br class=""> Driver::GetReleaseVersion(iOSVersion->getValue(), Major, Minor, Micro,<br class=""> HadExtra) &&<br class=""> Major > 10)<br class="">- getDriver().Diag(diag::err_invalid_ios_deployment_target)<br class="">+ getDriver().Diag(diag::warn_invalid_ios_deployment_target)<br class=""> << iOSVersion->getAsString(Args);<br class=""><br class=""> // Add a macro to differentiate between m(iphone|tv|watch)os-version-min=X.Y and<br class="">@@ -1228,7 +1228,7 @@ void Darwin::AddDeploymentTarget(Derived<br class=""> Driver::GetReleaseVersion(iOSTarget.c_str(), Major, Minor, Micro,<br class=""> HadExtra) &&<br class=""> Major > 10)<br class="">- getDriver().Diag(diag::err_invalid_ios_deployment_target)<br class="">+ getDriver().Diag(diag::warn_invalid_ios_deployment_target)<br class=""> << std::string("IPHONEOS_DEPLOYMENT_TARGET=") + iOSTarget;<br class=""><br class=""> // If there is no command-line argument to specify the Target version and<br class="">@@ -1298,6 +1298,15 @@ void Darwin::AddDeploymentTarget(Derived<br class=""> break;<br class=""> case llvm::Triple::IOS:<br class=""> getTriple().getiOSVersion(Major, Minor, Micro);<br class="">+<br class="">+ // iOS 10 is the maximum deployment target for 32-bit targets. If the<br class="">+ // inferred deployment target is iOS 11 or later, set it to 10.99.<br class="">+ if (getTriple().isArch32Bit() && Major >= 11) {<br class="">+ Major = 10;<br class="">+ Minor = 99;<br class="">+ Micro = 99;<br class="">+ }<br class="">+<br class=""> OSTarget = &iOSTarget;<br class=""> break;<br class=""> case llvm::Triple::TvOS:<br class="">@@ -1393,13 +1402,6 @@ void Darwin::AddDeploymentTarget(Derived<br class=""> HadExtra || Major >= 100 || Minor >= 100 || Micro >= 100)<br class=""> getDriver().Diag(diag::err_drv_invalid_version_number)<br class=""> << iOSVersion->getAsString(Args);<br class="">- // iOS 10 is the maximum deployment target for 32-bit targets. If the<br class="">- // inferred deployment target is iOS 11 or later, set it to 10.99.<br class="">- if (getTriple().isArch32Bit() && Major >= 11) {<br class="">- Major = 10;<br class="">- Minor = 99;<br class="">- Micro = 99;<br class="">- }<br class=""> } else if (Platform == TvOS) {<br class=""> if (!Driver::GetReleaseVersion(TvOSVersion->getValue(), Major, Minor,<br class=""> Micro, HadExtra) || HadExtra ||<br class=""><br class="">Modified: cfe/trunk/test/Driver/darwin-version.c<br class="">URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/darwin-version.c?rev=309607&r1=309606&r2=309607&view=diff<br class="">==============================================================================<br class="">--- cfe/trunk/test/Driver/darwin-version.c (original)<br class="">+++ cfe/trunk/test/Driver/darwin-version.c Mon Jul 31 12:16:40 2017<br class="">@@ -45,6 +45,10 @@<br class="">// RUN: FileCheck --check-prefix=CHECK-VERSION-IOS11 %s<br class="">// CHECK-VERSION-IOS11: arm64-apple-ios11.1.0<br class=""><br class="">+// RUN: %clang -target armv7-apple-ios9.0 -miphoneos-version-min=11.0 -c -Wno-invalid-ios-deployment-target -### %s 2>&1 | \<br class="">+// RUN: FileCheck --check-prefix=CHECK-VERSION-IOS12 %s<br class="">+// CHECK-VERSION-IOS12: thumbv7-apple-ios11.0.0<br class="">+<br class="">// RUN: %clang -target i686-apple-darwin8 -c %s -### 2>&1 | \<br class="">// RUN: FileCheck --check-prefix=CHECK-VERSION-OSX4 %s<br class="">// RUN: %clang -target i686-apple-darwin9 -mmacosx-version-min=10.4 -c %s -### 2>&1 | \<br class=""><br class=""><br class="">_______________________________________________<br class="">cfe-commits mailing list<br class="">cfe-commits@lists.llvm.org<br class="">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits<br class=""></blockquote><br class="">_______________________________________________<br class="">cfe-commits mailing list<br class=""><a href="mailto:cfe-commits@lists.llvm.org" class="">cfe-commits@lists.llvm.org</a><br class="">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits<br class=""></div></div></blockquote></div><br class=""></div></body></html>