patches/gcc/4.4.3/130-cross-compile.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 1611 e2516bba8fe5
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 -durN gcc-4.4.0.orig/gcc/configure gcc-4.4.0/gcc/configure
     2 --- gcc-4.4.0.orig/gcc/configure	2009-03-24 18:46:03.000000000 +0100
     3 +++ gcc-4.4.0/gcc/configure	2009-05-27 21:38:06.000000000 +0200
     4 @@ -13997,7 +13997,7 @@
     5  	    | powerpc*-*-*,powerpc64*-*-*)
     6  		CROSS="$CROSS -DNATIVE_CROSS" ;;
     7  	esac
     8 -elif test "x$TARGET_SYSTEM_ROOT" != x; then
     9 +elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
    10          SYSTEM_HEADER_DIR=$build_system_header_dir
    11  fi
    12  
    13 diff -durN gcc-4.4.0.orig/gcc/configure.ac gcc-4.4.0/gcc/configure.ac
    14 --- gcc-4.4.0.orig/gcc/configure.ac	2009-03-24 18:46:03.000000000 +0100
    15 +++ gcc-4.4.0/gcc/configure.ac	2009-05-27 21:38:06.000000000 +0200
    16 @@ -1720,7 +1720,7 @@
    17  	    | powerpc*-*-*,powerpc64*-*-*)
    18  		CROSS="$CROSS -DNATIVE_CROSS" ;;
    19  	esac
    20 -elif test "x$TARGET_SYSTEM_ROOT" != x; then
    21 +elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
    22          SYSTEM_HEADER_DIR=$build_system_header_dir 
    23  fi
    24  
    25 diff -durN gcc-4.4.0.orig/gcc/unwind-dw2.c gcc-4.4.0/gcc/unwind-dw2.c
    26 --- gcc-4.4.0.orig/gcc/unwind-dw2.c	2009-04-10 01:23:07.000000000 +0200
    27 +++ gcc-4.4.0/gcc/unwind-dw2.c	2009-05-27 21:38:06.000000000 +0200
    28 @@ -329,9 +329,11 @@
    29  }
    30  #endif
    31  
    32 +#ifndef inhibit_libc
    33  #ifdef MD_UNWIND_SUPPORT
    34  #include MD_UNWIND_SUPPORT
    35  #endif
    36 +#endif
    37  
    38  /* Extract any interesting information from the CIE for the translation
    39     unit F belongs to.  Return a pointer to the byte after the augmentation,