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

[mercurial at gmplib.org]

details:   /var/hg/gmp-5.0/rev/a915a9638719
changeset: 13511:a915a9638719
user:      Torbjorn Granlund <tege at gmplib.org>
date:      Sat Jan 21 15:14:15 2012 +0100
description:
Merge t-locale change from mainline repo.

details:   /var/hg/gmp-5.0/rev/b2c0a7740c38
changeset: 13512:b2c0a7740c38
user:      Torbjorn Granlund <tege at gmplib.org>
date:      Sat Jan 21 15:14:56 2012 +0100
description:
Merge arm/invert_lib.asm change from mainline repo.

diffstat:

 ChangeLog               |   7 +++++++
 mpn/arm/invert_limb.asm |  26 +++++++++++++-------------
 tests/misc/t-locale.c   |   8 ++++++++
 3 files changed, 28 insertions(+), 13 deletions(-)

diffs (91 lines):

diff -r 13e1d308963a -r b2c0a7740c38 ChangeLog
--- a/ChangeLog	Sat Jan 21 13:47:00 2012 +0100
+++ b/ChangeLog	Sat Jan 21 15:14:56 2012 +0100
@@ -120,6 +120,11 @@
 
 	* tests/rand/t-lc2exp.c (check_bigc): Call abort after reporting error.
 
+2011-07-15  Torbjorn Granlund  <tege at gmplib.org>
+
+	* mpn/arm/invert_limb.asm: Swap around some registers to silence 'as'
+	warnings.
+
 2011-07-14  Torbjorn Granlund  <tege at gmplib.org>
 
 	* mpn/generic/dcpi1_bdiv_q.c (mpn_dcpi1_bdiv_q): Get mpn_sub_1 size
@@ -127,6 +132,8 @@
 
 2011-07-04  Torbjorn Granlund  <tege at gmplib.org>
 
+	* tests/misc/t-locale.c: Disable test for mingw.
+
 	* configure.in (x86_64 *-*-mingw*): Handle also cygwin here; clear out
 	extra_functions_64.
 
diff -r 13e1d308963a -r b2c0a7740c38 mpn/arm/invert_limb.asm
--- a/mpn/arm/invert_limb.asm	Sat Jan 21 13:47:00 2012 +0100
+++ b/mpn/arm/invert_limb.asm	Sat Jan 21 15:14:56 2012 +0100
@@ -1,6 +1,6 @@
 dnl  ARM mpn_invert_limb -- Invert a normalized limb.
 
-dnl  Copyright 2001, 2009 Free Software Foundation, Inc.
+dnl  Copyright 2001, 2009, 2011 Free Software Foundation, Inc.
 
 dnl  This file is part of the GNU MP Library.
 
@@ -27,21 +27,21 @@
 	mov	r3, r3, asl #1
 	ldrh	r3, [r3, r2]
 	mov	r1, r3, asl #17
-	mul	r3, r3, r3
-	umull	r12, r2, r3, r0
+	mul	r12, r3, r3
+	umull	r3, r2, r12, r0
 	sub	r1, r1, r2, asl #1
-	umull	r12, r2, r1, r1
-	umull	r3, r12, r0, r12
-	umull	r2, r3, r0, r2
-	adds	r2, r2, r12
-	adc	r3, r3, #0
-	rsb	r1, r3, r1
+	umull	r3, r2, r1, r1
+	umull	r12, r3, r0, r3
+	umull	r2, r12, r0, r2
+	adds	r2, r2, r3
+	adc	r12, r12, #0
+	rsb	r1, r12, r1
 	mvn	r2, r2, lsr #30
 	add	r2, r2, r1, asl #2
-	umull	r3, r12, r0, r2
-	adds	r1, r3, r0
-	adc	r12, r12, r0
-	rsb	r0, r12, r2
+	umull	r12, r3, r0, r2
+	adds	r1, r12, r0
+	adc	r3, r3, r0
+	rsb	r0, r3, r2
 	bx	lr
 
 	ALIGN(4)
diff -r 13e1d308963a -r b2c0a7740c38 tests/misc/t-locale.c
--- a/tests/misc/t-locale.c	Sat Jan 21 13:47:00 2012 +0100
+++ b/tests/misc/t-locale.c	Sat Jan 21 15:14:56 2012 +0100
@@ -41,6 +41,13 @@
 #include "gmp-impl.h"
 #include "tests.h"
 
+#ifdef __MINGW32__
+int
+main (void)
+{
+  exit (0);
+}
+#else
 
 char *decimal_point;
 
@@ -191,3 +198,4 @@
   tests_memory_end ();
   exit (0);
 }
+#endif