From 7effc632d65c2d72bf6fa32a219ec2f82fef9405 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Mar 2013 09:33:04 +0400 Subject: [PATCH 16/39] Use the multilib config files from ${B} instead of using the ones from ${S} Use the multilib config files from ${B} instead of using the ones from ${S} 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 Signed-off-by: Constantin Musca Upstream-Status: Inappropriate [configuration] --- gcc/configure | 22 ++++++++++++++++++---- gcc/configure.ac | 22 ++++++++++++++++++---- 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/gcc/configure b/gcc/configure index 52f52b0ec86..a5f208af7cf 100755 --- a/gcc/configure +++ b/gcc/configure @@ -12322,10 +12322,20 @@ done tmake_file_= for f in ${tmake_file} do - if test -f ${srcdir}/config/$f - then - tmake_file_="${tmake_file_} \$(srcdir)/config/$f" - fi + case $f in + */t-linux64 ) + if test -f ./config/$f + then + tmake_file_="${tmake_file_} ./config/$f" + fi + ;; + * ) + if test -f ${srcdir}/config/$f + then + tmake_file_="${tmake_file_} \$(srcdir)/config/$f" + fi + ;; + esac done tmake_file="${tmake_file_}" @@ -12336,6 +12346,10 @@ tm_file_list="options.h" tm_include_list="options.h insn-constants.h" for f in $tm_file; do case $f in + */linux64.h ) + tm_file_list="${tm_file_list} ./config/$f" + tm_include_list="${tm_include_list} ./config/$f" + ;; ./* ) f=`echo $f | sed 's/^..//'` tm_file_list="${tm_file_list} $f" diff --git a/gcc/configure.ac b/gcc/configure.ac index 242ad28ec83..b7a7ead1c02 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -1948,10 +1948,20 @@ done tmake_file_= for f in ${tmake_file} do - if test -f ${srcdir}/config/$f - then - tmake_file_="${tmake_file_} \$(srcdir)/config/$f" - fi + case $f in + */t-linux64 ) + if test -f ./config/$f + then + tmake_file_="${tmake_file_} ./config/$f" + fi + ;; + * ) + if test -f ${srcdir}/config/$f + then + tmake_file_="${tmake_file_} \$(srcdir)/config/$f" + fi + ;; + esac done tmake_file="${tmake_file_}" @@ -1962,6 +1972,10 @@ tm_file_list="options.h" tm_include_list="options.h insn-constants.h" for f in $tm_file; do case $f in + */linux64.h ) + tm_file_list="${tm_file_list} ./config/$f" + tm_include_list="${tm_include_list} ./config/$f" + ;; ./* ) f=`echo $f | sed 's/^..//'` tm_file_list="${tm_file_list} $f" -- 2.25.1