patches/gmp/4.3.1/100-multiplicity-that-does-not-fit-an-int.patch
author "Bryan Hundven" <bryanhundven@gmail.com>
Thu Mar 01 15:23:49 2012 -0800 (2012-03-01)
changeset 2909 28ac8fbd9e6a
permissions -rw-r--r--
libg/eglibc: add updated eglibc 2.15

Includes a patch to remove __builtin_expect test:

In eglibc-2.15, the build breaks in configure while testing
for the existance of __builtin_expect. It fails with newer
versions of gcc.

This patch is a modification of an upstream change in glibc
mainline (to be 2.16) to fix the following error:

[CFG ] checking for __builtin_expect... no
[ERROR] configure: error: support for __builtin_expect needed

http://sourceware.org/git/?p=glibc.git;a=commit;h=3857022a761ea7251f8e5c0e45d382ebc3e34cf9

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
[yann.morin.1998@free.fr: coalesce both patches into a single changeset]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
     1 diff --git a/mpz/remove.c b/mpz/remove.c
     2 --- a/mpz/remove.c
     3 +++ b/mpz/remove.c
     4 @@ -23,7 +23,7 @@
     5  unsigned long int
     6  mpz_remove (mpz_ptr dest, mpz_srcptr src, mpz_srcptr f)
     7  {
     8 -  mpz_t fpow[40];		/* inexhaustible...until year 2020 or so */
     9 +  mpz_t fpow[GMP_LIMB_BITS];		/* Really MP_SIZE_T_BITS */
    10    mpz_t x, rem;
    11    unsigned long int pwr;
    12    int p;
    13 @@ -69,7 +69,7 @@
    14        mpz_set (dest, x);
    15      }
    16  
    17 -  pwr = (1 << p) - 1;
    18 +  pwr = (1L << p) - 1;
    19  
    20    mpz_clear (fpow[p]);
    21  
    22 diff --git a/mpz/remove.c b/mpz/remove.c
    23 --- a/mpz/remove.c
    24 +++ b/mpz/remove.c
    25 @@ -80,7 +80,7 @@
    26        mpz_tdiv_qr (x, rem, dest, fpow[p]);
    27        if (SIZ (rem) == 0)
    28  	{
    29 -	  pwr += 1 << p;
    30 +	  pwr += 1L << p;
    31  	  mpz_set (dest, x);
    32  	}
    33        mpz_clear (fpow[p]);