patches/gcc/4.3.2/330-unwind-for-uClibc.patch
author Johannes Stezenbach <js@sig21.net>
Thu Jul 29 19:47:16 2010 +0200 (2010-07-29)
changeset 2045 fdaa6c7f6dea
parent 766 717efd8b78b4
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@766
     1
diff -durN gcc-4.3.1.orig/gcc/config/t-linux-uclibc gcc-4.3.1/gcc/config/t-linux-uclibc
yann@766
     2
--- gcc-4.3.1.orig/gcc/config/t-linux-uclibc	1970-01-01 01:00:00.000000000 +0100
yann@766
     3
+++ gcc-4.3.1/gcc/config/t-linux-uclibc	2008-07-29 13:07:15.000000000 +0200
yann@766
     4
@@ -0,0 +1,5 @@
yann@766
     5
+# Remove glibc specific files added in t-linux
yann@766
     6
+SHLIB_MAPFILES := $(filter-out $(srcdir)/config/libgcc-glibc.ver, $(SHLIB_MAPFILES))
yann@766
     7
+
yann@766
     8
+# Use unwind-dw2-fde instead of unwind-dw2-fde-glibc
yann@766
     9
+LIB2ADDEH := $(subst unwind-dw2-fde-glibc.c,unwind-dw2-fde.c,$(LIB2ADDEH))
yann@766
    10
diff -durN gcc-4.3.1.orig/gcc/config.gcc gcc-4.3.1/gcc/config.gcc
yann@766
    11
--- gcc-4.3.1.orig/gcc/config.gcc	2008-07-29 13:11:02.000000000 +0200
yann@766
    12
+++ gcc-4.3.1/gcc/config.gcc	2008-07-29 13:10:05.000000000 +0200
yann@766
    13
@@ -2651,6 +2651,12 @@
yann@766
    14
 	;;
yann@766
    15
 esac
yann@766
    16
 
yann@766
    17
+# Rather than hook into each target, just do it after all the linux
yann@766
    18
+# targets have been processed
yann@766
    19
+case ${target} in
yann@766
    20
+  *-linux-uclibc*) tm_defines="${tm_defines} USE_UCLIBC" ; tmake_file="${tmake_file} t-linux-uclibc";;
yann@766
    21
+esac
yann@766
    22
+
yann@766
    23
 case ${target} in
yann@766
    24
 i[34567]86-*-linux*aout* | i[34567]86-*-linux*libc1)
yann@766
    25
 	tmake_file="${tmake_file} i386/t-gmm_malloc"