https://github.com/Zhenhang1213 created https://github.com/llvm/llvm-project/pull/130027
We follow GCC mtp=auto when arch is arm_arch6k and support thumb2 reference:https://reviews.llvm.org/D114116 >From 751ef68cf68739277b8975157b5693fa4bc72abe 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 | 13 ++++++++++--- clang/lib/Driver/ToolChains/Arch/ARM.h | 1 + clang/test/Driver/arm-thread-pointer.c | 16 ++++++++++++++++ 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/clang/lib/Driver/ToolChains/Arch/ARM.cpp b/clang/lib/Driver/ToolChains/Arch/ARM.cpp index 51454de1b9dcc..b7d5b3a9a882a 100644 --- a/clang/lib/Driver/ToolChains/Arch/ARM.cpp +++ b/clang/lib/Driver/ToolChains/Arch/ARM.cpp @@ -208,10 +208,17 @@ 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 Triple.isARM() || (Ver >= 7 && AK != llvm::ARM::ArchKind::ARMV8MBaseline); } + +// We follow GCC mtp=auto when arch is arm_arch6k and support thumb2 +bool arm::isHardTPAndThumb2(const llvm::Triple &Triple) { + llvm::ARM::ArchKind AK = llvm::ARM::parseArch(Triple.getArchName()); + return Triple.isARM() && AK >= llvm::ARM::ArchKind::ARMV6K && AK != llvm::ARM::ArchKind::ARMV8MBaseline; +} + + // Select mode for reading thread pointer (-mtp=soft/cp15). arm::ReadTPMode arm::getReadTPMode(const Driver &D, const ArgList &Args, const llvm::Triple &Triple, bool ForAS) { @@ -240,7 +247,7 @@ arm::ReadTPMode arm::getReadTPMode(const Driver &D, const ArgList &Args, D.Diag(diag::err_drv_invalid_mtp) << A->getAsString(Args); return ReadTPMode::Invalid; } - return (isHardTPSupported(Triple) ? ReadTPMode::TPIDRURO : ReadTPMode::Soft); + return (isHardTPAndThumb2(Triple) ? ReadTPMode::TPIDRURO : ReadTPMode::Soft); } void arm::setArchNameInTriple(const Driver &D, const ArgList &Args, diff --git a/clang/lib/Driver/ToolChains/Arch/ARM.h b/clang/lib/Driver/ToolChains/Arch/ARM.h index a23a8793a89e2..0641580900fd1 100644 --- a/clang/lib/Driver/ToolChains/Arch/ARM.h +++ b/clang/lib/Driver/ToolChains/Arch/ARM.h @@ -57,6 +57,7 @@ FloatABI getARMFloatABI(const Driver &D, const llvm::Triple &Triple, void setFloatABIInTriple(const Driver &D, const llvm::opt::ArgList &Args, llvm::Triple &triple); bool isHardTPSupported(const llvm::Triple &Triple); +bool isHardTPAndThumb2(const llvm::Triple &Triple); ReadTPMode getReadTPMode(const Driver &D, const llvm::opt::ArgList &Args, const llvm::Triple &Triple, bool ForAS); void setArchNameInTriple(const Driver &D, const llvm::opt::ArgList &Args, diff --git a/clang/test/Driver/arm-thread-pointer.c b/clang/test/Driver/arm-thread-pointer.c index 985c5046f6d26..b487a8d83fe34 100644 --- a/clang/test/Driver/arm-thread-pointer.c +++ b/clang/test/Driver/arm-thread-pointer.c @@ -47,3 +47,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" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
