patches/gcc/4.4.4/130-cross-compile.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Jul 12 23:52:24 2011 +0200 (2011-07-12)
branch1.11
changeset 2558 b7317d2fe0e9
parent 1948 d341be24dc68
permissions -rw-r--r--
scripts, cc/gcc: do not fail on existing symlinks or build.log

If the user builds a toolchain over an existing one, so, without removing
CT_PREFIX_DIR, the build fails as the symlinks already exist, as does the
build.log.

This can also happen (for build.log) if the user first ran in download-
or extract-only.

Patch (with no SoB) originally from:
Phil Wilshire <phil.wilshire@overturenetworks.com>

Modified by me as it did not apply cleanly.

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