From 82e06600505cc26810d263a964d9eca6f3cdfe91 Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Tue, 18 Jul 2017 11:15:12 +0100 Subject: [PATCH] [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. --- ChangeLog | 7 +++++++ sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c | 6 ++++-- sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h | 4 ++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5944df03fc..3cf8d4a5c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2017-07-19 Szabolcs Nagy + + * 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 * 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 bc37bad782..fed31fd9b5 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 44dc296d3e..0333a18267 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. */