Skip to content

Commit ab10e36

Browse files
committed
[ARM] Using cp15 while mtp =auto and arch is arm_arch6k and support thumb2
We follow GCC mtp=auto when arch is arm_arch6k and support thumb2 Reference: https://reviews.llvm.org/D114116
1 parent 620c383 commit ab10e36

File tree

2 files changed

+27
-7
lines changed

2 files changed

+27
-7
lines changed

clang/lib/Driver/ToolChains/Arch/ARM.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,10 @@ bool arm::useAAPCSForMachO(const llvm::Triple &T) {
208208
bool arm::isHardTPSupported(const llvm::Triple &Triple) {
209209
int Ver = getARMSubArchVersionNumber(Triple);
210210
llvm::ARM::ArchKind AK = llvm::ARM::parseArch(Triple.getArchName());
211-
return Triple.isARM() || AK == llvm::ARM::ArchKind::ARMV6T2 ||
212-
(Ver >= 7 && AK != llvm::ARM::ArchKind::ARMV8MBaseline);
211+
return AK == llvm::ARM::ArchKind::ARMV6T2 ||
212+
AK == llvm::ARM::ArchKind::ARMV6K ||
213+
AK == llvm::ARM::ArchKind::ARMV6KZ ||
214+
(Ver >= 7 && !isARMMProfile(Triple));
213215
}
214216

215217
// Select mode for reading thread pointer (-mtp=soft/cp15).

clang/test/Driver/arm-thread-pointer.c

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,21 @@
2020
// RUN: FileCheck -check-prefix=ARM_THREAD_POINTER-HARD %s
2121
// RUN: %clang --target=armv6k-linux -mtp=cp15 -### -S %s 2>&1 | \
2222
// RUN: FileCheck -check-prefix=ARM_THREAD_POINTER-HARD %s
23+
// ARM_THREAD_POINTER-HARD: "-target-feature" "+read-tp-tpidruro"
24+
2325
// RUN: %clang --target=armv6-linux -mtp=cp15 -### -S %s 2>&1 | \
24-
// RUN: FileCheck -check-prefix=ARM_THREAD_POINTER-HARD %s
26+
// RUN: FileCheck -check-prefix=ARM_THREAD_POINTER_HARD %s
2527
// RUN: %clang --target=armv5t-linux -mtp=cp15 -### -S %s 2>&1 | \
26-
// RUN: FileCheck -check-prefix=ARM_THREAD_POINTER-HARD %s
27-
// ARM_THREAD_POINTER-HARD: "-target-feature" "+read-tp-tpidruro"
28+
// RUN: FileCheck -check-prefix=ARM_THREAD_POINTER_HARD %s
29+
// ARM_THREAD_POINTER_HARD-NOT: "-target-feature" "+read-tp-tpidruro"
2830

2931
// RUN: %clang --target=armv5t-linux -mtp=cp15 -x assembler -### %s 2>&1 | \
3032
// RUN: FileCheck -check-prefix=ARMv5_THREAD_POINTER_ASSEMBLER %s
3133
// ARMv5_THREAD_POINTER_ASSEMBLER-NOT: hardware TLS register is not supported for the armv5 sub-architecture
3234

33-
// RUN: not %clang --target=armv6-linux -mthumb -mtp=cp15 -### -S %s 2>&1 | \
35+
// RUN: %clang --target=armv6-linux -mthumb -mtp=cp15 -### -S %s 2>&1 | \
3436
// RUN: FileCheck -check-prefix=THUMBv6_THREAD_POINTER_UNSUPP %s
35-
// RUN: not %clang --target=thumbv6-linux -mthumb -mtp=cp15 -### -S %s 2>&1 | \
37+
// RUN: %clang --target=thumbv6-linux -mthumb -mtp=cp15 -### -S %s 2>&1 | \
3638
// RUN: FileCheck -check-prefix=THUMBv6_THREAD_POINTER_UNSUPP %s
3739
// THUMBv6_THREAD_POINTER_UNSUPP: hardware TLS register is not supported for the thumbv6 sub-architecture
3840

@@ -47,3 +49,19 @@
4749
// RUN: %clang --target=armv7-linux -mtp=auto -### -S %s 2>&1 | \
4850
// RUN: FileCheck -check-prefix=ARMv7_THREAD_POINTER_Auto %s
4951
// ARMv7_THREAD_POINTER_Auto: "-target-feature" "+read-tp-tpidruro"
52+
53+
// RUN: %clang --target=armv5t-linux -mtp=auto -### -S %s 2>&1 | \
54+
// RUN: FileCheck -check-prefix=ARMv5t_THREAD_POINTER_Auto %s
55+
// ARMv5t_THREAD_POINTER_Auto-NOT: "-target-feature" "+read-tp-tpidruro"
56+
57+
// RUN: %clang --target=armv6k-linux -mtp=auto -### -S %s 2>&1 | \
58+
// RUN: FileCheck -check-prefix=ARMv6k_THREAD_POINTER_Auto %s
59+
// ARMv6k_THREAD_POINTER_Auto: "-target-feature" "+read-tp-tpidruro"
60+
61+
// RUN: %clang --target=armv6-linux -mtp=auto -### -S %s 2>&1 | \
62+
// RUN: FileCheck -check-prefix=ARMv6_THREAD_POINTER_Auto %s
63+
// ARMv6_THREAD_POINTER_Auto-NOT: "-target-feature" "+read-tp-tpidruro"
64+
65+
// RUN: %clang --target=armv6kz-linux -mtp=auto -### -S %s 2>&1 | \
66+
// RUN: FileCheck -check-prefix=ARMv6kz_THREAD_POINTER_Auto %s
67+
// ARMv6kz_THREAD_POINTER_Auto: "-target-feature" "+read-tp-tpidruro"

0 commit comments

Comments
 (0)