diff options
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-4.7/64bithack.patch')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-4.7/64bithack.patch | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.7/64bithack.patch b/meta/recipes-devtools/gcc/gcc-4.7/64bithack.patch deleted file mode 100644 index f47566951b..0000000000 --- a/meta/recipes-devtools/gcc/gcc-4.7/64bithack.patch +++ /dev/null | |||
@@ -1,63 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | GCC has internal multilib handling code but it assumes a very specific rigid directory | ||
4 | layout. The build system implementation of multilib layout is very generic and allows | ||
5 | complete customisation of the library directories. | ||
6 | |||
7 | This patch is a partial solution to allow any custom directories to be passed into gcc | ||
8 | and handled correctly. It forces gcc to use the base_libdir (which is the current | ||
9 | directory, "."). We need to do this for each multilib that is configured as we don't | ||
10 | know which compiler options may be being passed into the compiler. Since we have a compiler | ||
11 | per mulitlib at this point that isn't an issue. | ||
12 | |||
13 | The one problem is the target compiler is only going to work for the default multlilib at | ||
14 | this point. Ideally we'd figure out which multilibs were being enabled with which paths | ||
15 | and be able to patch these entries with a complete set of correct paths but this we | ||
16 | don't have such code at this point. This is something the target gcc recipe should do | ||
17 | and override these platform defaults in its build config. | ||
18 | |||
19 | RP 15/8/11 | ||
20 | |||
21 | Index: trunk/gcc/config/i386/t-linux64 | ||
22 | =================================================================== | ||
23 | --- trunk.orig/gcc/config/i386/t-linux64 2012-02-22 09:44:48.000000000 -0800 | ||
24 | +++ trunk/gcc/config/i386/t-linux64 2012-02-22 12:31:01.836462957 -0800 | ||
25 | @@ -33,7 +33,6 @@ | ||
26 | # | ||
27 | comma=, | ||
28 | MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) | ||
29 | -MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS))) | ||
30 | -MULTILIB_OSDIRNAMES = m64=../lib64 | ||
31 | -MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) | ||
32 | -MULTILIB_OSDIRNAMES+= mx32=../libx32 | ||
33 | +MULTILIB_DIRNAMES = . . | ||
34 | +MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) | ||
35 | + | ||
36 | Index: trunk/gcc/config/mips/t-linux64 | ||
37 | =================================================================== | ||
38 | --- trunk.orig/gcc/config/mips/t-linux64 2012-02-22 09:44:58.000000000 -0800 | ||
39 | +++ trunk/gcc/config/mips/t-linux64 2012-02-22 12:32:01.132465823 -0800 | ||
40 | @@ -17,5 +17,5 @@ | ||
41 | # <http://www.gnu.org/licenses/>. | ||
42 | |||
43 | MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64 | ||
44 | -MULTILIB_DIRNAMES = n32 32 64 | ||
45 | -MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64 | ||
46 | +MULTILIB_DIRNAMES = . . . | ||
47 | +MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) | ||
48 | Index: trunk/gcc/config/rs6000/t-linux64 | ||
49 | =================================================================== | ||
50 | --- trunk.orig/gcc/config/rs6000/t-linux64 2012-02-22 09:44:54.000000000 -0800 | ||
51 | +++ trunk/gcc/config/rs6000/t-linux64 2012-02-22 12:28:17.960454968 -0800 | ||
52 | @@ -27,9 +27,9 @@ | ||
53 | # MULTILIB_OSDIRNAMES according to what is found on the target. | ||
54 | |||
55 | MULTILIB_OPTIONS = m64/m32 msoft-float | ||
56 | -MULTILIB_DIRNAMES = 64 32 nof | ||
57 | +MULTILIB_DIRNAMES = . . . | ||
58 | MULTILIB_EXTRA_OPTS = fPIC mstrict-align | ||
59 | MULTILIB_EXCEPTIONS = m64/msoft-float | ||
60 | MULTILIB_EXCLUSIONS = m64/!m32/msoft-float | ||
61 | -MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof | ||
62 | +MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) | ||
63 | MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT) | ||