patches/gcc/4.4.0/130-cross-compile.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/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,