patches/gmp/4.3.1/100-multiplicity-that-does-not-fit-an-int.patch
author "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
Wed Dec 14 16:55:22 2011 +0100 (2011-12-14)
branch1.13
changeset 2848 1ff89596dab0
permissions -rw-r--r--
libc/eglibc: fix localedef 2.14 build

The localedef of eglibc 2.14 requires NOT_IN_libc to be defined in order to
compile intl/l10nflist.c.

This is because localedef is built separately from eglibc and uses some parts of
eglibc that don't compile in standalone without this preprocessor definition.

This fixes the following error:

[ALL ] gcc -g -O2 -DNO_SYSCONF -DNO_UNCOMPRESS
-DLOCALE_PATH='"/usr/lib/locale:/usr/share/i18n"'
-DLOCALEDIR='"/usr/lib/locale"' -DLOCALE_ALIAS_PATH='"/usr/share/locale"'
-DCHARMAP_PATH='"/usr/share/i18n/charmaps"'
-DREPERTOIREMAP_PATH='"/usr/share/i18n/repertoiremaps"'
-DLOCSRCDIR='"/usr/share/i18n/locales"' -Iglibc/locale/programs -Iglibc/locale
-I/<snip>/.build/src/eglibc-localedef-2_14/include
-I/<snip>/.build/src/eglibc-localedef-2_14 -I.
-include /<snip>/.build/src/eglibc-localedef-2_14/include/always.h -Wall
-Wno-format -c -o locarchive.o glibc/locale/programs/locarchive.c
[ALL ] glibc/locale/programs/locarchive.c: In function 'enlarge_archive':
[ALL ] glibc/locale/programs/locarchive.c:303:21: warning: variable
'oldlocrectab' set but not used [-Wunused-but-set-variable]
[ALL ] In file included from glibc/locale/programs/locarchive.c:651:0:
[ALL ] glibc/locale/programs/../../intl/l10nflist.c: In function
'_nl_normalize_codeset':
[ERROR] glibc/locale/programs/../../intl/l10nflist.c:342:9: error:
'_nl_C_locobj_ptr' undeclared (first use in this function)
[ALL ] glibc/locale/programs/../../intl/l10nflist.c:342:9: note: each
undeclared identifier is reported only once for each function it appears in
[ALL ] glibc/locale/programs/locarchive.c: In function
'add_locales_to_archive':
[ALL ] glibc/locale/programs/locarchive.c:1450:7: warning: passing argument
1 of '__xpg_basename' discards 'const' qualifier from pointer target type
[enabled by default]
[ALL ] /usr/include/libgen.h:35:14: note: expected 'char *' but argument is
of type 'const char *'
[ERROR] make[1]: *** [locarchive.o] Error 1

Signed-off-by: "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
(transplanted from 4cd9134739b594451794cf61a6e1b137422cdafd)
     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]);