From: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date: Tue, 18 Jul 2017 10:15:12 +0000 (+0100)
Subject: [AArch64] Update dl-procinfo for new HWCAP flags in Linux 4.12
X-Git-Tag: upstream/2.30~3009
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=82e06600505cc26810d263a964d9eca6f3cdfe91;p=platform%2Fupstream%2Fglibc.git

[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 5944df0..3cf8d4a 100644
--- 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 bc37bad..fed31fd 100644
--- 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 44dc296..0333a18 100644
--- 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.  */