patches/glibc/2.3.6/290-gcc-4.3-include.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 GCC trunk now has multiple internal headers directories, one
     2 containing the self-contained GCC-provided headers and one containing
     3 the <limits.h> (not self-contained but including libc's <limits.h> or
     4 a fixed version thereof) and the fixed headers; more such directories
     5 may be added in future.
     6 
     7 When glibc uses -nostdinc, it needs to use -isystem options for all
     8 these internal directories.  This patch teaches it about the
     9 include-fixed directory (and is harmless with old GCC versions without
    10 that directory).
    11 
    12 2007-03-18  Joseph Myers  <joseph@codesourcery.com>
    13 
    14 	* configure.in: Also pass -isystem option for GCC's include-fixed
    15 	directory.
    16 	* configure: Regenerate.
    17 
    18 
    19 --- glibc-2.3.6.ori/configure.in	2008-10-22 14:55:58.000000000 +0200
    20 +++ glibc-2.3.6/configure.in	2008-10-22 14:56:15.000000000 +0200
    21 @@ -804,7 +804,7 @@
    22  # thing on a system that doesn't need fixincludes.  (Not presently a problem.)
    23  if test -n "$sysheaders"; then
    24    ccheaders=`$CC -print-file-name=include`
    25 -  SYSINCLUDES="-nostdinc -isystem $ccheaders \
    26 +  SYSINCLUDES="-nostdinc -isystem $ccheaders -isystem $ccheaders-fixed \
    27  -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`"
    28  fi
    29  AC_SUBST(SYSINCLUDES)
    30 --- glibc-2.3.6.ori/configure	2008-10-22 15:11:37.000000000 +0200
    31 +++ glibc-2.3.6/configure	2008-10-22 15:11:54.000000000 +0200
    32 @@ -4438,7 +4438,7 @@
    33  # thing on a system that doesn't need fixincludes.  (Not presently a problem.)
    34  if test -n "$sysheaders"; then
    35    ccheaders=`$CC -print-file-name=include`
    36 -  SYSINCLUDES="-nostdinc -isystem $ccheaders \
    37 +  SYSINCLUDES="-nostdinc -isystem $ccheaders -isystem $ccheaders-fixed \
    38  -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`"
    39  fi
    40