Author: Alex Lorenz Date: 2021-04-26T14:57:00-07:00 New Revision: ab0df6c0346e515291a381467527621ab0ccf953
URL: https://github.com/llvm/llvm-project/commit/ab0df6c0346e515291a381467527621ab0ccf953 DIFF: https://github.com/llvm/llvm-project/commit/ab0df6c0346e515291a381467527621ab0ccf953.diff LOG: Revert "[clang][driver] Use the provided arch name for a Darwin target triple" This reverts commit 6cc62043c8bf4daa27664a2e1674abbe8d0492c6. This caused a test failure on a M1 mac CI job (https://reviews.llvm.org/D100807#2718006), I will recommit this with a fix. Added: Modified: clang/lib/Driver/ToolChains/Darwin.cpp clang/test/Driver/aarch64-cpus.c clang/test/Driver/arm64_32-link.c clang/test/Driver/darwin-version.c clang/test/Driver/default-toolchain.c Removed: ################################################################################ diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp index 177cfd60ffb3..bc59b6beafc7 100644 --- a/clang/lib/Driver/ToolChains/Darwin.cpp +++ b/clang/lib/Driver/ToolChains/Darwin.cpp @@ -74,12 +74,12 @@ void darwin::setTripleTypeForMachOArchName(llvm::Triple &T, StringRef Str) { const llvm::Triple::ArchType Arch = getArchTypeForMachOArchName(Str); llvm::ARM::ArchKind ArchKind = llvm::ARM::parseArch(Str); T.setArch(Arch); - if (Arch != llvm::Triple::UnknownArch) - T.setArchName(Str); - if (ArchKind == llvm::ARM::ArchKind::ARMV6M || - ArchKind == llvm::ARM::ArchKind::ARMV7M || - ArchKind == llvm::ARM::ArchKind::ARMV7EM) { + if (Str == "x86_64h" || Str == "arm64e") + T.setArchName(Str); + else if (ArchKind == llvm::ARM::ArchKind::ARMV6M || + ArchKind == llvm::ARM::ArchKind::ARMV7M || + ArchKind == llvm::ARM::ArchKind::ARMV7EM) { T.setOS(llvm::Triple::UnknownOS); T.setObjectFormat(llvm::Triple::MachO); } diff --git a/clang/test/Driver/aarch64-cpus.c b/clang/test/Driver/aarch64-cpus.c index 9a2fc857a0c2..5b9bd5207792 100644 --- a/clang/test/Driver/aarch64-cpus.c +++ b/clang/test/Driver/aarch64-cpus.c @@ -33,7 +33,7 @@ // ARM64E-DARWIN: "-cc1"{{.*}} "-triple" "arm64e{{.*}}" "-target-cpu" "apple-a12" // RUN: %clang -target arm64-apple-darwin -arch arm64_32 -### -c %s 2>&1 | FileCheck -check-prefix=ARM64_32-DARWIN %s -// ARM64_32-DARWIN: "-cc1"{{.*}} "-triple" "arm64_32{{.*}}" "-target-cpu" "apple-s4" +// ARM64_32-DARWIN: "-cc1"{{.*}} "-triple" "aarch64_32{{.*}}" "-target-cpu" "apple-s4" // RUN: %clang -target aarch64 -mcpu=cortex-a35 -### -c %s 2>&1 | FileCheck -check-prefix=CA35 %s // RUN: %clang -target aarch64 -mlittle-endian -mcpu=cortex-a35 -### -c %s 2>&1 | FileCheck -check-prefix=CA35 %s diff --git a/clang/test/Driver/arm64_32-link.c b/clang/test/Driver/arm64_32-link.c index 6ef0b6f9f2f7..972ae6a234e1 100644 --- a/clang/test/Driver/arm64_32-link.c +++ b/clang/test/Driver/arm64_32-link.c @@ -1,4 +1,4 @@ // RUN: %clang -target x86_64-apple-darwin -arch arm64_32 -miphoneos-version-min=8.0 %s -### 2>&1 | FileCheck %s -// CHECK: "-cc1"{{.*}} "-triple" "arm64_32-apple-ios8.0.0" +// CHECK: "-cc1"{{.*}} "-triple" "aarch64_32-apple-ios8.0.0" // CHECK: ld{{.*}} "-arch" "arm64_32" diff --git a/clang/test/Driver/darwin-version.c b/clang/test/Driver/darwin-version.c index 130a66575a93..3471552c937f 100644 --- a/clang/test/Driver/darwin-version.c +++ b/clang/test/Driver/darwin-version.c @@ -60,17 +60,17 @@ // RUN: FileCheck --check-prefix=CHECK-VERSION-OSX4 %s // RUN: %clang -target i686-apple-darwin9 -mmacosx-version-min=10.4 -c %s -### 2>&1 | \ // RUN: FileCheck --check-prefix=CHECK-VERSION-OSX4 %s -// CHECK-VERSION-OSX4: "i686-apple-macosx10.4.0" +// CHECK-VERSION-OSX4: "i386-apple-macosx10.4.0" // RUN: %clang -target i686-apple-darwin9 -c %s -### 2>&1 | \ // RUN: FileCheck --check-prefix=CHECK-VERSION-OSX5 %s // RUN: %clang -target i686-apple-darwin9 -mmacosx-version-min=10.5 -c %s -### 2>&1 | \ // RUN: FileCheck --check-prefix=CHECK-VERSION-OSX5 %s -// CHECK-VERSION-OSX5: "i686-apple-macosx10.5.0" +// CHECK-VERSION-OSX5: "i386-apple-macosx10.5.0" // RUN: %clang -target i686-apple-darwin10 -c %s -### 2>&1 | \ // RUN: FileCheck --check-prefix=CHECK-VERSION-OSX6 %s // RUN: %clang -target i686-apple-darwin9 -mmacosx-version-min=10.6 -c %s -### 2>&1 | \ // RUN: FileCheck --check-prefix=CHECK-VERSION-OSX6 %s -// CHECK-VERSION-OSX6: "i686-apple-macosx10.6.0" +// CHECK-VERSION-OSX6: "i386-apple-macosx10.6.0" // RUN: %clang -target x86_64-apple-darwin14 -c %s -### 2>&1 | \ // RUN: FileCheck --check-prefix=CHECK-VERSION-OSX10 %s // RUN: %clang -target x86_64-apple-darwin -mmacosx-version-min=10.10 -c %s -### 2>&1 | \ @@ -100,7 +100,7 @@ // Check environment variable gets interpreted correctly // RUN: env MACOSX_DEPLOYMENT_TARGET=10.5 IPHONEOS_DEPLOYMENT_TARGET=2.0 \ -// RUN: %clang -target i686-apple-darwin9 -c %s -### 2>&1 | \ +// RUN: %clang -target i386-apple-darwin9 -c %s -### 2>&1 | \ // RUN: FileCheck --check-prefix=CHECK-VERSION-OSX5 %s // RUN: env MACOSX_DEPLOYMENT_TARGET=10.5 IPHONEOS_DEPLOYMENT_TARGET=2.0 \ // RUN: %clang -target armv6-apple-darwin9 -c %s -### 2>&1 | \ diff --git a/clang/test/Driver/default-toolchain.c b/clang/test/Driver/default-toolchain.c index 4971c906cf02..b9111a620055 100644 --- a/clang/test/Driver/default-toolchain.c +++ b/clang/test/Driver/default-toolchain.c @@ -6,6 +6,3 @@ // RUN: %clang -target i386-apple-darwin9 -arch ppc64 -m32 -v 2> %t // RUN: grep 'Target: powerpc-apple-darwin9' %t - -// RUN: %clang -target x86_64-apple-macos11 -arch arm64 -v 2>&1 | FileCheck --check-prefix=ARM64 %s -// ARM64: Target: arm64-apple-macos11 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits