patches/gcc/4.3.1/130-cross-compile.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Wed Sep 07 01:22:37 2011 +0200 (2011-09-07)
branch1.12
changeset 2655 3ba359965eb0
parent 746 b150d6f590fc
permissions -rw-r--r--
scripts: fix sysroot prefix dir

The sysroot prefix dir was broken in #4960f5d9f829 due to a mishap
when making the out-of-sysroot lib/ symlink: the './' was mistakenly
changed into a single '.' .

Although Jonathan suggested restoring the missing '/' to restore it to
normal operation, I prefered using an explicit pushd/popd to be extra
sure of the symlink location and target, along with a fix in the sysroot
relative directory calculation.

Reported-by: Jonathan Grundon <JGrundon@xos.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
(transplanted from e5fc5c9ea78af28d05244ba09cf718cf75470903)
yann@552
     1
Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/08_all_gcc-4.1-cross-compile.patch
yann@552
     2
Some notes on the 'bootstrap with or without libc headers' debate:
yann@552
     3
http://linuxfromscratch.org/pipermail/lfs-dev/2005-July/052409.html
yann@552
     4
http://gcc.gnu.org/ml/gcc/2005-07/msg01195.html
yann@552
     5
yann@552
     6
diff -durN gcc-4.3.1.orig/gcc/configure gcc-4.3.1/gcc/configure
yann@552
     7
--- gcc-4.3.1.orig/gcc/configure	2008-05-21 10:54:15.000000000 +0200
yann@552
     8
+++ gcc-4.3.1/gcc/configure	2008-06-10 14:57:42.000000000 +0200
yann@552
     9
@@ -13283,7 +13283,7 @@
yann@552
    10
 	    | powerpc*-*-*,powerpc64*-*-*)
yann@552
    11
 		CROSS="$CROSS -DNATIVE_CROSS" ;;
yann@552
    12
 	esac
yann@552
    13
-elif test "x$TARGET_SYSTEM_ROOT" != x; then
yann@552
    14
+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
yann@552
    15
         SYSTEM_HEADER_DIR=$build_system_header_dir
yann@552
    16
 fi
yann@552
    17
 
yann@552
    18
diff -durN gcc-4.3.1.orig/gcc/configure.ac gcc-4.3.1/gcc/configure.ac
yann@552
    19
--- gcc-4.3.1.orig/gcc/configure.ac	2008-05-21 10:54:15.000000000 +0200
yann@552
    20
+++ gcc-4.3.1/gcc/configure.ac	2008-06-10 14:57:42.000000000 +0200
yann@552
    21
@@ -1749,7 +1749,7 @@
yann@552
    22
 	    | powerpc*-*-*,powerpc64*-*-*)
yann@552
    23
 		CROSS="$CROSS -DNATIVE_CROSS" ;;
yann@552
    24
 	esac
yann@552
    25
-elif test "x$TARGET_SYSTEM_ROOT" != x; then
yann@552
    26
+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
yann@552
    27
         SYSTEM_HEADER_DIR=$build_system_header_dir 
yann@552
    28
 fi
yann@552
    29
 
yann@552
    30
diff -durN gcc-4.3.1.orig/gcc/unwind-dw2.c gcc-4.3.1/gcc/unwind-dw2.c
yann@552
    31
--- gcc-4.3.1.orig/gcc/unwind-dw2.c	2007-07-25 20:14:57.000000000 +0200
yann@552
    32
+++ gcc-4.3.1/gcc/unwind-dw2.c	2008-06-10 14:57:42.000000000 +0200
yann@552
    33
@@ -334,9 +334,11 @@
yann@552
    34
 }
yann@552
    35
 #endif
yann@552
    36
 
yann@552
    37
+#ifndef inhibit_libc
yann@552
    38
 #ifdef MD_UNWIND_SUPPORT
yann@552
    39
 #include MD_UNWIND_SUPPORT
yann@552
    40
 #endif
yann@552
    41
+#endif
yann@552
    42
 
yann@552
    43
 /* Extract any interesting information from the CIE for the translation
yann@552
    44
    unit F belongs to.  Return a pointer to the byte after the augmentation,