patches/gcc/4.3.2/330-unwind-for-uClibc.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun Sep 12 23:51:25 2010 +0200 (2010-09-12)
changeset 2123 ff2181adbd28
parent 766 717efd8b78b4
permissions -rw-r--r--
cc/gcc: disable complibs if not selected

Force gcc to not link with some companion libraries when
there are not needed (because selected-out).

There is no option to tell gcc *not* to build the Graphite and/or
LTO stuff. They *will* be built if gcc finds the suitable companion
libraries. If we do not provide them, but the host has them, then
gcc *will* find them, and link with them.

Consider the following:
- host has suitable PPL and CLooG (eg. Debian Squeeze)
- user wants to build gcc>=4.4
- user de-selects GRAPHITE
- gcc will find the hosts PPL and CLooG, and will use them
- the user moves the toolchain to an older host that does
not have them (eg. Debian Lenny)
- the toolchain fails, when it was properly setup not to

So, explicitly tell gcc *not* to use unneeded companion libs.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
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"