[Gmp-commit] /home/hgfiles/gmp: Match new AMD processors, allow finer distinc...

[mercurial at gmplib.org]

details:   /home/hgfiles/gmp/rev/aa13a14722bd
changeset: 13699:aa13a14722bd
user:      Torbjorn Granlund <tege at gmplib.org>
date:      Wed Dec 01 19:11:56 2010 +0100
description:
Match new AMD processors, allow finer distinctions among old ones.

diffstat:

 ChangeLog    |   6 ++++++
 acinclude.m4 |   2 +-
 config.guess |  26 +++++++++++++++++++++++---
 config.sub   |   4 ++--
 configure.in |   4 ++--
 5 files changed, 34 insertions(+), 8 deletions(-)

diffs (99 lines):

diff -r 26b971d3c4d5 -r aa13a14722bd ChangeLog
--- a/ChangeLog	Wed Dec 01 17:21:16 2010 +0100
+++ b/ChangeLog	Wed Dec 01 19:11:56 2010 +0100
@@ -1,5 +1,11 @@
 2010-12-01  Torbjorn Granlund  <tege at gmplib.org>
 
+	* config.guess: Match new AMD processors, allow finer distinctions
+	among old ones.
+	* acinclude.m4 (X86_64_PATTERN): Likewise.
+	* config.sub: Likewise.
+	* configure.in: Rudimentarily support new AMD processors.
+
 	* configure.in (--enable_assembly): New option.
 	(target none-*-*): Disable, give error.
 
diff -r 26b971d3c4d5 -r aa13a14722bd acinclude.m4
--- a/acinclude.m4	Wed Dec 01 17:21:16 2010 +0100
+++ b/acinclude.m4	Wed Dec 01 19:11:56 2010 +0100
@@ -47,7 +47,7 @@
 [[i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-* | geode*-*-* | atom-*-*]])
 
 define(X86_64_PATTERN,
-[[athlon64-*-* | pentium4-*-* | atom-*-* | core2-*-* | corei-*-* | x86_64-*-* | nano-*-*]])
+[[athlon64-*-* | k8-*-* | k10-*-* | bobcat-*-* | bulldozer-*-* | pentium4-*-* | atom-*-* | core2-*-* | corei-*-* | x86_64-*-* | nano-*-*]])
 
 dnl  GMP_FAT_SUFFIX(DSTVAR, DIRECTORY)
 dnl  ---------------------------------
diff -r 26b971d3c4d5 -r aa13a14722bd config.guess
--- a/config.guess	Wed Dec 01 17:21:16 2010 +0100
+++ b/config.guess	Wed Dec 01 19:11:56 2010 +0100
@@ -777,9 +777,29 @@
 	case 6:
 	  modelstr = "athlon";
 	  break;
-	case 15:
-	case 16:
-	  cpu_64bit = 1, modelstr = "athlon64";
+	case 15:		/* K8, K9 */
+	  cpu_64bit = 1, modelstr = "k8";
+	  break;
+	case 16:		/* K10 */
+	  cpu_64bit = 1, modelstr = "k10";
+	  break;
+	case 17:		/* AMD Internal, assume future K10 */
+	  cpu_64bit = 1, modelstr = "k10";
+	  break;
+	case 18:		/* Llano, uses K10 core */
+	  cpu_64bit = 1, modelstr = "k10";
+	  break;
+	case 19:		/* AMD Internal, assume future K10 */
+	  cpu_64bit = 1, modelstr = "k10";
+	  break;
+	case 20:		/* Bobcat */
+	  cpu_64bit = 1, modelstr = "bobcat";
+	  break;
+	case 21:		/* Bulldozer */
+	  cpu_64bit = 1, modelstr = "bulldozer";
+	  break;
+	case 22:		/* AMD Internal, assume future bulldozer */
+	  cpu_64bit = 1, modelstr = "bulldozer";
 	  break;
 	}
     }
diff -r 26b971d3c4d5 -r aa13a14722bd config.sub
--- a/config.sub	Wed Dec 01 17:21:16 2010 +0100
+++ b/config.sub	Wed Dec 01 19:11:56 2010 +0100
@@ -89,9 +89,9 @@
 case "$given_cpu" in
 itanium | itanium2)
   test_cpu=ia64 ;;
-pentium | pentiummmx | pentiumpro | pentium[234m] | k[56] | k6[23] | geode | athlon | viac3* | nano)
+pentium | pentiummmx | pentiumpro | pentium[234m] | k[567] | k6[23] | geode | athlon | viac3*)
   test_cpu=i386 ;;
-athlon64 | atom | core2 | corei | opteron)
+athlon64 | atom | core2 | corei | opteron | k[89] | k10 | bobcat | bulldozer | nano)
   test_cpu=x86_64 ;;
 power[2-9] | power2sc)
   test_cpu=power ;;
diff -r 26b971d3c4d5 -r aa13a14722bd configure.in
--- a/configure.in	Wed Dec 01 17:21:16 2010 +0100
+++ b/configure.in	Wed Dec 01 19:11:56 2010 +0100
@@ -1444,7 +1444,7 @@
         gcc_cflags_cpu="-mtune=c3 -mcpu=c3 -mcpu=i486 -m486"
         gcc_cflags_arch="-march=c3 -march=pentium-mmx -march=pentium"
         ;;
-      athlon64 | x86_64)
+      athlon64 | k8 | k10 | bobcat | bulldozer | x86_64)
         gcc_cflags_cpu="-mtune=k8 -mcpu=athlon -mcpu=pentiumpro -mcpu=i486 -m486"
         gcc_cflags_arch="-march=k8 -march=k8~-mno-sse2 -march=athlon -march=pentiumpro -march=pentium"
         ;;
@@ -1500,7 +1500,7 @@
 	case $host_cpu in
 	  x86_64)
 	    ;;
-	  athlon64)
+	  athlon64 | k8 | k10 | bobcat | bulldozer)
 	    path_64="x86_64/k8 $path_64"
 	    ;;
 	  pentium4)