Remove unused _DL_HWCAP_LAST definition and move _DL_HWCAP_COUNT
where it is needed (dl-procinfo.h always includes dl-procinfo.c).
* sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h
(_DL_HWCAP_LAST): Remove.
(_DL_HWCAP_COUNT): Move to ...
* sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c
(_DL_HWCAP_COUNT): ... here.
+2018-01-16 Szabolcs Nagy <szabolcs.nagy@arm.com>
+
+ * sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h
+ (_DL_HWCAP_LAST): Remove.
+ (_DL_HWCAP_COUNT): Move to ...
+ * sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c
+ (_DL_HWCAP_COUNT): ... here.
+
2018-01-16 Florian Weimer <fweimer@redhat.com>
* nptl/Makefile (CFLAGS-tst-minstack-throw.o): Compile in C++11
# 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. */
/* 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