patches/gcc/4.4.4/130-cross-compile.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Fri Oct 08 23:37:12 2010 +0200 (2010-10-08)
branch1.8
changeset 2150 f97a8ad2b172
child 2148 ada9128c98b8
permissions -rw-r--r--
cc/gcc: fix C++ headers location

In case we build the C++ compiler, we have to tell gcc where to put the C++
headers, or else it will try to # put it in prefix/tuple/include, which we
make a symlink to sysroot/usr/include during the build, and that we delete
(the symlink!) after the build, but gcc will not look in sysroot/usr/inlcude
for C++ headers by default.

Implements a fix suggested by: Bryan Hundven <bryanhundven@gmail.com>

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