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. Upstream-Status: Inappropriate [configuration] Signed-off-by: Constantin Musca Index: gcc-4.7.2/gcc/configure =================================================================== --- gcc-4.7.2.orig/gcc/configure +++ gcc-4.7.2/gcc/configure @@ -11717,10 +11717,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_}" @@ -11731,6 +11741,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" Index: gcc-4.7.2/gcc/configure.ac =================================================================== --- gcc-4.7.2.orig/gcc/configure.ac +++ gcc-4.7.2/gcc/configure.ac @@ -1701,10 +1701,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_}" @@ -1715,6 +1725,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"