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