From ff04dda46d227ea9ccf79b0f1e48636dbb3cc913 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Wed, 5 Sep 2012 17:59:16 -0700 Subject: Recognize new sparc hwcap bits. * sysdeps/sparc/bits/hwcap.h (HWCAP_SPARC_PAUSE, HWCAP_SPARC_CBCOND, HWCAP_SPARC_CRYPTO): Define. * sysdeps/sparc/dl-procinfo.h (_DL_HWCAP_COUNT): Increase to 27. * sysdeps/sparc/dl-procinfo.c (_dl_sparc_cap_flags): Add new entries. --- ChangeLog | 6 ++++++ sysdeps/sparc/bits/hwcap.h | 3 +++ sysdeps/sparc/dl-procinfo.c | 4 ++-- sysdeps/sparc/dl-procinfo.h | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3249500f46..c69a7c4c6f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,12 @@ * sysdeps/sparc/fpu/libm-test-ulps: Update. + * sysdeps/sparc/bits/hwcap.h (HWCAP_SPARC_PAUSE, + HWCAP_SPARC_CBCOND, HWCAP_SPARC_CRYPTO): Define. + * sysdeps/sparc/dl-procinfo.h (_DL_HWCAP_COUNT): Increase to 27. + * sysdeps/sparc/dl-procinfo.c (_dl_sparc_cap_flags): Add new + entries. + 2012-09-05 Alexandre Oliva * malloc/arena.c: Fold copyright years. diff --git a/sysdeps/sparc/bits/hwcap.h b/sysdeps/sparc/bits/hwcap.h index d922d7b0e8..74ca130bb1 100644 --- a/sysdeps/sparc/bits/hwcap.h +++ b/sysdeps/sparc/bits/hwcap.h @@ -45,3 +45,6 @@ #define HWCAP_SPARC_IMA 0x00400000 #define HWCAP_SPARC_ASI_CACHE_SPARING \ 0x00800000 +#define HWCAP_SPARC_PAUSE 0x01000000 +#define HWCAP_SPARC_CBCOND 0x02000000 +#define HWCAP_SPARC_CRYPTO 0x04000000 diff --git a/sysdeps/sparc/dl-procinfo.c b/sysdeps/sparc/dl-procinfo.c index 6e107dd1de..8280e01792 100644 --- a/sysdeps/sparc/dl-procinfo.c +++ b/sysdeps/sparc/dl-procinfo.c @@ -46,13 +46,13 @@ #if !defined PROCINFO_DECL && defined SHARED ._dl_sparc_cap_flags #else -PROCINFO_CLASS const char _dl_sparc_cap_flags[24][11] +PROCINFO_CLASS const char _dl_sparc_cap_flags[27][11] #endif #ifndef PROCINFO_DECL = { "flush", "stbar", "swap", "muldiv", "v9", "ultra3", "v9v", "v9v2", "mul32", "div32", "fsmuld", "v8plus", "popc", "vis", "vis2", "ASIBlkInit", "fmaf", "vis3", "hpc", "random", "trans", "fjfmau", - "ima", "cspare" } + "ima", "cspare", "pause", "cbcond", "crypto" } #endif #if !defined SHARED || defined PROCINFO_DECL ; diff --git a/sysdeps/sparc/dl-procinfo.h b/sysdeps/sparc/dl-procinfo.h index 8ceb830725..6ae8768288 100644 --- a/sysdeps/sparc/dl-procinfo.h +++ b/sysdeps/sparc/dl-procinfo.h @@ -24,7 +24,7 @@ #include #include -#define _DL_HWCAP_COUNT 24 +#define _DL_HWCAP_COUNT 27 static inline int __attribute__ ((unused)) -- cgit 1.4.1