[compiler-rt] 57b5ba0 - [FMV][AArch64] Fix build after edb43192516a55165cc4c158eb4fd4b2d81a8fce (#162383)

[via llvm-commits]

Author: Brad Smith
Date: 2025-10-07T22:17:53Z
New Revision: 57b5ba00cb421b9be17bac10036763f42fbe9298

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

LOG: [FMV][AArch64] Fix build after edb43192516a55165cc4c158eb4fd4b2d81a8fce (#162383)

Revert removal of local variables.

Added: 
    

Modified: 
    compiler-rt/lib/builtins/cpu_model/aarch64/fmv/android.inc
    compiler-rt/lib/builtins/cpu_model/aarch64/fmv/getauxval.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 f9c260e80f40e..f3065735ad501 100644
--- a/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/android.inc
+++ b/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/android.inc
@@ -25,11 +25,16 @@ void CONSTRUCTOR_ATTRIBUTE __init_cpu_features(void) {
   if (__isExynos9810())
     return;
 
+  unsigned long hwcap = getauxval(AT_HWCAP);
+  unsigned long hwcap2 = getauxval(AT_HWCAP2);
+  unsigned long hwcap2 = getauxval(AT_HWCAP3);
+  unsigned long hwcap2 = getauxval(AT_HWCAP4);
+
   __ifunc_arg_t arg;
   arg._size = sizeof(__ifunc_arg_t);
-  arg._hwcap = getauxval(AT_HWCAP);
-  arg._hwcap2 = getauxval(AT_HWCAP2);
-  arg._hwcap3 = getauxval(AT_HWCAP3);
-  arg._hwcap4 = getauxval(AT_HWCAP4);
+  arg._hwcap = hwcap;
+  arg._hwcap2 = hwcap2;
+  arg._hwcap3 = hwcap3;
+  arg._hwcap4 = hwcap4;
   __init_cpu_features_constructor(hwcap | _IFUNC_ARG_HWCAP, &arg);
 }

diff  --git a/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/getauxval.inc b/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/getauxval.inc
index 689a1f7175aef..91b37b69ca47a 100644
--- a/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/getauxval.inc
+++ b/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/getauxval.inc
@@ -10,11 +10,16 @@ void CONSTRUCTOR_ATTRIBUTE __init_cpu_features(void) {
   if (__atomic_load_n(&__aarch64_cpu_features.features, __ATOMIC_RELAXED))
     return;
 
+  unsigned long hwcap = getauxval(AT_HWCAP);
+  unsigned long hwcap2 = getauxval(AT_HWCAP2);
+  unsigned long hwcap2 = getauxval(AT_HWCAP3);
+  unsigned long hwcap2 = getauxval(AT_HWCAP4);
+
   __ifunc_arg_t arg;
   arg._size = sizeof(__ifunc_arg_t);
-  arg._hwcap = getauxval(AT_HWCAP);
-  arg._hwcap2 = getauxval(AT_HWCAP2);
-  arg._hwcap3 = getauxval(AT_HWCAP3);
-  arg._hwcap4 = getauxval(AT_HWCAP4);
+  arg._hwcap = hwcap;
+  arg._hwcap2 = hwcap2;
+  arg._hwcap3 = hwcap3;
+  arg._hwcap4 = hwcap4;
   __init_cpu_features_constructor(hwcap | _IFUNC_ARG_HWCAP, &arg);
 }