From 484e8c1e8d43e626ee2ddbde9eb8e0af7a176aef Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 Mar 2013 09:33:04 +0400
Subject: [PATCH 27/35] 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 <raj.khem@gmail.com>
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>

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 98853b3..d0ec50f 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -11821,10 +11821,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_}"
 
@@ -11835,6 +11845,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 52cdcb8..3cf606a 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -1812,10 +1812,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_}"
 
@@ -1826,6 +1836,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.1.4