diff options
Diffstat (limited to 'compiler-rt/lib/builtins')
| -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 d788052..8af736d 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 afe9d4e..0f56cef 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; |