Author: Alex Lorenz Date: 2020-06-23T15:14:26-07:00 New Revision: f724ce0d73eb3f85364e346a036588825bc47567
URL: https://github.com/llvm/llvm-project/commit/f724ce0d73eb3f85364e346a036588825bc47567 DIFF: https://github.com/llvm/llvm-project/commit/f724ce0d73eb3f85364e346a036588825bc47567.diff LOG: [clang][driver] allow macOS 11 OS version in the driver Added: Modified: clang/lib/Driver/ToolChains/Darwin.cpp clang/test/Driver/darwin-version.c Removed: ################################################################################ diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp index 3bf7f9cbc139..bb7c7f768b35 100644 --- a/clang/lib/Driver/ToolChains/Darwin.cpp +++ b/clang/lib/Driver/ToolChains/Darwin.cpp @@ -1822,7 +1822,7 @@ void Darwin::AddDeploymentTarget(DerivedArgList &Args) const { if (Platform == MacOS) { if (!Driver::GetReleaseVersion(OSTarget->getOSVersion(), Major, Minor, Micro, HadExtra) || - HadExtra || Major != 10 || Minor >= 100 || Micro >= 100) + HadExtra || Major < 10 || Major >= 100 || Minor >= 100 || Micro >= 100) getDriver().Diag(diag::err_drv_invalid_version_number) << OSTarget->getAsString(Args, Opts); } else if (Platform == IPhoneOS) { diff --git a/clang/test/Driver/darwin-version.c b/clang/test/Driver/darwin-version.c index 7885b5964626..3471552c937f 100644 --- a/clang/test/Driver/darwin-version.c +++ b/clang/test/Driver/darwin-version.c @@ -305,3 +305,13 @@ // RUN: %clang -target armv7k-apple-ios10.1-simulator -c %s -### 2>&1 | \ // RUN: FileCheck --check-prefix=CHECK-VERSION-TENV-SIM2 %s // CHECK-VERSION-TENV-SIM2: "thumbv7k-apple-ios10.1.0-simulator" + + +// RUN: %clang -target x86_64-apple-macos11 -c %s -### 2>&1 | \ +// RUN: FileCheck --check-prefix=CHECK-MACOS11 %s +// RUN: %clang -target x86_64-apple-darwin20 -c %s -### 2>&1 | \ +// RUN: FileCheck --check-prefix=CHECK-MACOS11 %s +// RUN: %clang -target x86_64-apple-darwin -mmacos-version-min=11 -c %s -### 2>&1 | \ +// RUN: FileCheck --check-prefix=CHECK-MACOS11 %s + +// CHECK-MACOS11: "x86_64-apple-macosx11.0.0" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits