patches/gmp/4.3.1/100-multiplicity-that-does-not-fit-an-int.patch
author Johannes Stezenbach <js@sig21.net>
Thu Jul 29 19:47:16 2010 +0200 (2010-07-29)
changeset 2045 fdaa6c7f6dea
permissions -rw-r--r--
cc/gcc: add option to compile against static libstdc++, for gcc-4.4 and newer

Idea and know-how taken from CodeSourcery build script.

Normal build:
$ ldd arm-unknown-linux-uclibcgnueabi-gcc
linux-gate.so.1 => (0xb77f3000)
libstdc++.so.6 => /usr/lib/libstdc++.so.6 (0xb76e8000)
libc.so.6 => /lib/i686/cmov/libc.so.6 (0xb75a1000)
libm.so.6 => /lib/i686/cmov/libm.so.6 (0xb757a000)
/lib/ld-linux.so.2 (0xb77f4000)
libgcc_s.so.1 => /lib/libgcc_s.so.1 (0xb755c000)

CC_STATIC_LIBSTDCXX=y:
$ ldd arm-unknown-linux-uclibcgnueabi-gcc
linux-gate.so.1 => (0xb7843000)
libc.so.6 => /lib/i686/cmov/libc.so.6 (0xb76e6000)
/lib/ld-linux.so.2 (0xb7844000)

I made CC_STATIC_LIBSTDCXX default=y since I think
it is always desirable.

Signed-off-by: Johannes Stezenbach <js@sig21.net>
     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]);