Skip to content

Commit 57b5ba0

Browse files
authored
[FMV][AArch64] Fix build after edb4319 (#162383)
Revert removal of local variables.
1 parent 84cb386 commit 57b5ba0

File tree

2 files changed

+18
-8
lines changed

2 files changed

+18
-8
lines changed

compiler-rt/lib/builtins/cpu_model/aarch64/fmv/android.inc

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,16 @@ void CONSTRUCTOR_ATTRIBUTE __init_cpu_features(void) {
2525
if (__isExynos9810())
2626
return;
2727

28+
unsigned long hwcap = getauxval(AT_HWCAP);
29+
unsigned long hwcap2 = getauxval(AT_HWCAP2);
30+
unsigned long hwcap2 = getauxval(AT_HWCAP3);
31+
unsigned long hwcap2 = getauxval(AT_HWCAP4);
32+
2833
__ifunc_arg_t arg;
2934
arg._size = sizeof(__ifunc_arg_t);
30-
arg._hwcap = getauxval(AT_HWCAP);
31-
arg._hwcap2 = getauxval(AT_HWCAP2);
32-
arg._hwcap3 = getauxval(AT_HWCAP3);
33-
arg._hwcap4 = getauxval(AT_HWCAP4);
35+
arg._hwcap = hwcap;
36+
arg._hwcap2 = hwcap2;
37+
arg._hwcap3 = hwcap3;
38+
arg._hwcap4 = hwcap4;
3439
__init_cpu_features_constructor(hwcap | _IFUNC_ARG_HWCAP, &arg);
3540
}

compiler-rt/lib/builtins/cpu_model/aarch64/fmv/getauxval.inc

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,16 @@ void CONSTRUCTOR_ATTRIBUTE __init_cpu_features(void) {
1010
if (__atomic_load_n(&__aarch64_cpu_features.features, __ATOMIC_RELAXED))
1111
return;
1212

13+
unsigned long hwcap = getauxval(AT_HWCAP);
14+
unsigned long hwcap2 = getauxval(AT_HWCAP2);
15+
unsigned long hwcap2 = getauxval(AT_HWCAP3);
16+
unsigned long hwcap2 = getauxval(AT_HWCAP4);
17+
1318
__ifunc_arg_t arg;
1419
arg._size = sizeof(__ifunc_arg_t);
15-
arg._hwcap = getauxval(AT_HWCAP);
16-
arg._hwcap2 = getauxval(AT_HWCAP2);
17-
arg._hwcap3 = getauxval(AT_HWCAP3);
18-
arg._hwcap4 = getauxval(AT_HWCAP4);
20+
arg._hwcap = hwcap;
21+
arg._hwcap2 = hwcap2;
22+
arg._hwcap3 = hwcap3;
23+
arg._hwcap4 = hwcap4;
1924
__init_cpu_features_constructor(hwcap | _IFUNC_ARG_HWCAP, &arg);
2025
}

0 commit comments

Comments
 (0)