[AArch64] Update dl-procinfo for new HWCAP flags in Linux 4.12

Follow up to commit 512d245bc30cca893db6979f42f058e734f345c3.

	* sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c:
	(_dl_aarch64_cap_flags): Update.
	* sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h
	(_DL_HWCAP_COUNT, _DL_HWCAP_LAST): Update.

diff --git a/ChangeLog b/ChangeLog
index 5944df03fcb40a22e9abf8fb5e1014f5e991110b..3cf8d4a5c70cedb80a731dcd912626bb4f830e80 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-07-19  Szabolcs Nagy  <szabolcs.nagy@arm.com>
+
+       * sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c:
+       (_dl_aarch64_cap_flags): Update.
+       * sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h
+       (_DL_HWCAP_COUNT, _DL_HWCAP_LAST): Update.
+
 2017-07-18  Szabolcs Nagy  <szabolcs.nagy@arm.com>
 
        * sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h (_dl_procinfo): Revert.

diff --git a/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c b/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c
index bc37bad7826ab79223dc342213110cc62daa5e65..fed31fd9b5b1bffac8407afbb1a6bd03f1656de8 100644 (file)
--- a/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c
+++ b/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c
@@ -59,11 +59,13 @@ PROCINFO_CLASS struct cpu_features _dl_aarch64_cpu_features
 #if !defined PROCINFO_DECL && defined SHARED
   ._dl_aarch64_cap_flags
 #else
-PROCINFO_CLASS const char _dl_aarch64_cap_flags[13][10]
+PROCINFO_CLASS const char _dl_aarch64_cap_flags[16][10]
 #endif
 #ifndef PROCINFO_DECL
+/* Matches the names in arch/arm64/kernel/cpuinfo.c of Linux.  */
 = { "fp", "asimd", "evtstrm", "aes", "pmull", "sha1", "sha2", "crc32",
-    "atomics", "fphp", "asimdhp", "cpuid", "asimdrdm"}
+    "atomics", "fphp", "asimdhp", "cpuid", "asimdrdm", "jscvt", "fcma",
+    "lrcpc" }
 #endif
 #if !defined SHARED || defined PROCINFO_DECL
 ;

diff --git a/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h b/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h
index 44dc296d3ea147101193d09c7d206feb36e59047..0333a18267dfef3e657d2d3d29f163fb6237bcdf 100644 (file)
--- a/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h
+++ b/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h
@@ -28,10 +28,10 @@
 #define _dl_procinfo(type, word) -1
 
 /* Number of HWCAP bits set.  */
-#define _DL_HWCAP_COUNT 13
+#define _DL_HWCAP_COUNT 16
 
 /* Offset of the last bit allocated in HWCAP.  */
-#define _DL_HWCAP_LAST 12
+#define _DL_HWCAP_LAST 15
 
 /* HWCAP_CPUID should be available by default to influence IFUNC as well as
    library search.  */