https://github.com/Zhenhang1213 updated https://github.com/llvm/llvm-project/pull/130027
>From ab10e36766013ef8406ed8a4f7f3e398e04186d2 Mon Sep 17 00:00:00 2001 From: Austin <zhenhangw...@huawei.com> Date: Thu, 6 Mar 2025 17:25:55 +0800 Subject: [PATCH] [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 --- clang/lib/Driver/ToolChains/Arch/ARM.cpp | 6 +++-- clang/test/Driver/arm-thread-pointer.c | 28 +++++++++++++++++++----- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/clang/lib/Driver/ToolChains/Arch/ARM.cpp b/clang/lib/Driver/ToolChains/Arch/ARM.cpp index 51454de1b9dcc..446228b76a903 100644 --- a/clang/lib/Driver/ToolChains/Arch/ARM.cpp +++ b/clang/lib/Driver/ToolChains/Arch/ARM.cpp @@ -208,8 +208,10 @@ bool arm::useAAPCSForMachO(const llvm::Triple &T) { bool arm::isHardTPSupported(const llvm::Triple &Triple) { int Ver = getARMSubArchVersionNumber(Triple); llvm::ARM::ArchKind AK = llvm::ARM::parseArch(Triple.getArchName()); - return Triple.isARM() || AK == llvm::ARM::ArchKind::ARMV6T2 || - (Ver >= 7 && AK != llvm::ARM::ArchKind::ARMV8MBaseline); + return AK == llvm::ARM::ArchKind::ARMV6T2 || + AK == llvm::ARM::ArchKind::ARMV6K || + AK == llvm::ARM::ArchKind::ARMV6KZ || + (Ver >= 7 && !isARMMProfile(Triple)); } // Select mode for reading thread pointer (-mtp=soft/cp15). diff --git a/clang/test/Driver/arm-thread-pointer.c b/clang/test/Driver/arm-thread-pointer.c index 985c5046f6d26..9e575cdf3d0d7 100644 --- a/clang/test/Driver/arm-thread-pointer.c +++ b/clang/test/Driver/arm-thread-pointer.c @@ -20,19 +20,21 @@ // RUN: FileCheck -check-prefix=ARM_THREAD_POINTER-HARD %s // RUN: %clang --target=armv6k-linux -mtp=cp15 -### -S %s 2>&1 | \ // RUN: FileCheck -check-prefix=ARM_THREAD_POINTER-HARD %s +// ARM_THREAD_POINTER-HARD: "-target-feature" "+read-tp-tpidruro" + // RUN: %clang --target=armv6-linux -mtp=cp15 -### -S %s 2>&1 | \ -// RUN: FileCheck -check-prefix=ARM_THREAD_POINTER-HARD %s +// RUN: FileCheck -check-prefix=ARM_THREAD_POINTER_HARD %s // RUN: %clang --target=armv5t-linux -mtp=cp15 -### -S %s 2>&1 | \ -// RUN: FileCheck -check-prefix=ARM_THREAD_POINTER-HARD %s -// ARM_THREAD_POINTER-HARD: "-target-feature" "+read-tp-tpidruro" +// RUN: FileCheck -check-prefix=ARM_THREAD_POINTER_HARD %s +// ARM_THREAD_POINTER_HARD-NOT: "-target-feature" "+read-tp-tpidruro" // RUN: %clang --target=armv5t-linux -mtp=cp15 -x assembler -### %s 2>&1 | \ // RUN: FileCheck -check-prefix=ARMv5_THREAD_POINTER_ASSEMBLER %s // ARMv5_THREAD_POINTER_ASSEMBLER-NOT: hardware TLS register is not supported for the armv5 sub-architecture -// RUN: not %clang --target=armv6-linux -mthumb -mtp=cp15 -### -S %s 2>&1 | \ +// RUN: %clang --target=armv6-linux -mthumb -mtp=cp15 -### -S %s 2>&1 | \ // RUN: FileCheck -check-prefix=THUMBv6_THREAD_POINTER_UNSUPP %s -// RUN: not %clang --target=thumbv6-linux -mthumb -mtp=cp15 -### -S %s 2>&1 | \ +// RUN: %clang --target=thumbv6-linux -mthumb -mtp=cp15 -### -S %s 2>&1 | \ // RUN: FileCheck -check-prefix=THUMBv6_THREAD_POINTER_UNSUPP %s // THUMBv6_THREAD_POINTER_UNSUPP: hardware TLS register is not supported for the thumbv6 sub-architecture @@ -47,3 +49,19 @@ // RUN: %clang --target=armv7-linux -mtp=auto -### -S %s 2>&1 | \ // RUN: FileCheck -check-prefix=ARMv7_THREAD_POINTER_Auto %s // ARMv7_THREAD_POINTER_Auto: "-target-feature" "+read-tp-tpidruro" + +// RUN: %clang --target=armv5t-linux -mtp=auto -### -S %s 2>&1 | \ +// RUN: FileCheck -check-prefix=ARMv5t_THREAD_POINTER_Auto %s +// ARMv5t_THREAD_POINTER_Auto-NOT: "-target-feature" "+read-tp-tpidruro" + +// RUN: %clang --target=armv6k-linux -mtp=auto -### -S %s 2>&1 | \ +// RUN: FileCheck -check-prefix=ARMv6k_THREAD_POINTER_Auto %s +// ARMv6k_THREAD_POINTER_Auto: "-target-feature" "+read-tp-tpidruro" + +// RUN: %clang --target=armv6-linux -mtp=auto -### -S %s 2>&1 | \ +// RUN: FileCheck -check-prefix=ARMv6_THREAD_POINTER_Auto %s +// ARMv6_THREAD_POINTER_Auto-NOT: "-target-feature" "+read-tp-tpidruro" + +// RUN: %clang --target=armv6kz-linux -mtp=auto -### -S %s 2>&1 | \ +// RUN: FileCheck -check-prefix=ARMv6kz_THREAD_POINTER_Auto %s +// ARMv6kz_THREAD_POINTER_Auto: "-target-feature" "+read-tp-tpidruro" \ No newline at end of file _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
