diff -ru gcc-4.1.1.orig/gcc/config/i386/linux64.h gcc-4.1.1/gcc/config/i386/linux64.h --- gcc-4.1.1.orig/gcc/config/i386/linux64.h 2006-11-30 09:45:18.000000000 +0100 +++ gcc-4.1.1/gcc/config/i386/linux64.h 2006-11-30 09:47:39.000000000 +0100 @@ -55,13 +55,13 @@ done. */ #undef LINK_SPEC -#define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \ +#define LINK_SPEC "%{m64:-m elf_x86_64} %{!m64:-m elf_i386} \ %{shared:-shared} \ %{!shared: \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{m32:%{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \ - %{!m32:%{!dynamic-linker:-dynamic-linker /lib64/ld-linux-x86-64.so.2}}} \ + %{!m64:%{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \ + %{m64:%{!dynamic-linker:-dynamic-linker /lib64/ld-linux-x86-64.so.2}}} \ %{static:-static}}" /* Similar to standard Linux, but adding -ffast-math support. */ @@ -70,7 +70,7 @@ "%{ffast-math|funsafe-math-optimizations:crtfastmath.o%s} \ %{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s" -#define MULTILIB_DEFAULTS { "m64" } +#define MULTILIB_DEFAULTS { "m32" } #undef NEED_INDICATE_EXEC_STACK #define NEED_INDICATE_EXEC_STACK 1 diff -ru gcc-4.1.1.orig/gcc/config/i386/t-linux64 gcc-4.1.1/gcc/config/i386/t-linux64 --- gcc-4.1.1.orig/gcc/config/i386/t-linux64 2006-11-30 09:45:18.000000000 +0100 +++ gcc-4.1.1/gcc/config/i386/t-linux64 2006-11-30 09:59:53.000000000 +0100 @@ -4,9 +4,9 @@ SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver \ $(srcdir)/config/i386/libgcc-x86_64-glibc.ver -MULTILIB_OPTIONS = m64/m32 -MULTILIB_DIRNAMES = 64 32 -MULTILIB_OSDIRNAMES = ../lib64 ../lib +MULTILIB_OPTIONS = m32/m64 +MULTILIB_DIRNAMES = 32 64 +MULTILIB_OSDIRNAMES = ../lib ../lib64 LIBGCC = stmp-multilib INSTALL_LIBGCC = install-multilib diff -ru gcc-4.1.1.orig/gcc/config/i386/x86-64.h gcc-4.1.1/gcc/config/i386/x86-64.h --- gcc-4.1.1.orig/gcc/config/i386/x86-64.h 2006-11-30 09:45:17.000000000 +0100 +++ gcc-4.1.1/gcc/config/i386/x86-64.h 2006-11-30 09:49:19.000000000 +0100 @@ -49,7 +49,7 @@ #undef ASM_SPEC #define ASM_SPEC "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} \ - %{Wa,*:%*} %{m32:--32} %{m64:--64}" + %{Wa,*:%*} %{!m64:--32} %{m64:--64}" #undef ASM_OUTPUT_ALIGNED_BSS #define ASM_OUTPUT_ALIGNED_BSS(FILE, DECL, NAME, SIZE, ALIGN) \