patches/gcc/4.4.0/310-uclibc-conf.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>
yann@1393
     1
diff -durN gcc-4.4.0.orig/contrib/regression/objs-gcc.sh gcc-4.4.0/contrib/regression/objs-gcc.sh
yann@1393
     2
--- gcc-4.4.0.orig/contrib/regression/objs-gcc.sh	2009-04-10 01:23:07.000000000 +0200
yann@1393
     3
+++ gcc-4.4.0/contrib/regression/objs-gcc.sh	2009-05-27 21:38:53.000000000 +0200
yann@1393
     4
@@ -106,6 +106,10 @@
yann@1393
     5
  then
yann@1393
     6
   make all-gdb all-dejagnu all-ld || exit 1
yann@1393
     7
   make install-gdb install-dejagnu install-ld || exit 1
yann@1393
     8
+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
yann@1393
     9
+ then
yann@1393
    10
+  make all-gdb all-dejagnu all-ld || exit 1
yann@1393
    11
+  make install-gdb install-dejagnu install-ld || exit 1
yann@1393
    12
 elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
yann@1393
    13
   make bootstrap || exit 1
yann@1393
    14
   make install || exit 1
yann@1393
    15
diff -durN gcc-4.4.0.orig/libjava/classpath/ltconfig gcc-4.4.0/libjava/classpath/ltconfig
yann@1393
    16
--- gcc-4.4.0.orig/libjava/classpath/ltconfig	2007-06-04 01:18:43.000000000 +0200
yann@1393
    17
+++ gcc-4.4.0/libjava/classpath/ltconfig	2009-05-27 21:38:53.000000000 +0200
yann@1393
    18
@@ -603,7 +603,7 @@
yann@1393
    19
 
yann@1393
    20
 # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
yann@1393
    21
 case $host_os in
yann@1393
    22
-linux-gnu*) ;;
yann@1393
    23
+linux-gnu*|linux-uclibc*) ;;
yann@1393
    24
 linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
yann@1393
    25
 esac
yann@1393
    26
 
yann@1393
    27
@@ -1251,7 +1251,7 @@
yann@1393
    28
   ;;
yann@1393
    29
 
yann@1393
    30
 # This must be Linux ELF.
yann@1393
    31
-linux-gnu*)
yann@1393
    32
+linux*)
yann@1393
    33
   version_type=linux
yann@1393
    34
   need_lib_prefix=no
yann@1393
    35
   need_version=no