[Gmp-commit] /var/hg/gmp-5.0: 3 new changesets

[mercurial at gmplib.org]

details:   /var/hg/gmp-5.0/rev/1927ad3f8a42
changeset: 13444:1927ad3f8a42
user:      Torbjorn Granlund <tege at gmplib.org>
date:      Mon Mar 21 16:39:40 2011 +0100
description:
(hppa): Under linux, treat 64-bit processors as if they were 32-bit processors.

details:   /var/hg/gmp-5.0/rev/ce90ed9bc951
changeset: 13445:ce90ed9bc951
user:      Torbjorn Granlund <tege at gmplib.org>
date:      Mon Mar 21 16:39:49 2011 +0100
description:
*** empty log message ***

details:   /var/hg/gmp-5.0/rev/f3cf602c192f
changeset: 13446:f3cf602c192f
user:      Torbjorn Granlund <tege at gmplib.org>
date:      Mon Mar 21 16:41:13 2011 +0100
description:
Trivial merge.

diffstat:

 ChangeLog                            |  10 +++++++++-
 configure.in                         |  15 +++++++++++++++
 mpn/generic/toom_interpolate_16pts.c |   4 ++--
 3 files changed, 26 insertions(+), 3 deletions(-)

diffs (76 lines):

diff -r 1ebe39104437 -r f3cf602c192f ChangeLog
--- a/ChangeLog	Thu Feb 10 11:32:39 2011 +0100
+++ b/ChangeLog	Mon Mar 21 16:41:13 2011 +0100
@@ -1,3 +1,12 @@
+2011-03-21  Torbjorn Granlund  <tege at gmplib.org>
+
+	* configure.in (hppa): Under linux, treat 64-bit processors as if they
+	were 32-bit processors.
+
+2011-03-15 Marco Bodrato <bodrato at mail.dm.unipi.it>
+
+	* mpn/generic/toom_interpolate_16pts.c: Remove ambiguity.
+
 2011-01-25 Marco Bodrato <bodrato at mail.dm.unipi.it>
 
 	* mpz/mul.c: Remove redundant size computation.
@@ -3714,7 +3723,6 @@
 	usable for local symbols.
 	(LEA): Replace with code for external references.
 
-
 	* mpn/powerpc32/vmx/mod_34lsub1.asm: Use LEAL.
 
 2007-10-07  Torbjorn Granlund  <tege at swox.com>
diff -r 1ebe39104437 -r f3cf602c192f configure.in
--- a/configure.in	Thu Feb 10 11:32:39 2011 +0100
+++ b/configure.in	Mon Mar 21 16:41:13 2011 +0100
@@ -656,6 +656,7 @@
           # systems (GNU/Linux for instance), but lets assume they're ok.
           case $host in
             [*-*-hpux[1-9] | *-*-hpux[1-9].* | *-*-hpux10 | *-*-hpux10.*]) ;;
+	    [*-*-linux*])  abilist="1.0" ;; # due to linux permanent kernel bug
             *)    abilist="2.0w $abilist" ;;
           esac
 
@@ -960,6 +961,20 @@
     esac
 
     case $host in
+      *-*-aix*)
+	cclist="gcc xlc cc"
+	gcc_32_cflags_maybe="-maix32"
+	xlc_cflags="-O2 -qmaxmem=20000"
+	xlc_cflags_optlist="arch"
+	xlc_32_cflags_maybe="-q32"
+	cc_cflags="-O2 -qmaxmem=20000"
+	cc_cflags_optlist="arch"
+	cc_32_cflags_maybe="-q32"
+	ar_32_flags="-X32"
+	nm_32_flags="-X32"
+    esac
+
+    case $host in
       POWERPC64_PATTERN)
         case $host in
           *-*-aix*)
diff -r 1ebe39104437 -r f3cf602c192f mpn/generic/toom_interpolate_16pts.c
--- a/mpn/generic/toom_interpolate_16pts.c	Thu Feb 10 11:32:39 2011 +0100
+++ b/mpn/generic/toom_interpolate_16pts.c	Mon Mar 21 16:41:13 2011 +0100
@@ -335,14 +335,14 @@
   MP_PTR_SWAP(r3, wsi);
 #endif
 
-  r7[n3] -= DO_mpn_sublsh_n (r7 + n + BIT_CORRECTION, pp, 2 * n, 42 - CORRECTION_BITS, wsi)
-	    * (1-BIT_CORRECTION); /* if BIT_CORRECTION != 0, discard the carry. */
+  cy = DO_mpn_sublsh_n (r7 + n + BIT_CORRECTION, pp, 2 * n, 42 - CORRECTION_BITS, wsi);
 #if BIT_CORRECTION
   MPN_DECR_U (r1 + n, 2 * n + 1, pp[0] >> 6);
   cy = DO_mpn_sublsh_n (r1 + n, pp + 1, 2 * n - 1, GMP_NUMB_BITS - 6, wsi);
   cy = mpn_sub_1(r1 + 3 * n - 1, r1 + 3 * n - 1, 2, cy);
   ASSERT ( BIT_CORRECTION > 0 || cy != 0 );
 #else
+  r7[n3] -= cy;
   DO_mpn_subrsh(r1 + n, 2 * n + 1, pp, 2 * n, 6, wsi);
 #endif