diff options
| author | Torbjorn Granlund <tege@gmplib.org> | 2009-11-18 01:38:05 +0100 |
|---|---|---|
| committer | Torbjorn Granlund <tege@gmplib.org> | 2009-11-18 01:38:05 +0100 |
| commit | 66cee67037325f71f1be3b74cedf8a82a855a576 (patch) | |
| tree | defbf9f345c8dc3b476859c40e37fb3068032859 | |
| parent | ca8f2335758e9e234fed5e1092c82b9a13b159b8 (diff) | |
| download | gmp-66cee67037325f71f1be3b74cedf8a82a855a576.tar.gz | |
Generalise x86_64 support; recognise VIA nano.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | acinclude.m4 | 2 | ||||
| -rwxr-xr-x | config.guess | 3 | ||||
| -rwxr-xr-x | config.sub | 2 | ||||
| -rw-r--r-- | configure.in | 54 |
5 files changed, 39 insertions, 30 deletions
@@ -1,3 +1,9 @@ +2009-11-18 Torbjorn Granlund <tege@gmplib.org> + + * config.guess: Recognise VIA nano. + * config.sub: Likewise. + * configure.in: Generalise x86_64 support; recognise VIA nano. + 2009-11-16 Torbjorn Granlund <tege@gmplib.org> * tune/speed.c (routine): Add measurement of mpn_addlsh2_n, @@ -11,7 +17,7 @@ * mpn/generic/toom_eval_pm2exp.c: Make HAVE_NATIVE_mpn_addlsh_n code work. - * mpn/x86_64/aorrlsh2_n.asm: Optimize inner loop. + * mpn/x86_64/aorrlsh2_n.asm: Optimise inner loop. * configure.in (gmp_mpn_functions_optional): Remove copyi,copyd, they are now in gmp_mpn_functions. Analogously move logical functions. diff --git a/acinclude.m4 b/acinclude.m4 index 5afc1bccb..f2d405f6f 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -47,7 +47,7 @@ define(X86_PATTERN, [[i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-* | geode*-*-* | atom-*-*]]) define(X86_64_PATTERN, -[[athlon64-*-* | pentium4-*-* | atom-*-* | core2-*-* | x86_64-*-*]]) +[[athlon64-*-* | pentium4-*-* | atom-*-* | core2-*-* | x86_64-*-* | nano-*-*]]) dnl GMP_FAT_SUFFIX(DSTVAR, DIRECTORY) dnl --------------------------------- diff --git a/config.guess b/config.guess index c64ba970e..a244135b1 100755 --- a/config.guess +++ b/config.guess @@ -775,7 +775,8 @@ main () { case 6: if (model < 9) modelstr = "viac3"; - else modelstr = "viac32"; + else if (model < 15) modelstr = "viac32"; + else modelstr = "nano"; break; } } diff --git a/config.sub b/config.sub index 1686176ab..13f4bb05e 100755 --- a/config.sub +++ b/config.sub @@ -89,7 +89,7 @@ given_full="$given_cpu$given_rest" case "$given_cpu" in itanium | itanium2) test_cpu=ia64 ;; -pentium | pentiummmx | pentiumpro | pentium[234m] | k[56] | k6[23] | geode | athlon | viac3*) +pentium | pentiummmx | pentiumpro | pentium[234m] | k[56] | k6[23] | geode | athlon | viac3* | nano) test_cpu=i386 ;; athlon64 | atom | core2 | opteron) test_cpu=x86_64 ;; diff --git a/configure.in b/configure.in index f253a588e..9373ce4f6 100644 --- a/configure.in +++ b/configure.in @@ -1442,48 +1442,50 @@ case $host in *) path="x86" ;; esac - case $host_cpu in - athlon64 | atom | core2 | pentium4 | x86_64) - cclist_64="gcc" - gcc_64_cflags="$gcc_64_cflags -m64" - gcc_64_cflags_optlist="cpu arch" - CALLING_CONVENTIONS_OBJS_64='amd64call.lo amd64check$U.lo' - SPEED_CYCLECOUNTER_OBJ_64=x86_64.lo - cyclecounter_size_64=2 + case $host in + X86_64_PATTERN) + cclist_64="gcc" + gcc_64_cflags="$gcc_64_cflags -m64" + gcc_64_cflags_optlist="cpu arch" + CALLING_CONVENTIONS_OBJS_64='amd64call.lo amd64check$U.lo' + SPEED_CYCLECOUNTER_OBJ_64=x86_64.lo + cyclecounter_size_64=2 + abilist="64 32" + path_64="x86_64" case $host_cpu in - athlon64 | x86_64) - abilist="64 32" - path_64="x86_64" + x86_64) + ;; + athlon64) + path_64="x86_64/k8 $path_64" ;; pentium4) - abilist="64 32" - path_64="x86_64/pentium4 x86_64" + path_64="x86_64/pentium4 $path_64" ;; core2) - abilist="64 32" - path_64="x86_64/core2 x86_64" + path_64="x86_64/core2 $path_64" ;; atom) - # The AMD K8/K9/K10 code seems best for Intel Atom - abilist="64 32" - path_64="x86_64/atom x86_64" + path_64="x86_64/atom $path_64" + ;; + nano) + path_64="x86_64/nano $path_64" ;; esac - case $host in - *-*-solaris*) - # Sun cc. - cclist_64="$cclist_64 cc" - cc_64_cflags="-xO3 -m64" - ;; + case $host in + *-*-solaris*) + # Sun cc. + cclist_64="$cclist_64 cc" + cc_64_cflags="-xO3 -m64" + ;; *-*-mingw*) limb_64=longlong path_64="" # Windows amd64 calling conventions are *different* # Silence many pedantic warnings for w64. FIXME. gcc_64_cflags="$gcc_64_cflags -std=gnu99" - ;; - esac + ;; + esac ;; esac ;; |