| author | Zhenqiang Chen <zhenqiang.chen@linaro.org> |
| Wed Dec 07 16:15:50 2011 +0800 (2011-12-07) | |
| branch | 1.13 |
| changeset 2844 | 78145960027e |
| permissions | -rw-r--r-- |
| yann@2149 | 1 |
diff -durN gcc-4.4.5.orig/gcc/configure gcc-4.4.5/gcc/configure |
| yann@2149 | 2 |
--- gcc-4.4.5.orig/gcc/configure 2010-06-20 17:43:53.000000000 +0200 |
| yann@2149 | 3 |
+++ gcc-4.4.5/gcc/configure 2010-10-09 22:58:36.000000000 +0200 |
| yann@2149 | 4 |
@@ -13997,7 +13997,7 @@ |
| yann@2149 | 5 |
| powerpc*-*-*,powerpc64*-*-*) |
| yann@2149 | 6 |
CROSS="$CROSS -DNATIVE_CROSS" ;; |
| yann@2149 | 7 |
esac |
| yann@2149 | 8 |
-elif test "x$TARGET_SYSTEM_ROOT" != x; then |
| yann@2149 | 9 |
+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then |
| yann@2149 | 10 |
SYSTEM_HEADER_DIR=$build_system_header_dir |
| yann@2149 | 11 |
fi |
| yann@2149 | 12 |
|
| yann@2149 | 13 |
diff -durN gcc-4.4.5.orig/gcc/configure.ac gcc-4.4.5/gcc/configure.ac |
| yann@2149 | 14 |
--- gcc-4.4.5.orig/gcc/configure.ac 2010-06-20 17:43:53.000000000 +0200 |
| yann@2149 | 15 |
+++ gcc-4.4.5/gcc/configure.ac 2010-10-09 22:58:36.000000000 +0200 |
| yann@2149 | 16 |
@@ -1720,7 +1720,7 @@ |
| yann@2149 | 17 |
| powerpc*-*-*,powerpc64*-*-*) |
| yann@2149 | 18 |
CROSS="$CROSS -DNATIVE_CROSS" ;; |
| yann@2149 | 19 |
esac |
| yann@2149 | 20 |
-elif test "x$TARGET_SYSTEM_ROOT" != x; then |
| yann@2149 | 21 |
+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then |
| yann@2149 | 22 |
SYSTEM_HEADER_DIR=$build_system_header_dir |
| yann@2149 | 23 |
fi |
| yann@2149 | 24 |
|
| yann@2149 | 25 |
diff -durN gcc-4.4.5.orig/gcc/unwind-dw2.c gcc-4.4.5/gcc/unwind-dw2.c |
| yann@2149 | 26 |
--- gcc-4.4.5.orig/gcc/unwind-dw2.c 2010-01-20 09:39:18.000000000 +0100 |
| yann@2149 | 27 |
+++ gcc-4.4.5/gcc/unwind-dw2.c 2010-10-09 22:58:36.000000000 +0200 |
| yann@2149 | 28 |
@@ -329,9 +329,11 @@ |
| yann@2149 | 29 |
} |
| yann@2149 | 30 |
#endif |
| yann@2149 | 31 |
|
| yann@2149 | 32 |
+#ifndef inhibit_libc |
| yann@2149 | 33 |
#ifdef MD_UNWIND_SUPPORT |
| yann@2149 | 34 |
#include MD_UNWIND_SUPPORT |
| yann@2149 | 35 |
#endif |
| yann@2149 | 36 |
+#endif |
| yann@2149 | 37 |
|
| yann@2149 | 38 |
/* Extract any interesting information from the CIE for the translation |
| yann@2149 | 39 |
unit F belongs to. Return a pointer to the byte after the augmentation, |