[Gmp-commit] /var/hg/gmp: Recognize SPARC T4 and T5 more consistently.

[mercurial at gmplib.org]

details:   /var/hg/gmp/rev/7e4c6c13253f
changeset: 16530:7e4c6c13253f
user:      Marc Glisse <marc.glisse at inria.fr>
date:      Mon Dec 08 19:25:44 2014 +0100
description:
Recognize SPARC T4 and T5 more consistently.

diffstat:

 ChangeLog    |   5 +++++
 config.guess |  14 ++++++++++++--
 configure.ac |   2 +-
 3 files changed, 18 insertions(+), 3 deletions(-)

diffs (62 lines):

diff -r a8bac4b6d3ea -r 7e4c6c13253f ChangeLog
--- a/ChangeLog	Tue Dec 02 22:20:17 2014 +0100
+++ b/ChangeLog	Mon Dec 08 19:25:44 2014 +0100
@@ -1,3 +1,8 @@
+2014-12-08  Marc Glisse  <marc.glisse at inria.fr>
+
+	* config.guess (ultrasparc*-*-*): Update for T4 and T5.
+	* configure.ac (ultrasparc*-*-*): Update for T5.
+
 2014-12-02  Torbjörn Granlund  <torbjorng at google.com>
 
 	* config.guess (arm*-*-*): Redirect stderr.
diff -r a8bac4b6d3ea -r 7e4c6c13253f config.guess
--- a/config.guess	Tue Dec 02 22:20:17 2014 +0100
+++ b/config.guess	Mon Dec 08 19:25:44 2014 +0100
@@ -592,6 +592,8 @@
     elif grep 'cpu.*MB86904' /proc/cpuinfo >/dev/null; then
       # actually MicroSPARC-II
       exact_cpu=microsparc
+    elif grep 'cpu.*UltraSparc T5' /proc/cpuinfo >/dev/null; then
+      exact_cpu="ultrasparct5"
     elif grep 'cpu.*UltraSparc T4' /proc/cpuinfo >/dev/null; then
       exact_cpu="ultrasparct4"
     elif grep 'cpu.*UltraSparc T3' /proc/cpuinfo >/dev/null; then
@@ -655,7 +657,11 @@
   for prtconfopt in "" "-vp"; do
     if test -z "$exact_cpu"; then
       if $SHELL -c "/usr/sbin/prtconf $prtconfopt" 2>/dev/null >$dummy; then
-	if grep 'SUNW,UltraSPARC-T3' $dummy >/dev/null; then
+	if grep 'SUNW,UltraSPARC-T5' $dummy >/dev/null; then
+	  exact_cpu=ultrasparct5
+	elif grep 'SUNW,UltraSPARC-T4' $dummy >/dev/null; then
+	  exact_cpu=ultrasparct4
+	elif grep 'SUNW,UltraSPARC-T3' $dummy >/dev/null; then
 	  exact_cpu=ultrasparct3
 	elif grep 'SUNW,UltraSPARC-T2' $dummy >/dev/null; then
 	  exact_cpu=ultrasparct2
@@ -693,7 +699,11 @@
   #
   if test -z "$exact_cpu"; then
     if $SHELL -c "/sbin/sysctl hw.model" 2>/dev/null >$dummy; then
-      if grep -i 'UltraSparc-T3' $dummy >/dev/null; then
+      if grep -i 'UltraSparc-T5' $dummy >/dev/null; then
+        exact_cpu=ultrasparct5
+      elif grep -i 'UltraSparc-T4' $dummy >/dev/null; then
+        exact_cpu=ultrasparct4
+      elif grep -i 'UltraSparc-T3' $dummy >/dev/null; then
         exact_cpu=ultrasparct3
       elif grep -i 'UltraSparc-T2' $dummy >/dev/null; then
         exact_cpu=ultrasparct2
diff -r a8bac4b6d3ea -r 7e4c6c13253f configure.ac
--- a/configure.ac	Tue Dec 02 22:20:17 2014 +0100
+++ b/configure.ac	Mon Dec 08 19:25:44 2014 +0100
@@ -1380,7 +1380,7 @@
 			gcc_cflags_cpu="-mcpu=niagara3 -mcpu=niagara -mcpu=v9"
 			gcc_32_cflags_asm="-Wa,-Av8plusd -Wa,-xarch=v8plusd"
 			gcc_64_cflags_asm="-Wa,-Av9d -Wa,-xarch=v9d";;
-      ultrasparct4)
+      ultrasparct[45])
 			gcc_cflags_cpu="-mcpu=niagara4 -mcpu=niagara3 -mcpu=niagara -mcpu=v9"
 			gcc_32_cflags_asm="-Wa,-Av8plusd -Wa,-xarch=v8plusd"
 			gcc_64_cflags_asm="-Wa,-Av9d -Wa,-xarch=v9d";;