# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../gcc/gcc-4.1.2-pure64-1.diff # Copyright (C) 2009 The OpenSDE Project # # More information can be found in the files COPYING and README. # # This patch file is dual-licensed. It is available under the license the # patched project is licensed under, as long as it is an OpenSource license # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms # of the GNU General Public License as published by the Free Software # Foundation; either version 2 of the License, or (at your option) any later # version. # --- SDE-COPYRIGHT-NOTE-END --- diff -Nur gcc-4.2.4-orig/gcc/config/i386/linux64.h gcc-4.2.4/gcc/config/i386/linux64.h --- gcc-4.2.4-orig/gcc/config/i386/linux64.h 2009-08-02 19:04:12.000000000 +0300 +++ gcc-4.2.4/gcc/config/i386/linux64.h 2009-08-02 19:47:53.000000000 +0300 @@ -48,8 +48,8 @@ When the -shared link option is used a final link is not being done. */ -#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" #undef LINK_SPEC #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \ diff -Nur gcc-4.2.4-orig/gcc/config/i386/t-linux64 gcc-4.2.4/gcc/config/i386/t-linux64 --- gcc-4.2.4-orig/gcc/config/i386/t-linux64 2009-08-02 19:04:12.000000000 +0300 +++ gcc-4.2.4/gcc/config/i386/t-linux64 2009-08-02 19:48:56.000000000 +0300 @@ -13,7 +13,7 @@ MULTILIB_OPTIONS = m64/m32 MULTILIB_DIRNAMES = 64 32 -MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) +MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32) LIBGCC = stmp-multilib INSTALL_LIBGCC = install-multilib diff -Nur gcc-4.2.4-orig/gcc/config/mips/linux64.h gcc-4.2.4/gcc/config/mips/linux64.h --- gcc-4.2.4-orig/gcc/config/mips/linux64.h 2009-08-02 19:04:12.000000000 +0300 +++ gcc-4.2.4/gcc/config/mips/linux64.h 2009-08-02 19:52:22.000000000 +0300 @@ -35,9 +35,9 @@ %{!shared: %{pthread:-lpthread} \ %{profile:-lc_p} %{!profile: -lc}}" -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1" -#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" +#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1" +#define GLIBC_DYNAMIC_LINKER64 "/lib/ld.so.1" +#define GLIBC_DYNAMIC_LINKERN32 "/lib64/ld.so.1" #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" #define LINUX_DYNAMIC_LINKERN32 \ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32) diff -Nur gcc-4.2.4-orig/gcc/config/mips/t-linux64 gcc-4.2.4/gcc/config/mips/t-linux64 --- gcc-4.2.4-orig/gcc/config/mips/t-linux64 2009-08-02 19:04:12.000000000 +0300 +++ gcc-4.2.4/gcc/config/mips/t-linux64 2009-08-02 19:53:22.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 ../lib EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o diff -Nur gcc-4.2.4-orig/gcc/config/rs6000/linux64.h gcc-4.2.4/gcc/config/rs6000/linux64.h --- gcc-4.2.4-orig/gcc/config/rs6000/linux64.h 2009-08-02 19:04:12.000000000 +0300 +++ gcc-4.2.4/gcc/config/rs6000/linux64.h 2009-08-02 19:55:36.000000000 +0300 @@ -335,8 +335,8 @@ #undef LINK_OS_DEFAULT_SPEC #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1" +#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1" +#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1" #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" #if UCLIBC_DEFAULT diff -Nur gcc-4.2.4-orig/gcc/config/rs6000/t-linux64 gcc-4.2.4/gcc/config/rs6000/t-linux64 --- gcc-4.2.4-orig/gcc/config/rs6000/t-linux64 2009-08-02 19:04:12.000000000 +0300 +++ gcc-4.2.4/gcc/config/rs6000/t-linux64 2009-08-02 20:07:36.000000000 +0300 @@ -19,7 +19,7 @@ MULTILIB_EXTRA_OPTS = fPIC mstrict-align MULTILIB_EXCEPTIONS = m64/msoft-float MULTILIB_EXCLUSIONS = m64/!m32/msoft-float -MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof +MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32) nof MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT) softfp_wrap_start := '\#ifndef __powerpc64__' diff -Nur gcc-4.2.4-orig/gcc/config/sparc/linux64.h gcc-4.2.4/gcc/config/sparc/linux64.h --- gcc-4.2.4-orig/gcc/config/sparc/linux64.h 2009-08-02 19:04:12.000000000 +0300 +++ gcc-4.2.4/gcc/config/sparc/linux64.h 2009-08-02 19:58:14.000000000 +0300 @@ -166,7 +166,7 @@ { "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: \ @@ -175,7 +175,7 @@ %{static:-static}}} \ " -#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \ +#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib %{shared:-shared} \ %{!shared: \ %{!ibcs: \ %{!static: \ diff -Nur gcc-4.2.4-orig/gcc/config/sparc/t-linux64 gcc-4.2.4/gcc/config/sparc/t-linux64 --- gcc-4.2.4-orig/gcc/config/sparc/t-linux64 2009-08-02 19:04:12.000000000 +0300 +++ gcc-4.2.4/gcc/config/sparc/t-linux64 2009-08-02 19:59:16.000000000 +0300 @@ -1,6 +1,6 @@ MULTILIB_OPTIONS = m64/m32 MULTILIB_DIRNAMES = 64 32 -MULTILIB_OSDIRNAMES = ../lib64 ../lib +MULTILIB_OSDIRNAMES = ../lib ../lib32 LIBGCC = stmp-multilib INSTALL_LIBGCC = install-multilib @@ -10,4 +10,4 @@ CRTSTUFF_T_CFLAGS = `if test x$$($(GCC_FOR_TARGET) $(MULTILIB_CFLAGS) \ -print-multi-os-directory) \ - = x../lib64; then echo -mcmodel=medany; fi` + = x../lib; then echo -mcmodel=medany; fi`