mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-09-19 22:08:32 +00:00
27 lines
1.3 KiB
Diff
27 lines
1.3 KiB
Diff
diff -Naur gcc-orig/gcc/config/i386/linux64.h gcc/gcc/config/i386/linux64.h
|
|
--- gcc-orig/gcc/config/i386/linux64.h 2011-07-08 01:38:34.000000000 +1000
|
|
+++ gcc/gcc/config/i386/linux64.h 2011-07-24 19:48:05.000000000 +1000
|
|
@@ -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 -Naur gcc-orig/gcc/config/i386/t-linux64 gcc/gcc/config/i386/t-linux64
|
|
--- gcc-orig/gcc/config/i386/t-linux64 2011-07-08 01:38:34.000000000 +1000
|
|
+++ gcc/gcc/config/i386/t-linux64 2011-07-24 19:49:41.000000000 +1000
|
|
@@ -34,8 +34,8 @@
|
|
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 = m64=../lib
|
|
+MULTILIB_OSDIRNAMES+= m32=../lib32
|
|
MULTILIB_OSDIRNAMES+= mx32=../libx32
|
|
|
|
LIBGCC = stmp-multilib
|