1 files changed, 19 insertions, 22 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0019-64-bit-multilib-hack.patch b/meta/recipes-devtools/gcc/gcc-4.8/0019-64-bit-multilib-hack.patch
index 51f4dba396..a975cfb130 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8/0019-64-bit-multilib-hack.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.8/0019-64-bit-multilib-hack.patch
@@ -31,10 +31,10 @@ Upstream-Status: Pending
 gcc/config/rs6000/t-linux64 |    5 ++---
 3 files changed, 7 insertions(+), 14 deletions(-)
-diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64
+Index: gcc-4.8.4/gcc/config/i386/t-linux64
-index bcea0c6..eb004d7 100644
+===================================================================
--- a/gcc/config/i386/t-linux64
+--- gcc-4.8.4.orig/gcc/config/i386/t-linux64
-+++ b/gcc/config/i386/t-linux64
+++ gcc-4.8.4/gcc/config/i386/t-linux64
 @@ -32,7 +32,5 @@
 #
 comma=,
@@ -45,10 +45,10 @@ index bcea0c6..eb004d7 100644
 -MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
 +MULTILIB_DIRNAMES = . .
 +MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir))
-diff --git a/gcc/config/mips/t-linux64 b/gcc/config/mips/t-linux64
+Index: gcc-4.8.4/gcc/config/mips/t-linux64
-index bdbbd4f..16a6366 100644
+===================================================================
--- a/gcc/config/mips/t-linux64
+--- gcc-4.8.4.orig/gcc/config/mips/t-linux64
-+++ b/gcc/config/mips/t-linux64
+++ gcc-4.8.4/gcc/config/mips/t-linux64
 @@ -17,10 +17,6 @@
 # <http://www.gnu.org/licenses/>.
 
@@ -63,20 +63,17 @@ index bdbbd4f..16a6366 100644
 +MULTILIB_DIRNAMES = . . .
 +MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir))
 +
-diff --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64
+Index: gcc-4.8.4/gcc/config/rs6000/t-linux64
-index 9175de2..3971019 100644
+===================================================================
--- a/gcc/config/rs6000/t-linux64
+--- gcc-4.8.4.orig/gcc/config/rs6000/t-linux64
-+++ b/gcc/config/rs6000/t-linux64
+++ gcc-4.8.4/gcc/config/rs6000/t-linux64
 @@ -26,7 +26,6 @@
 # MULTILIB_OSDIRNAMES according to what is found on the target.
 
- MULTILIB_OPTIONS        = m64/m32
+ MULTILIB_OPTIONS    := m64/m32
-MULTILIB_DIRNAMES       = 64 32
+-MULTILIB_DIRNAMES   := 64 32
-+MULTILIB_DIRNAMES       = . .
+MULTILIB_DIRNAMES   := . .
- MULTILIB_EXTRA_OPTS     = fPIC
+ MULTILIB_EXTRA_OPTS := 
-MULTILIB_OSDIRNAMES    = ../lib64$(call if_multiarch,:powerpc64-linux-gnu)
+-MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
-MULTILIB_OSDIRNAMES    += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu)
+-MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu)
-+MULTILIB_OSDIRNAMES    = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir))
+MULTILIB_OSDIRNAMES := ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir))
-- 
-1.7.10.4

diff --git a/meta/recipes-devtools/gcc/gcc-4.8/0019-64-bit-multilib-hack.patch b/meta/recipes-devtools/gcc/gcc-4.8/0019-64-bit-multilib-hack.patch index 51f4dba396..a975cfb130 100644 --- a/meta/recipes-devtools/gcc/gcc-4.8/0019-64-bit-multilib-hack.patch +++ b/meta/recipes-devtools/gcc/gcc-4.8/0019-64-bit-multilib-hack.patch
@@ -31,10 +31,10 @@ Upstream-Status: Pending
31	gcc/config/rs6000/t-linux64 \| 5 ++---	31	gcc/config/rs6000/t-linux64 \| 5 ++---
32	3 files changed, 7 insertions(+), 14 deletions(-)	32	3 files changed, 7 insertions(+), 14 deletions(-)
33		33
34	diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64	34	Index: gcc-4.8.4/gcc/config/i386/t-linux64
35	index bcea0c6..eb004d7 100644	35	===================================================================
36	--- a/gcc/config/i386/t-linux64	36	--- gcc-4.8.4.orig/gcc/config/i386/t-linux64
37	+++ b/gcc/config/i386/t-linux64	37	+++ gcc-4.8.4/gcc/config/i386/t-linux64
38	@@ -32,7 +32,5 @@	38	@@ -32,7 +32,5 @@
39	#	39	#
40	comma=,	40	comma=,
@@ -45,10 +45,10 @@ index bcea0c6..eb004d7 100644
45	-MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)	45	-MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
46	+MULTILIB_DIRNAMES = . .	46	+MULTILIB_DIRNAMES = . .
47	+MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir))	47	+MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir))
48	diff --git a/gcc/config/mips/t-linux64 b/gcc/config/mips/t-linux64	48	Index: gcc-4.8.4/gcc/config/mips/t-linux64
49	index bdbbd4f..16a6366 100644	49	===================================================================
50	--- a/gcc/config/mips/t-linux64	50	--- gcc-4.8.4.orig/gcc/config/mips/t-linux64
51	+++ b/gcc/config/mips/t-linux64	51	+++ gcc-4.8.4/gcc/config/mips/t-linux64
52	@@ -17,10 +17,6 @@	52	@@ -17,10 +17,6 @@
53	# <http://www.gnu.org/licenses/>.	53	# <http://www.gnu.org/licenses/>.
54		54
@@ -63,20 +63,17 @@ index bdbbd4f..16a6366 100644
63	+MULTILIB_DIRNAMES = . . .	63	+MULTILIB_DIRNAMES = . . .
64	+MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir))	64	+MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir))
65	+	65	+
66	diff --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64	66	Index: gcc-4.8.4/gcc/config/rs6000/t-linux64
67	index 9175de2..3971019 100644	67	===================================================================
68	--- a/gcc/config/rs6000/t-linux64	68	--- gcc-4.8.4.orig/gcc/config/rs6000/t-linux64
69	+++ b/gcc/config/rs6000/t-linux64	69	+++ gcc-4.8.4/gcc/config/rs6000/t-linux64
70	@@ -26,7 +26,6 @@	70	@@ -26,7 +26,6 @@
71	# MULTILIB_OSDIRNAMES according to what is found on the target.	71	# MULTILIB_OSDIRNAMES according to what is found on the target.
72		72
73	MULTILIB_OPTIONS = m64/m32	73	MULTILIB_OPTIONS := m64/m32
74	-MULTILIB_DIRNAMES = 64 32	74	-MULTILIB_DIRNAMES := 64 32
75	+MULTILIB_DIRNAMES = . .	75	+MULTILIB_DIRNAMES := . .
76	MULTILIB_EXTRA_OPTS = fPIC	76	MULTILIB_EXTRA_OPTS :=
77	-MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:powerpc64-linux-gnu)	77	-MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
78	-MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu)	78	-MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu)
79	+MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir))	79	+MULTILIB_OSDIRNAMES := ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir))
80	--
81	1.7.10.4
82