patches/gmp/4.3.1/100-multiplicity-that-does-not-fit-an-int.patch
author |
"Yann E. MORIN" <yann.morin.1998@free.fr> |
|
Tue Oct 16 20:57:44 2012 +0200 (2012-10-16) |
changeset 3079 |
37831a33e07e |
permissions |
-rw-r--r-- |
kernel/linux: fix using custom location
Currently, extract and patch are skipped as thus:
- using a custom directory of pre-installed headers
- a correctly named directory already exists
Otherwise, extract and patch are done.
The current second condition is wrong, because it allows the following
sequence to happen:
- a non-custom kernel is used
- a previous build only partially extracted the non-custom sources
- that p[revious build broke during extraction (eg. incomplete tarball...)
- a subsequent build will find a properly named directory, and will
thus skip extract and patch, which is wrong
Fix that by following the conditions in this table:
Type | Extract | Patch
----------------------+---------+-------
Pre-installed headers | N | N
custom directory | N | N
custom tarball | Y | N
mainstream tarball | Y | Y
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: David Holsgrove <david.holsgrove@xilinx.com>
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]);
|