[0804c00] | 1 | Submitted By: Jim Gifford (jim at cross-lfs dot org) |
---|
[56a4eb5] | 2 | Date: 04-21-2009 |
---|
| 3 | Initial Package Version: 4.4.0 |
---|
[0804c00] | 4 | Origin: Idea originally developed by Ryan Oliver and Greg Schafer for |
---|
| 5 | the Pure LFS project. |
---|
| 6 | Upstream Status: Not Applied |
---|
[56a4eb5] | 7 | Description: This patch modifies the location of the dynamic linker for gcc-4.4.0. |
---|
[0804c00] | 8 | |
---|
[56a4eb5] | 9 | diff -Naur gcc-4.4.0.orig/gcc/config/i386/linux64.h gcc-4.4.0/gcc/config/i386/linux64.h |
---|
| 10 | --- gcc-4.4.0.orig/gcc/config/i386/linux64.h 2009-04-09 16:23:07.000000000 -0700 |
---|
| 11 | +++ gcc-4.4.0/gcc/config/i386/linux64.h 2009-04-21 10:12:45.639047632 -0700 |
---|
| 12 | @@ -58,8 +58,8 @@ |
---|
[36d2525] | 13 | When the -shared link option is used a final link is not being |
---|
| 14 | done. */ |
---|
| 15 | |
---|
| 16 | -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" |
---|
| 17 | -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" |
---|
| 18 | +#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2" |
---|
| 19 | +#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" |
---|
| 20 | |
---|
[56a4eb5] | 21 | #undef ASM_SPEC |
---|
| 22 | #define ASM_SPEC "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} \ |
---|
| 23 | diff -Naur gcc-4.4.0.orig/gcc/config/i386/t-linux64 gcc-4.4.0/gcc/config/i386/t-linux64 |
---|
| 24 | --- gcc-4.4.0.orig/gcc/config/i386/t-linux64 2008-07-02 08:59:19.000000000 -0700 |
---|
| 25 | +++ gcc-4.4.0/gcc/config/i386/t-linux64 2009-04-21 10:12:52.642213438 -0700 |
---|
| 26 | @@ -7,7 +7,7 @@ |
---|
[36d2525] | 27 | |
---|
| 28 | MULTILIB_OPTIONS = m64/m32 |
---|
| 29 | MULTILIB_DIRNAMES = 64 32 |
---|
| 30 | -MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) |
---|
[0804c00] | 31 | +MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) |
---|
[36d2525] | 32 | |
---|
| 33 | LIBGCC = stmp-multilib |
---|
| 34 | INSTALL_LIBGCC = install-multilib |
---|
[56a4eb5] | 35 | diff -Naur gcc-4.4.0.orig/gcc/config/linux.h gcc-4.4.0/gcc/config/linux.h |
---|
| 36 | --- gcc-4.4.0.orig/gcc/config/linux.h 2009-04-09 16:23:07.000000000 -0700 |
---|
| 37 | +++ gcc-4.4.0/gcc/config/linux.h 2009-04-21 10:12:49.548334684 -0700 |
---|
| 38 | @@ -118,7 +118,7 @@ |
---|
[0804c00] | 39 | GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets |
---|
| 40 | supporting both 32-bit and 64-bit compilation. */ |
---|
| 41 | #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" |
---|
| 42 | -#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" |
---|
| 43 | +#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0" |
---|
| 44 | #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" |
---|
| 45 | #define LINUX_DYNAMIC_LINKER \ |
---|
| 46 | CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) |
---|
[56a4eb5] | 47 | diff -Naur gcc-4.4.0.orig/gcc/config/mips/linux64.h gcc-4.4.0/gcc/config/mips/linux64.h |
---|
| 48 | --- gcc-4.4.0.orig/gcc/config/mips/linux64.h 2009-02-20 07:20:38.000000000 -0800 |
---|
| 49 | +++ gcc-4.4.0/gcc/config/mips/linux64.h 2009-04-21 10:12:49.630265960 -0700 |
---|
| 50 | @@ -35,10 +35,10 @@ |
---|
[6a043e2] | 51 | %{!shared: \ |
---|
| 52 | %{profile:-lc_p} %{!profile:-lc}}" |
---|
[36d2525] | 53 | |
---|
| 54 | -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" |
---|
| 55 | -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1" |
---|
| 56 | -#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" |
---|
| 57 | -#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" |
---|
| 58 | +#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1" |
---|
| 59 | +#define GLIBC_DYNAMIC_LINKER64 "/lib/ld.so.1" |
---|
| 60 | +#define GLIBC_DYNAMIC_LINKERN32 "/lib64/ld.so.1" |
---|
| 61 | +#define UCLIBC_DYNAMIC_LINKERN32 "/lib64/ld-uClibc.so.0" |
---|
| 62 | #define LINUX_DYNAMIC_LINKERN32 \ |
---|
| 63 | CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32) |
---|
| 64 | |
---|
[56a4eb5] | 65 | diff -Naur gcc-4.4.0.orig/gcc/config/mips/t-linux64 gcc-4.4.0/gcc/config/mips/t-linux64 |
---|
| 66 | --- gcc-4.4.0.orig/gcc/config/mips/t-linux64 2006-06-06 05:51:24.000000000 -0700 |
---|
| 67 | +++ gcc-4.4.0/gcc/config/mips/t-linux64 2009-04-21 10:12:52.704637799 -0700 |
---|
[36d2525] | 68 | @@ -1,6 +1,6 @@ |
---|
| 69 | MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64 |
---|
| 70 | MULTILIB_DIRNAMES = n32 32 64 |
---|
| 71 | -MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64 |
---|
| 72 | +MULTILIB_OSDIRNAMES = ../lib64 ../lib32 ../lib |
---|
| 73 | |
---|
| 74 | EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o |
---|
| 75 | |
---|
[56a4eb5] | 76 | diff -Naur gcc-4.4.0.orig/gcc/config/rs6000/linux64.h gcc-4.4.0/gcc/config/rs6000/linux64.h |
---|
| 77 | --- gcc-4.4.0.orig/gcc/config/rs6000/linux64.h 2009-04-09 16:23:07.000000000 -0700 |
---|
| 78 | +++ gcc-4.4.0/gcc/config/rs6000/linux64.h 2009-04-21 10:12:42.311081157 -0700 |
---|
| 79 | @@ -342,9 +342,9 @@ |
---|
[36d2525] | 80 | #undef LINK_OS_DEFAULT_SPEC |
---|
| 81 | #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" |
---|
| 82 | |
---|
| 83 | -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" |
---|
| 84 | -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1" |
---|
[0804c00] | 85 | -#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" |
---|
[36d2525] | 86 | +#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1" |
---|
| 87 | +#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1" |
---|
[0804c00] | 88 | +#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0" |
---|
[36d2525] | 89 | #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" |
---|
| 90 | #if UCLIBC_DEFAULT |
---|
[0804c00] | 91 | #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}" |
---|
[56a4eb5] | 92 | diff -Naur gcc-4.4.0.orig/gcc/config/rs6000/t-linux64 gcc-4.4.0/gcc/config/rs6000/t-linux64 |
---|
| 93 | --- gcc-4.4.0.orig/gcc/config/rs6000/t-linux64 2007-09-27 12:56:06.000000000 -0700 |
---|
| 94 | +++ gcc-4.4.0/gcc/config/rs6000/t-linux64 2009-04-21 10:12:52.552479957 -0700 |
---|
[36d2525] | 95 | @@ -19,7 +19,7 @@ |
---|
| 96 | MULTILIB_EXTRA_OPTS = fPIC mstrict-align |
---|
| 97 | MULTILIB_EXCEPTIONS = m64/msoft-float |
---|
| 98 | MULTILIB_EXCLUSIONS = m64/!m32/msoft-float |
---|
| 99 | -MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof |
---|
| 100 | +MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof |
---|
| 101 | MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT) |
---|
| 102 | |
---|
| 103 | softfp_wrap_start := '\#ifndef __powerpc64__' |
---|
[56a4eb5] | 104 | diff -Naur gcc-4.4.0.orig/gcc/config/s390/linux.h gcc-4.4.0/gcc/config/s390/linux.h |
---|
| 105 | --- gcc-4.4.0.orig/gcc/config/s390/linux.h 2007-08-02 03:49:31.000000000 -0700 |
---|
| 106 | +++ gcc-4.4.0/gcc/config/s390/linux.h 2009-04-21 10:12:44.800229083 -0700 |
---|
[0804c00] | 107 | @@ -72,7 +72,7 @@ |
---|
| 108 | #define MULTILIB_DEFAULTS { "m31" } |
---|
| 109 | #endif |
---|
| 110 | |
---|
| 111 | -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" |
---|
| 112 | +#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1" |
---|
| 113 | #define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1" |
---|
| 114 | |
---|
| 115 | #undef LINK_SPEC |
---|
[56a4eb5] | 116 | diff -Naur gcc-4.4.0.orig/gcc/config/s390/t-linux64 gcc-4.4.0/gcc/config/s390/t-linux64 |
---|
| 117 | --- gcc-4.4.0.orig/gcc/config/s390/t-linux64 2006-02-06 09:41:54.000000000 -0800 |
---|
| 118 | +++ gcc-4.4.0/gcc/config/s390/t-linux64 2009-04-21 10:12:52.607098757 -0700 |
---|
[36d2525] | 119 | @@ -1,6 +1,6 @@ |
---|
| 120 | MULTILIB_OPTIONS = m64/m31 |
---|
| 121 | MULTILIB_DIRNAMES = 64 32 |
---|
| 122 | -MULTILIB_OSDIRNAMES = ../lib64 ../lib |
---|
| 123 | +MULTILIB_OSDIRNAMES = ../lib ../lib32 |
---|
| 124 | |
---|
| 125 | LIBGCC = stmp-multilib |
---|
| 126 | INSTALL_LIBGCC = install-multilib |
---|
[56a4eb5] | 127 | diff -Naur gcc-4.4.0.orig/gcc/config/sparc/linux64.h gcc-4.4.0/gcc/config/sparc/linux64.h |
---|
| 128 | --- gcc-4.4.0.orig/gcc/config/sparc/linux64.h 2009-02-20 07:20:38.000000000 -0800 |
---|
| 129 | +++ gcc-4.4.0/gcc/config/sparc/linux64.h 2009-04-21 10:12:52.029679006 -0700 |
---|
| 130 | @@ -109,8 +109,8 @@ |
---|
[36d2525] | 131 | |
---|
| 132 | /* If ELF is the default format, we should not use /lib/elf. */ |
---|
| 133 | |
---|
| 134 | -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" |
---|
| 135 | -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2" |
---|
| 136 | +#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2" |
---|
| 137 | +#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2" |
---|
[56a4eb5] | 138 | |
---|
| 139 | #ifdef SPARC_BI_ARCH |
---|
| 140 | |
---|
| 141 | @@ -121,7 +121,7 @@ |
---|
[36d2525] | 142 | { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \ |
---|
| 143 | { "link_arch", LINK_ARCH_SPEC }, |
---|
| 144 | |
---|
[56a4eb5] | 145 | -#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \ |
---|
| 146 | +#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib32 %{shared:-shared} \ |
---|
[36d2525] | 147 | %{!shared: \ |
---|
| 148 | %{!ibcs: \ |
---|
| 149 | %{!static: \ |
---|
[56a4eb5] | 150 | @@ -130,7 +130,7 @@ |
---|
[36d2525] | 151 | %{static:-static}}} \ |
---|
| 152 | " |
---|
| 153 | |
---|
[56a4eb5] | 154 | -#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ |
---|
| 155 | +#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib %{shared:-shared} \ |
---|
[36d2525] | 156 | %{!shared: \ |
---|
| 157 | %{!ibcs: \ |
---|
| 158 | %{!static: \ |
---|
[56a4eb5] | 159 | @@ -211,7 +211,7 @@ |
---|
[36d2525] | 160 | #else /* !SPARC_BI_ARCH */ |
---|
| 161 | |
---|
| 162 | #undef LINK_SPEC |
---|
[56a4eb5] | 163 | -#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ |
---|
| 164 | +#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib %{shared:-shared} \ |
---|
[36d2525] | 165 | %{!shared: \ |
---|
| 166 | %{!ibcs: \ |
---|
| 167 | %{!static: \ |
---|
[56a4eb5] | 168 | diff -Naur gcc-4.4.0.orig/gcc/config/sparc/linux.h gcc-4.4.0/gcc/config/sparc/linux.h |
---|
| 169 | --- gcc-4.4.0.orig/gcc/config/sparc/linux.h 2009-02-20 07:20:38.000000000 -0800 |
---|
| 170 | +++ gcc-4.4.0/gcc/config/sparc/linux.h 2009-04-21 10:12:52.271571169 -0700 |
---|
| 171 | @@ -86,7 +86,7 @@ |
---|
| 172 | #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" |
---|
[36d2525] | 173 | |
---|
| 174 | #undef LINK_SPEC |
---|
| 175 | -#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ |
---|
| 176 | +#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib32 %{shared:-shared} \ |
---|
| 177 | %{!mno-relax:%{!r:-relax}} \ |
---|
| 178 | %{!shared: \ |
---|
| 179 | %{!ibcs: \ |
---|
[56a4eb5] | 180 | diff -Naur gcc-4.4.0.orig/gcc/config/sparc/t-linux64 gcc-4.4.0/gcc/config/sparc/t-linux64 |
---|
| 181 | --- gcc-4.4.0.orig/gcc/config/sparc/t-linux64 2006-02-07 23:19:43.000000000 -0800 |
---|
| 182 | +++ gcc-4.4.0/gcc/config/sparc/t-linux64 2009-04-21 10:12:52.755357174 -0700 |
---|
[36d2525] | 183 | @@ -1,6 +1,6 @@ |
---|
| 184 | MULTILIB_OPTIONS = m64/m32 |
---|
| 185 | MULTILIB_DIRNAMES = 64 32 |
---|
| 186 | -MULTILIB_OSDIRNAMES = ../lib64 ../lib |
---|
| 187 | +MULTILIB_OSDIRNAMES = ../lib ../lib32 |
---|
| 188 | |
---|
| 189 | LIBGCC = stmp-multilib |
---|
| 190 | INSTALL_LIBGCC = install-multilib |
---|