1 files changed, 87 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.7/use-ml-conf-files-from-B.patch b/meta/recipes-devtools/gcc/gcc-4.7/use-ml-conf-files-from-B.patch
new file mode 100644
index 0000000000..4d229247a4
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-4.7/use-ml-conf-files-from-B.patch
@@ -0,0 +1,87 @@
+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 <constantinx.musca@intel.com>
+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"

diff --git a/meta/recipes-devtools/gcc/gcc-4.7/use-ml-conf-files-from-B.patch b/meta/recipes-devtools/gcc/gcc-4.7/use-ml-conf-files-from-B.patch new file mode 100644 index 0000000000..4d229247a4 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.7/use-ml-conf-files-from-B.patch
@@ -0,0 +1,87 @@
	1	Use the multilib config files from ${B} instead of using the ones from ${S}
	2	so that the source can be shared between gcc-cross-initial,
	3	gcc-cross-intermediate, gcc-cross, gcc-runtime, and also the sdk build.
	4
	5	Upstream-Status: Inappropriate [configuration]
	6	Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
	7
	8	Index: gcc-4.7.2/gcc/configure
	9	===================================================================
	10	--- gcc-4.7.2.orig/gcc/configure
	11	+++ gcc-4.7.2/gcc/configure
	12	@@ -11717,10 +11717,20 @@ done
	13	tmake_file_=
	14	for f in ${tmake_file}
	15	do
	16	- if test -f ${srcdir}/config/$f
	17	- then
	18	- tmake_file_="${tmake_file_} \$(srcdir)/config/$f"
	19	- fi
	20	+ case $f in
	21	+ */t-linux64 )
	22	+ if test -f ./config/$f
	23	+ then
	24	+ tmake_file_="${tmake_file_} ./config/$f"
	25	+ fi
	26	+ ;;
	27	+ * )
	28	+ if test -f ${srcdir}/config/$f
	29	+ then
	30	+ tmake_file_="${tmake_file_} \$(srcdir)/config/$f"
	31	+ fi
	32	+ ;;
	33	+ esac
	34	done
	35	tmake_file="${tmake_file_}"
	36
	37	@@ -11731,6 +11741,10 @@ tm_file_list="options.h"
	38	tm_include_list="options.h insn-constants.h"
	39	for f in $tm_file; do
	40	case $f in
	41	+ */linux64.h )
	42	+ tm_file_list="${tm_file_list} ./config/$f"
	43	+ tm_include_list="${tm_include_list} ./config/$f"
	44	+ ;;
	45	./* )
	46	f=`echo $f \| sed 's/^..//'`
	47	tm_file_list="${tm_file_list} $f"
	48	Index: gcc-4.7.2/gcc/configure.ac
	49	===================================================================
	50	--- gcc-4.7.2.orig/gcc/configure.ac
	51	+++ gcc-4.7.2/gcc/configure.ac
	52	@@ -1701,10 +1701,20 @@ done
	53	tmake_file_=
	54	for f in ${tmake_file}
	55	do
	56	- if test -f ${srcdir}/config/$f
	57	- then
	58	- tmake_file_="${tmake_file_} \$(srcdir)/config/$f"
	59	- fi
	60	+ case $f in
	61	+ */t-linux64 )
	62	+ if test -f ./config/$f
	63	+ then
	64	+ tmake_file_="${tmake_file_} ./config/$f"
	65	+ fi
	66	+ ;;
	67	+ * )
	68	+ if test -f ${srcdir}/config/$f
	69	+ then
	70	+ tmake_file_="${tmake_file_} \$(srcdir)/config/$f"
	71	+ fi
	72	+ ;;
	73	+ esac
	74	done
	75	tmake_file="${tmake_file_}"
	76
	77	@@ -1715,6 +1725,10 @@ tm_file_list="options.h"
	78	tm_include_list="options.h insn-constants.h"
	79	for f in $tm_file; do
	80	case $f in
	81	+ */linux64.h )
	82	+ tm_file_list="${tm_file_list} ./config/$f"
	83	+ tm_include_list="${tm_include_list} ./config/$f"
	84	+ ;;
	85	./* )
	86	f=`echo $f \| sed 's/^..//'`
	87	tm_file_list="${tm_file_list} $f"