[src/trunk]: src/external/lgpl3/gmp/dist/mpn/generic Apply upstream fix for w...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fa2bfb9b3232
branches:  trunk
changeset: 325043:fa2bfb9b3232
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Dec 01 09:29:06 2013 +0000

description:
Apply upstream fix for warnings seen on sparc64

diffstat:

 external/lgpl3/gmp/dist/mpn/generic/div_qr_2.c |  9 +++++----
 external/lgpl3/gmp/dist/mpn/generic/divrem_2.c |  2 +-
 external/lgpl3/gmp/dist/mpn/generic/mod_1_1.c  |  2 +-
 external/lgpl3/gmp/dist/mpn/generic/mod_1_2.c  |  4 ++--
 external/lgpl3/gmp/dist/mpn/generic/mod_1_3.c  |  6 +++---
 external/lgpl3/gmp/dist/mpn/generic/mod_1_4.c  |  8 ++++----
 6 files changed, 16 insertions(+), 15 deletions(-)

diffs (118 lines):

diff -r 059e49c29d78 -r fa2bfb9b3232 external/lgpl3/gmp/dist/mpn/generic/div_qr_2.c
--- a/external/lgpl3/gmp/dist/mpn/generic/div_qr_2.c    Sun Dec 01 09:13:54 2013 +0000
+++ b/external/lgpl3/gmp/dist/mpn/generic/div_qr_2.c    Sun Dec 01 09:29:06 2013 +0000
@@ -130,10 +130,11 @@
     umul_ppmm (_q1d,_q0, n2, di0);                                     \
     add_sssaaaa (_q3,_q2,_q1, _q2,_q1, _q2a,_q1d);                     \
                                                                        \
-    add_ssaaaa (r1, r0, n3, n2, 0, 1); /* FIXME: combine as in x86_64 asm */ \
+    add_ssaaaa (r1, r0, n3, n2, CNST_LIMB(0), CNST_LIMB(1));           \
+                                 /* FIXME: combine as in x86_64 asm */ \
                                                                        \
     /* [q3,q2,q1,q0] += [n3,n3,n1,n0] */                               \
-    add_csaac (_c, _q0, _q0, n0, 0);                                   \
+    add_csaac (_c, _q0, _q0, n0, CNST_LIMB(0));                                \
     add_csaac (_c, _q1, _q1, n1, _c);                                  \
     add_csaac (_c, _q2, _q2, r0, _c);                                  \
     _q3 = _q3 + r1 + _c;                                               \
@@ -145,14 +146,14 @@
                                                                        \
     _mask = -(mp_limb_t) (r1 >= _q1 & (r1 > _q1 | r0 >= _q0));  /* (r1,r0) >= (q1,q0) */  \
     add_ssaaaa (r1, r0, r1, r0, d1 & _mask, d0 & _mask);               \
-    sub_ddmmss (_q3, _q2, _q3, _q2, 0, -_mask);                                \
+    sub_ddmmss (_q3, _q2, _q3, _q2, CNST_LIMB(0), -_mask);             \
                                                                        \
     if (UNLIKELY (r1 >= d1))                                           \
       {                                                                        \
        if (r1 > d1 || r0 >= d0)                                        \
          {                                                             \
            sub_ddmmss (r1, r0, r1, r0, d1, d0);                        \
-           add_ssaaaa (_q3, _q2, _q3, _q2, 0, 1);                      \
+           add_ssaaaa (_q3, _q2, _q3, _q2, CNST_LIMB(0), CNST_LIMB(1));\
          }                                                             \
       }                                                                        \
     (q1) = _q3;                                                                \
diff -r 059e49c29d78 -r fa2bfb9b3232 external/lgpl3/gmp/dist/mpn/generic/divrem_2.c
--- a/external/lgpl3/gmp/dist/mpn/generic/divrem_2.c    Sun Dec 01 09:13:54 2013 +0000
+++ b/external/lgpl3/gmp/dist/mpn/generic/divrem_2.c    Sun Dec 01 09:29:06 2013 +0000
@@ -98,7 +98,7 @@
       for (i = qxn - 1; i >= 0; i--)
        {
          mp_limb_t q;
-         udiv_qr_3by2 (q, r1, r0, r1, r0, 0UL, d1, d0, di.inv32);
+         udiv_qr_3by2 (q, r1, r0, r1, r0, CNST_LIMB(0), d1, d0, di.inv32);
          qp[i] = q;
        }
     }
diff -r 059e49c29d78 -r fa2bfb9b3232 external/lgpl3/gmp/dist/mpn/generic/mod_1_1.c
--- a/external/lgpl3/gmp/dist/mpn/generic/mod_1_1.c     Sun Dec 01 09:13:54 2013 +0000
+++ b/external/lgpl3/gmp/dist/mpn/generic/mod_1_1.c     Sun Dec 01 09:29:06 2013 +0000
@@ -160,7 +160,7 @@
    *   B2modb = - b * bi;
    *   ASSERT (B2modb <= b);    // NB: equality iff b = B/2
    */
-  udiv_rnnd_preinv (B2modb, B1modb, 0, b, bi);
+  udiv_rnnd_preinv (B2modb, B1modb, CNST_LIMB(0), b, bi);
   cps[3] = B2modb >> cnt;
 }
 
diff -r 059e49c29d78 -r fa2bfb9b3232 external/lgpl3/gmp/dist/mpn/generic/mod_1_2.c
--- a/external/lgpl3/gmp/dist/mpn/generic/mod_1_2.c     Sun Dec 01 09:13:54 2013 +0000
+++ b/external/lgpl3/gmp/dist/mpn/generic/mod_1_2.c     Sun Dec 01 09:29:06 2013 +0000
@@ -51,10 +51,10 @@
   ASSERT (B1modb <= b);                /* NB: not fully reduced mod b */
   cps[2] = B1modb >> cnt;
 
-  udiv_rnnd_preinv (B2modb, B1modb, 0, b, bi);
+  udiv_rnnd_preinv (B2modb, B1modb, CNST_LIMB(0), b, bi);
   cps[3] = B2modb >> cnt;
 
-  udiv_rnnd_preinv (B3modb, B2modb, 0, b, bi);
+  udiv_rnnd_preinv (B3modb, B2modb, CNST_LIMB(0), b, bi);
   cps[4] = B3modb >> cnt;
 
 #if WANT_ASSERT
diff -r 059e49c29d78 -r fa2bfb9b3232 external/lgpl3/gmp/dist/mpn/generic/mod_1_3.c
--- a/external/lgpl3/gmp/dist/mpn/generic/mod_1_3.c     Sun Dec 01 09:13:54 2013 +0000
+++ b/external/lgpl3/gmp/dist/mpn/generic/mod_1_3.c     Sun Dec 01 09:29:06 2013 +0000
@@ -51,13 +51,13 @@
   ASSERT (B1modb <= b);                /* NB: not fully reduced mod b */
   cps[2] = B1modb >> cnt;
 
-  udiv_rnnd_preinv (B2modb, B1modb, 0, b, bi);
+  udiv_rnnd_preinv (B2modb, B1modb, CNST_LIMB(0), b, bi);
   cps[3] = B2modb >> cnt;
 
-  udiv_rnnd_preinv (B3modb, B2modb, 0, b, bi);
+  udiv_rnnd_preinv (B3modb, B2modb, CNST_LIMB(0), b, bi);
   cps[4] = B3modb >> cnt;
 
-  udiv_rnnd_preinv (B4modb, B3modb, 0, b, bi);
+  udiv_rnnd_preinv (B4modb, B3modb, CNST_LIMB(0), b, bi);
   cps[5] = B4modb >> cnt;
 
 #if WANT_ASSERT
diff -r 059e49c29d78 -r fa2bfb9b3232 external/lgpl3/gmp/dist/mpn/generic/mod_1_4.c
--- a/external/lgpl3/gmp/dist/mpn/generic/mod_1_4.c     Sun Dec 01 09:13:54 2013 +0000
+++ b/external/lgpl3/gmp/dist/mpn/generic/mod_1_4.c     Sun Dec 01 09:29:06 2013 +0000
@@ -51,16 +51,16 @@
   ASSERT (B1modb <= b);                /* NB: not fully reduced mod b */
   cps[2] = B1modb >> cnt;
 
-  udiv_rnnd_preinv (B2modb, B1modb, 0, b, bi);
+  udiv_rnnd_preinv (B2modb, B1modb, CNST_LIMB(0), b, bi);
   cps[3] = B2modb >> cnt;
 
-  udiv_rnnd_preinv (B3modb, B2modb, 0, b, bi);
+  udiv_rnnd_preinv (B3modb, B2modb, CNST_LIMB(0), b, bi);
   cps[4] = B3modb >> cnt;
 
-  udiv_rnnd_preinv (B4modb, B3modb, 0, b, bi);
+  udiv_rnnd_preinv (B4modb, B3modb, CNST_LIMB(0), b, bi);
   cps[5] = B4modb >> cnt;
 
-  udiv_rnnd_preinv (B5modb, B4modb, 0, b, bi);
+  udiv_rnnd_preinv (B5modb, B4modb, CNST_LIMB(0), b, bi);
   cps[6] = B5modb >> cnt;
 
 #if WANT_ASSERT