Changeset 0804c00 for patches/gcc-4.3.3-pure64_specs-1.patch
- Timestamp:
- Jan 25, 2009, 1:06:18 AM (15 years ago)
- Branches:
- clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
- Children:
- 49073ef
- Parents:
- 5ec7db05
- File:
-
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
patches/gcc-4.3.3-pure64_specs-1.patch
r5ec7db05 r0804c00 1 Submitted By: Joe Ciccone <jciccone@gmail.com> 2 Date: 2008-08-24 3 Initial Package Version: 4.1.2 4 Upstream Status: Not Sent - LFS Specific 1 Submitted By: Jim Gifford (jim at cross-lfs dot org) 2 Date: 01-25-2009 3 Initial Package Version: 4.3.3 5 4 Origin: Idea originally developed by Ryan Oliver and Greg Schafer for 6 5 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 13 Rediffed against gcc 4.3.1 by Joe Ciccone 14 Description: This patch modifies the location of the dynamic linker for 15 the GCC Pass 2 build in LFS Chapter 5. 6 Upstream Status: Not Applied 7 Description: This patch modifies the location of the dynamic linker for gcc-4.3.3. 16 8 17 diff -Naur gcc-4.3. 1.orig/gcc/config/alpha/gnu.h gcc-4.3.1/gcc/config/alpha/gnu.h18 --- gcc-4.3. 1.orig/gcc/config/alpha/gnu.h 2004-09-07 20:17:19.000000000 -040019 +++ gcc-4.3. 1/gcc/config/alpha/gnu.h 2008-08-24 13:51:46.000000000 -04009 diff -Naur gcc-4.3.3.orig/gcc/config/alpha/gnu.h gcc-4.3.3/gcc/config/alpha/gnu.h 10 --- gcc-4.3.3.orig/gcc/config/alpha/gnu.h 2004-09-07 17:17:19.000000000 -0700 11 +++ gcc-4.3.3/gcc/config/alpha/gnu.h 2009-01-25 00:46:43.363275038 -0800 20 12 @@ -11,7 +11,7 @@ 21 13 } while (0) … … 27 19 #undef STARTFILE_SPEC 28 20 #define STARTFILE_SPEC \ 29 diff -Naur gcc-4.3. 1.orig/gcc/config/alpha/linux-elf.h gcc-4.3.1/gcc/config/alpha/linux-elf.h30 --- gcc-4.3. 1.orig/gcc/config/alpha/linux-elf.h 2007-08-02 06:49:31.000000000 -040031 +++ gcc-4.3. 1/gcc/config/alpha/linux-elf.h 2008-08-24 13:51:46.000000000 -040021 diff -Naur gcc-4.3.3.orig/gcc/config/alpha/linux-elf.h gcc-4.3.3/gcc/config/alpha/linux-elf.h 22 --- gcc-4.3.3.orig/gcc/config/alpha/linux-elf.h 2007-08-02 03:49:31.000000000 -0700 23 +++ gcc-4.3.3/gcc/config/alpha/linux-elf.h 2009-01-25 00:46:43.506828048 -0800 32 24 @@ -27,8 +27,8 @@ 33 25 #define EXTRA_SPECS \ … … 41 33 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}" 42 34 #else 43 diff -Naur gcc-4.3. 1.orig/gcc/config/arm/linux-eabi.h gcc-4.3.1/gcc/config/arm/linux-eabi.h44 --- gcc-4.3. 1.orig/gcc/config/arm/linux-eabi.h 2007-11-08 08:44:09.000000000 -050045 +++ gcc-4.3. 1/gcc/config/arm/linux-eabi.h 2008-08-24 13:52:56.000000000 -040035 diff -Naur gcc-4.3.3.orig/gcc/config/arm/linux-eabi.h gcc-4.3.3/gcc/config/arm/linux-eabi.h 36 --- gcc-4.3.3.orig/gcc/config/arm/linux-eabi.h 2007-11-08 05:44:09.000000000 -0800 37 +++ gcc-4.3.3/gcc/config/arm/linux-eabi.h 2009-01-25 00:46:48.034939237 -0800 46 38 @@ -61,7 +61,7 @@ 47 39 /* Use ld-linux.so.3 so that it will be possible to run "classic" … … 53 45 /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to 54 46 use the GNU/Linux version, not the generic BPABI version. */ 55 diff -Naur gcc-4.3. 1.orig/gcc/config/arm/linux-elf.h gcc-4.3.1/gcc/config/arm/linux-elf.h56 --- gcc-4.3. 1.orig/gcc/config/arm/linux-elf.h 2007-11-08 08:44:09.000000000 -050057 +++ gcc-4.3. 1/gcc/config/arm/linux-elf.h 2008-08-24 13:51:46.000000000 -040047 diff -Naur gcc-4.3.3.orig/gcc/config/arm/linux-elf.h gcc-4.3.3/gcc/config/arm/linux-elf.h 48 --- gcc-4.3.3.orig/gcc/config/arm/linux-elf.h 2007-11-08 05:44:09.000000000 -0800 49 +++ gcc-4.3.3/gcc/config/arm/linux-elf.h 2009-01-25 00:46:47.747830702 -0800 58 50 @@ -62,7 +62,7 @@ 59 51 … … 65 57 #define LINUX_TARGET_LINK_SPEC "%{h*} %{version:-v} \ 66 58 %{b} \ 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 59 diff -Naur gcc-4.3.3.orig/gcc/config/bfin/linux.h gcc-4.3.3/gcc/config/bfin/linux.h 60 --- gcc-4.3.3.orig/gcc/config/bfin/linux.h 2007-09-05 17:09:05.000000000 -0700 61 +++ gcc-4.3.3/gcc/config/bfin/linux.h 2009-01-25 00:46:40.418363458 -0800 62 @@ -22,7 +22,7 @@ 63 %{shared:-G -Bdynamic} \ 64 %{!shared: %{!static: \ 65 %{rdynamic:-export-dynamic} \ 66 - %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}} \ 67 + %{!dynamic-linker:-dynamic-linker /tools/lib/ld-uClibc.so.0}} \ 68 %{static}} -init __init -fini __fini" 69 70 #define MD_UNWIND_SUPPORT "config/bfin/linux-unwind.h" 71 diff -Naur gcc-4.3.3.orig/gcc/config/cris/linux.h gcc-4.3.3/gcc/config/cris/linux.h 72 --- gcc-4.3.3.orig/gcc/config/cris/linux.h 2008-01-23 09:17:58.000000000 -0800 73 +++ gcc-4.3.3/gcc/config/cris/linux.h 2009-01-25 00:46:38.092783349 -0800 70 74 @@ -102,7 +102,7 @@ 71 75 #undef CRIS_DEFAULT_CPU_VERSION … … 77 81 /* We need an -rpath-link to ld.so.1, and presumably to each directory 78 82 specified with -B. */ 79 diff -Naur gcc-4.3. 1.orig/gcc/config/frv/linux.h gcc-4.3.1/gcc/config/frv/linux.h80 --- gcc-4.3. 1.orig/gcc/config/frv/linux.h 2007-08-02 06:49:31.000000000 -040081 +++ gcc-4.3. 1/gcc/config/frv/linux.h 2008-08-24 13:51:46.000000000 -040083 diff -Naur gcc-4.3.3.orig/gcc/config/frv/linux.h gcc-4.3.3/gcc/config/frv/linux.h 84 --- gcc-4.3.3.orig/gcc/config/frv/linux.h 2007-08-02 03:49:31.000000000 -0700 85 +++ gcc-4.3.3/gcc/config/frv/linux.h 2009-01-25 00:46:37.813879592 -0800 82 86 @@ -35,7 +35,7 @@ 83 87 #define ENDFILE_SPEC \ … … 89 93 #undef LINK_SPEC 90 94 #define LINK_SPEC "\ 91 diff -Naur gcc-4.3. 1.orig/gcc/config/i386/gnu.h gcc-4.3.1/gcc/config/i386/gnu.h92 --- gcc-4.3. 1.orig/gcc/config/i386/gnu.h 2007-08-08 02:35:17.000000000 -040093 +++ gcc-4.3. 1/gcc/config/i386/gnu.h 2008-08-24 13:51:46.000000000 -040095 diff -Naur gcc-4.3.3.orig/gcc/config/i386/gnu.h gcc-4.3.3/gcc/config/i386/gnu.h 96 --- gcc-4.3.3.orig/gcc/config/i386/gnu.h 2007-08-07 23:35:17.000000000 -0700 97 +++ gcc-4.3.3/gcc/config/i386/gnu.h 2009-01-25 00:46:40.849024165 -0800 94 98 @@ -22,7 +22,7 @@ 95 99 %{!shared: \ … … 101 105 102 106 #undef STARTFILE_SPEC 103 diff -Naur gcc-4.3. 1.orig/gcc/config/i386/linux64.h gcc-4.3.1/gcc/config/i386/linux64.h104 --- gcc-4.3. 1.orig/gcc/config/i386/linux64.h 2007-08-02 06:49:31.000000000 -0400105 +++ gcc-4.3. 1/gcc/config/i386/linux64.h 2008-08-24 13:51:46.000000000 -0400107 diff -Naur gcc-4.3.3.orig/gcc/config/i386/linux64.h gcc-4.3.3/gcc/config/i386/linux64.h 108 --- gcc-4.3.3.orig/gcc/config/i386/linux64.h 2007-08-02 03:49:31.000000000 -0700 109 +++ gcc-4.3.3/gcc/config/i386/linux64.h 2009-01-25 00:46:40.578323788 -0800 106 110 @@ -53,8 +53,8 @@ 107 111 When the -shared link option is used a final link is not being … … 115 119 #if TARGET_64BIT_DEFAULT 116 120 #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.h118 --- gcc-4.3. 1.orig/gcc/config/i386/linux.h 2007-11-27 20:04:27.000000000 -0500119 +++ gcc-4.3. 1/gcc/config/i386/linux.h 2008-08-24 13:51:46.000000000 -0400121 diff -Naur gcc-4.3.3.orig/gcc/config/i386/linux.h gcc-4.3.3/gcc/config/i386/linux.h 122 --- gcc-4.3.3.orig/gcc/config/i386/linux.h 2007-11-27 17:04:27.000000000 -0800 123 +++ gcc-4.3.3/gcc/config/i386/linux.h 2009-01-25 00:46:42.161519765 -0800 120 124 @@ -100,7 +100,7 @@ 121 125 … … 127 131 #undef SUBTARGET_EXTRA_SPECS 128 132 #define SUBTARGET_EXTRA_SPECS \ 129 diff -Naur gcc-4.3. 1.orig/gcc/config/ia64/linux.h gcc-4.3.1/gcc/config/ia64/linux.h130 --- gcc-4.3. 1.orig/gcc/config/ia64/linux.h 2006-12-12 10:15:19.000000000 -0500131 +++ gcc-4.3. 1/gcc/config/ia64/linux.h 2008-08-24 13:51:46.000000000 -0400133 diff -Naur gcc-4.3.3.orig/gcc/config/ia64/linux.h gcc-4.3.3/gcc/config/ia64/linux.h 134 --- gcc-4.3.3.orig/gcc/config/ia64/linux.h 2006-12-12 07:15:19.000000000 -0800 135 +++ gcc-4.3.3/gcc/config/ia64/linux.h 2009-01-25 00:46:43.236127392 -0800 132 136 @@ -37,7 +37,7 @@ 133 137 /* Define this for shared library support because it isn't in the main … … 139 143 #undef LINK_SPEC 140 144 #define LINK_SPEC "\ 141 diff -Naur gcc-4.3. 1.orig/gcc/config/linux.h gcc-4.3.1/gcc/config/linux.h142 --- gcc-4.3. 1.orig/gcc/config/linux.h 2007-08-02 06:49:31.000000000 -0400143 +++ gcc-4.3. 1/gcc/config/linux.h 2008-08-24 13:51:46.000000000 -0400145 diff -Naur gcc-4.3.3.orig/gcc/config/linux.h gcc-4.3.3/gcc/config/linux.h 146 --- gcc-4.3.3.orig/gcc/config/linux.h 2007-08-02 03:49:31.000000000 -0700 147 +++ gcc-4.3.3/gcc/config/linux.h 2009-01-25 00:46:46.090803184 -0800 144 148 @@ -112,9 +112,9 @@ 145 149 GLIBC_DYNAMIC_LINKER must be defined for each target using them, or … … 150 154 -#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" 151 155 +#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0" 152 +#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib /ld-uClibc.so.0"156 +#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-uClibc.so.0" 153 157 +#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0" 154 158 #define LINUX_DYNAMIC_LINKER \ 155 159 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) 156 160 #define LINUX_DYNAMIC_LINKER32 \ 157 @@ -130,3 +130,7 @@ 158 #define TARGET_HAS_SINCOS (OPTION_GLIBC) 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 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 161 diff -Naur gcc-4.3.3.orig/gcc/config/m32r/linux.h gcc-4.3.3/gcc/config/m32r/linux.h 162 --- gcc-4.3.3.orig/gcc/config/m32r/linux.h 2007-08-02 03:49:31.000000000 -0700 163 +++ gcc-4.3.3/gcc/config/m32r/linux.h 2009-01-25 00:46:40.180472971 -0800 168 164 @@ -58,7 +58,7 @@ 169 165 … … 175 171 #undef LINK_SPEC 176 172 #if TARGET_LITTLE_ENDIAN 177 diff -Naur gcc-4.3. 1.orig/gcc/config/m68k/linux.h gcc-4.3.1/gcc/config/m68k/linux.h178 --- gcc-4.3. 1.orig/gcc/config/m68k/linux.h 2007-09-24 17:07:08.000000000 -0400179 +++ gcc-4.3. 1/gcc/config/m68k/linux.h 2008-08-24 13:51:46.000000000 -0400173 diff -Naur gcc-4.3.3.orig/gcc/config/m68k/linux.h gcc-4.3.3/gcc/config/m68k/linux.h 174 --- gcc-4.3.3.orig/gcc/config/m68k/linux.h 2007-09-24 14:07:08.000000000 -0700 175 +++ gcc-4.3.3/gcc/config/m68k/linux.h 2009-01-25 00:46:38.769538482 -0800 180 176 @@ -84,7 +84,7 @@ 181 177 … … 187 183 #undef LINK_SPEC 188 184 #define LINK_SPEC "-m m68kelf %{shared} \ 189 diff -Naur gcc-4.3. 1.orig/gcc/config/mips/linux64.h gcc-4.3.1/gcc/config/mips/linux64.h190 --- gcc-4.3. 1.orig/gcc/config/mips/linux64.h 2007-08-02 06:49:31.000000000 -0400191 +++ gcc-4.3. 1/gcc/config/mips/linux64.h 2008-08-24 13:51:46.000000000 -0400185 diff -Naur gcc-4.3.3.orig/gcc/config/mips/linux64.h gcc-4.3.3/gcc/config/mips/linux64.h 186 --- gcc-4.3.3.orig/gcc/config/mips/linux64.h 2007-08-02 03:49:31.000000000 -0700 187 +++ gcc-4.3.3/gcc/config/mips/linux64.h 2009-01-25 00:46:46.197444615 -0800 192 188 @@ -38,10 +38,10 @@ 193 189 %{!shared: \ … … 205 201 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32) 206 202 207 diff -Naur gcc-4.3. 1.orig/gcc/config/mips/linux.h gcc-4.3.1/gcc/config/mips/linux.h208 --- gcc-4.3. 1.orig/gcc/config/mips/linux.h 2007-10-21 05:20:49.000000000 -0400209 +++ gcc-4.3. 1/gcc/config/mips/linux.h 2008-08-24 13:51:46.000000000 -0400203 diff -Naur gcc-4.3.3.orig/gcc/config/mips/linux.h gcc-4.3.3/gcc/config/mips/linux.h 204 --- gcc-4.3.3.orig/gcc/config/mips/linux.h 2007-10-21 02:20:49.000000000 -0700 205 +++ gcc-4.3.3/gcc/config/mips/linux.h 2009-01-25 00:46:46.685527587 -0800 210 206 @@ -64,7 +64,7 @@ 211 207 #undef MIPS_DEFAULT_GVALUE … … 217 213 /* Borrowed from sparc/linux.h */ 218 214 #undef LINK_SPEC 219 diff -Naur gcc-4.3. 1.orig/gcc/config/mn10300/linux.h gcc-4.3.1/gcc/config/mn10300/linux.h220 --- gcc-4.3. 1.orig/gcc/config/mn10300/linux.h 2007-08-02 06:49:31.000000000 -0400221 +++ gcc-4.3. 1/gcc/config/mn10300/linux.h 2008-08-24 13:51:46.000000000 -0400215 diff -Naur gcc-4.3.3.orig/gcc/config/mn10300/linux.h gcc-4.3.3/gcc/config/mn10300/linux.h 216 --- gcc-4.3.3.orig/gcc/config/mn10300/linux.h 2007-08-02 03:49:31.000000000 -0700 217 +++ gcc-4.3.3/gcc/config/mn10300/linux.h 2009-01-25 00:46:47.091582902 -0800 222 218 @@ -32,7 +32,7 @@ 223 219 #undef ASM_SPEC … … 229 225 #undef LINK_SPEC 230 226 #define LINK_SPEC "%{mrelax:--relax} %{shared:-shared} \ 231 diff -Naur gcc-4.3. 1.orig/gcc/config/pa/pa-linux.h gcc-4.3.1/gcc/config/pa/pa-linux.h232 --- gcc-4.3. 1.orig/gcc/config/pa/pa-linux.h 2007-08-02 06:49:31.000000000 -0400233 +++ gcc-4.3. 1/gcc/config/pa/pa-linux.h 2008-08-24 13:51:46.000000000 -0400227 diff -Naur gcc-4.3.3.orig/gcc/config/pa/pa-linux.h gcc-4.3.3/gcc/config/pa/pa-linux.h 228 --- gcc-4.3.3.orig/gcc/config/pa/pa-linux.h 2007-08-02 03:49:31.000000000 -0700 229 +++ gcc-4.3.3/gcc/config/pa/pa-linux.h 2009-01-25 00:46:45.143347394 -0800 234 230 @@ -44,7 +44,7 @@ 235 231 /* Define this for shared library support because it isn't in the main … … 241 237 #undef LINK_SPEC 242 238 #define LINK_SPEC "\ 243 diff -Naur gcc-4.3. 1.orig/gcc/config/rs6000/linux64.h gcc-4.3.1/gcc/config/rs6000/linux64.h244 --- gcc-4.3. 1.orig/gcc/config/rs6000/linux64.h 2007-08-02 06:49:31.000000000 -0400245 +++ gcc-4.3. 1/gcc/config/rs6000/linux64.h 2008-08-24 13:51:46.000000000 -0400239 diff -Naur gcc-4.3.3.orig/gcc/config/rs6000/linux64.h gcc-4.3.3/gcc/config/rs6000/linux64.h 240 --- gcc-4.3.3.orig/gcc/config/rs6000/linux64.h 2007-08-02 03:49:31.000000000 -0700 241 +++ gcc-4.3.3/gcc/config/rs6000/linux64.h 2009-01-25 00:46:36.037907528 -0800 246 242 @@ -339,10 +339,10 @@ 247 243 #undef LINK_OS_DEFAULT_SPEC … … 254 250 +#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld.so.1" 255 251 +#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64.so.1" 256 +#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib /ld-uClibc.so.0"252 +#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-uClibc.so.0" 257 253 +#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0" 258 254 #if UCLIBC_DEFAULT 259 255 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}" 260 256 #else 261 diff -Naur gcc-4.3. 1.orig/gcc/config/rs6000/sysv4.h gcc-4.3.1/gcc/config/rs6000/sysv4.h262 --- gcc-4.3. 1.orig/gcc/config/rs6000/sysv4.h 2007-08-08 15:33:24.000000000 -0400263 +++ gcc-4.3. 1/gcc/config/rs6000/sysv4.h 2008-08-24 13:51:46.000000000 -0400257 diff -Naur gcc-4.3.3.orig/gcc/config/rs6000/sysv4.h gcc-4.3.3/gcc/config/rs6000/sysv4.h 258 --- gcc-4.3.3.orig/gcc/config/rs6000/sysv4.h 2007-08-08 12:33:24.000000000 -0700 259 +++ gcc-4.3.3/gcc/config/rs6000/sysv4.h 2009-01-25 00:46:36.316812403 -0800 264 260 @@ -891,8 +891,8 @@ 265 261 … … 282 278 #define CPP_OS_GNU_SPEC "-D__unix__ -D__gnu_hurd__ -D__GNU__ \ 283 279 %{!undef: \ 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 280 diff -Naur gcc-4.3.3.orig/gcc/config/s390/linux.h gcc-4.3.3/gcc/config/s390/linux.h 281 --- gcc-4.3.3.orig/gcc/config/s390/linux.h 2007-08-02 03:49:31.000000000 -0700 282 +++ gcc-4.3.3/gcc/config/s390/linux.h 2009-01-25 00:46:39.536529682 -0800 310 283 @@ -72,8 +72,8 @@ 311 284 #define MULTILIB_DEFAULTS { "m31" } … … 314 287 -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" 315 288 -#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1" 316 +#define GLIBC_DYNAMIC_LINKER32 "/tools/lib /ld.so.1"289 +#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld.so.1" 317 290 +#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64.so.1" 318 291 319 292 #undef LINK_SPEC 320 293 #define LINK_SPEC \ 321 diff -Naur gcc-4.3. 1.orig/gcc/config/sh/linux.h gcc-4.3.1/gcc/config/sh/linux.h322 --- gcc-4.3. 1.orig/gcc/config/sh/linux.h 2007-08-02 06:49:31.000000000 -0400323 +++ gcc-4.3. 1/gcc/config/sh/linux.h 2008-08-24 13:51:46.000000000 -0400294 diff -Naur gcc-4.3.3.orig/gcc/config/sh/linux.h gcc-4.3.3/gcc/config/sh/linux.h 295 --- gcc-4.3.3.orig/gcc/config/sh/linux.h 2007-08-02 03:49:31.000000000 -0700 296 +++ gcc-4.3.3/gcc/config/sh/linux.h 2009-01-25 00:46:44.454287190 -0800 324 297 @@ -47,7 +47,7 @@ 325 298 … … 331 304 #undef SUBTARGET_LINK_EMUL_SUFFIX 332 305 #define SUBTARGET_LINK_EMUL_SUFFIX "_linux" 333 diff -Naur gcc-4.3. 1.orig/gcc/config/sparc/linux64.h gcc-4.3.1/gcc/config/sparc/linux64.h334 --- gcc-4.3. 1.orig/gcc/config/sparc/linux64.h 2007-10-19 00:29:38.000000000 -0400335 +++ gcc-4.3. 1/gcc/config/sparc/linux64.h 2008-08-24 13:51:46.000000000 -0400306 diff -Naur gcc-4.3.3.orig/gcc/config/sparc/linux64.h gcc-4.3.3/gcc/config/sparc/linux64.h 307 --- gcc-4.3.3.orig/gcc/config/sparc/linux64.h 2007-10-18 21:29:38.000000000 -0700 308 +++ gcc-4.3.3/gcc/config/sparc/linux64.h 2009-01-25 00:46:48.145679843 -0800 336 309 @@ -144,10 +144,10 @@ 337 310 … … 344 317 +#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-linux.so.2" 345 318 +#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld-linux.so.2" 346 +#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib /ld-uClibc.so.0"319 +#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-uClibc.so.0" 347 320 +#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0" 348 321 #if UCLIBC_DEFAULT … … 376 349 %{!ibcs: \ 377 350 %{!static: \ 378 diff -Naur gcc-4.3. 1.orig/gcc/config/sparc/linux.h gcc-4.3.1/gcc/config/sparc/linux.h379 --- gcc-4.3. 1.orig/gcc/config/sparc/linux.h 2007-08-02 06:49:31.000000000 -0400380 +++ gcc-4.3. 1/gcc/config/sparc/linux.h 2008-08-24 13:51:46.000000000 -0400351 diff -Naur gcc-4.3.3.orig/gcc/config/sparc/linux.h gcc-4.3.3/gcc/config/sparc/linux.h 352 --- gcc-4.3.3.orig/gcc/config/sparc/linux.h 2007-08-02 03:49:31.000000000 -0700 353 +++ gcc-4.3.3/gcc/config/sparc/linux.h 2009-01-25 00:46:48.494310657 -0800 381 354 @@ -120,8 +120,8 @@ 382 355 … … 399 372 %{!shared: \ 400 373 %{!ibcs: \ 401 diff -Naur gcc-4.3. 1.orig/gcc/config/xtensa/linux.h gcc-4.3.1/gcc/config/xtensa/linux.h402 --- gcc-4.3. 1.orig/gcc/config/xtensa/linux.h 2008-01-17 20:37:53.000000000 -0500403 +++ gcc-4.3. 1/gcc/config/xtensa/linux.h 2008-08-24 13:51:46.000000000 -0400374 diff -Naur gcc-4.3.3.orig/gcc/config/xtensa/linux.h gcc-4.3.3/gcc/config/xtensa/linux.h 375 --- gcc-4.3.3.orig/gcc/config/xtensa/linux.h 2008-01-17 17:37:53.000000000 -0800 376 +++ gcc-4.3.3/gcc/config/xtensa/linux.h 2009-01-25 00:46:37.658018717 -0800 404 377 @@ -43,7 +43,7 @@ 405 378 %{mlongcalls:--longcalls} \
Note: See TracChangeset
for help on using the changeset viewer.