blob: 84962e6d46d7113573a346f42f550282ed612527 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
Upstream-Status: Inappropriate [embedded specific]
By default gcc places 64 bit libs in a lib64 directory. This makes it use
"lib" instead.
RP 25/7/10
Index: gcc-4.6.0/gcc/config/i386/t-linux64
===================================================================
--- gcc-4.6.0.orig/gcc/config/i386/t-linux64
+++ gcc-4.6.0/gcc/config/i386/t-linux64
@@ -24,8 +24,8 @@
# MULTILIB_OSDIRNAMES according to what is found on the target.
MULTILIB_OPTIONS = m64/m32
-MULTILIB_DIRNAMES = 64 32
-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
+MULTILIB_DIRNAMES = . 32
+MULTILIB_OSDIRNAMES = . $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
LIBGCC = stmp-multilib
INSTALL_LIBGCC = install-multilib
Index: gcc-4.6.0/gcc/config/i386/linux64.h
===================================================================
--- gcc-4.6.0.orig/gcc/config/i386/linux64.h
+++ gcc-4.6.0/gcc/config/i386/linux64.h
@@ -63,7 +63,7 @@ see the files COPYING3 and COPYING.RUNTI
done. */
#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
#if TARGET_64BIT_DEFAULT
#define SPEC_32 "m32"
|
