Finish renaming BITS_PER_MP_LIMB to GMP_LIMB_BITS.

68 files changed, 80 insertions, 80 deletions

diff --git a/mpn/alpha/ev5/gmp-mparam.h b/mpn/alpha/ev5/gmp-mparam.h
index 93938e14d..8a40f2720 100644
--- a/mpn/alpha/ev5/gmp-mparam.h
+++ b/mpn/alpha/ev5/gmp-mparam.h
@@ -18,7 +18,7 @@ License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#define BITS_PER_MP_LIMB 64
+#define GMP_LIMB_BITS 64
 #define BYTES_PER_MP_LIMB 8
 
 
diff --git a/mpn/alpha/ev6/gmp-mparam.h b/mpn/alpha/ev6/gmp-mparam.h
index 9bb3880ca..b330793e6 100644
--- a/mpn/alpha/ev6/gmp-mparam.h
+++ b/mpn/alpha/ev6/gmp-mparam.h
@@ -18,7 +18,7 @@ License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#define BITS_PER_MP_LIMB 64
+#define GMP_LIMB_BITS 64
 #define BYTES_PER_MP_LIMB 8
 
 #define DIVEXACT_BY3_METHOD 0	/* override ../diveby3.asm */
diff --git a/mpn/alpha/ev6/nails/gmp-mparam.h b/mpn/alpha/ev6/nails/gmp-mparam.h
index 75777880d..9911ea214 100644
--- a/mpn/alpha/ev6/nails/gmp-mparam.h
+++ b/mpn/alpha/ev6/nails/gmp-mparam.h
@@ -18,7 +18,7 @@ License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#define BITS_PER_MP_LIMB 64
+#define GMP_LIMB_BITS 64
 #define BYTES_PER_MP_LIMB 8
 
 /* Generated by tuneup.c, 2004-02-07, gcc 3.3 */
diff --git a/mpn/alpha/gmp-mparam.h b/mpn/alpha/gmp-mparam.h
index fc63edabf..1ae5192ea 100644
--- a/mpn/alpha/gmp-mparam.h
+++ b/mpn/alpha/gmp-mparam.h
@@ -18,7 +18,7 @@ License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#define BITS_PER_MP_LIMB 64
+#define GMP_LIMB_BITS 64
 #define BYTES_PER_MP_LIMB 8
 
 
diff --git a/mpn/arm/gmp-mparam.h b/mpn/arm/gmp-mparam.h
index 35055da32..8e08a3dea 100644
--- a/mpn/arm/gmp-mparam.h
+++ b/mpn/arm/gmp-mparam.h
@@ -18,7 +18,7 @@ License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#define BITS_PER_MP_LIMB 32
+#define GMP_LIMB_BITS 32
 #define BYTES_PER_MP_LIMB 4
 
 /* 593MHz ARM (gcc50.fsffrance.org) */
diff --git a/mpn/cray/gmp-mparam.h b/mpn/cray/gmp-mparam.h
index e2aecdb6f..3ff8f5e16 100644
--- a/mpn/cray/gmp-mparam.h
+++ b/mpn/cray/gmp-mparam.h
@@ -18,7 +18,7 @@ License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#define BITS_PER_MP_LIMB 64
+#define GMP_LIMB_BITS 64
 #define BYTES_PER_MP_LIMB 8
 
 #if 0
diff --git a/mpn/cray/ieee/gmp-mparam.h b/mpn/cray/ieee/gmp-mparam.h
index e86b6db64..3442c11fe 100644
--- a/mpn/cray/ieee/gmp-mparam.h
+++ b/mpn/cray/ieee/gmp-mparam.h
@@ -18,7 +18,7 @@ License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#define BITS_PER_MP_LIMB 64
+#define GMP_LIMB_BITS 64
 #define BYTES_PER_MP_LIMB 8
 
 /* Generated by tuneup.c, 2004-02-07, system compiler */
diff --git a/mpn/cray/ieee/invert_limb.c b/mpn/cray/ieee/invert_limb.c
index e3484a915..220cc25f0 100644
--- a/mpn/cray/ieee/invert_limb.c
+++ b/mpn/cray/ieee/invert_limb.c
@@ -73,14 +73,14 @@ mpn_invert_limb (mp_limb_t d)
   mp_limb_t xh, xl;
   mp_limb_t zh, zl;
 
-#if BITS_PER_MP_LIMB == 32
+#if GMP_LIMB_BITS == 32
   z = approx_tab[(d >> 23) - 0x100] << 6;	/* z < 2^16 */
 
   z2l = z * z;					/* z2l < 2^32 */
   umul_ppmm (th, tl, z2l, d);
   z = (z << 17) - (th << 1);
 #endif
-#if BITS_PER_MP_LIMB == 64
+#if GMP_LIMB_BITS == 64
   z = approx_tab[(d >> 55) - 0x100] << 6;	/* z < 2^16 */
 
   z2l = z * z;					/* z2l < 2^32 */
@@ -97,7 +97,7 @@ mpn_invert_limb (mp_limb_t d)
   umul_ppmm (xh, xl, z2l, d);
   tl += xh;
   th += tl < xh;
-  th = (th << 2) | (tl >> BITS_PER_MP_LIMB - 2);
+  th = (th << 2) | (tl >> GMP_LIMB_BITS - 2);
   tl = tl << 2;
   sub_ddmmss (zh, zl, z << 2, 0, th, tl);
 
diff --git a/mpn/cray/lshift.c b/mpn/cray/lshift.c
index 64302e9d3..482747254 100644
--- a/mpn/cray/lshift.c
+++ b/mpn/cray/lshift.c
@@ -29,7 +29,7 @@ mpn_lshift (mp_ptr wp, mp_srcptr up, mp_size_t n, unsigned int cnt)
   mp_limb_t retval;
 
   sh_1 = cnt;
-  sh_2 = BITS_PER_MP_LIMB - sh_1;
+  sh_2 = GMP_LIMB_BITS - sh_1;
   retval = up[n - 1] >> sh_2;
 
 #pragma _CRI ivdep
diff --git a/mpn/cray/rshift.c b/mpn/cray/rshift.c
index 6280d2ca7..3630b628d 100644
--- a/mpn/cray/rshift.c
+++ b/mpn/cray/rshift.c
@@ -29,7 +29,7 @@ mpn_rshift (mp_ptr wp, mp_srcptr up, mp_size_t n, unsigned int cnt)
   mp_limb_t retval;
 
   sh_1 = cnt;
-  sh_2 = BITS_PER_MP_LIMB - sh_1;
+  sh_2 = GMP_LIMB_BITS - sh_1;
   retval = up[0] << sh_2;
 
 #pragma _CRI ivdep
diff --git a/mpn/generic/bdivmod.c b/mpn/generic/bdivmod.c
index a7bff1bbd..bc8cd34a0 100644
--- a/mpn/generic/bdivmod.c
+++ b/mpn/generic/bdivmod.c
@@ -20,16 +20,16 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
 /* q_high = mpn_bdivmod (qp, up, usize, vp, vsize, d).
 
-   Puts the low d/BITS_PER_MP_LIMB limbs of Q = U / V mod 2^d at qp, and
-   returns the high d%BITS_PER_MP_LIMB bits of Q as the result.
+   Puts the low d/GMP_LIMB_BITS limbs of Q = U / V mod 2^d at qp, and
+   returns the high d%GMP_LIMB_BITS bits of Q as the result.
 
-   Also, U - Q * V mod 2^(usize*BITS_PER_MP_LIMB) is placed at up.  Since the
-   low d/BITS_PER_MP_LIMB limbs of this difference are zero, the code allows
+   Also, U - Q * V mod 2^(usize*GMP_LIMB_BITS) is placed at up.  Since the
+   low d/GMP_LIMB_BITS limbs of this difference are zero, the code allows
    the limb vectors at qp to overwrite the low limbs at up, provided qp <= up.
 
    Preconditions:
    1.  V is odd.
-   2.  usize * BITS_PER_MP_LIMB >= d.
+   2.  usize * GMP_LIMB_BITS >= d.
    3.  If Q and U overlap, qp <= up.
 
    Ken Weber (kweber@mat.ufrgs.br, kweber@mcs.kent.edu)
diff --git a/mpn/generic/dive_1.c b/mpn/generic/dive_1.c
index 27df57b80..f246b091c 100644
--- a/mpn/generic/dive_1.c
+++ b/mpn/generic/dive_1.c
@@ -30,7 +30,7 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 /* Divide a={src,size} by d=divisor and store the quotient in q={dst,size}.
    q will only be correct if d divides a exactly.
 
-   A separate loop is used for shift==0 because n<<BITS_PER_MP_LIMB doesn't
+   A separate loop is used for shift==0 because n<<GMP_LIMB_BITS doesn't
    give zero on all CPUs (for instance it doesn't on the x86s).  This
    separate loop might run faster too, helping odd divisors.
 
@@ -50,7 +50,7 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
    faster on some CPUs and would mean just the shift==0 style loop would be
    needed.
 
-   If n<<BITS_PER_MP_LIMB gives zero on a particular CPU then the separate
+   If n<<GMP_LIMB_BITS gives zero on a particular CPU then the separate
    shift==0 loop is unnecessary, and could be eliminated if there's no great
    speed difference.
 
diff --git a/mpn/generic/gmp-mparam.h b/mpn/generic/gmp-mparam.h
index b22b96ef6..aab5fa510 100644
--- a/mpn/generic/gmp-mparam.h
+++ b/mpn/generic/gmp-mparam.h
@@ -18,5 +18,5 @@ You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
 
-/* Values for BITS_PER_MP_LIMB etc will be determined by ./configure and put
+/* Values for GMP_LIMB_BITS etc will be determined by ./configure and put
    in config.h. */
diff --git a/mpn/generic/mode1o.c b/mpn/generic/mode1o.c
index 064becdad..e8978a4c5 100644
--- a/mpn/generic/mode1o.c
+++ b/mpn/generic/mode1o.c
@@ -30,7 +30,7 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
            r*B^k + a - c == q*d
 
-   where B=2^BITS_PER_MP_LIMB, a is {src,size}, k is either size or size-1
+   where B=2^GMP_LIMB_BITS, a is {src,size}, k is either size or size-1
    (the caller won't know which), and q is the quotient (discarded).  d must
    be odd, c can be any limb value.
 
diff --git a/mpn/generic/pre_divrem_1.c b/mpn/generic/pre_divrem_1.c
index c5a028894..134b4cb44 100644
--- a/mpn/generic/pre_divrem_1.c
+++ b/mpn/generic/pre_divrem_1.c
@@ -32,7 +32,7 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 /* Same test here for skipping one divide step as in mpn_divrem_1.
 
    The main reason for a separate shift==0 case is that not all CPUs give
-   zero for "n0 >> BITS_PER_MP_LIMB" which would arise in the general case
+   zero for "n0 >> GMP_LIMB_BITS" which would arise in the general case
    code used on shift==0.  shift==0 is also reasonably common in mp_bases
    big_base, for instance base==10 on a 64-bit limb.
 
@@ -106,14 +106,14 @@ mpn_preinv_divrem_1 (mp_ptr qp, mp_size_t xsize,
 	}
 
       n1 = ap[size-1];
-      r |= n1 >> (BITS_PER_MP_LIMB - shift);
+      r |= n1 >> (GMP_LIMB_BITS - shift);
 
       for (i = size-2; i >= 0; i--)
 	{
 	  ASSERT (r < d);
 	  n0 = ap[i];
 	  udiv_qrnnd_preinv (*qp, r, r,
-			     ((n1 << shift) | (n0 >> (BITS_PER_MP_LIMB - shift))),
+			     ((n1 << shift) | (n0 >> (GMP_LIMB_BITS - shift))),
 			     d, dinv);
 	  qp--;
 	  n1 = n0;
diff --git a/mpn/generic/sizeinbase.c b/mpn/generic/sizeinbase.c
index cfa57ea35..303359a5c 100644
--- a/mpn/generic/sizeinbase.c
+++ b/mpn/generic/sizeinbase.c
@@ -45,7 +45,7 @@ mpn_sizeinbase (mp_srcptr xp, mp_size_t xsize, int base)
 
   /* Calculate the total number of significant bits of X.  */
   count_leading_zeros (cnt, xp[xsize-1]);
-  totbits = xsize * BITS_PER_MP_LIMB - cnt;
+  totbits = xsize * GMP_LIMB_BITS - cnt;
 
   if (POW2_P (base))
     {
diff --git a/mpn/generic/tdiv_qr.c b/mpn/generic/tdiv_qr.c
index 59d04c424..ceee8f70d 100644
--- a/mpn/generic/tdiv_qr.c
+++ b/mpn/generic/tdiv_qr.c
@@ -280,7 +280,7 @@ mpn_tdiv_qr (mp_ptr qp, mp_ptr rp, mp_size_t qxn,
 		dl = dp[in - 2];
 
 #if GMP_NAIL_BITS == 0
-	      x = (dp[in - 1] << cnt) | ((dl >> 1) >> ((~cnt) % BITS_PER_MP_LIMB));
+	      x = (dp[in - 1] << cnt) | ((dl >> 1) >> ((~cnt) % GMP_LIMB_BITS));
 #else
 	      x = (dp[in - 1] << cnt) & GMP_NUMB_MASK;
 	      if (cnt != 0)
diff --git a/mpn/generic/udiv_w_sdiv.c b/mpn/generic/udiv_w_sdiv.c
index f876aa573..c01f95847 100644
--- a/mpn/generic/udiv_w_sdiv.c
+++ b/mpn/generic/udiv_w_sdiv.c
@@ -42,7 +42,7 @@ mpn_udiv_w_sdiv (rp, a1, a0, d)
 
   if ((mp_limb_signed_t) d >= 0)
     {
-      if (a1 < d - a1 - (a0 >> (BITS_PER_MP_LIMB - 1)))
+      if (a1 < d - a1 - (a0 >> (GMP_LIMB_BITS - 1)))
 	{
 	  /* dividend, divisor, and quotient are nonnegative */
 	  sdiv_qrnnd (q, r, a1, a0, d);
@@ -50,18 +50,18 @@ mpn_udiv_w_sdiv (rp, a1, a0, d)
       else
 	{
 	  /* Compute c1*2^32 + c0 = a1*2^32 + a0 - 2^31*d */
-	  sub_ddmmss (c1, c0, a1, a0, d >> 1, d << (BITS_PER_MP_LIMB - 1));
+	  sub_ddmmss (c1, c0, a1, a0, d >> 1, d << (GMP_LIMB_BITS - 1));
 	  /* Divide (c1*2^32 + c0) by d */
 	  sdiv_qrnnd (q, r, c1, c0, d);
 	  /* Add 2^31 to quotient */
-	  q += (mp_limb_t) 1 << (BITS_PER_MP_LIMB - 1);
+	  q += (mp_limb_t) 1 << (GMP_LIMB_BITS - 1);
 	}
     }
   else
     {
       b1 = d >> 1;			/* d/2, between 2^30 and 2^31 - 1 */
       c1 = a1 >> 1;			/* A/2 */
-      c0 = (a1 << (BITS_PER_MP_LIMB - 1)) + (a0 >> 1);
+      c0 = (a1 << (GMP_LIMB_BITS - 1)) + (a0 >> 1);
 
       if (a1 < b1)			/* A < 2^32*b1, so A/2 < 2^31*b1 */
 	{
diff --git a/mpn/ia64/gmp-mparam.h b/mpn/ia64/gmp-mparam.h
index a889b6693..5f929b8f8 100644
--- a/mpn/ia64/gmp-mparam.h
+++ b/mpn/ia64/gmp-mparam.h
@@ -18,7 +18,7 @@ License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#define BITS_PER_MP_LIMB 64
+#define GMP_LIMB_BITS 64
 #define BYTES_PER_MP_LIMB 8
 
 /* 1300MHz Itanium2 (babe.fsffrance.org) */
diff --git a/mpn/m68k/gmp-mparam.h b/mpn/m68k/gmp-mparam.h
index f682cdfef..21b817ed4 100644
--- a/mpn/m68k/gmp-mparam.h
+++ b/mpn/m68k/gmp-mparam.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
 
-#define BITS_PER_MP_LIMB 32
+#define GMP_LIMB_BITS 32
 #define BYTES_PER_MP_LIMB 4
 
 
diff --git a/mpn/mips32/gmp-mparam.h b/mpn/mips32/gmp-mparam.h
index 2c605160d..a8f27326c 100644
--- a/mpn/mips32/gmp-mparam.h
+++ b/mpn/mips32/gmp-mparam.h
@@ -19,7 +19,7 @@ You should have received a copy of the GNU Lesser General Public License along
 with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
 
-#define BITS_PER_MP_LIMB 32
+#define GMP_LIMB_BITS 32
 #define BYTES_PER_MP_LIMB 4
 
 
diff --git a/mpn/mips64/gmp-mparam.h b/mpn/mips64/gmp-mparam.h
index 0781da835..2bf942431 100644
--- a/mpn/mips64/gmp-mparam.h
+++ b/mpn/mips64/gmp-mparam.h
@@ -19,7 +19,7 @@ You should have received a copy of the GNU Lesser General Public License along
 with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
 
-#define BITS_PER_MP_LIMB 64
+#define GMP_LIMB_BITS 64
 #define BYTES_PER_MP_LIMB 8
 
 
diff --git a/mpn/pa32/gmp-mparam.h b/mpn/pa32/gmp-mparam.h
index c41214da2..ca5ead0e3 100644
--- a/mpn/pa32/gmp-mparam.h
+++ b/mpn/pa32/gmp-mparam.h
@@ -18,7 +18,7 @@ License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#define BITS_PER_MP_LIMB 32
+#define GMP_LIMB_BITS 32
 #define BYTES_PER_MP_LIMB 4
 
 /* These values are for the PA7100 using GCC.  */
diff --git a/mpn/pa32/hppa1_1/gmp-mparam.h b/mpn/pa32/hppa1_1/gmp-mparam.h
index 57d6fefb1..32b3ae9d6 100644
--- a/mpn/pa32/hppa1_1/gmp-mparam.h
+++ b/mpn/pa32/hppa1_1/gmp-mparam.h
@@ -18,7 +18,7 @@ License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#define BITS_PER_MP_LIMB 32
+#define GMP_LIMB_BITS 32
 #define BYTES_PER_MP_LIMB 4
 
 /* Generated by tuneup.c, 2004-02-07, gcc 2.8 (pa7100/100MHz) */
diff --git a/mpn/pa32/hppa2_0/gmp-mparam.h b/mpn/pa32/hppa2_0/gmp-mparam.h
index c19a113d9..1cfd70b1d 100644
--- a/mpn/pa32/hppa2_0/gmp-mparam.h
+++ b/mpn/pa32/hppa2_0/gmp-mparam.h
@@ -18,7 +18,7 @@ License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#define BITS_PER_MP_LIMB 32
+#define GMP_LIMB_BITS 32
 #define BYTES_PER_MP_LIMB 4
 
 /* Generated by tuneup.c, 2009-03-05, gcc 4.3 */
diff --git a/mpn/pa64/gmp-mparam.h b/mpn/pa64/gmp-mparam.h
index 527c9648b..e8e11f32c 100644
--- a/mpn/pa64/gmp-mparam.h
+++ b/mpn/pa64/gmp-mparam.h
@@ -18,7 +18,7 @@ for more details.
 You should have received a copy of the GNU Lesser General Public License along
 with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#define BITS_PER_MP_LIMB 64
+#define GMP_LIMB_BITS 64
 #define BYTES_PER_MP_LIMB 8
 
 /* 440MHz PA8200 */
diff --git a/mpn/powerpc32/750/gmp-mparam.h b/mpn/powerpc32/750/gmp-mparam.h
index c443729d4..23a0a0500 100644
--- a/mpn/powerpc32/750/gmp-mparam.h
+++ b/mpn/powerpc32/750/gmp-mparam.h
@@ -17,7 +17,7 @@ License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#define BITS_PER_MP_LIMB 32
+#define GMP_LIMB_BITS 32
 #define BYTES_PER_MP_LIMB 4
 
 
diff --git a/mpn/powerpc32/gmp-mparam.h b/mpn/powerpc32/gmp-mparam.h
index e6de1649c..a0e40edad 100644
--- a/mpn/powerpc32/gmp-mparam.h
+++ b/mpn/powerpc32/gmp-mparam.h
@@ -18,7 +18,7 @@ License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#define BITS_PER_MP_LIMB 32
+#define GMP_LIMB_BITS 32
 #define BYTES_PER_MP_LIMB 4
 
 
diff --git a/mpn/powerpc64/gmp-mparam.h b/mpn/powerpc64/gmp-mparam.h
index b2f853bbc..cd4a5de3d 100644
--- a/mpn/powerpc64/gmp-mparam.h
+++ b/mpn/powerpc64/gmp-mparam.h
@@ -18,7 +18,7 @@ License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#define BITS_PER_MP_LIMB 64
+#define GMP_LIMB_BITS 64
 #define BYTES_PER_MP_LIMB 8
 
 
diff --git a/mpn/powerpc64/mode64/gmp-mparam.h b/mpn/powerpc64/mode64/gmp-mparam.h
index 91bdec45a..58eead316 100644
--- a/mpn/powerpc64/mode64/gmp-mparam.h
+++ b/mpn/powerpc64/mode64/gmp-mparam.h
@@ -17,7 +17,7 @@ License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#define BITS_PER_MP_LIMB 64
+#define GMP_LIMB_BITS 64
 #define BYTES_PER_MP_LIMB 8
 
 /* 1600MHz PPC970 */
diff --git a/mpn/powerpc64/mode64/p3/gmp-mparam.h b/mpn/powerpc64/mode64/p3/gmp-mparam.h
index 2f0984093..c707eb782 100644
--- a/mpn/powerpc64/mode64/p3/gmp-mparam.h
+++ b/mpn/powerpc64/mode64/p3/gmp-mparam.h
@@ -17,7 +17,7 @@ License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#define BITS_PER_MP_LIMB 64
+#define GMP_LIMB_BITS 64
 #define BYTES_PER_MP_LIMB 8
 
 
diff --git a/mpn/powerpc64/mode64/p4/gmp-mparam.h b/mpn/powerpc64/mode64/p4/gmp-mparam.h
index 3acf6905d..17994f786 100644
--- a/mpn/powerpc64/mode64/p4/gmp-mparam.h
+++ b/mpn/powerpc64/mode64/p4/gmp-mparam.h
@@ -17,7 +17,7 @@ License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#define BITS_PER_MP_LIMB 64
+#define GMP_LIMB_BITS 64
 #define BYTES_PER_MP_LIMB 8
 
 
diff --git a/mpn/powerpc64/mode64/p5/gmp-mparam.h b/mpn/powerpc64/mode64/p5/gmp-mparam.h
index f8f9d5bd3..e5c7a8b14 100644
--- a/mpn/powerpc64/mode64/p5/gmp-mparam.h
+++ b/mpn/powerpc64/mode64/p5/gmp-mparam.h
@@ -18,7 +18,7 @@ License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#define BITS_PER_MP_LIMB 64
+#define GMP_LIMB_BITS 64
 #define BYTES_PER_MP_LIMB 8
 
 /* POWER5 (friggms.hpc.ntnu.no) */
diff --git a/mpn/s390/gmp-mparam.h b/mpn/s390/gmp-mparam.h
index a2e31156d..bbcfbd6a4 100644
--- a/mpn/s390/gmp-mparam.h
+++ b/mpn/s390/gmp-mparam.h
@@ -18,7 +18,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
 
-/* BITS_PER_MP_LIMB etc generated by configure */
+/* GMP_LIMB_BITS etc generated by configure */
 
 
 /* Generated by tuneup.c, 2001-12-03, gcc 2.95 */
diff --git a/mpn/sparc32/v8/gmp-mparam.h b/mpn/sparc32/v8/gmp-mparam.h
index bb5cd4766..0962732b5 100644
--- a/mpn/sparc32/v8/gmp-mparam.h
+++ b/mpn/sparc32/v8/gmp-mparam.h
@@ -19,7 +19,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
 
-#define BITS_PER_MP_LIMB 32
+#define GMP_LIMB_BITS 32
 #define BYTES_PER_MP_LIMB 4
 
 /* Generated by tuneup.c, 2004-02-07, gcc 2.95 */
diff --git a/mpn/sparc32/v8/supersparc/gmp-mparam.h b/mpn/sparc32/v8/supersparc/gmp-mparam.h
index c01722710..130e9a539 100644
--- a/mpn/sparc32/v8/supersparc/gmp-mparam.h
+++ b/mpn/sparc32/v8/supersparc/gmp-mparam.h
@@ -19,7 +19,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
 
-#define BITS_PER_MP_LIMB 32
+#define GMP_LIMB_BITS 32
 #define BYTES_PER_MP_LIMB 4
 
 /* Generated by tuneup.c, 2004-02-10, gcc 3.3 */
diff --git a/mpn/sparc32/v9/gmp-mparam.h b/mpn/sparc32/v9/gmp-mparam.h
index 65e45e0dd..2add06892 100644
--- a/mpn/sparc32/v9/gmp-mparam.h
+++ b/mpn/sparc32/v9/gmp-mparam.h
@@ -18,7 +18,7 @@ License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#define BITS_PER_MP_LIMB 32
+#define GMP_LIMB_BITS 32
 #define BYTES_PER_MP_LIMB 4
 
 /* Generated by tuneup.c, 2009-02-12, gcc 2.95 */
diff --git a/mpn/sparc64/gmp-mparam.h b/mpn/sparc64/gmp-mparam.h
index b91e1a902..88f387240 100644
--- a/mpn/sparc64/gmp-mparam.h
+++ b/mpn/sparc64/gmp-mparam.h
@@ -18,7 +18,7 @@ License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#define BITS_PER_MP_LIMB 64
+#define GMP_LIMB_BITS 64
 #define BYTES_PER_MP_LIMB 8
 
 /* Generated by tuneup.c, 2009-01-15, gcc 3.4 */
diff --git a/mpn/x86/dive_1.asm b/mpn/x86/dive_1.asm
index d2d02f9f7..cb927e5d9 100644
--- a/mpn/x86/dive_1.asm
+++ b/mpn/x86/dive_1.asm
@@ -97,7 +97,7 @@ ifdef(`PIC',`
 
 	subl	%edx, %eax		C inv = 2*inv - inv*inv*d
 
-	ASSERT(e,`	C expect d*inv == 1 mod 2^BITS_PER_MP_LIMB
+	ASSERT(e,`	C expect d*inv == 1 mod 2^GMP_LIMB_BITS
 	pushl	%eax	FRAME_pushl()
 	imull	PARAM_DIVISOR, %eax
 	cmpl	$1, %eax
diff --git a/mpn/x86/fat/gmp-mparam.h b/mpn/x86/fat/gmp-mparam.h
index 83c3716cd..051a87d19 100644
--- a/mpn/x86/fat/gmp-mparam.h
+++ b/mpn/x86/fat/gmp-mparam.h
@@ -18,7 +18,7 @@ License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#define BITS_PER_MP_LIMB 32
+#define GMP_LIMB_BITS 32
 #define BYTES_PER_MP_LIMB 4
 
 
diff --git a/mpn/x86/gmp-mparam.h b/mpn/x86/gmp-mparam.h
index 22ee86f7e..4f91bd230 100644
--- a/mpn/x86/gmp-mparam.h
+++ b/mpn/x86/gmp-mparam.h
@@ -17,7 +17,7 @@ License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#define BITS_PER_MP_LIMB 32
+#define GMP_LIMB_BITS 32
 #define BYTES_PER_MP_LIMB 4
 
 
diff --git a/mpn/x86/i486/gmp-mparam.h b/mpn/x86/i486/gmp-mparam.h
index a9c592c7c..30084ed67 100644
--- a/mpn/x86/i486/gmp-mparam.h
+++ b/mpn/x86/i486/gmp-mparam.h
@@ -17,7 +17,7 @@ License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#define BITS_PER_MP_LIMB 32
+#define GMP_LIMB_BITS 32
 #define BYTES_PER_MP_LIMB 4
 
 
diff --git a/mpn/x86/k6/gmp-mparam.h b/mpn/x86/k6/gmp-mparam.h
index f2b003f0f..0029ba6f4 100644
--- a/mpn/x86/k6/gmp-mparam.h
+++ b/mpn/x86/k6/gmp-mparam.h
@@ -18,7 +18,7 @@ License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#define BITS_PER_MP_LIMB 32
+#define GMP_LIMB_BITS 32
 #define BYTES_PER_MP_LIMB 4
 
 
diff --git a/mpn/x86/k6/mmx/dive_1.asm b/mpn/x86/k6/mmx/dive_1.asm
index 9cc90d88a..f169bfc14 100644
--- a/mpn/x86/k6/mmx/dive_1.asm
+++ b/mpn/x86/k6/mmx/dive_1.asm
@@ -117,7 +117,7 @@ Zdisp(	movzbl,	0,(%eax,%ebp), %eax)
 	subl	%ebp, %eax		C inv = 2*inv - inv*inv*d
 	subl	$1, %edx		C shift amount, and clear carry
 
-	ASSERT(e,`	C expect d*inv == 1 mod 2^BITS_PER_MP_LIMB
+	ASSERT(e,`	C expect d*inv == 1 mod 2^GMP_LIMB_BITS
 	pushl	%eax	FRAME_pushl()
 	imull	PARAM_DIVISOR, %eax
 	cmpl	$1, %eax
diff --git a/mpn/x86/k6/mode1o.asm b/mpn/x86/k6/mode1o.asm
index f29987791..34f35369f 100644
--- a/mpn/x86/k6/mode1o.asm
+++ b/mpn/x86/k6/mode1o.asm
@@ -103,7 +103,7 @@ Zdisp(	movzbl,	0,(%ecx,%edi), %edi)		C inv 8 bits
 
 	subl	%ecx, %edi		C inv = 2*inv - inv*inv*d
 
-	ASSERT(e,`	C d*inv == 1 mod 2^BITS_PER_MP_LIMB
+	ASSERT(e,`	C d*inv == 1 mod 2^GMP_LIMB_BITS
 	pushl	%eax
 	movl	%esi, %eax
 	imull	%edi, %eax
diff --git a/mpn/x86/k7/dive_1.asm b/mpn/x86/k7/dive_1.asm
index c994e0fb0..a754d0916 100644
--- a/mpn/x86/k7/dive_1.asm
+++ b/mpn/x86/k7/dive_1.asm
@@ -105,7 +105,7 @@ ifdef(`PIC',`
 
 	subl	%edx, %eax		C inv = 2*inv - inv*inv*d
 
-	ASSERT(e,`	C expect d*inv == 1 mod 2^BITS_PER_MP_LIMB
+	ASSERT(e,`	C expect d*inv == 1 mod 2^GMP_LIMB_BITS
 	pushl	%eax	FRAME_pushl()
 	imull	PARAM_DIVISOR, %eax
 	cmpl	$1, %eax
diff --git a/mpn/x86/k7/gmp-mparam.h b/mpn/x86/k7/gmp-mparam.h
index 910cebcdc..fc65b1f82 100644
--- a/mpn/x86/k7/gmp-mparam.h
+++ b/mpn/x86/k7/gmp-mparam.h
@@ -18,7 +18,7 @@ License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#define BITS_PER_MP_LIMB 32
+#define GMP_LIMB_BITS 32
 #define BYTES_PER_MP_LIMB 4
 
 
diff --git a/mpn/x86/k7/mode1o.asm b/mpn/x86/k7/mode1o.asm
index ef858049a..f2eaf22cb 100644
--- a/mpn/x86/k7/mode1o.asm
+++ b/mpn/x86/k7/mode1o.asm
@@ -111,7 +111,7 @@ ifdef(`PIC',`
 
 	subl	%eax, %edi		C inv = 2*inv - inv*inv*d
 
-	ASSERT(e,`	C d*inv == 1 mod 2^BITS_PER_MP_LIMB
+	ASSERT(e,`	C d*inv == 1 mod 2^GMP_LIMB_BITS
 	movl	%esi, %eax
 	imull	%edi, %eax
 	cmpl	$1, %eax')
diff --git a/mpn/x86/p6/dive_1.asm b/mpn/x86/p6/dive_1.asm
index e8efc28ea..23d1d53af 100644
--- a/mpn/x86/p6/dive_1.asm
+++ b/mpn/x86/p6/dive_1.asm
@@ -106,7 +106,7 @@ ifdef(`PIC',`
 
 	subl	%eax, %ebp		C inv = 2*inv - inv*inv*d
 
-	ASSERT(e,`	C d*inv == 1 mod 2^BITS_PER_MP_LIMB
+	ASSERT(e,`	C d*inv == 1 mod 2^GMP_LIMB_BITS
 	movl	PARAM_DIVISOR, %eax
 	imull	%ebp, %eax
 	cmpl	$1, %eax')
diff --git a/mpn/x86/p6/gmp-mparam.h b/mpn/x86/p6/gmp-mparam.h
index 9c4207617..a84b018ee 100644
--- a/mpn/x86/p6/gmp-mparam.h
+++ b/mpn/x86/p6/gmp-mparam.h
@@ -19,7 +19,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
 
-#define BITS_PER_MP_LIMB 32
+#define GMP_LIMB_BITS 32
 #define BYTES_PER_MP_LIMB 4
 
 
diff --git a/mpn/x86/p6/mmx/gmp-mparam.h b/mpn/x86/p6/mmx/gmp-mparam.h
index f57ef0cea..10f22adf9 100644
--- a/mpn/x86/p6/mmx/gmp-mparam.h
+++ b/mpn/x86/p6/mmx/gmp-mparam.h
@@ -19,7 +19,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
 
-#define BITS_PER_MP_LIMB 32
+#define GMP_LIMB_BITS 32
 #define BYTES_PER_MP_LIMB 4
 
 
diff --git a/mpn/x86/p6/mode1o.asm b/mpn/x86/p6/mode1o.asm
index 4aff48d7e..7361164cd 100644
--- a/mpn/x86/p6/mode1o.asm
+++ b/mpn/x86/p6/mode1o.asm
@@ -101,7 +101,7 @@ ifdef(`PIC',`
 
 	subl	%eax, %edi		C inv = 2*inv - inv*inv*d
 
-	ASSERT(e,`	C d*inv == 1 mod 2^BITS_PER_MP_LIMB
+	ASSERT(e,`	C d*inv == 1 mod 2^GMP_LIMB_BITS
 	movl	PARAM_DIVISOR, %eax
 	imull	%edi, %eax
 	cmpl	$1, %eax')
diff --git a/mpn/x86/p6/sse2/gmp-mparam.h b/mpn/x86/p6/sse2/gmp-mparam.h
index 31ddfb705..6c2856550 100644
--- a/mpn/x86/p6/sse2/gmp-mparam.h
+++ b/mpn/x86/p6/sse2/gmp-mparam.h
@@ -19,7 +19,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
 
-#define BITS_PER_MP_LIMB 32
+#define GMP_LIMB_BITS 32
 #define BYTES_PER_MP_LIMB 4
 
 
diff --git a/mpn/x86/pentium/dive_1.asm b/mpn/x86/pentium/dive_1.asm
index 79885244a..253d1283d 100644
--- a/mpn/x86/pentium/dive_1.asm
+++ b/mpn/x86/pentium/dive_1.asm
@@ -146,7 +146,7 @@ dnl non-PIC
 
 	negl	%ebx			C -size
 
-	ASSERT(e,`	C expect d*inv == 1 mod 2^BITS_PER_MP_LIMB
+	ASSERT(e,`	C expect d*inv == 1 mod 2^GMP_LIMB_BITS
 	pushl	%eax	FRAME_pushl()
 	imull	PARAM_DIVISOR, %eax
 	cmpl	$1, %eax
diff --git a/mpn/x86/pentium/gmp-mparam.h b/mpn/x86/pentium/gmp-mparam.h
index cf8328ad1..de293c4a2 100644
--- a/mpn/x86/pentium/gmp-mparam.h
+++ b/mpn/x86/pentium/gmp-mparam.h
@@ -19,7 +19,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
 
-#define BITS_PER_MP_LIMB 32
+#define GMP_LIMB_BITS 32
 #define BYTES_PER_MP_LIMB 4
 
 
diff --git a/mpn/x86/pentium/mmx/gmp-mparam.h b/mpn/x86/pentium/mmx/gmp-mparam.h
index 21819d20b..d9d4eaad7 100644
--- a/mpn/x86/pentium/mmx/gmp-mparam.h
+++ b/mpn/x86/pentium/mmx/gmp-mparam.h
@@ -19,7 +19,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
 
-#define BITS_PER_MP_LIMB 32
+#define GMP_LIMB_BITS 32
 #define BYTES_PER_MP_LIMB 4
 
 
diff --git a/mpn/x86/pentium/mode1o.asm b/mpn/x86/pentium/mode1o.asm
index 222f64e5c..afb0ebe5b 100644
--- a/mpn/x86/pentium/mode1o.asm
+++ b/mpn/x86/pentium/mode1o.asm
@@ -122,7 +122,7 @@ dnl non-PIC
 	subl	%eax, %ecx		C inv = 2*inv - inv*inv*d
 	pushl	%esi		FRAME_pushl()
 
-	ASSERT(e,`	C d*inv == 1 mod 2^BITS_PER_MP_LIMB
+	ASSERT(e,`	C d*inv == 1 mod 2^GMP_LIMB_BITS
 	movl	%ecx, %eax
 	imull	PARAM_DIVISOR, %eax
 	cmpl	$1, %eax')
diff --git a/mpn/x86/pentium4/sse2/dive_1.asm b/mpn/x86/pentium4/sse2/dive_1.asm
index c50ef7d29..5e0e38e53 100644
--- a/mpn/x86/pentium4/sse2/dive_1.asm
+++ b/mpn/x86/pentium4/sse2/dive_1.asm
@@ -126,7 +126,7 @@ ifdef(`PIC',`
 
 	psubd	%mm0, %mm5		C inv = 2*inv - inv*inv*d
 
-	ASSERT(e,`	C expect d*inv == 1 mod 2^BITS_PER_MP_LIMB
+	ASSERT(e,`	C expect d*inv == 1 mod 2^GMP_LIMB_BITS
 	pushl	%eax	FRAME_pushl()
 	movq	%mm6, %mm0
 	pmuludq	%mm5, %mm0
diff --git a/mpn/x86/pentium4/sse2/gmp-mparam.h b/mpn/x86/pentium4/sse2/gmp-mparam.h
index f26adf271..da9ace622 100644
--- a/mpn/x86/pentium4/sse2/gmp-mparam.h
+++ b/mpn/x86/pentium4/sse2/gmp-mparam.h
@@ -18,7 +18,7 @@ License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#define BITS_PER_MP_LIMB 32
+#define GMP_LIMB_BITS 32
 #define BYTES_PER_MP_LIMB 4
 
 
diff --git a/mpn/x86/pentium4/sse2/mode1o.asm b/mpn/x86/pentium4/sse2/mode1o.asm
index 2f0b177a0..f9d1f1496 100644
--- a/mpn/x86/pentium4/sse2/mode1o.asm
+++ b/mpn/x86/pentium4/sse2/mode1o.asm
@@ -101,7 +101,7 @@ ifdef(`PIC',`
 
 	psubd	%mm0, %mm6		C inv = 2*inv - inv*inv*d
 
-	ASSERT(e,`	C expect d*inv == 1 mod 2^BITS_PER_MP_LIMB
+	ASSERT(e,`	C expect d*inv == 1 mod 2^GMP_LIMB_BITS
 	pushl	%eax	FRAME_pushl()
 	movd	%mm6, %eax
 	imul	PARAM_DIVISOR, %eax
diff --git a/mpn/x86_64/atom/gmp-mparam.h b/mpn/x86_64/atom/gmp-mparam.h
index 917b1cece..9ec43c742 100644
--- a/mpn/x86_64/atom/gmp-mparam.h
+++ b/mpn/x86_64/atom/gmp-mparam.h
@@ -18,7 +18,7 @@ License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#define BITS_PER_MP_LIMB 64
+#define GMP_LIMB_BITS 64
 #define BYTES_PER_MP_LIMB 8
 
 /* Generated by tuneup.c, 2009-11-26, gcc 4.4 */
diff --git a/mpn/x86_64/core2/gmp-mparam.h b/mpn/x86_64/core2/gmp-mparam.h
index e9f8d0eb0..7ec4783e2 100644
--- a/mpn/x86_64/core2/gmp-mparam.h
+++ b/mpn/x86_64/core2/gmp-mparam.h
@@ -18,7 +18,7 @@ License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#define BITS_PER_MP_LIMB 64
+#define GMP_LIMB_BITS 64
 #define BYTES_PER_MP_LIMB 8
 
 /* 2133 MHz Core 2 (65nm) */
diff --git a/mpn/x86_64/corei/gmp-mparam.h b/mpn/x86_64/corei/gmp-mparam.h
index 00c2aec05..8e60f94de 100644
--- a/mpn/x86_64/corei/gmp-mparam.h
+++ b/mpn/x86_64/corei/gmp-mparam.h
@@ -18,7 +18,7 @@ License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#define BITS_PER_MP_LIMB 64
+#define GMP_LIMB_BITS 64
 #define BYTES_PER_MP_LIMB 8
 
 /* 2667 MHz Core i7 */
diff --git a/mpn/x86_64/fat/gmp-mparam.h b/mpn/x86_64/fat/gmp-mparam.h
index 17591e415..7e71f715b 100644
--- a/mpn/x86_64/fat/gmp-mparam.h
+++ b/mpn/x86_64/fat/gmp-mparam.h
@@ -18,7 +18,7 @@ License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#define BITS_PER_MP_LIMB 64
+#define GMP_LIMB_BITS 64
 #define BYTES_PER_MP_LIMB 8
 
 
diff --git a/mpn/x86_64/gmp-mparam.h b/mpn/x86_64/gmp-mparam.h
index 76f345197..8d43a2403 100644
--- a/mpn/x86_64/gmp-mparam.h
+++ b/mpn/x86_64/gmp-mparam.h
@@ -18,7 +18,7 @@ License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#define BITS_PER_MP_LIMB 64
+#define GMP_LIMB_BITS 64
 #define BYTES_PER_MP_LIMB 8
 
 /* 2500 MHz Athlon64 / 512 Kibyte cache */
diff --git a/mpn/x86_64/nano/gmp-mparam.h b/mpn/x86_64/nano/gmp-mparam.h
index b20015a64..374999649 100644
--- a/mpn/x86_64/nano/gmp-mparam.h
+++ b/mpn/x86_64/nano/gmp-mparam.h
@@ -18,7 +18,7 @@ License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#define BITS_PER_MP_LIMB 64
+#define GMP_LIMB_BITS 64
 #define BYTES_PER_MP_LIMB 8
 
 /* 1600 MHz Nano 2xxx */
diff --git a/mpn/x86_64/pentium4/gmp-mparam.h b/mpn/x86_64/pentium4/gmp-mparam.h
index 56beb00bc..26fa78e36 100644
--- a/mpn/x86_64/pentium4/gmp-mparam.h
+++ b/mpn/x86_64/pentium4/gmp-mparam.h
@@ -18,7 +18,7 @@ License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#define BITS_PER_MP_LIMB 64
+#define GMP_LIMB_BITS 64
 #define BYTES_PER_MP_LIMB 8
 
 /* These routines exists for all x86_64 chips, but they are slower on Pentium4
diff --git a/mpn/z8000/gmp-mparam.h b/mpn/z8000/gmp-mparam.h
index f42e380a7..1b25c9b47 100644
--- a/mpn/z8000/gmp-mparam.h
+++ b/mpn/z8000/gmp-mparam.h
@@ -17,5 +17,5 @@ License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 
-#define BITS_PER_MP_LIMB 16
+#define GMP_LIMB_BITS 16
 #define BYTES_PER_MP_LIMB 2