From 47358f3cdd5dc71c47e556cb1ff40bcfc49f8845 Mon Sep 17 00:00:00 2001 From: Brad Smith Date: Tue, 7 Oct 2025 19:01:29 -0400 Subject: [PATCH] [FMV][AArch64] Fix build after edb43192516a55165cc4c158eb4fd4b2d81a8fce, try 2 Correct the variable names --- compiler-rt/lib/builtins/cpu_model/aarch64/fmv/android.inc | 4 ++-- compiler-rt/lib/builtins/cpu_model/aarch64/fmv/getauxval.inc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 f3065735ad501..d19beca690580 100644 --- a/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/android.inc +++ b/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/android.inc @@ -27,8 +27,8 @@ void CONSTRUCTOR_ATTRIBUTE __init_cpu_features(void) { unsigned long hwcap = getauxval(AT_HWCAP); unsigned long hwcap2 = getauxval(AT_HWCAP2); - unsigned long hwcap2 = getauxval(AT_HWCAP3); - unsigned long hwcap2 = getauxval(AT_HWCAP4); + unsigned long hwcap3 = getauxval(AT_HWCAP3); + unsigned long hwcap4 = getauxval(AT_HWCAP4); __ifunc_arg_t arg; arg._size = sizeof(__ifunc_arg_t); 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 91b37b69ca47a..6c52c5311bc53 100644 --- a/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/getauxval.inc +++ b/compiler-rt/lib/builtins/cpu_model/aarch64/fmv/getauxval.inc @@ -12,8 +12,8 @@ void CONSTRUCTOR_ATTRIBUTE __init_cpu_features(void) { unsigned long hwcap = getauxval(AT_HWCAP); unsigned long hwcap2 = getauxval(AT_HWCAP2); - unsigned long hwcap2 = getauxval(AT_HWCAP3); - unsigned long hwcap2 = getauxval(AT_HWCAP4); + unsigned long hwcap3 = getauxval(AT_HWCAP3); + unsigned long hwcap4 = getauxval(AT_HWCAP4); __ifunc_arg_t arg; arg._size = sizeof(__ifunc_arg_t);