24 lines
1.3 KiB
Diff
24 lines
1.3 KiB
Diff
diff -urN gcc-4.7.1.orig/gcc/config/i386/linux64.h gcc-4.7.1/gcc/config/i386/linux64.h
|
|
--- gcc-4.7.1.orig/gcc/config/i386/linux64.h 2011-07-07 10:38:34.000000000 -0500
|
|
+++ gcc-4.7.1/gcc/config/i386/linux64.h 2012-07-02 09:57:56.993022198 -0500
|
|
@@ -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 -urN gcc-4.7.1.orig/gcc/config/i386/t-linux64 gcc-4.7.1/gcc/config/i386/t-linux64
|
|
--- gcc-4.7.1.orig/gcc/config/i386/t-linux64 2011-11-02 10:23:48.000000000 -0500
|
|
+++ gcc-4.7.1/gcc/config/i386/t-linux64 2012-07-02 09:58:47.278153100 -0500
|
|
@@ -34,6 +34,6 @@
|
|
comma=,
|
|
MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
|
|
MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
|
|
-MULTILIB_OSDIRNAMES = m64=../lib64
|
|
+MULTILIB_OSDIRNAMES = m64=../lib
|
|
MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
|
|
MULTILIB_OSDIRNAMES+= mx32=../libx32
|