97 lines
3.2 KiB
Diff
97 lines
3.2 KiB
Diff
|
From 47071cbd4f13ff5a4974f71f359a04afcfb125da Mon Sep 17 00:00:00 2001
|
||
|
|
From: Khem Raj <raj.khem@gmail.com>
|
||
|
|
Date: Fri, 29 Mar 2013 09:17:25 +0400
|
||
|
|
Subject: [PATCH 16/47] Use the defaults.h in ${B} instead of ${S}, and t-oe in
|
||
|
|
${B}
|
||
|
|
|
||
|
|
Use the defaults.h in ${B} instead of ${S}, and t-oe in ${B}, so that
|
||
|
|
the source can be shared between gcc-cross-initial,
|
||
|
|
gcc-cross-intermediate, gcc-cross, gcc-runtime, and also the sdk build.
|
||
|
|
|
||
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||
|
|
|
||
|
|
Upstream-Status: Pending
|
||
|
|
|
||
|
|
While compiling gcc-crosssdk-initial-x86_64 on some host, there is
|
||
|
|
occasionally failure that test the existance of default.h doesn't
|
||
|
|
work, the reason is tm_include_list='** defaults.h' rather than
|
||
|
|
tm_include_list='** ./defaults.h'
|
||
|
|
|
||
|
|
So we add the test condition for this situation.
|
||
|
|
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||
|
|
---
|
||
|
|
gcc/Makefile.in | 2 +-
|
||
|
|
gcc/configure | 4 ++--
|
||
|
|
gcc/configure.ac | 4 ++--
|
||
|
|
gcc/mkconfig.sh | 4 ++--
|
||
|
|
4 files changed, 7 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
|
||
|
|
index 2411671cea3..7b590c9bbd3 100644
|
||
|
|
--- a/gcc/Makefile.in
|
||
|
|
+++ b/gcc/Makefile.in
|
||
|
|
@@ -532,7 +532,7 @@ TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@
|
||
|
|
TARGET_SYSTEM_ROOT_DEFINE = @TARGET_SYSTEM_ROOT_DEFINE@
|
||
|
|
|
||
|
|
xmake_file=@xmake_file@
|
||
|
|
-tmake_file=@tmake_file@
|
||
|
|
+tmake_file=@tmake_file@ ./t-oe
|
||
|
|
TM_ENDIAN_CONFIG=@TM_ENDIAN_CONFIG@
|
||
|
|
TM_MULTILIB_CONFIG=@TM_MULTILIB_CONFIG@
|
||
|
|
TM_MULTILIB_EXCEPTIONS_CONFIG=@TM_MULTILIB_EXCEPTIONS_CONFIG@
|
||
|
|
diff --git a/gcc/configure b/gcc/configure
|
||
|
|
index 640e4643805..b5ac1552541 100755
|
||
|
|
--- a/gcc/configure
|
||
|
|
+++ b/gcc/configure
|
||
|
|
@@ -12150,8 +12150,8 @@ for f in $tm_file; do
|
||
|
|
tm_include_list="${tm_include_list} $f"
|
||
|
|
;;
|
||
|
|
defaults.h )
|
||
|
|
- tm_file_list="${tm_file_list} \$(srcdir)/$f"
|
||
|
|
- tm_include_list="${tm_include_list} $f"
|
||
|
|
+ tm_file_list="${tm_file_list} ./$f"
|
||
|
|
+ tm_include_list="${tm_include_list} ./$f"
|
||
|
|
;;
|
||
|
|
* )
|
||
|
|
tm_file_list="${tm_file_list} \$(srcdir)/config/$f"
|
||
|
|
diff --git a/gcc/configure.ac b/gcc/configure.ac
|
||
|
|
index 9a2dae55ba2..cb1479d1ef4 100644
|
||
|
|
--- a/gcc/configure.ac
|
||
|
|
+++ b/gcc/configure.ac
|
||
|
|
@@ -1922,8 +1922,8 @@ for f in $tm_file; do
|
||
|
|
tm_include_list="${tm_include_list} $f"
|
||
|
|
;;
|
||
|
|
defaults.h )
|
||
|
|
- tm_file_list="${tm_file_list} \$(srcdir)/$f"
|
||
|
|
- tm_include_list="${tm_include_list} $f"
|
||
|
|
+ tm_file_list="${tm_file_list} ./$f"
|
||
|
|
+ tm_include_list="${tm_include_list} ./$f"
|
||
|
|
;;
|
||
|
|
* )
|
||
|
|
tm_file_list="${tm_file_list} \$(srcdir)/config/$f"
|
||
|
|
diff --git a/gcc/mkconfig.sh b/gcc/mkconfig.sh
|
||
|
|
index 9fc7b5ca734..04abecfe648 100644
|
||
|
|
--- a/gcc/mkconfig.sh
|
||
|
|
+++ b/gcc/mkconfig.sh
|
||
|
|
@@ -77,7 +77,7 @@ if [ -n "$HEADERS" ]; then
|
||
|
|
if [ $# -ge 1 ]; then
|
||
|
|
echo '#ifdef IN_GCC' >> ${output}T
|
||
|
|
for file in "$@"; do
|
||
|
|
- if test x"$file" = x"defaults.h"; then
|
||
|
|
+ if test x"$file" = x"./defaults.h" -o x"$file" = x"defaults.h"; then
|
||
|
|
postpone_defaults_h="yes"
|
||
|
|
else
|
||
|
|
echo "# include \"$file\"" >> ${output}T
|
||
|
|
@@ -109,7 +109,7 @@ esac
|
||
|
|
|
||
|
|
# If we postponed including defaults.h, add the #include now.
|
||
|
|
if test x"$postpone_defaults_h" = x"yes"; then
|
||
|
|
- echo "# include \"defaults.h\"" >> ${output}T
|
||
|
|
+ echo "# include \"./defaults.h\"" >> ${output}T
|
||
|
|
fi
|
||
|
|
|
||
|
|
# Add multiple inclusion protection guard, part two.
|
||
|
|
--
|
||
|
|
2.12.2
|
||
|
|
|