diff options
| author | Brad Smith <brad@comstyle.com> | 2025-10-02 16:49:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-02 16:49:10 -0400 |
| commit | ea443d528d1a6687c2f5ecfe3de62e5c9d2ca42c (patch) | |
| tree | 8da1bc0b7acdc2dd5fa1551efdd12543ab5f1c59 | |
| parent | 2b2bc6320f7037bdbad912fe3cd8003988e6c0ae (diff) | |
[FMV][AArch64] Remove last of MRS bits and rename file (#161585)
474f5d2aefb44430b89ed72774a3c1d26a0adfb1 removed the last
bits reading from system registers so remove the last bits
utilizing MRS and rename the file to hwcap as the
code is now only decoding the hwcap flags.
| -rw-r--r-- | compiler-rt/lib/builtins/cpu_model/aarch64.c | 6 | ||||
| -rw-r--r-- | compiler-rt/lib/builtins/cpu_model/aarch64/fmv/hwcap.inc (renamed from compiler-rt/lib/builtins/cpu_model/aarch64/fmv/mrs.inc) | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/compiler-rt/lib/builtins/cpu_model/aarch64.c b/compiler-rt/lib/builtins/cpu_model/aarch64.c index d7880529ebe7..8af736d0ffe9 100644 --- a/compiler-rt/lib/builtins/cpu_model/aarch64.c +++ b/compiler-rt/lib/builtins/cpu_model/aarch64.c @@ -69,15 +69,15 @@ struct { #if defined(__APPLE__) #include "aarch64/fmv/apple.inc" #elif defined(__FreeBSD__) || defined(__OpenBSD__) -#include "aarch64/fmv/mrs.inc" +#include "aarch64/fmv/hwcap.inc" #include "aarch64/fmv/elf_aux_info.inc" #elif defined(__Fuchsia__) #include "aarch64/fmv/fuchsia.inc" #elif defined(__ANDROID__) -#include "aarch64/fmv/mrs.inc" +#include "aarch64/fmv/hwcap.inc" #include "aarch64/fmv/android.inc" #elif defined(__linux__) && __has_include(<sys/auxv.h>) -#include "aarch64/fmv/mrs.inc" +#include "aarch64/fmv/hwcap.inc" #include "aarch64/fmv/getauxval.inc" #elif defined(_WIN32) #include "aarch64/fmv/windows.inc" diff --git a/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/mrs.inc b/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/hwcap.inc index afe9d4efd6af..0f56cef97d4a 100644 --- a/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/mrs.inc +++ b/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/hwcap.inc @@ -7,9 +7,6 @@ static void __init_cpu_features_constructor(unsigned long hwcap, const __ifunc_arg_t *arg) { unsigned long long feat = 0; #define setCPUFeature(F) feat |= 1ULL << F -#define getCPUFeature(id, ftr) __asm__("mrs %0, " #id : "=r"(ftr)) -#define extractBits(val, start, number) \ - (val & ((1ULL << number) - 1ULL) << start) >> start unsigned long hwcap2 = 0; if (hwcap & _IFUNC_ARG_HWCAP) hwcap2 = arg->_hwcap2; |