Mercurialcrosstool-ng / annotate
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.4.2/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
parent 1544 2228ea3f6b79
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@1393 
     1
 
diff -durN gcc-4.4.0.orig/gcc/configure gcc-4.4.0/gcc/configure
yann@1393 
     2
 
--- gcc-4.4.0.orig/gcc/configure	2009-03-24 18:46:03.000000000 +0100
yann@1393 
     3
 
+++ gcc-4.4.0/gcc/configure	2009-05-27 21:38:06.000000000 +0200
yann@1393 
     4
 
@@ -13997,7 +13997,7 @@
yann@1393 
     5
 
 	    | powerpc*-*-*,powerpc64*-*-*)
yann@1393 
     6
 
 		CROSS="$CROSS -DNATIVE_CROSS" ;;
yann@1393 
     7
 
 	esac
yann@1393 
     8
 
-elif test "x$TARGET_SYSTEM_ROOT" != x; then
yann@1393 
     9
 
+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
yann@1393 
    10
 
         SYSTEM_HEADER_DIR=$build_system_header_dir
yann@1393 
    11
 
 fi
yann@1393 
    12
yann@1393 
    13
 
diff -durN gcc-4.4.0.orig/gcc/configure.ac gcc-4.4.0/gcc/configure.ac
yann@1393 
    14
 
--- gcc-4.4.0.orig/gcc/configure.ac	2009-03-24 18:46:03.000000000 +0100
yann@1393 
    15
 
+++ gcc-4.4.0/gcc/configure.ac	2009-05-27 21:38:06.000000000 +0200
yann@1393 
    16
 
@@ -1720,7 +1720,7 @@
yann@1393 
    17
 
 	    | powerpc*-*-*,powerpc64*-*-*)
yann@1393 
    18
 
 		CROSS="$CROSS -DNATIVE_CROSS" ;;
yann@1393 
    19
 
 	esac
yann@1393 
    20
 
-elif test "x$TARGET_SYSTEM_ROOT" != x; then
yann@1393 
    21
 
+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
yann@1393 
    22
 
         SYSTEM_HEADER_DIR=$build_system_header_dir
yann@1393 
    23
 
 fi
yann@1393 
    24
yann@1393 
    25
 
diff -durN gcc-4.4.0.orig/gcc/unwind-dw2.c gcc-4.4.0/gcc/unwind-dw2.c
yann@1393 
    26
 
--- gcc-4.4.0.orig/gcc/unwind-dw2.c	2009-04-10 01:23:07.000000000 +0200
yann@1393 
    27
 
+++ gcc-4.4.0/gcc/unwind-dw2.c	2009-05-27 21:38:06.000000000 +0200
yann@1393 
    28
 
@@ -329,9 +329,11 @@
yann@1393 
    29
 
 }
yann@1393 
    30
 
 #endif
yann@1393 
    31
yann@1393 
    32
 
+#ifndef inhibit_libc
yann@1393 
    33
 
 #ifdef MD_UNWIND_SUPPORT
yann@1393 
    34
 
 #include MD_UNWIND_SUPPORT
yann@1393 
    35
 
 #endif
yann@1393 
    36
 
+#endif
yann@1393 
    37
yann@1393 
    38
 
 /* Extract any interesting information from the CIE for the translation
yann@1393 
    39
 
    unit F belongs to.  Return a pointer to the byte after the augmentation,
crosstool-ng