diff options
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-4.9/0019-64-bit-multilib-hack.patch')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-4.9/0019-64-bit-multilib-hack.patch | 82 |
1 files changed, 0 insertions, 82 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0019-64-bit-multilib-hack.patch b/meta/recipes-devtools/gcc/gcc-4.9/0019-64-bit-multilib-hack.patch deleted file mode 100644 index 058be0c40a..0000000000 --- a/meta/recipes-devtools/gcc/gcc-4.9/0019-64-bit-multilib-hack.patch +++ /dev/null | |||
@@ -1,82 +0,0 @@ | |||
1 | From 18fde5740b09324dfb9cf41e9849672573ff5fa0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 29 Mar 2013 09:10:06 +0400 | ||
4 | Subject: [PATCH 19/35] 64-bit multilib hack. | ||
5 | |||
6 | GCC has internal multilib handling code but it assumes a very specific rigid directory | ||
7 | layout. The build system implementation of multilib layout is very generic and allows | ||
8 | complete customisation of the library directories. | ||
9 | |||
10 | This patch is a partial solution to allow any custom directories to be passed into gcc | ||
11 | and handled correctly. It forces gcc to use the base_libdir (which is the current | ||
12 | directory, "."). We need to do this for each multilib that is configured as we don't | ||
13 | know which compiler options may be being passed into the compiler. Since we have a compiler | ||
14 | per mulitlib at this point that isn't an issue. | ||
15 | |||
16 | The one problem is the target compiler is only going to work for the default multlilib at | ||
17 | this point. Ideally we'd figure out which multilibs were being enabled with which paths | ||
18 | and be able to patch these entries with a complete set of correct paths but this we | ||
19 | don't have such code at this point. This is something the target gcc recipe should do | ||
20 | and override these platform defaults in its build config. | ||
21 | |||
22 | RP 15/8/11 | ||
23 | |||
24 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
25 | Signed-off-by: Elvis Dowson <elvis.dowson@gmail.com> | ||
26 | |||
27 | Upstream-Status: Pending | ||
28 | --- | ||
29 | gcc/config/i386/t-linux64 | 6 ++---- | ||
30 | gcc/config/mips/t-linux64 | 10 +++------- | ||
31 | gcc/config/rs6000/t-linux64 | 5 ++--- | ||
32 | 3 files changed, 7 insertions(+), 14 deletions(-) | ||
33 | |||
34 | Index: gcc-4.9-20140316/gcc/config/i386/t-linux64 | ||
35 | =================================================================== | ||
36 | --- gcc-4.9-20140316.orig/gcc/config/i386/t-linux64 | ||
37 | +++ gcc-4.9-20140316/gcc/config/i386/t-linux64 | ||
38 | @@ -32,7 +32,5 @@ | ||
39 | # | ||
40 | comma=, | ||
41 | MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) | ||
42 | -MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS))) | ||
43 | -MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu) | ||
44 | -MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu) | ||
45 | -MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32) | ||
46 | +MULTILIB_DIRNAMES = . . | ||
47 | +MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) | ||
48 | Index: gcc-4.9-20140316/gcc/config/mips/t-linux64 | ||
49 | =================================================================== | ||
50 | --- gcc-4.9-20140316.orig/gcc/config/mips/t-linux64 | ||
51 | +++ gcc-4.9-20140316/gcc/config/mips/t-linux64 | ||
52 | @@ -17,10 +17,6 @@ | ||
53 | # <http://www.gnu.org/licenses/>. | ||
54 | |||
55 | MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64 | ||
56 | -MULTILIB_DIRNAMES = n32 32 64 | ||
57 | -MIPS_EL = $(if $(filter %el, $(firstword $(subst -, ,$(target)))),el) | ||
58 | -MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft) | ||
59 | -MULTILIB_OSDIRNAMES = \ | ||
60 | - ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \ | ||
61 | - ../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ | ||
62 | - ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) | ||
63 | +MULTILIB_DIRNAMES = . . . | ||
64 | +MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) | ||
65 | + | ||
66 | Index: gcc-4.9-20140316/gcc/config/rs6000/t-linux64 | ||
67 | =================================================================== | ||
68 | --- gcc-4.9-20140316.orig/gcc/config/rs6000/t-linux64 | ||
69 | +++ gcc-4.9-20140316/gcc/config/rs6000/t-linux64 | ||
70 | @@ -26,10 +26,9 @@ | ||
71 | # MULTILIB_OSDIRNAMES according to what is found on the target. | ||
72 | |||
73 | MULTILIB_OPTIONS := m64/m32 | ||
74 | -MULTILIB_DIRNAMES := 64 32 | ||
75 | +MULTILIB_DIRNAMES := . . | ||
76 | MULTILIB_EXTRA_OPTS := | ||
77 | -MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-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)) | ||
80 | |||
81 | rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c | ||
82 | $(COMPILE) $< | ||