diff options
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc/0003-64-bit-multilib-hack.patch')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc/0003-64-bit-multilib-hack.patch | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/meta/recipes-devtools/gcc/gcc/0003-64-bit-multilib-hack.patch b/meta/recipes-devtools/gcc/gcc/0003-64-bit-multilib-hack.patch index c0e8cbd4d9..e83f05b8aa 100644 --- a/meta/recipes-devtools/gcc/gcc/0003-64-bit-multilib-hack.patch +++ b/meta/recipes-devtools/gcc/gcc/0003-64-bit-multilib-hack.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b87a3ac51df372128be2fda992238c5aab4a719a Mon Sep 17 00:00:00 2001 | 1 | From 34b861e7a4cfd7b1f0d2c0f8cf9bb0b0b81eb61a Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 29 Mar 2013 09:10:06 +0400 | 3 | Date: Fri, 29 Mar 2013 09:10:06 +0400 |
4 | Subject: [PATCH] 64-bit multilib hack. | 4 | Subject: [PATCH] 64-bit multilib hack. |
@@ -28,6 +28,7 @@ Upstream-Status: Inappropriate [OE-Specific] | |||
28 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 28 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
29 | Signed-off-by: Elvis Dowson <elvis.dowson@gmail.com> | 29 | Signed-off-by: Elvis Dowson <elvis.dowson@gmail.com> |
30 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 30 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
31 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
31 | --- | 32 | --- |
32 | gcc/config/aarch64/t-aarch64-linux | 8 ++++---- | 33 | gcc/config/aarch64/t-aarch64-linux | 8 ++++---- |
33 | gcc/config/arc/t-multilib-linux | 4 ++-- | 34 | gcc/config/arc/t-multilib-linux | 4 ++-- |
@@ -38,7 +39,7 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | |||
38 | 6 files changed, 17 insertions(+), 22 deletions(-) | 39 | 6 files changed, 17 insertions(+), 22 deletions(-) |
39 | 40 | ||
40 | diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux | 41 | diff --git a/gcc/config/aarch64/t-aarch64-linux b/gcc/config/aarch64/t-aarch64-linux |
41 | index 241b0ef20b6..a7dadb2d64f 100644 | 42 | index d0cd546002a..f4056d68372 100644 |
42 | --- a/gcc/config/aarch64/t-aarch64-linux | 43 | --- a/gcc/config/aarch64/t-aarch64-linux |
43 | +++ b/gcc/config/aarch64/t-aarch64-linux | 44 | +++ b/gcc/config/aarch64/t-aarch64-linux |
44 | @@ -21,8 +21,8 @@ | 45 | @@ -21,8 +21,8 @@ |
@@ -55,7 +56,7 @@ index 241b0ef20b6..a7dadb2d64f 100644 | |||
55 | -MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32) | 56 | -MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32) |
56 | +#MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32) | 57 | +#MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32) |
57 | diff --git a/gcc/config/arc/t-multilib-linux b/gcc/config/arc/t-multilib-linux | 58 | diff --git a/gcc/config/arc/t-multilib-linux b/gcc/config/arc/t-multilib-linux |
58 | index fc3fff640a2..d58e28f6df8 100644 | 59 | index ecb9ae6859f..12a164028d4 100644 |
59 | --- a/gcc/config/arc/t-multilib-linux | 60 | --- a/gcc/config/arc/t-multilib-linux |
60 | +++ b/gcc/config/arc/t-multilib-linux | 61 | +++ b/gcc/config/arc/t-multilib-linux |
61 | @@ -16,9 +16,9 @@ | 62 | @@ -16,9 +16,9 @@ |
@@ -71,7 +72,7 @@ index fc3fff640a2..d58e28f6df8 100644 | |||
71 | # Aliases: | 72 | # Aliases: |
72 | MULTILIB_MATCHES += mcpu?arc700=mA7 | 73 | MULTILIB_MATCHES += mcpu?arc700=mA7 |
73 | diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64 | 74 | diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64 |
74 | index d288b093522..7b5980a9d21 100644 | 75 | index 5526ad0e6cc..fa51c88912b 100644 |
75 | --- a/gcc/config/i386/t-linux64 | 76 | --- a/gcc/config/i386/t-linux64 |
76 | +++ b/gcc/config/i386/t-linux64 | 77 | +++ b/gcc/config/i386/t-linux64 |
77 | @@ -32,7 +32,5 @@ | 78 | @@ -32,7 +32,5 @@ |
@@ -85,7 +86,7 @@ index d288b093522..7b5980a9d21 100644 | |||
85 | +MULTILIB_DIRNAMES = . . | 86 | +MULTILIB_DIRNAMES = . . |
86 | +MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) | 87 | +MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) |
87 | diff --git a/gcc/config/mips/t-linux64 b/gcc/config/mips/t-linux64 | 88 | diff --git a/gcc/config/mips/t-linux64 b/gcc/config/mips/t-linux64 |
88 | index 130e1f04707..3b7eb6b2a2f 100644 | 89 | index 2fdd8e00407..04f2099250f 100644 |
89 | --- a/gcc/config/mips/t-linux64 | 90 | --- a/gcc/config/mips/t-linux64 |
90 | +++ b/gcc/config/mips/t-linux64 | 91 | +++ b/gcc/config/mips/t-linux64 |
91 | @@ -17,10 +17,6 @@ | 92 | @@ -17,10 +17,6 @@ |
@@ -115,7 +116,7 @@ index 216d2776a18..e4d817621fc 100644 | |||
115 | +#MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES)) | 116 | +#MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES)) |
116 | +MULTILIB_OSDIRNAMES := ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) | 117 | +MULTILIB_OSDIRNAMES := ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) |
117 | diff --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64 | 118 | diff --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64 |
118 | index e11a118cb5f..4eaffb416fe 100644 | 119 | index 47e0efd5764..05f5a3f188e 100644 |
119 | --- a/gcc/config/rs6000/t-linux64 | 120 | --- a/gcc/config/rs6000/t-linux64 |
120 | +++ b/gcc/config/rs6000/t-linux64 | 121 | +++ b/gcc/config/rs6000/t-linux64 |
121 | @@ -26,10 +26,9 @@ | 122 | @@ -26,10 +26,9 @@ |
@@ -129,5 +130,5 @@ index e11a118cb5f..4eaffb416fe 100644 | |||
129 | -MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu) | 130 | -MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu) |
130 | +MULTILIB_OSDIRNAMES := ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) | 131 | +MULTILIB_OSDIRNAMES := ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) |
131 | 132 | ||
132 | rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c | 133 | rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.cc |
133 | $(COMPILE) $< | 134 | $(COMPILE) $< |