| author | Darcy Watkins <dwatkins@tranzeo.com> |
| Thu Aug 05 18:19:07 2010 +0200 (2010-08-05) | |
| branch | 1.8 |
| changeset 2073 | a3b7a63dce01 |
| parent 1611 | e2516bba8fe5 |
| permissions | -rw-r--r-- |
| 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, |