[6a043e2] | 1 | Submitted By: Joe Ciccone <jciccone@gmail.com>
|
---|
| 2 | Date: 2008-08-24
|
---|
[08c058a] | 3 | Initial Package Version: 4.1.2
|
---|
| 4 | Upstream Status: Not Sent - LFS Specific
|
---|
| 5 | Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
|
---|
| 6 | the Pure LFS project.
|
---|
| 7 | More architectures added by Zack Winkles.
|
---|
| 8 | Further fine tunings by Greg Schafer.
|
---|
| 9 | Rediffed against gcc 4.0.0 by Robert Connolly.
|
---|
| 10 | Rediffed against gcc 4.1.0 by Chris Staub
|
---|
| 11 | Rediffed against gcc 4.1.2 by Jim Gifford
|
---|
| 12 | Rediffed against gcc 4.2.0 by Joe Ciccone
|
---|
[6a043e2] | 13 | Rediffed against gcc 4.3.1 by Joe Ciccone
|
---|
[08c058a] | 14 | Description: This patch modifies the location of the dynamic linker for
|
---|
| 15 | the GCC Pass 2 build in LFS Chapter 5.
|
---|
| 16 |
|
---|
[6a043e2] | 17 | diff -Naur gcc-4.3.1.orig/gcc/config/alpha/gnu.h gcc-4.3.1/gcc/config/alpha/gnu.h
|
---|
| 18 | --- gcc-4.3.1.orig/gcc/config/alpha/gnu.h 2004-09-07 20:17:19.000000000 -0400
|
---|
| 19 | +++ gcc-4.3.1/gcc/config/alpha/gnu.h 2008-08-24 13:51:46.000000000 -0400
|
---|
[08c058a] | 20 | @@ -11,7 +11,7 @@
|
---|
| 21 | } while (0)
|
---|
| 22 |
|
---|
| 23 | #undef ELF_DYNAMIC_LINKER
|
---|
| 24 | -#define ELF_DYNAMIC_LINKER "/lib/ld.so"
|
---|
| 25 | +#define ELF_DYNAMIC_LINKER "/tools/lib/ld.so"
|
---|
| 26 |
|
---|
| 27 | #undef STARTFILE_SPEC
|
---|
| 28 | #define STARTFILE_SPEC \
|
---|
[6a043e2] | 29 | diff -Naur gcc-4.3.1.orig/gcc/config/alpha/linux-elf.h gcc-4.3.1/gcc/config/alpha/linux-elf.h
|
---|
| 30 | --- gcc-4.3.1.orig/gcc/config/alpha/linux-elf.h 2007-08-02 06:49:31.000000000 -0400
|
---|
| 31 | +++ gcc-4.3.1/gcc/config/alpha/linux-elf.h 2008-08-24 13:51:46.000000000 -0400
|
---|
| 32 | @@ -27,8 +27,8 @@
|
---|
| 33 | #define EXTRA_SPECS \
|
---|
[08c058a] | 34 | { "elf_dynamic_linker", ELF_DYNAMIC_LINKER },
|
---|
| 35 |
|
---|
| 36 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
|
---|
| 37 | -#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
|
---|
| 38 | +#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
|
---|
| 39 | +#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
|
---|
| 40 | #if UCLIBC_DEFAULT
|
---|
| 41 | #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
|
---|
| 42 | #else
|
---|
[6a043e2] | 43 | diff -Naur gcc-4.3.1.orig/gcc/config/arm/linux-eabi.h gcc-4.3.1/gcc/config/arm/linux-eabi.h
|
---|
| 44 | --- gcc-4.3.1.orig/gcc/config/arm/linux-eabi.h 2007-11-08 08:44:09.000000000 -0500
|
---|
| 45 | +++ gcc-4.3.1/gcc/config/arm/linux-eabi.h 2008-08-24 13:52:56.000000000 -0400
|
---|
| 46 | @@ -61,7 +61,7 @@
|
---|
[08c058a] | 47 | /* Use ld-linux.so.3 so that it will be possible to run "classic"
|
---|
| 48 | GNU/Linux binaries on an EABI system. */
|
---|
[6a043e2] | 49 | #undef GLIBC_DYNAMIC_LINKER
|
---|
[08c058a] | 50 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3"
|
---|
| 51 | +#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.3"
|
---|
| 52 |
|
---|
| 53 | /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to
|
---|
| 54 | use the GNU/Linux version, not the generic BPABI version. */
|
---|
[6a043e2] | 55 | diff -Naur gcc-4.3.1.orig/gcc/config/arm/linux-elf.h gcc-4.3.1/gcc/config/arm/linux-elf.h
|
---|
| 56 | --- gcc-4.3.1.orig/gcc/config/arm/linux-elf.h 2007-11-08 08:44:09.000000000 -0500
|
---|
| 57 | +++ gcc-4.3.1/gcc/config/arm/linux-elf.h 2008-08-24 13:51:46.000000000 -0400
|
---|
| 58 | @@ -62,7 +62,7 @@
|
---|
[08c058a] | 59 |
|
---|
| 60 | #define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
|
---|
| 61 |
|
---|
| 62 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
|
---|
| 63 | +#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
|
---|
| 64 |
|
---|
| 65 | #define LINUX_TARGET_LINK_SPEC "%{h*} %{version:-v} \
|
---|
| 66 | %{b} \
|
---|
[6a043e2] | 67 | diff -Naur gcc-4.3.1.orig/gcc/config/cris/linux.h gcc-4.3.1/gcc/config/cris/linux.h
|
---|
| 68 | --- gcc-4.3.1.orig/gcc/config/cris/linux.h 2008-01-23 12:17:58.000000000 -0500
|
---|
| 69 | +++ gcc-4.3.1/gcc/config/cris/linux.h 2008-08-24 13:51:46.000000000 -0400
|
---|
| 70 | @@ -102,7 +102,7 @@
|
---|
| 71 | #undef CRIS_DEFAULT_CPU_VERSION
|
---|
| 72 | #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
|
---|
[08c058a] | 73 |
|
---|
| 74 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
|
---|
| 75 | +#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
|
---|
| 76 |
|
---|
| 77 | /* We need an -rpath-link to ld.so.1, and presumably to each directory
|
---|
| 78 | specified with -B. */
|
---|
[6a043e2] | 79 | diff -Naur gcc-4.3.1.orig/gcc/config/frv/linux.h gcc-4.3.1/gcc/config/frv/linux.h
|
---|
| 80 | --- gcc-4.3.1.orig/gcc/config/frv/linux.h 2007-08-02 06:49:31.000000000 -0400
|
---|
| 81 | +++ gcc-4.3.1/gcc/config/frv/linux.h 2008-08-24 13:51:46.000000000 -0400
|
---|
| 82 | @@ -35,7 +35,7 @@
|
---|
[08c058a] | 83 | #define ENDFILE_SPEC \
|
---|
| 84 | "%{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s"
|
---|
| 85 |
|
---|
| 86 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
|
---|
| 87 | +#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
|
---|
| 88 |
|
---|
| 89 | #undef LINK_SPEC
|
---|
| 90 | #define LINK_SPEC "\
|
---|
[6a043e2] | 91 | diff -Naur gcc-4.3.1.orig/gcc/config/i386/gnu.h gcc-4.3.1/gcc/config/i386/gnu.h
|
---|
| 92 | --- gcc-4.3.1.orig/gcc/config/i386/gnu.h 2007-08-08 02:35:17.000000000 -0400
|
---|
| 93 | +++ gcc-4.3.1/gcc/config/i386/gnu.h 2008-08-24 13:51:46.000000000 -0400
|
---|
[08c058a] | 94 | @@ -22,7 +22,7 @@
|
---|
| 95 | %{!shared: \
|
---|
| 96 | %{!static: \
|
---|
| 97 | %{rdynamic:-export-dynamic} \
|
---|
| 98 | - %{!dynamic-linker:-dynamic-linker /lib/ld.so}} \
|
---|
| 99 | + %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so}} \
|
---|
| 100 | %{static:-static}}"
|
---|
| 101 |
|
---|
| 102 | #undef STARTFILE_SPEC
|
---|
[6a043e2] | 103 | diff -Naur gcc-4.3.1.orig/gcc/config/i386/linux64.h gcc-4.3.1/gcc/config/i386/linux64.h
|
---|
| 104 | --- gcc-4.3.1.orig/gcc/config/i386/linux64.h 2007-08-02 06:49:31.000000000 -0400
|
---|
| 105 | +++ gcc-4.3.1/gcc/config/i386/linux64.h 2008-08-24 13:51:46.000000000 -0400
|
---|
| 106 | @@ -53,8 +53,8 @@
|
---|
[08c058a] | 107 | When the -shared link option is used a final link is not being
|
---|
| 108 | done. */
|
---|
| 109 |
|
---|
| 110 | -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
|
---|
| 111 | -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
|
---|
| 112 | +#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-linux.so.2"
|
---|
| 113 | +#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld-linux-x86-64.so.2"
|
---|
| 114 |
|
---|
[6a043e2] | 115 | #if TARGET_64BIT_DEFAULT
|
---|
| 116 | #define SPEC_32 "m32"
|
---|
| 117 | diff -Naur gcc-4.3.1.orig/gcc/config/i386/linux.h gcc-4.3.1/gcc/config/i386/linux.h
|
---|
| 118 | --- gcc-4.3.1.orig/gcc/config/i386/linux.h 2007-11-27 20:04:27.000000000 -0500
|
---|
| 119 | +++ gcc-4.3.1/gcc/config/i386/linux.h 2008-08-24 13:51:46.000000000 -0400
|
---|
| 120 | @@ -100,7 +100,7 @@
|
---|
[08c058a] | 121 |
|
---|
| 122 | /* These macros may be overridden in k*bsd-gnu.h and i386/k*bsd-gnu.h. */
|
---|
| 123 | #define LINK_EMULATION "elf_i386"
|
---|
| 124 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
|
---|
| 125 | +#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
|
---|
| 126 |
|
---|
| 127 | #undef SUBTARGET_EXTRA_SPECS
|
---|
| 128 | #define SUBTARGET_EXTRA_SPECS \
|
---|
[6a043e2] | 129 | diff -Naur gcc-4.3.1.orig/gcc/config/ia64/linux.h gcc-4.3.1/gcc/config/ia64/linux.h
|
---|
| 130 | --- gcc-4.3.1.orig/gcc/config/ia64/linux.h 2006-12-12 10:15:19.000000000 -0500
|
---|
| 131 | +++ gcc-4.3.1/gcc/config/ia64/linux.h 2008-08-24 13:51:46.000000000 -0400
|
---|
[08c058a] | 132 | @@ -37,7 +37,7 @@
|
---|
| 133 | /* Define this for shared library support because it isn't in the main
|
---|
| 134 | linux.h file. */
|
---|
| 135 |
|
---|
| 136 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
|
---|
| 137 | +#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux-ia64.so.2"
|
---|
| 138 |
|
---|
| 139 | #undef LINK_SPEC
|
---|
| 140 | #define LINK_SPEC "\
|
---|
[6a043e2] | 141 | diff -Naur gcc-4.3.1.orig/gcc/config/linux.h gcc-4.3.1/gcc/config/linux.h
|
---|
| 142 | --- gcc-4.3.1.orig/gcc/config/linux.h 2007-08-02 06:49:31.000000000 -0400
|
---|
| 143 | +++ gcc-4.3.1/gcc/config/linux.h 2008-08-24 13:51:46.000000000 -0400
|
---|
[08c058a] | 144 | @@ -112,9 +112,9 @@
|
---|
| 145 | GLIBC_DYNAMIC_LINKER must be defined for each target using them, or
|
---|
| 146 | GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
|
---|
| 147 | supporting both 32-bit and 64-bit compilation. */
|
---|
| 148 | -#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
|
---|
| 149 | -#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
|
---|
| 150 | -#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
|
---|
| 151 | +#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
|
---|
| 152 | +#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
|
---|
| 153 | +#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
|
---|
| 154 | #define LINUX_DYNAMIC_LINKER \
|
---|
| 155 | CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
|
---|
| 156 | #define LINUX_DYNAMIC_LINKER32 \
|
---|
[6a043e2] | 157 | @@ -130,3 +130,7 @@
|
---|
| 158 | #define TARGET_HAS_SINCOS (OPTION_GLIBC)
|
---|
[08c058a] | 159 |
|
---|
| 160 | #define TARGET_POSIX_IO
|
---|
| 161 | +
|
---|
| 162 | +/* Remove /usr/include from the end of the include search path. */
|
---|
| 163 | +#undef STANDARD_INCLUDE_DIR
|
---|
| 164 | +#define STANDARD_INCLUDE_DIR 0
|
---|
[6a043e2] | 165 | diff -Naur gcc-4.3.1.orig/gcc/config/m32r/linux.h gcc-4.3.1/gcc/config/m32r/linux.h
|
---|
| 166 | --- gcc-4.3.1.orig/gcc/config/m32r/linux.h 2007-08-02 06:49:31.000000000 -0400
|
---|
| 167 | +++ gcc-4.3.1/gcc/config/m32r/linux.h 2008-08-24 13:51:46.000000000 -0400
|
---|
| 168 | @@ -58,7 +58,7 @@
|
---|
[08c058a] | 169 |
|
---|
| 170 | /* If ELF is the default format, we should not use /lib/elf. */
|
---|
| 171 |
|
---|
| 172 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
|
---|
| 173 | +#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
|
---|
| 174 |
|
---|
| 175 | #undef LINK_SPEC
|
---|
| 176 | #if TARGET_LITTLE_ENDIAN
|
---|
[6a043e2] | 177 | diff -Naur gcc-4.3.1.orig/gcc/config/m68k/linux.h gcc-4.3.1/gcc/config/m68k/linux.h
|
---|
| 178 | --- gcc-4.3.1.orig/gcc/config/m68k/linux.h 2007-09-24 17:07:08.000000000 -0400
|
---|
| 179 | +++ gcc-4.3.1/gcc/config/m68k/linux.h 2008-08-24 13:51:46.000000000 -0400
|
---|
| 180 | @@ -84,7 +84,7 @@
|
---|
[08c058a] | 181 |
|
---|
| 182 | /* If ELF is the default format, we should not use /lib/elf. */
|
---|
| 183 |
|
---|
| 184 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
|
---|
| 185 | +#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
|
---|
| 186 |
|
---|
[6a043e2] | 187 | #undef LINK_SPEC
|
---|
[08c058a] | 188 | #define LINK_SPEC "-m m68kelf %{shared} \
|
---|
[6a043e2] | 189 | diff -Naur gcc-4.3.1.orig/gcc/config/mips/linux64.h gcc-4.3.1/gcc/config/mips/linux64.h
|
---|
| 190 | --- gcc-4.3.1.orig/gcc/config/mips/linux64.h 2007-08-02 06:49:31.000000000 -0400
|
---|
| 191 | +++ gcc-4.3.1/gcc/config/mips/linux64.h 2008-08-24 13:51:46.000000000 -0400
|
---|
| 192 | @@ -38,10 +38,10 @@
|
---|
| 193 | %{!shared: \
|
---|
| 194 | %{profile:-lc_p} %{!profile:-lc}}"
|
---|
[08c058a] | 195 |
|
---|
| 196 | -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
|
---|
| 197 | -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
|
---|
| 198 | -#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
|
---|
| 199 | -#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
|
---|
| 200 | +#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld.so.1"
|
---|
| 201 | +#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld.so.1"
|
---|
| 202 | +#define GLIBC_DYNAMIC_LINKERN32 "/tools/lib64/ld.so.1"
|
---|
| 203 | +#define UCLIBC_DYNAMIC_LINKERN32 "/tools/lib64/ld-uClibc.so.0"
|
---|
| 204 | #define LINUX_DYNAMIC_LINKERN32 \
|
---|
| 205 | CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32)
|
---|
| 206 |
|
---|
[6a043e2] | 207 | diff -Naur gcc-4.3.1.orig/gcc/config/mips/linux.h gcc-4.3.1/gcc/config/mips/linux.h
|
---|
| 208 | --- gcc-4.3.1.orig/gcc/config/mips/linux.h 2007-10-21 05:20:49.000000000 -0400
|
---|
| 209 | +++ gcc-4.3.1/gcc/config/mips/linux.h 2008-08-24 13:51:46.000000000 -0400
|
---|
| 210 | @@ -64,7 +64,7 @@
|
---|
[08c058a] | 211 | #undef MIPS_DEFAULT_GVALUE
|
---|
| 212 | #define MIPS_DEFAULT_GVALUE 0
|
---|
| 213 |
|
---|
| 214 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
|
---|
| 215 | +#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
|
---|
| 216 |
|
---|
| 217 | /* Borrowed from sparc/linux.h */
|
---|
| 218 | #undef LINK_SPEC
|
---|
[6a043e2] | 219 | diff -Naur gcc-4.3.1.orig/gcc/config/mn10300/linux.h gcc-4.3.1/gcc/config/mn10300/linux.h
|
---|
| 220 | --- gcc-4.3.1.orig/gcc/config/mn10300/linux.h 2007-08-02 06:49:31.000000000 -0400
|
---|
| 221 | +++ gcc-4.3.1/gcc/config/mn10300/linux.h 2008-08-24 13:51:46.000000000 -0400
|
---|
| 222 | @@ -32,7 +32,7 @@
|
---|
[08c058a] | 223 | #undef ASM_SPEC
|
---|
| 224 | #define ASM_SPEC "%{Wa,*:%*}"
|
---|
| 225 |
|
---|
| 226 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
|
---|
| 227 | +#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
|
---|
| 228 |
|
---|
| 229 | #undef LINK_SPEC
|
---|
| 230 | #define LINK_SPEC "%{mrelax:--relax} %{shared:-shared} \
|
---|
[6a043e2] | 231 | diff -Naur gcc-4.3.1.orig/gcc/config/pa/pa-linux.h gcc-4.3.1/gcc/config/pa/pa-linux.h
|
---|
| 232 | --- gcc-4.3.1.orig/gcc/config/pa/pa-linux.h 2007-08-02 06:49:31.000000000 -0400
|
---|
| 233 | +++ gcc-4.3.1/gcc/config/pa/pa-linux.h 2008-08-24 13:51:46.000000000 -0400
|
---|
| 234 | @@ -44,7 +44,7 @@
|
---|
[08c058a] | 235 | /* Define this for shared library support because it isn't in the main
|
---|
| 236 | linux.h file. */
|
---|
| 237 |
|
---|
| 238 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
|
---|
| 239 | +#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
|
---|
| 240 |
|
---|
| 241 | #undef LINK_SPEC
|
---|
| 242 | #define LINK_SPEC "\
|
---|
[6a043e2] | 243 | diff -Naur gcc-4.3.1.orig/gcc/config/rs6000/linux64.h gcc-4.3.1/gcc/config/rs6000/linux64.h
|
---|
| 244 | --- gcc-4.3.1.orig/gcc/config/rs6000/linux64.h 2007-08-02 06:49:31.000000000 -0400
|
---|
| 245 | +++ gcc-4.3.1/gcc/config/rs6000/linux64.h 2008-08-24 13:51:46.000000000 -0400
|
---|
| 246 | @@ -339,10 +339,10 @@
|
---|
[08c058a] | 247 | #undef LINK_OS_DEFAULT_SPEC
|
---|
| 248 | #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
|
---|
| 249 |
|
---|
| 250 | -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
|
---|
| 251 | -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
|
---|
| 252 | -#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
|
---|
| 253 | -#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
|
---|
| 254 | +#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld.so.1"
|
---|
| 255 | +#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64.so.1"
|
---|
| 256 | +#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
|
---|
| 257 | +#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
|
---|
| 258 | #if UCLIBC_DEFAULT
|
---|
| 259 | #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
|
---|
| 260 | #else
|
---|
[6a043e2] | 261 | diff -Naur gcc-4.3.1.orig/gcc/config/rs6000/sysv4.h gcc-4.3.1/gcc/config/rs6000/sysv4.h
|
---|
| 262 | --- gcc-4.3.1.orig/gcc/config/rs6000/sysv4.h 2007-08-08 15:33:24.000000000 -0400
|
---|
| 263 | +++ gcc-4.3.1/gcc/config/rs6000/sysv4.h 2008-08-24 13:51:46.000000000 -0400
|
---|
| 264 | @@ -891,8 +891,8 @@
|
---|
[08c058a] | 265 |
|
---|
| 266 | #define LINK_START_LINUX_SPEC ""
|
---|
| 267 |
|
---|
| 268 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
|
---|
| 269 | -#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
|
---|
| 270 | +#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
|
---|
| 271 | +#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
|
---|
| 272 | #if UCLIBC_DEFAULT
|
---|
| 273 | #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
|
---|
| 274 | #else
|
---|
[6a043e2] | 275 | @@ -934,7 +934,7 @@
|
---|
[08c058a] | 276 |
|
---|
| 277 | #define LINK_OS_GNU_SPEC "-m elf32ppclinux %{!shared: %{!static: \
|
---|
| 278 | %{rdynamic:-export-dynamic} \
|
---|
| 279 | - %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}"
|
---|
| 280 | + %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so.1}}}"
|
---|
| 281 |
|
---|
| 282 | #define CPP_OS_GNU_SPEC "-D__unix__ -D__gnu_hurd__ -D__GNU__ \
|
---|
| 283 | %{!undef: \
|
---|
[6a043e2] | 284 | diff -Naur gcc-4.3.1.orig/gcc/config/rs6000/t-linux64 gcc-4.3.1/gcc/config/rs6000/t-linux64
|
---|
| 285 | --- gcc-4.3.1.orig/gcc/config/rs6000/t-linux64 2007-09-27 15:56:06.000000000 -0400
|
---|
| 286 | +++ gcc-4.3.1/gcc/config/rs6000/t-linux64 2008-08-24 13:50:38.000000000 -0400
|
---|
| 287 | @@ -14,13 +14,13 @@
|
---|
| 288 | # it doesn't tell anything about the 32bit libraries on those systems. Set
|
---|
| 289 | # MULTILIB_OSDIRNAMES according to what is found on the target.
|
---|
| 290 |
|
---|
| 291 | -MULTILIB_OPTIONS = m64/m32 msoft-float
|
---|
| 292 | -MULTILIB_DIRNAMES = 64 32 nof
|
---|
| 293 | +MULTILIB_OPTIONS = m64/m32
|
---|
| 294 | +MULTILIB_DIRNAMES = 64 32
|
---|
| 295 | MULTILIB_EXTRA_OPTS = fPIC mstrict-align
|
---|
| 296 | -MULTILIB_EXCEPTIONS = m64/msoft-float
|
---|
| 297 | -MULTILIB_EXCLUSIONS = m64/!m32/msoft-float
|
---|
| 298 | -MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
|
---|
| 299 | -MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT)
|
---|
| 300 | +MULTILIB_EXCEPTIONS =
|
---|
| 301 | +MULTILIB_EXCLUSIONS =
|
---|
| 302 | +MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
|
---|
| 303 | +MULTILIB_MATCHES =
|
---|
| 304 |
|
---|
| 305 | softfp_wrap_start := '\#ifndef __powerpc64__'
|
---|
| 306 | softfp_wrap_end := '\#endif'
|
---|
| 307 | diff -Naur gcc-4.3.1.orig/gcc/config/s390/linux.h gcc-4.3.1/gcc/config/s390/linux.h
|
---|
| 308 | --- gcc-4.3.1.orig/gcc/config/s390/linux.h 2007-08-02 06:49:31.000000000 -0400
|
---|
| 309 | +++ gcc-4.3.1/gcc/config/s390/linux.h 2008-08-24 13:51:46.000000000 -0400
|
---|
| 310 | @@ -72,8 +72,8 @@
|
---|
[08c058a] | 311 | #define MULTILIB_DEFAULTS { "m31" }
|
---|
| 312 | #endif
|
---|
| 313 |
|
---|
| 314 | -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
|
---|
| 315 | -#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
|
---|
| 316 | +#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1"
|
---|
| 317 | +#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64.so.1"
|
---|
| 318 |
|
---|
| 319 | #undef LINK_SPEC
|
---|
| 320 | #define LINK_SPEC \
|
---|
[6a043e2] | 321 | diff -Naur gcc-4.3.1.orig/gcc/config/sh/linux.h gcc-4.3.1/gcc/config/sh/linux.h
|
---|
| 322 | --- gcc-4.3.1.orig/gcc/config/sh/linux.h 2007-08-02 06:49:31.000000000 -0400
|
---|
| 323 | +++ gcc-4.3.1/gcc/config/sh/linux.h 2008-08-24 13:51:46.000000000 -0400
|
---|
| 324 | @@ -47,7 +47,7 @@
|
---|
[08c058a] | 325 |
|
---|
| 326 | #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
|
---|
| 327 |
|
---|
| 328 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
|
---|
| 329 | +#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
|
---|
| 330 |
|
---|
| 331 | #undef SUBTARGET_LINK_EMUL_SUFFIX
|
---|
| 332 | #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
|
---|
[6a043e2] | 333 | diff -Naur gcc-4.3.1.orig/gcc/config/sparc/linux64.h gcc-4.3.1/gcc/config/sparc/linux64.h
|
---|
| 334 | --- gcc-4.3.1.orig/gcc/config/sparc/linux64.h 2007-10-19 00:29:38.000000000 -0400
|
---|
| 335 | +++ gcc-4.3.1/gcc/config/sparc/linux64.h 2008-08-24 13:51:46.000000000 -0400
|
---|
[08c058a] | 336 | @@ -144,10 +144,10 @@
|
---|
| 337 |
|
---|
| 338 | /* If ELF is the default format, we should not use /lib/elf. */
|
---|
| 339 |
|
---|
| 340 | -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
|
---|
| 341 | -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
|
---|
| 342 | -#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
|
---|
| 343 | -#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
|
---|
| 344 | +#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-linux.so.2"
|
---|
| 345 | +#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld-linux.so.2"
|
---|
| 346 | +#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
|
---|
| 347 | +#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
|
---|
| 348 | #if UCLIBC_DEFAULT
|
---|
| 349 | #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
|
---|
| 350 | #else
|
---|
| 351 | @@ -167,7 +167,7 @@
|
---|
| 352 | { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \
|
---|
| 353 | { "link_arch", LINK_ARCH_SPEC },
|
---|
| 354 |
|
---|
| 355 | -#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
|
---|
| 356 | +#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/tools/lib32 %{shared:-shared} \
|
---|
| 357 | %{!shared: \
|
---|
| 358 | %{!ibcs: \
|
---|
| 359 | %{!static: \
|
---|
| 360 | @@ -176,7 +176,7 @@
|
---|
| 361 | %{static:-static}}} \
|
---|
| 362 | "
|
---|
| 363 |
|
---|
| 364 | -#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
|
---|
| 365 | +#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/tools/lib %{shared:-shared} \
|
---|
| 366 | %{!shared: \
|
---|
| 367 | %{!ibcs: \
|
---|
| 368 | %{!static: \
|
---|
| 369 | @@ -257,7 +257,7 @@
|
---|
| 370 | #else /* !SPARC_BI_ARCH */
|
---|
| 371 |
|
---|
| 372 | #undef LINK_SPEC
|
---|
| 373 | -#define LINK_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
|
---|
| 374 | +#define LINK_SPEC "-m elf64_sparc -Y P,/tools/lib %{shared:-shared} \
|
---|
| 375 | %{!shared: \
|
---|
| 376 | %{!ibcs: \
|
---|
| 377 | %{!static: \
|
---|
[6a043e2] | 378 | diff -Naur gcc-4.3.1.orig/gcc/config/sparc/linux.h gcc-4.3.1/gcc/config/sparc/linux.h
|
---|
| 379 | --- gcc-4.3.1.orig/gcc/config/sparc/linux.h 2007-08-02 06:49:31.000000000 -0400
|
---|
| 380 | +++ gcc-4.3.1/gcc/config/sparc/linux.h 2008-08-24 13:51:46.000000000 -0400
|
---|
| 381 | @@ -120,8 +120,8 @@
|
---|
[08c058a] | 382 |
|
---|
| 383 | /* If ELF is the default format, we should not use /lib/elf. */
|
---|
| 384 |
|
---|
| 385 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
|
---|
| 386 | -#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
|
---|
| 387 | +#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
|
---|
| 388 | +#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
|
---|
| 389 | #if UCLIBC_DEFAULT
|
---|
| 390 | #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
|
---|
| 391 | #else
|
---|
[6a043e2] | 392 | @@ -132,7 +132,7 @@
|
---|
[08c058a] | 393 |
|
---|
| 394 |
|
---|
| 395 | #undef LINK_SPEC
|
---|
| 396 | -#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
|
---|
| 397 | +#define LINK_SPEC "-m elf32_sparc -Y P,/tools/lib32 %{shared:-shared} \
|
---|
| 398 | %{!mno-relax:%{!r:-relax}} \
|
---|
| 399 | %{!shared: \
|
---|
| 400 | %{!ibcs: \
|
---|
[6a043e2] | 401 | diff -Naur gcc-4.3.1.orig/gcc/config/xtensa/linux.h gcc-4.3.1/gcc/config/xtensa/linux.h
|
---|
| 402 | --- gcc-4.3.1.orig/gcc/config/xtensa/linux.h 2008-01-17 20:37:53.000000000 -0500
|
---|
| 403 | +++ gcc-4.3.1/gcc/config/xtensa/linux.h 2008-08-24 13:51:46.000000000 -0400
|
---|
[08c058a] | 404 | @@ -43,7 +43,7 @@
|
---|
| 405 | %{mlongcalls:--longcalls} \
|
---|
| 406 | %{mno-longcalls:--no-longcalls}"
|
---|
| 407 |
|
---|
| 408 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
|
---|
| 409 | +#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
|
---|
| 410 |
|
---|
| 411 | #undef LINK_SPEC
|
---|
| 412 | #define LINK_SPEC \
|
---|