aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-09-05 17:59:16 -0700
committerDavid S. Miller <davem@davemloft.net>2012-09-05 17:59:16 -0700
commitff04dda46d227ea9ccf79b0f1e48636dbb3cc913 (patch)
tree84638e285e04f3635a9b28094f5d9f394d87e6b7
parent430d6ce62a22760f56d5dea0dcccd30413a45fc2 (diff)
downloadglibc-ff04dda46d227ea9ccf79b0f1e48636dbb3cc913.tar
glibc-ff04dda46d227ea9ccf79b0f1e48636dbb3cc913.tar.gz
glibc-ff04dda46d227ea9ccf79b0f1e48636dbb3cc913.tar.bz2
glibc-ff04dda46d227ea9ccf79b0f1e48636dbb3cc913.zip
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.
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/sparc/bits/hwcap.h3
-rw-r--r--sysdeps/sparc/dl-procinfo.c4
-rw-r--r--sysdeps/sparc/dl-procinfo.h2
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 <aoliva@redhat.com>
* 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 <ldsodefs.h>
#include <sysdep.h>
-#define _DL_HWCAP_COUNT 24
+#define _DL_HWCAP_COUNT 27
static inline int
__attribute__ ((unused))