From 7d7af8f17d81358817a8e2d97f60dc528f27d6e9 Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Wed, 2 Jan 2019 17:27:02 +0000 Subject: AArch64: Update dl-procinfo.c with new HWCAP bits/hwcap.h should be updated together with dl-procinfo.c. * sysdeps/unix/sysv/linux/aarch64/bits/hwcap.h: Add comment. * sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c (_DL_HWCAP_COUNT): Update. --- ChangeLog | 6 ++++++ sysdeps/unix/sysv/linux/aarch64/bits/hwcap.h | 3 ++- sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index f51ba49d17..12422b23b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2019-01-03 Szabolcs Nagy + + * sysdeps/unix/sysv/linux/aarch64/bits/hwcap.h: Add comment. + * sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c (_DL_HWCAP_COUNT): + Update. + 2019-01-03 Adhemerval Zanella [BZ #23640] diff --git a/sysdeps/unix/sysv/linux/aarch64/bits/hwcap.h b/sysdeps/unix/sysv/linux/aarch64/bits/hwcap.h index 193959fe9b..9a395c597f 100644 --- a/sysdeps/unix/sysv/linux/aarch64/bits/hwcap.h +++ b/sysdeps/unix/sysv/linux/aarch64/bits/hwcap.h @@ -20,7 +20,8 @@ # error "Never include directly; use instead." #endif -/* The following must match the kernel's . */ +/* The following must match the kernel's and update the + list together with sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c. */ #define HWCAP_FP (1 << 0) #define HWCAP_ASIMD (1 << 1) #define HWCAP_EVTSTRM (1 << 2) diff --git a/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c b/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c index 6c20d84839..30ee7c8176 100644 --- a/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c +++ b/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c @@ -57,7 +57,7 @@ PROCINFO_CLASS struct cpu_features _dl_aarch64_cpu_features #endif /* Number of HWCAP bits set. */ -#define _DL_HWCAP_COUNT 28 +#define _DL_HWCAP_COUNT 29 #if !defined PROCINFO_DECL && defined SHARED ._dl_aarch64_cap_flags @@ -69,7 +69,7 @@ PROCINFO_CLASS const char _dl_aarch64_cap_flags[_DL_HWCAP_COUNT][10] = { "fp", "asimd", "evtstrm", "aes", "pmull", "sha1", "sha2", "crc32", "atomics", "fphp", "asimdhp", "cpuid", "asimdrdm", "jscvt", "fcma", "lrcpc", "dcpop", "sha3", "sm3", "sm4", "asimddp", "sha512", "sve", - "asimdfhm", "dit", "uscat", "ilrcpc", "flagm" } + "asimdfhm", "dit", "uscat", "ilrcpc", "flagm", "ssbs" } #endif #if !defined SHARED || defined PROCINFO_DECL ; -- cgit 1.4.1