patches/gmp/4.3.1/100-multiplicity-that-does-not-fit-an-int.patch
| author |
"Yann E. MORIN" <yann.morin.1998@free.fr> |
|
Tue Mar 11 22:11:43 2014 +0100 (2014-03-11) |
| changeset 3293 |
e11a8a2e225d |
| permissions |
-rw-r--r-- |
comptools: do not force build of make-3.81 unless really needed
On systems with make-3.82, we forcibly force the build and the use
of make-3.81
But some newer tools break when building with make-3.81. For example,
eglibc-3.18 breaks.
Introduce a new blind options that tools may select if they require
make-3.81. If the system does not have make-3.81, and this option is
selected, then we force the build of make-3.81. Otherwise, we leave
it to the user to decide on his own.
Note that no component selects this option for now. It will come in
later patches as we find them.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
yann@1440
|
1 |
diff --git a/mpz/remove.c b/mpz/remove.c
|
|
yann@1440
|
2 |
--- a/mpz/remove.c
|
|
yann@1440
|
3 |
+++ b/mpz/remove.c
|
|
yann@1440
|
4 |
@@ -23,7 +23,7 @@
|
|
yann@1440
|
5 |
unsigned long int
|
|
yann@1440
|
6 |
mpz_remove (mpz_ptr dest, mpz_srcptr src, mpz_srcptr f)
|
|
yann@1440
|
7 |
{
|
|
yann@1440
|
8 |
- mpz_t fpow[40]; /* inexhaustible...until year 2020 or so */
|
|
yann@1440
|
9 |
+ mpz_t fpow[GMP_LIMB_BITS]; /* Really MP_SIZE_T_BITS */
|
|
yann@1440
|
10 |
mpz_t x, rem;
|
|
yann@1440
|
11 |
unsigned long int pwr;
|
|
yann@1440
|
12 |
int p;
|
|
yann@1440
|
13 |
@@ -69,7 +69,7 @@
|
|
yann@1440
|
14 |
mpz_set (dest, x);
|
|
yann@1440
|
15 |
}
|
|
yann@1440
|
16 |
|
|
yann@1440
|
17 |
- pwr = (1 << p) - 1;
|
|
yann@1440
|
18 |
+ pwr = (1L << p) - 1;
|
|
yann@1440
|
19 |
|
|
yann@1440
|
20 |
mpz_clear (fpow[p]);
|
|
yann@1440
|
21 |
|
|
yann@1440
|
22 |
diff --git a/mpz/remove.c b/mpz/remove.c
|
|
yann@1440
|
23 |
--- a/mpz/remove.c
|
|
yann@1440
|
24 |
+++ b/mpz/remove.c
|
|
yann@1440
|
25 |
@@ -80,7 +80,7 @@
|
|
yann@1440
|
26 |
mpz_tdiv_qr (x, rem, dest, fpow[p]);
|
|
yann@1440
|
27 |
if (SIZ (rem) == 0)
|
|
yann@1440
|
28 |
{
|
|
yann@1440
|
29 |
- pwr += 1 << p;
|
|
yann@1440
|
30 |
+ pwr += 1L << p;
|
|
yann@1440
|
31 |
mpz_set (dest, x);
|
|
yann@1440
|
32 |
}
|
|
yann@1440
|
33 |
mpz_clear (fpow[p]);
|