[compiler-rt] c88e74c - fixup! fixup! [builtins] Refactor cpu_model support to reduce #if nesting. NFCI

[Jon Roelofs via llvm-commits]

Author: Jon Roelofs
Date: 2023-12-19T11:46:40-07:00
New Revision: c88e74c26d5c258d42f069540fc046d52c420927

URL: https://github.com/llvm/llvm-project/commit/c88e74c26d5c258d42f069540fc046d52c420927
DIFF: https://github.com/llvm/llvm-project/commit/c88e74c26d5c258d42f069540fc046d52c420927.diff

LOG: fixup! fixup! [builtins] Refactor cpu_model support to reduce #if nesting. NFCI

Added: 
    

Modified: 
    compiler-rt/lib/builtins/cpu_model/aarch64/fmv/android.inc
    compiler-rt/lib/builtins/cpu_model/aarch64/fmv/fuchsia.inc
    compiler-rt/lib/builtins/cpu_model/aarch64/fmv/sysauxv.inc

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/android.inc b/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/android.inc
index 8fccede18c7183..f711431489cc77 100644
--- a/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/android.inc
+++ b/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/android.inc
@@ -25,7 +25,7 @@ void CONSTRUCTOR_ATTRIBUTE __init_cpu_features(void) {
   if (__isExynos9810())
     return;
 
-  unsgined long hwcap = getauxval(AT_HWCAP);
+  unsigned long hwcap = getauxval(AT_HWCAP);
   unsigned long hwcap2 = getauxval(AT_HWCAP2);
 
   __ifunc_arg_t arg;

diff  --git a/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/fuchsia.inc b/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/fuchsia.inc
index 3fffafd8c2492e..4dab6ff58b3782 100644
--- a/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/fuchsia.inc
+++ b/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/fuchsia.inc
@@ -11,7 +11,7 @@ void CONSTRUCTOR_ATTRIBUTE __init_cpu_features(void) {
   if (__aarch64_cpu_features.features)
     return;
 
-  unsgined long hwcap = getauxval(AT_HWCAP);
+  unsigned long hwcap = getauxval(AT_HWCAP);
   unsigned long hwcap2 = getauxval(AT_HWCAP2);
 
   __ifunc_arg_t arg;

diff  --git a/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/sysauxv.inc b/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/sysauxv.inc
index 8af05d941a5378..fb5722c4306fd8 100644
--- a/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/sysauxv.inc
+++ b/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/sysauxv.inc
@@ -10,7 +10,7 @@ void CONSTRUCTOR_ATTRIBUTE __init_cpu_features(void) {
   if (__aarch64_cpu_features.features)
     return;
 
-  unsgined long hwcap = getauxval(AT_HWCAP);
+  unsigned long hwcap = getauxval(AT_HWCAP);
   unsigned long hwcap2 = getauxval(AT_HWCAP2);
 
   __ifunc_arg_t arg;