From 1397a8b6a2561a1ece7ffbbf9812c4f8180263c1 Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Fri, 19 Aug 2011 17:55:36 +0200 Subject: [PATCH] gcc: updated/rediffed multilib patch --- ...tilib-1.patch => gcc-4.6-multilib-1.patch} | 54 ++++++++++--------- 1 file changed, 28 insertions(+), 26 deletions(-) rename base/gcc/{gcc-4.4-multilib-1.patch => gcc-4.6-multilib-1.patch} (79%) diff --git a/base/gcc/gcc-4.4-multilib-1.patch b/base/gcc/gcc-4.6-multilib-1.patch similarity index 79% rename from base/gcc/gcc-4.4-multilib-1.patch rename to base/gcc/gcc-4.6-multilib-1.patch index bf64cfe47..f9d5dae0a 100644 --- a/base/gcc/gcc-4.4-multilib-1.patch +++ b/base/gcc/gcc-4.6-multilib-1.patch @@ -1,8 +1,8 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../gcc/gcc-4.4-multilib-1.patch -# Copyright (C) 2009 - 2010 The OpenSDE Project +# Filename: package/.../gcc/gcc-4.6-multilib-1.patch +# Copyright (C) 2009 - 2011 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -15,10 +15,10 @@ # --- SDE-COPYRIGHT-NOTE-END --- diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h -index cfa3f49..0846dd0 100644 +index 8392fab..14659ab 100644 --- a/gcc/config/i386/linux64.h +++ b/gcc/config/i386/linux64.h -@@ -58,7 +58,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +@@ -62,7 +62,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see When the -shared link option is used a final link is not being done. */ @@ -26,12 +26,12 @@ index cfa3f49..0846dd0 100644 +#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2" #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" - #undef ASM_SPEC + #if TARGET_64BIT_DEFAULT diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64 -index 36378d8..b76b2e3 100644 +index 5d5a476..b7740c0 100644 --- a/gcc/config/i386/t-linux64 +++ b/gcc/config/i386/t-linux64 -@@ -7,7 +7,7 @@ +@@ -25,7 +25,7 @@ MULTILIB_OPTIONS = m64/m32 MULTILIB_DIRNAMES = 64 32 @@ -41,7 +41,7 @@ index 36378d8..b76b2e3 100644 LIBGCC = stmp-multilib INSTALL_LIBGCC = install-multilib diff --git a/gcc/config/mips/linux64.h b/gcc/config/mips/linux64.h -index 2f24dfa..d0164ac 100644 +index 987a991..6e2ebcb 100644 --- a/gcc/config/mips/linux64.h +++ b/gcc/config/mips/linux64.h @@ -35,9 +35,9 @@ along with GCC; see the file COPYING3. If not see @@ -54,13 +54,14 @@ index 2f24dfa..d0164ac 100644 -#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" +#define GLIBC_DYNAMIC_LINKERN32 "/lib64/ld.so.1" #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" + #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" #define LINUX_DYNAMIC_LINKERN32 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32) diff --git a/gcc/config/mips/t-linux64 b/gcc/config/mips/t-linux64 -index 0592e7f..d418d73 100644 +index 66ea51a..d5f424a 100644 --- a/gcc/config/mips/t-linux64 +++ b/gcc/config/mips/t-linux64 -@@ -1,6 +1,6 @@ +@@ -18,7 +18,7 @@ + MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64 MULTILIB_DIRNAMES = n32 32 64 -MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64 @@ -69,10 +70,10 @@ index 0592e7f..d418d73 100644 EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h -index a83cc24..da6bfe7 100644 +index e6840d6..412f7ce 100644 --- a/gcc/config/rs6000/linux64.h +++ b/gcc/config/rs6000/linux64.h -@@ -342,7 +342,7 @@ extern int dot_symbols; +@@ -372,7 +372,7 @@ extern int dot_symbols; #undef LINK_OS_DEFAULT_SPEC #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" @@ -82,10 +83,10 @@ index a83cc24..da6bfe7 100644 #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" diff --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64 -index 2a2e7b0..b4ef657 100644 +index 6a2235f..3d50579 100644 --- a/gcc/config/rs6000/t-linux64 +++ b/gcc/config/rs6000/t-linux64 -@@ -19,7 +19,7 @@ MULTILIB_DIRNAMES = 64 32 nof +@@ -36,7 +36,7 @@ MULTILIB_DIRNAMES = 64 32 nof MULTILIB_EXTRA_OPTS = fPIC mstrict-align MULTILIB_EXCEPTIONS = m64/msoft-float MULTILIB_EXCLUSIONS = m64/!m32/msoft-float @@ -95,36 +96,37 @@ index 2a2e7b0..b4ef657 100644 softfp_wrap_start := '\#ifndef __powerpc64__' diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h -index 9d0799f..4a4cb37 100644 +index a4c67dc..1801418 100644 --- a/gcc/config/sparc/linux64.h +++ b/gcc/config/sparc/linux64.h -@@ -109,7 +109,7 @@ along with GCC; see the file COPYING3. If not see - - /* If ELF is the default format, we should not use /lib/elf. */ +@@ -101,7 +101,7 @@ along with GCC; see the file COPYING3. If not see + 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_LINKER32 "/lib32/ld-linux.so.2" #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2" #ifdef SPARC_BI_ARCH -@@ -121,7 +121,7 @@ along with GCC; see the file COPYING3. If not see +@@ -113,7 +113,7 @@ along with GCC; see the file COPYING3. If not see { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \ { "link_arch", LINK_ARCH_SPEC }, -#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \ +#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib32 %{shared:-shared} \ %{!shared: \ - %{!ibcs: \ - %{!static: \ + %{!static: \ + %{rdynamic:-export-dynamic} \ diff --git a/gcc/config/sparc/t-linux64 b/gcc/config/sparc/t-linux64 -index 7a1d5b1..8e8025e 100644 +index 74d0489..3343351 100644 --- a/gcc/config/sparc/t-linux64 +++ b/gcc/config/sparc/t-linux64 -@@ -1,6 +1,6 @@ +@@ -26,7 +26,7 @@ + MULTILIB_OPTIONS = m64/m32 MULTILIB_DIRNAMES = 64 32 --MULTILIB_OSDIRNAMES = ../lib64 ../lib -+MULTILIB_OSDIRNAMES = ../lib64 ../lib32 +-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) ++MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32) LIBGCC = stmp-multilib INSTALL_LIBGCC = install-multilib