@@ -56,10 +56,13 @@ PROCINFO_CLASS struct cpu_features _dl_aarch64_cpu_features
# endif
#endif
+/* Number of HWCAP bits set. */
+#define _DL_HWCAP_COUNT 16
+
#if !defined PROCINFO_DECL && defined SHARED
._dl_aarch64_cap_flags
#else
-PROCINFO_CLASS const char _dl_aarch64_cap_flags[16][10]
+PROCINFO_CLASS const char _dl_aarch64_cap_flags[_DL_HWCAP_COUNT][10]
#endif
#ifndef PROCINFO_DECL
/* Matches the names in arch/arm64/kernel/cpuinfo.c of Linux. */
@@ -27,12 +27,6 @@
/* We cannot provide a general printing function. */
#define _dl_procinfo(type, word) -1
-/* Number of HWCAP bits set. */
-#define _DL_HWCAP_COUNT 16
-
-/* Offset of the last bit allocated in HWCAP. */
-#define _DL_HWCAP_LAST 15
-
/* HWCAP_CPUID should be available by default to influence IFUNC as well as
library search. */
#define HWCAP_IMPORTANT HWCAP_CPUID