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