1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192 |
- From 5455fc1de74897a27c1199dc5611ec02243e24af 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] 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 31ff95500c9..a8277254696 100644
- --- a/gcc/Makefile.in
- +++ b/gcc/Makefile.in
- @@ -553,7 +553,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 dc2d59701ad..3fc0e2f5813 100755
- --- a/gcc/configure
- +++ b/gcc/configure
- @@ -13381,8 +13381,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 36ce78924de..46de496b256 100644
- --- a/gcc/configure.ac
- +++ b/gcc/configure.ac
- @@ -2332,8 +2332,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 91cc43f69ff..8de33713cd8 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
- @@ -106,7 +106,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.
|