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