patches/gcc/4.3.1/230-pr34571.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
parent 746 b150d6f590fc
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)
yann@552
     1
Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/64_all_gcc43-pr34571.patch
yann@552
     2
http://gcc.gnu.org/PR34571
yann@552
     3
yann@552
     4
2007-12-26  Rask Ingemann Lambertsen  <rask@sygehus.dk>
yann@552
     5
yann@552
     6
	PR target/34571
yann@552
     7
	* config/alpha/alpha.c (alpha_cannot_force_const_mem): Use
yann@552
     8
	symbolic_operand.
yann@552
     9
	* varasm.c (output_constant_pool_1): Fix typo.
yann@552
    10
yann@552
    11
diff -durN gcc-4.3.1.orig/gcc/config/alpha/alpha.c gcc-4.3.1/gcc/config/alpha/alpha.c
yann@552
    12
--- gcc-4.3.1.orig/gcc/config/alpha/alpha.c	2008-02-07 18:45:24.000000000 +0100
yann@552
    13
+++ gcc-4.3.1/gcc/config/alpha/alpha.c	2008-06-10 14:58:24.000000000 +0200
yann@552
    14
@@ -1113,8 +1113,7 @@
yann@552
    15
 static bool
yann@552
    16
 alpha_cannot_force_const_mem (rtx x)
yann@552
    17
 {
yann@552
    18
-  enum rtx_code code = GET_CODE (x);
yann@552
    19
-  return code == SYMBOL_REF || code == LABEL_REF || code == CONST;
yann@552
    20
+  return symbolic_operand (x, GET_MODE (x));
yann@552
    21
 }
yann@552
    22
 
yann@552
    23
 /* We do not allow indirect calls to be optimized into sibling calls, nor
yann@552
    24
diff -durN gcc-4.3.1.orig/gcc/varasm.c gcc-4.3.1/gcc/varasm.c
yann@552
    25
--- gcc-4.3.1.orig/gcc/varasm.c	2007-12-05 22:55:10.000000000 +0100
yann@552
    26
+++ gcc-4.3.1/gcc/varasm.c	2008-06-10 14:58:24.000000000 +0200
yann@552
    27
@@ -3710,7 +3710,7 @@
yann@552
    28
       /* FALLTHRU  */
yann@552
    29
 
yann@552
    30
     case LABEL_REF:
yann@552
    31
-      tmp = XEXP (x, 0);
yann@552
    32
+      tmp = XEXP (tmp, 0);
yann@552
    33
       gcc_assert (!INSN_DELETED_P (tmp));
yann@552
    34
       gcc_assert (!NOTE_P (tmp)
yann@552
    35
 		  || NOTE_KIND (tmp) != NOTE_INSN_DELETED);