patches/gcc/4.4.1/130-cross-compile.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Thu Dec 27 12:45:22 2012 +0100 (2012-12-27)
changeset 3152 b286c7993be5
parent 1393 b432bd628b10
permissions -rw-r--r--
scripts/addToolsVersion: properly handle .in vs. .in.2

While most components have their version in the .in file, some
have it in the .in.2 (eg. elf2flt).

Currently, to handle this case, we indiscriminately munge both files,
but this is wrong: in the elf2flt case, if we add a binutils version,
we do not want it to be added to elf2flt, and conversely.

So, for each tool, we need to explicitly know what file to munge.

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