You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
104 lines
4.6 KiB
104 lines
4.6 KiB
17 years ago
|
diff -ruN gcc-4.1.2/gcc/config/i386/linux64.h gcc-4.1.2-multilib/gcc/config/i386/linux64.h
|
||
|
|
--- gcc-4.1.2/gcc/config/i386/linux64.h 2005-08-10 20:53:01.000000000 +0300
|
||
|
|
+++ gcc-4.1.2-multilib/gcc/config/i386/linux64.h 2007-10-01 00:37:19.000000000 +0300
|
||
|
|
@@ -60,7 +60,7 @@
|
||
|
|
%{!shared: \
|
||
|
|
%{!static: \
|
||
|
|
%{rdynamic:-export-dynamic} \
|
||
|
|
- %{m32:%{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
|
||
|
|
+ %{m32:%{!dynamic-linker:-dynamic-linker /lib32/ld-linux.so.2}} \
|
||
|
|
%{!m32:%{!dynamic-linker:-dynamic-linker /lib64/ld-linux-x86-64.so.2}}} \
|
||
|
|
%{static:-static}}"
|
||
|
|
|
||
|
|
diff -ruN gcc-4.1.2/gcc/config/i386/t-linux64 gcc-4.1.2-multilib/gcc/config/i386/t-linux64
|
||
|
|
--- gcc-4.1.2/gcc/config/i386/t-linux64 2005-08-10 20:53:01.000000000 +0300
|
||
|
|
+++ gcc-4.1.2-multilib/gcc/config/i386/t-linux64 2007-10-01 00:37:40.000000000 +0300
|
||
|
|
@@ -6,7 +6,7 @@
|
||
|
|
|
||
|
|
MULTILIB_OPTIONS = m64/m32
|
||
|
|
MULTILIB_DIRNAMES = 64 32
|
||
|
|
-MULTILIB_OSDIRNAMES = ../lib64 ../lib
|
||
|
|
+MULTILIB_OSDIRNAMES = ../lib64 ../lib32
|
||
|
|
|
||
|
|
LIBGCC = stmp-multilib
|
||
|
|
INSTALL_LIBGCC = install-multilib
|
||
|
|
diff -ruN gcc-4.1.2/gcc/config/mips/linux64.h gcc-4.1.2-multilib/gcc/config/mips/linux64.h
|
||
|
|
--- gcc-4.1.2/gcc/config/mips/linux64.h 2005-06-25 04:22:41.000000000 +0300
|
||
|
|
+++ gcc-4.1.2-multilib/gcc/config/mips/linux64.h 2007-10-01 00:40:25.000000000 +0300
|
||
|
|
@@ -47,9 +47,9 @@
|
||
|
|
%{!static: \
|
||
|
|
%{rdynamic:-export-dynamic} \
|
||
|
|
%{!dynamic-linker: \
|
||
|
|
- %{mabi=n32: -dynamic-linker /lib32/ld.so.1} \
|
||
|
|
+ %{mabi=n32: -dynamic-linker /lib64/ld.so.1} \
|
||
|
|
%{mabi=64: -dynamic-linker /lib64/ld.so.1} \
|
||
|
|
- %{mabi=32: -dynamic-linker /lib/ld.so.1}}} \
|
||
|
|
+ %{mabi=32: -dynamic-linker /lib32/ld.so.1}}} \
|
||
|
|
%{static:-static}}} \
|
||
|
|
%{mabi=n32:-melf32%{EB:b}%{EL:l}tsmipn32} \
|
||
|
|
%{mabi=64:-melf64%{EB:b}%{EL:l}tsmip} \
|
||
|
|
diff -ruN gcc-4.1.2/gcc/config/mips/t-linux64 gcc-4.1.2-multilib/gcc/config/mips/t-linux64
|
||
|
|
--- gcc-4.1.2/gcc/config/mips/t-linux64 2006-09-10 10:13:12.000000000 +0300
|
||
|
|
+++ gcc-4.1.2-multilib/gcc/config/mips/t-linux64 2007-10-01 00:40:59.000000000 +0300
|
||
|
|
@@ -1,6 +1,6 @@
|
||
|
|
MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
|
||
|
|
MULTILIB_DIRNAMES = n32 32 64
|
||
|
|
-MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
|
||
|
|
+MULTILIB_OSDIRNAMES = ../lib64 ../lib32 ../lib64
|
||
|
|
|
||
|
|
EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
|
||
|
|
|
||
|
|
diff -ruN gcc-4.1.2/gcc/config/rs6000/linux64.h gcc-4.1.2-multilib/gcc/config/rs6000/linux64.h
|
||
|
|
--- gcc-4.1.2/gcc/config/rs6000/linux64.h 2006-02-10 22:58:33.000000000 +0200
|
||
|
|
+++ gcc-4.1.2-multilib/gcc/config/rs6000/linux64.h 2007-10-01 00:42:07.000000000 +0300
|
||
|
|
@@ -339,7 +339,7 @@
|
||
|
|
|
||
|
|
#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
|
||
|
|
%{rdynamic:-export-dynamic} \
|
||
|
|
- %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}"
|
||
|
|
+ %{!dynamic-linker:-dynamic-linker /lib32/ld.so.1}}}"
|
||
|
|
|
||
|
|
#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
|
||
|
|
%{rdynamic:-export-dynamic} \
|
||
|
|
diff -ruN gcc-4.1.2/gcc/config/rs6000/t-linux64 gcc-4.1.2-multilib/gcc/config/rs6000/t-linux64
|
||
|
|
--- gcc-4.1.2/gcc/config/rs6000/t-linux64 2007-10-01 00:44:58.000000000 +0300
|
||
|
|
+++ gcc-4.1.2-multilib/gcc/config/rs6000/t-linux64 2007-10-01 00:43:54.000000000 +0300
|
||
|
|
@@ -11,7 +11,7 @@
|
||
|
|
MULTILIB_EXTRA_OPTS = fPIC mstrict-align
|
||
|
|
MULTILIB_EXCEPTIONS =
|
||
|
|
MULTILIB_EXCLUSIONS =
|
||
|
|
-MULTILIB_OSDIRNAMES = ../lib64 ../lib
|
||
|
|
+MULTILIB_OSDIRNAMES = ../lib64 ../lib32
|
||
|
|
MULTILIB_MATCHES =
|
||
|
|
|
||
|
|
# We want fine grained libraries, so use the new code to build the
|
||
|
|
diff -ruN gcc-4.1.2/gcc/config/sparc/linux64.h gcc-4.1.2-multilib/gcc/config/sparc/linux64.h
|
||
|
|
--- gcc-4.1.2/gcc/config/sparc/linux64.h 2006-02-11 10:38:51.000000000 +0200
|
||
|
|
+++ gcc-4.1.2-multilib/gcc/config/sparc/linux64.h 2007-10-01 00:46:56.000000000 +0300
|
||
|
|
@@ -162,12 +162,12 @@
|
||
|
|
{ "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \
|
||
|
|
{ "link_arch", LINK_ARCH_SPEC },
|
||
|
|
|
||
|
|
-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
|
||
|
|
+#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib32 %{shared:-shared} \
|
||
|
|
%{!shared: \
|
||
|
|
%{!ibcs: \
|
||
|
|
%{!static: \
|
||
|
|
%{rdynamic:-export-dynamic} \
|
||
|
|
- %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
|
||
|
|
+ %{!dynamic-linker:-dynamic-linker /lib32/ld-linux.so.2}} \
|
||
|
|
%{static:-static}}} \
|
||
|
|
"
|
||
|
|
|
||
|
|
diff -ruN gcc-4.1.2/gcc/config/sparc/t-linux64 gcc-4.1.2-multilib/gcc/config/sparc/t-linux64
|
||
|
|
--- gcc-4.1.2/gcc/config/sparc/t-linux64 2004-04-01 19:05:22.000000000 +0300
|
||
|
|
+++ gcc-4.1.2-multilib/gcc/config/sparc/t-linux64 2007-10-01 00:47:58.000000000 +0300
|
||
|
|
@@ -1,6 +1,6 @@
|
||
|
|
MULTILIB_OPTIONS = m64/m32
|
||
|
|
MULTILIB_DIRNAMES = 64 32
|
||
|
|
-MULTILIB_OSDIRNAMES = ../lib64 ../lib
|
||
|
|
+MULTILIB_OSDIRNAMES = ../lib64 ../lib32
|
||
|
|
|
||
|
|
LIBGCC = stmp-multilib
|
||
|
|
INSTALL_LIBGCC = install-multilib
|