Ignore:
Timestamp:
Jan 25, 2009, 1:06:18 AM (15 years ago)
Author:
Jim Gifford <clfs@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
49073ef
Parents:
5ec7db05
Message:

Updated to GCC 4.3.3 - Patches

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
     1Submitted By: Jim Gifford (jim at cross-lfs dot org)
     2Date: 01-25-2009
     3Initial Package Version: 4.3.3
    54Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
    65        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.
     6Upstream Status: Not Applied
     7Description: This patch modifies the location of the dynamic linker for gcc-4.3.3.
    168
    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
     9diff -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
    2012@@ -11,7 +11,7 @@
    2113     } while (0)
     
    2719 #undef STARTFILE_SPEC
    2820 #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.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
     21diff -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
    3224@@ -27,8 +27,8 @@
    3325 #define EXTRA_SPECS \
     
    4133 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
    4234 #else
    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
     35diff -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
    4638@@ -61,7 +61,7 @@
    4739 /* Use ld-linux.so.3 so that it will be possible to run "classic"
     
    5345 /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
    5446    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.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
     47diff -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
    5850@@ -62,7 +62,7 @@
    5951 
     
    6557 #define LINUX_TARGET_LINK_SPEC  "%{h*} %{version:-v} \
    6658    %{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
     59diff -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"
     71diff -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
    7074@@ -102,7 +102,7 @@
    7175 #undef CRIS_DEFAULT_CPU_VERSION
     
    7781 /* We need an -rpath-link to ld.so.1, and presumably to each directory
    7882    specified with -B.  */
    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
     83diff -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
    8286@@ -35,7 +35,7 @@
    8387 #define ENDFILE_SPEC \
     
    8993 #undef LINK_SPEC
    9094 #define LINK_SPEC "\
    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
     95diff -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
    9498@@ -22,7 +22,7 @@
    9599   %{!shared: \
     
    101105 
    102106 #undef STARTFILE_SPEC
    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
     107diff -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
    106110@@ -53,8 +53,8 @@
    107111    When the -shared link option is used a final link is not being
     
    115119 #if TARGET_64BIT_DEFAULT
    116120 #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
     121diff -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
    120124@@ -100,7 +100,7 @@
    121125 
     
    127131 #undef  SUBTARGET_EXTRA_SPECS
    128132 #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.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
     133diff -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
    132136@@ -37,7 +37,7 @@
    133137 /* Define this for shared library support because it isn't in the main
     
    139143 #undef LINK_SPEC
    140144 #define LINK_SPEC "\
    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
     145diff -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
    144148@@ -112,9 +112,9 @@
    145149    GLIBC_DYNAMIC_LINKER must be defined for each target using them, or
     
    150154-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
    151155+#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"
    153157+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
    154158 #define LINUX_DYNAMIC_LINKER \
    155159   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
    156160 #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
     161diff -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
    168164@@ -58,7 +58,7 @@
    169165 
     
    175171 #undef LINK_SPEC
    176172 #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.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
     173diff -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
    180176@@ -84,7 +84,7 @@
    181177 
     
    187183 #undef LINK_SPEC
    188184 #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.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
     185diff -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
    192188@@ -38,10 +38,10 @@
    193189 %{!shared: \
     
    205201   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32)
    206202 
    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
     203diff -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
    210206@@ -64,7 +64,7 @@
    211207 #undef MIPS_DEFAULT_GVALUE
     
    217213 /* Borrowed from sparc/linux.h */
    218214 #undef LINK_SPEC
    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
     215diff -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
    222218@@ -32,7 +32,7 @@
    223219 #undef  ASM_SPEC
     
    229225 #undef  LINK_SPEC
    230226 #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.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
     227diff -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
    234230@@ -44,7 +44,7 @@
    235231 /* Define this for shared library support because it isn't in the main
     
    241237 #undef LINK_SPEC
    242238 #define LINK_SPEC "\
    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
     239diff -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
    246242@@ -339,10 +339,10 @@
    247243 #undef LINK_OS_DEFAULT_SPEC
     
    254250+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld.so.1"
    255251+#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"
    257253+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
    258254 #if UCLIBC_DEFAULT
    259255 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
    260256 #else
    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
     257diff -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
    264260@@ -891,8 +891,8 @@
    265261 
     
    282278 #define CPP_OS_GNU_SPEC "-D__unix__ -D__gnu_hurd__ -D__GNU__   \
    283279 %{!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
     280diff -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
    310283@@ -72,8 +72,8 @@
    311284 #define MULTILIB_DEFAULTS { "m31" }
     
    314287-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
    315288-#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"
    317290+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64.so.1"
    318291 
    319292 #undef  LINK_SPEC
    320293 #define LINK_SPEC \
    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
     294diff -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
    324297@@ -47,7 +47,7 @@
    325298 
     
    331304 #undef SUBTARGET_LINK_EMUL_SUFFIX
    332305 #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.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
     306diff -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
    336309@@ -144,10 +144,10 @@
    337310 
     
    344317+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-linux.so.2"
    345318+#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"
    347320+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
    348321 #if UCLIBC_DEFAULT
     
    376349     %{!ibcs: \
    377350       %{!static: \
    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
     351diff -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
    381354@@ -120,8 +120,8 @@
    382355 
     
    399372   %{!shared: \
    400373     %{!ibcs: \
    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
     374diff -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
    404377@@ -43,7 +43,7 @@
    405378   %{mlongcalls:--longcalls} \
Note: See TracChangeset for help on using the changeset viewer.