Skip to content

Commit bab804e

Browse files
hyphyp
authored
Merge pull request #2901 from apple/eng/cherry-driver
Recommit "[clang][driver] Use the provided arch name for a Darwin tar…
2 parents 9dd73ba + c85fcb0 commit bab804e

File tree

7 files changed

+13
-18
lines changed

7 files changed

+13
-18
lines changed

‎clang/lib/Driver/ToolChains/Darwin.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,12 @@ void darwin::setTripleTypeForMachOArchName(llvm::Triple &T, StringRef Str) {
7474
const llvm::Triple::ArchType Arch = getArchTypeForMachOArchName(Str);
7575
llvm::ARM::ArchKind ArchKind = llvm::ARM::parseArch(Str);
7676
T.setArch(Arch);
77-
78-
if (Str == "x86_64h" || Str == "arm64e")
77+
if (Arch != llvm::Triple::UnknownArch)
7978
T.setArchName(Str);
8079

81-
// These arches aren't really Darwin even if we're using a Darwin toolchain.
82-
else if (ArchKind == llvm::ARM::ArchKind::ARMV6M ||
83-
ArchKind == llvm::ARM::ArchKind::ARMV7M ||
84-
ArchKind == llvm::ARM::ArchKind::ARMV7EM) {
80+
if (ArchKind == llvm::ARM::ArchKind::ARMV6M ||
81+
ArchKind == llvm::ARM::ArchKind::ARMV7M ||
82+
ArchKind == llvm::ARM::ArchKind::ARMV7EM) {
8583
T.setOS(llvm::Triple::UnknownOS);
8684
T.setObjectFormat(llvm::Triple::MachO);
8785
}

‎clang/test/Driver/aarch64-cpus.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
// ARM64E-DARWIN: "-cc1"{{.*}} "-triple" "arm64e{{.*}}" "-target-cpu" "apple-a12"
3434

3535
// RUN: %clang -target arm64-apple-darwin -arch arm64_32 -### -c %s 2>&1 | FileCheck -check-prefix=ARM64_32-DARWIN %s
36-
// ARM64_32-DARWIN: "-cc1"{{.*}} "-triple" "aarch64_32{{.*}}" "-target-cpu" "apple-s4"
36+
// ARM64_32-DARWIN: "-cc1"{{.*}} "-triple" "arm64_32{{.*}}" "-target-cpu" "apple-s4"
3737

3838
// RUN: %clang -target aarch64 -mcpu=cortex-a35 -### -c %s 2>&1 | FileCheck -check-prefix=CA35 %s
3939
// RUN: %clang -target aarch64 -mlittle-endian -mcpu=cortex-a35 -### -c %s 2>&1 | FileCheck -check-prefix=CA35 %s

‎clang/test/Driver/arm64_32-link.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
// RUN: %clang -target x86_64-apple-darwin -arch arm64_32 -miphoneos-version-min=8.0 %s -### 2>&1 | FileCheck %s
22

3-
// CHECK: "-cc1"{{.*}} "-triple" "aarch64_32-apple-ios8.0.0"
3+
// CHECK: "-cc1"{{.*}} "-triple" "arm64_32-apple-ios8.0.0"
44
// CHECK: ld{{.*}} "-arch" "arm64_32"

‎clang/test/Driver/darwin-version.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,17 @@
6060
// RUN: FileCheck --check-prefix=CHECK-VERSION-OSX4 %s
6161
// RUN: %clang -target i686-apple-darwin9 -mmacosx-version-min=10.4 -c %s -### 2>&1 | \
6262
// RUN: FileCheck --check-prefix=CHECK-VERSION-OSX4 %s
63-
// CHECK-VERSION-OSX4: "i386-apple-macosx10.4.0"
63+
// CHECK-VERSION-OSX4: "i686-apple-macosx10.4.0"
6464
// RUN: %clang -target i686-apple-darwin9 -c %s -### 2>&1 | \
6565
// RUN: FileCheck --check-prefix=CHECK-VERSION-OSX5 %s
6666
// RUN: %clang -target i686-apple-darwin9 -mmacosx-version-min=10.5 -c %s -### 2>&1 | \
6767
// RUN: FileCheck --check-prefix=CHECK-VERSION-OSX5 %s
68-
// CHECK-VERSION-OSX5: "i386-apple-macosx10.5.0"
68+
// CHECK-VERSION-OSX5: "i686-apple-macosx10.5.0"
6969
// RUN: %clang -target i686-apple-darwin10 -c %s -### 2>&1 | \
7070
// RUN: FileCheck --check-prefix=CHECK-VERSION-OSX6 %s
7171
// RUN: %clang -target i686-apple-darwin9 -mmacosx-version-min=10.6 -c %s -### 2>&1 | \
7272
// RUN: FileCheck --check-prefix=CHECK-VERSION-OSX6 %s
73-
// CHECK-VERSION-OSX6: "i386-apple-macosx10.6.0"
73+
// CHECK-VERSION-OSX6: "i686-apple-macosx10.6.0"
7474
// RUN: %clang -target x86_64-apple-darwin14 -c %s -### 2>&1 | \
7575
// RUN: FileCheck --check-prefix=CHECK-VERSION-OSX10 %s
7676
// RUN: %clang -target x86_64-apple-darwin -mmacosx-version-min=10.10 -c %s -### 2>&1 | \
@@ -100,7 +100,7 @@
100100

101101
// Check environment variable gets interpreted correctly
102102
// RUN: env MACOSX_DEPLOYMENT_TARGET=10.5 IPHONEOS_DEPLOYMENT_TARGET=2.0 \
103-
// RUN: %clang -target i386-apple-darwin9 -c %s -### 2>&1 | \
103+
// RUN: %clang -target i686-apple-darwin9 -c %s -### 2>&1 | \
104104
// RUN: FileCheck --check-prefix=CHECK-VERSION-OSX5 %s
105105
// RUN: env MACOSX_DEPLOYMENT_TARGET=10.5 IPHONEOS_DEPLOYMENT_TARGET=2.0 \
106106
// RUN: %clang -target armv6-apple-darwin9 -c %s -### 2>&1 | \

‎clang/test/Driver/default-toolchain.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@
66

77
// RUN: %clang -target i386-apple-darwin9 -arch ppc64 -m32 -v 2> %t
88
// RUN: grep 'Target: powerpc-apple-darwin9' %t
9+
10+
// RUN: %clang -target x86_64-apple-macos11 -arch arm64 -v 2>&1 | FileCheck --check-prefix=ARM64 %s
11+
// ARM64: Target: arm64-apple-macos11

‎clang/test/Driver/openmp-offload-gpu.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
/// Perform several driver tests for OpenMP offloading
33
///
44

5-
// https://PR46644
6-
// XFAIL: arm64-apple
7-
85
// REQUIRES: clang-driver
96
// REQUIRES: x86-registered-target
107
// REQUIRES: powerpc-registered-target

‎clang/test/Driver/openmp-offload.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
/// Perform several driver tests for OpenMP offloading
33
///
44

5-
// https://PR46644
6-
// XFAIL: arm64-apple
7-
85
// REQUIRES: clang-driver
96
// REQUIRES: x86-registered-target
107
// REQUIRES: powerpc-registered-target

0 commit comments

Comments
 (0)