gcc: removed multilib support

diff --git a/gcc/Pkgfile b/gcc/Pkgfile
index ade2adf6f9885719c1cc5d2906fad22527714590..b70a2d757fc14ce8be1661419a662176ec41dd9f 100644 (file)
--- a/gcc/Pkgfile
+++ b/gcc/Pkgfile
@@ -39,7 +39,6 @@ build() {
                               --disable-nls \
                               --with-x=no \
                               --with-system-zlib \
-                              --enable-multilib \
                               --with-pkgversion="CRUX-ARM 64b"
 
   # prevent GCC from looking in the wrong directories for headers and libraries

diff --git a/gcc/gcc-5.3.0-multilib-dirs.patch b/gcc/gcc-5.3.0-multilib-dirs.patch
new file mode 100644 (file)
index 0000000..014919f
--- /dev/null
+++ b/gcc/gcc-5.3.0-multilib-dirs.patch
@@ -0,0 +1,23 @@
+diff -Nru gcc-4.7.3.orig/gcc/config/i386/linux64.h gcc-4.7.3/gcc/config/i386/linux64.h
+--- gcc-4.7.3.orig/gcc/config/i386/linux64.h   2013-04-13 18:33:41.015109554 +0200
++++ gcc-4.7.3/gcc/config/i386/linux64.h        2013-04-13 18:34:01.147713013 +0200
+@@ -28,6 +28,6 @@
+ #define GNU_USER_LINK_EMULATION64 "elf_x86_64"
+ #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
+ 
+-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
++#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
+ #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
+diff -Nru gcc-4.7.3.orig/gcc/config/i386/t-linux64 gcc-4.7.3/gcc/config/i386/t-linux64
+--- gcc-4.7.3.orig/gcc/config/i386/t-linux64   2013-04-13 18:33:41.015109554 +0200
++++ gcc-4.7.3/gcc/config/i386/t-linux64        2013-04-13 18:39:13.269752565 +0200
+@@ -34,6 +34,6 @@
+ comma=,
+ MULTILIB_OPTIONS    = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
+ MULTILIB_DIRNAMES   = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
+-MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
++MULTILIB_OSDIRNAMES = m64=../lib$(call if_multiarch,:x86_64-linux-gnu)
+ MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
+ MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)