1*4882a593SmuzhiyunFrom 1766cf28fd7d917df510b1c262c47211b9ea70fa Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Khem Raj <raj.khem@gmail.com> 3*4882a593SmuzhiyunDate: Fri, 29 Mar 2013 09:17:25 +0400 4*4882a593SmuzhiyunSubject: [PATCH] Use the defaults.h in ${B} instead of ${S}, and t-oe in ${B} 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunUse the defaults.h in ${B} instead of ${S}, and t-oe in ${B}, so that 7*4882a593Smuzhiyunthe source can be shared between gcc-cross-initial, 8*4882a593Smuzhiyungcc-cross-intermediate, gcc-cross, gcc-runtime, and also the sdk build. 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunSigned-off-by: Khem Raj <raj.khem@gmail.com> 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunUpstream-Status: Pending 13*4882a593Smuzhiyun 14*4882a593SmuzhiyunWhile compiling gcc-crosssdk-initial-x86_64 on some host, there is 15*4882a593Smuzhiyunoccasionally failure that test the existance of default.h doesn't 16*4882a593Smuzhiyunwork, the reason is tm_include_list='** defaults.h' rather than 17*4882a593Smuzhiyuntm_include_list='** ./defaults.h' 18*4882a593Smuzhiyun 19*4882a593SmuzhiyunSo we add the test condition for this situation. 20*4882a593SmuzhiyunSigned-off-by: Hongxu Jia <hongxu.jia@windriver.com> 21*4882a593Smuzhiyun--- 22*4882a593Smuzhiyun gcc/Makefile.in | 2 +- 23*4882a593Smuzhiyun gcc/configure | 4 ++-- 24*4882a593Smuzhiyun gcc/configure.ac | 4 ++-- 25*4882a593Smuzhiyun gcc/mkconfig.sh | 4 ++-- 26*4882a593Smuzhiyun 4 files changed, 7 insertions(+), 7 deletions(-) 27*4882a593Smuzhiyun 28*4882a593Smuzhiyundiff --git a/gcc/Makefile.in b/gcc/Makefile.in 29*4882a593Smuzhiyunindex 7bfd6ce653f..95962ae37b6 100644 30*4882a593Smuzhiyun--- a/gcc/Makefile.in 31*4882a593Smuzhiyun+++ b/gcc/Makefile.in 32*4882a593Smuzhiyun@@ -552,7 +552,7 @@ TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@ 33*4882a593Smuzhiyun TARGET_SYSTEM_ROOT_DEFINE = @TARGET_SYSTEM_ROOT_DEFINE@ 34*4882a593Smuzhiyun 35*4882a593Smuzhiyun xmake_file=@xmake_file@ 36*4882a593Smuzhiyun-tmake_file=@tmake_file@ 37*4882a593Smuzhiyun+tmake_file=@tmake_file@ ./t-oe 38*4882a593Smuzhiyun TM_ENDIAN_CONFIG=@TM_ENDIAN_CONFIG@ 39*4882a593Smuzhiyun TM_MULTILIB_CONFIG=@TM_MULTILIB_CONFIG@ 40*4882a593Smuzhiyun TM_MULTILIB_EXCEPTIONS_CONFIG=@TM_MULTILIB_EXCEPTIONS_CONFIG@ 41*4882a593Smuzhiyundiff --git a/gcc/configure b/gcc/configure 42*4882a593Smuzhiyunindex d7445339f9a..f5b99d1cf7d 100755 43*4882a593Smuzhiyun--- a/gcc/configure 44*4882a593Smuzhiyun+++ b/gcc/configure 45*4882a593Smuzhiyun@@ -13131,8 +13131,8 @@ for f in $tm_file; do 46*4882a593Smuzhiyun tm_include_list="${tm_include_list} $f" 47*4882a593Smuzhiyun ;; 48*4882a593Smuzhiyun defaults.h ) 49*4882a593Smuzhiyun- tm_file_list="${tm_file_list} \$(srcdir)/$f" 50*4882a593Smuzhiyun- tm_include_list="${tm_include_list} $f" 51*4882a593Smuzhiyun+ tm_file_list="${tm_file_list} ./$f" 52*4882a593Smuzhiyun+ tm_include_list="${tm_include_list} ./$f" 53*4882a593Smuzhiyun ;; 54*4882a593Smuzhiyun * ) 55*4882a593Smuzhiyun tm_file_list="${tm_file_list} \$(srcdir)/config/$f" 56*4882a593Smuzhiyundiff --git a/gcc/configure.ac b/gcc/configure.ac 57*4882a593Smuzhiyunindex fe488f2232b..29005f6d18f 100644 58*4882a593Smuzhiyun--- a/gcc/configure.ac 59*4882a593Smuzhiyun+++ b/gcc/configure.ac 60*4882a593Smuzhiyun@@ -2294,8 +2294,8 @@ for f in $tm_file; do 61*4882a593Smuzhiyun tm_include_list="${tm_include_list} $f" 62*4882a593Smuzhiyun ;; 63*4882a593Smuzhiyun defaults.h ) 64*4882a593Smuzhiyun- tm_file_list="${tm_file_list} \$(srcdir)/$f" 65*4882a593Smuzhiyun- tm_include_list="${tm_include_list} $f" 66*4882a593Smuzhiyun+ tm_file_list="${tm_file_list} ./$f" 67*4882a593Smuzhiyun+ tm_include_list="${tm_include_list} ./$f" 68*4882a593Smuzhiyun ;; 69*4882a593Smuzhiyun * ) 70*4882a593Smuzhiyun tm_file_list="${tm_file_list} \$(srcdir)/config/$f" 71*4882a593Smuzhiyundiff --git a/gcc/mkconfig.sh b/gcc/mkconfig.sh 72*4882a593Smuzhiyunindex c49acd8f7e4..a0a657bdbb9 100644 73*4882a593Smuzhiyun--- a/gcc/mkconfig.sh 74*4882a593Smuzhiyun+++ b/gcc/mkconfig.sh 75*4882a593Smuzhiyun@@ -77,7 +77,7 @@ if [ -n "$HEADERS" ]; then 76*4882a593Smuzhiyun if [ $# -ge 1 ]; then 77*4882a593Smuzhiyun echo '#ifdef IN_GCC' >> ${output}T 78*4882a593Smuzhiyun for file in "$@"; do 79*4882a593Smuzhiyun- if test x"$file" = x"defaults.h"; then 80*4882a593Smuzhiyun+ if test x"$file" = x"./defaults.h" -o x"$file" = x"defaults.h"; then 81*4882a593Smuzhiyun postpone_defaults_h="yes" 82*4882a593Smuzhiyun else 83*4882a593Smuzhiyun echo "# include \"$file\"" >> ${output}T 84*4882a593Smuzhiyun@@ -106,7 +106,7 @@ esac 85*4882a593Smuzhiyun 86*4882a593Smuzhiyun # If we postponed including defaults.h, add the #include now. 87*4882a593Smuzhiyun if test x"$postpone_defaults_h" = x"yes"; then 88*4882a593Smuzhiyun- echo "# include \"defaults.h\"" >> ${output}T 89*4882a593Smuzhiyun+ echo "# include \"./defaults.h\"" >> ${output}T 90*4882a593Smuzhiyun fi 91*4882a593Smuzhiyun 92*4882a593Smuzhiyun # Add multiple inclusion protection guard, part two. 93