Changeset 56a4eb5

Timestamp:

Jun 3, 2009, 12:19:12 PM (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:

eafdda9

Parents:

77e17c8d

Message:

Updated to GCC 4.4.0

Location:

patches

Files:

• gcc-4.3.3-branch_update-5.patch (deleted)
• gcc-4.3.3-powerpc64_multilib-1.patch (deleted)
• gcc-4.3.3-ppc_fixes-1.patch (deleted)
• gcc-4.4.0-branch_update-1.patch (added)
• gcc-4.4.0-posix-1.patch (moved) (moved from patches/gcc-4.3.3-posix-1.patch) (14 diffs)
• gcc-4.4.0-pure64-1.patch (moved) (moved from patches/gcc-4.3.3-pure64-1.patch) (12 diffs)
• gcc-4.4.0-pure64_specs-1.patch (moved) (moved from patches/gcc-4.3.3-pure64_specs-1.patch) (25 diffs)
• gcc-4.4.0-specs-1.patch (moved) (moved from patches/gcc-4.3.3-specs-1.patch) (25 diffs)

patches/gcc-4.4.0-posix-1.patch

@@ -1 +1 @@
 Submitted By: Jim Gifford (jim at cross-lfs dot org)
-Date: 01-25-2009
-Initial Package Version: 4.3.3
+Date: 04-21-2009
+Initial Package Version: 4.4.0
 Origin: Jim Gifford
         Rediffed against 4.1.0 by Chris Staub
@@ -8 +8 @@
         Rediffed against 4.3.0 by Joe Ciccone
         Rediffed against 4.3.3 by Jim Gifford
+        Rediffed against 4.4.0 by Jim Gifford
 Upstream Status: On Hold
 Description: Makes GCC Posix Compliant
 
-diff -Naur gcc-4.3.3.orig/contrib/patch_tester.sh gcc-4.3.3/contrib/patch_tester.sh
---- gcc-4.3.3.orig/contrib/patch_tester.sh      2007-12-26 13:01:38.000000000 -0800
-+++ gcc-4.3.3/contrib/patch_tester.sh   2009-01-25 00:53:32.447636261 -0800
-@@ -287,7 +287,7 @@
- 
-     if ! make $dashj `grep "^make:" $PATCH | sed -e "s/^make://g"` bootstrap &> $1/bootstrap ; then
-        report "bootstrap failed with last lines:"
+diff -Naur gcc-4.4.0.orig/contrib/patch_tester.sh gcc-4.4.0/contrib/patch_tester.sh
+--- gcc-4.4.0.orig/contrib/patch_tester.sh      2008-05-08 08:14:47.000000000 -0700
++++ gcc-4.4.0/contrib/patch_tester.sh   2009-04-21 09:56:06.009963403 -0700
+@@ -324,7 +324,7 @@
+     MAKE_ARGS="$default_make $MAKE_ARGS"
+     if ! eval make $dashj $MAKE_ARGS &> $1/bootstrap ; then
+        report "bootstrap with `basename $1` version failed with last lines:"
 -       tail -30 $1/bootstrap > $1/last_bootstrap
 +       tail -n 30 $1/bootstrap > $1/last_bootstrap
@@ -23 +24 @@
         report "grep --context=20 Error bootstrap:"
         grep --context=20 Error $1/bootstrap > $1/bootstrap_error
-@@ -420,7 +420,7 @@
+@@ -464,7 +464,7 @@
  # After selfexec, $TESTING is already set up.  
  if [ -d $TESTING ]; then
@@ -32 +33 @@
      if [ -f $PATCH ]; then
         bootntest_patched && bootntest_pristine && compare_passes
-@@ -429,7 +429,7 @@
- fi
- 
+@@ -474,7 +474,7 @@
+ 
+ firstpatch=true
  while true; do
 -    PATCH=`ls -rt -1 $PATCHES | head -1`
 +    PATCH=`ls -rt -1 $PATCHES | head -n 1`
      if [ x$PATCH = x ]; then
-        sleep ${standby}m
-     else
-diff -Naur gcc-4.3.3.orig/contrib/test_summary gcc-4.3.3/contrib/test_summary
---- gcc-4.3.3.orig/contrib/test_summary 2007-02-09 16:30:46.000000000 -0800
-+++ gcc-4.3.3/contrib/test_summary      2009-01-25 00:53:32.447636261 -0800
+        if [ $stop = true ]; then
+            if [ $firstpatch = true ]; then
+diff -Naur gcc-4.4.0.orig/contrib/test_summary gcc-4.4.0/contrib/test_summary
+--- gcc-4.4.0.orig/contrib/test_summary 2007-02-09 16:30:46.000000000 -0800
++++ gcc-4.4.0/contrib/test_summary      2009-04-21 09:55:36.820093030 -0700
 @@ -107,7 +107,7 @@
      srcdir = configflags;
@@ -53 +54 @@
  
      sub(/^[^ ]*\/configure */, " ", configflags);
-diff -Naur gcc-4.3.3.orig/gcc/configure gcc-4.3.3/gcc/configure
---- gcc-4.3.3.orig/gcc/configure        2008-08-01 02:51:03.000000000 -0700
-+++ gcc-4.3.3/gcc/configure     2009-01-25 00:53:32.455839362 -0800
-@@ -20245,7 +20245,7 @@
+diff -Naur gcc-4.4.0.orig/gcc/configure gcc-4.4.0/gcc/configure
+--- gcc-4.4.0.orig/gcc/configure        2009-03-24 10:46:03.000000000 -0700
++++ gcc-4.4.0/gcc/configure     2009-04-21 09:55:36.828093310 -0700
+@@ -21750,7 +21750,7 @@
    # Therefore, use diff -b for the comparisons.
    if test x$gcc_cv_objdump != x \
@@ -65 +66 @@
      || diff -b conftest.big conftest.got > /dev/null 2>&1; }
    then
-diff -Naur gcc-4.3.3.orig/gcc/configure.ac gcc-4.3.3/gcc/configure.ac
---- gcc-4.3.3.orig/gcc/configure.ac     2008-08-01 02:51:03.000000000 -0700
-+++ gcc-4.3.3/gcc/configure.ac  2009-01-25 00:53:32.455839362 -0800
-@@ -2241,7 +2241,7 @@
+diff -Naur gcc-4.4.0.orig/gcc/configure.ac gcc-4.4.0/gcc/configure.ac
+--- gcc-4.4.0.orig/gcc/configure.ac     2009-03-24 10:46:03.000000000 -0700
++++ gcc-4.4.0/gcc/configure.ac  2009-04-21 09:55:36.840094427 -0700
+@@ -2351,7 +2351,7 @@
    # Therefore, use diff -b for the comparisons.
    if test x$gcc_cv_objdump != x \
@@ -77 +78 @@
      || diff -b conftest.big conftest.got > /dev/null 2>&1; }
    then
-diff -Naur gcc-4.3.3.orig/gcc/testsuite/ada/acats/run_all.sh gcc-4.3.3/gcc/testsuite/ada/acats/run_all.sh
---- gcc-4.3.3.orig/gcc/testsuite/ada/acats/run_all.sh   2006-09-14 03:12:03.000000000 -0700
-+++ gcc-4.3.3/gcc/testsuite/ada/acats/run_all.sh        2009-01-25 00:53:32.459940773 -0800
+diff -Naur gcc-4.4.0.orig/gcc/testsuite/ada/acats/run_all.sh gcc-4.4.0/gcc/testsuite/ada/acats/run_all.sh
+--- gcc-4.4.0.orig/gcc/testsuite/ada/acats/run_all.sh   2006-09-14 03:12:03.000000000 -0700
++++ gcc-4.4.0/gcc/testsuite/ada/acats/run_all.sh        2009-04-21 09:55:36.848094706 -0700
 @@ -68,7 +68,7 @@
    ls ${i}?.adb > ${i}.lst 2> /dev/null
@@ -89 +90 @@
  
  EXTERNAL_OBJECTS=""
-diff -Naur gcc-4.3.3.orig/libgomp/acinclude.m4 gcc-4.3.3/libgomp/acinclude.m4
---- gcc-4.3.3.orig/libgomp/acinclude.m4 2007-03-18 04:17:44.000000000 -0700
-+++ gcc-4.3.3/libgomp/acinclude.m4      2009-01-25 00:53:32.459940773 -0800
-@@ -147,7 +147,7 @@
-   # Start by getting the version number.  I think the libtool test already
-   # does some of this, but throws away the result.
+diff -Naur gcc-4.4.0.orig/libgomp/acinclude.m4 gcc-4.4.0/libgomp/acinclude.m4
+--- gcc-4.4.0.orig/libgomp/acinclude.m4 2009-01-31 09:09:24.000000000 -0800
++++ gcc-4.4.0/libgomp/acinclude.m4      2009-04-21 09:56:53.993037854 -0700
+@@ -152,7 +152,7 @@
+     libgomp_ld_is_gold=yes
+   fi
    changequote(,)
 -  ldver=`$LD --version 2>/dev/null | head -1 | \
 +  ldver=`$LD --version 2>/dev/null | head -n 1 | \
-          sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
+          sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'`
    changequote([,])
    libgomp_gnu_ld_version=`echo $ldver | \
-diff -Naur gcc-4.3.3.orig/libgomp/configure gcc-4.3.3/libgomp/configure
---- gcc-4.3.3.orig/libgomp/configure    2008-01-24 08:23:13.000000000 -0800
-+++ gcc-4.3.3/libgomp/configure 2009-01-25 00:53:32.464042184 -0800
-@@ -17600,7 +17600,7 @@
-   # Start by getting the version number.  I think the libtool test already
-   # does some of this, but throws away the result.
+diff -Naur gcc-4.4.0.orig/libgomp/configure gcc-4.4.0/libgomp/configure
+--- gcc-4.4.0.orig/libgomp/configure    2009-04-21 02:08:08.000000000 -0700
++++ gcc-4.4.0/libgomp/configure 2009-04-21 09:56:33.615732086 -0700
+@@ -18486,7 +18486,7 @@
+     libgomp_ld_is_gold=yes
+   fi
  
 -  ldver=`$LD --version 2>/dev/null | head -1 | \
 +  ldver=`$LD --version 2>/dev/null | head -n 1 | \
-          sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
+          sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'`
  
    libgomp_gnu_ld_version=`echo $ldver | \
-diff -Naur gcc-4.3.3.orig/libjava/classpath/configure gcc-4.3.3/libjava/classpath/configure
---- gcc-4.3.3.orig/libjava/classpath/configure  2008-02-29 15:47:54.000000000 -0800
-+++ gcc-4.3.3/libjava/classpath/configure       2009-01-25 00:53:32.480448386 -0800
-@@ -29126,7 +29126,7 @@
+diff -Naur gcc-4.4.0.orig/libjava/classpath/configure gcc-4.4.0/libjava/classpath/configure
+--- gcc-4.4.0.orig/libjava/classpath/configure  2009-03-16 05:08:23.000000000 -0700
++++ gcc-4.4.0/libjava/classpath/configure       2009-04-21 09:55:36.872096103 -0700
+@@ -29072,7 +29072,7 @@
  fi # shortcircut to system "stdint.h"
  # ------------------ PREPARE VARIABLES ------------------------------
@@ -125 +126 @@
  ac_cv_stdint_message="using $CC"
  fi
-diff -Naur gcc-4.3.3.orig/libjava/classpath/ltcf-c.sh gcc-4.3.3/libjava/classpath/ltcf-c.sh
---- gcc-4.3.3.orig/libjava/classpath/ltcf-c.sh  2006-01-17 10:09:40.000000000 -0800
-+++ gcc-4.3.3/libjava/classpath/ltcf-c.sh       2009-01-25 00:53:32.484550356 -0800
+diff -Naur gcc-4.4.0.orig/libjava/classpath/ltcf-c.sh gcc-4.4.0/libjava/classpath/ltcf-c.sh
+--- gcc-4.4.0.orig/libjava/classpath/ltcf-c.sh  2006-01-17 10:09:40.000000000 -0800
++++ gcc-4.4.0/libjava/classpath/ltcf-c.sh       2009-04-21 09:55:36.872096103 -0700
 @@ -153,7 +153,7 @@
      # If the export-symbols file already is a .def file (1st line
@@ -137 +138 @@
        else
          echo EXPORTS > $output_objdir/$soname-def;
-diff -Naur gcc-4.3.3.orig/libjava/classpath/ltcf-gcj.sh gcc-4.3.3/libjava/classpath/ltcf-gcj.sh
---- gcc-4.3.3.orig/libjava/classpath/ltcf-gcj.sh        2005-09-23 14:31:04.000000000 -0700
-+++ gcc-4.3.3/libjava/classpath/ltcf-gcj.sh     2009-01-25 00:53:32.484550356 -0800
+diff -Naur gcc-4.4.0.orig/libjava/classpath/ltcf-gcj.sh gcc-4.4.0/libjava/classpath/ltcf-gcj.sh
+--- gcc-4.4.0.orig/libjava/classpath/ltcf-gcj.sh        2005-09-23 14:31:04.000000000 -0700
++++ gcc-4.4.0/libjava/classpath/ltcf-gcj.sh     2009-04-21 09:55:36.872096103 -0700
 @@ -156,7 +156,7 @@
      # If the export-symbols file already is a .def file (1st line
@@ -149 +150 @@
        else
          echo EXPORTS > $output_objdir/$soname-def;
-diff -Naur gcc-4.3.3.orig/libjava/classpath/m4/ax_create_stdint_h.m4 gcc-4.3.3/libjava/classpath/m4/ax_create_stdint_h.m4
---- gcc-4.3.3.orig/libjava/classpath/m4/ax_create_stdint_h.m4   2007-05-19 13:44:43.000000000 -0700
-+++ gcc-4.3.3/libjava/classpath/m4/ax_create_stdint_h.m4        2009-01-25 00:53:32.484550356 -0800
+diff -Naur gcc-4.4.0.orig/libjava/classpath/m4/ax_create_stdint_h.m4 gcc-4.4.0/libjava/classpath/m4/ax_create_stdint_h.m4
+--- gcc-4.4.0.orig/libjava/classpath/m4/ax_create_stdint_h.m4   2007-05-19 13:44:43.000000000 -0700
++++ gcc-4.4.0/libjava/classpath/m4/ax_create_stdint_h.m4        2009-04-21 09:55:36.872096103 -0700
 @@ -217,7 +217,7 @@
  fi # shortcircut to system "stdint.h"
@@ -161 +162 @@
  ac_cv_stdint_message="using $CC"
  fi
-diff -Naur gcc-4.3.3.orig/libjava/configure gcc-4.3.3/libjava/configure
---- gcc-4.3.3.orig/libjava/configure    2009-01-24 02:32:29.000000000 -0800
-+++ gcc-4.3.3/libjava/configure 2009-01-25 00:53:32.492753177 -0800
-@@ -18673,8 +18673,8 @@
+diff -Naur gcc-4.4.0.orig/libjava/configure gcc-4.4.0/libjava/configure
+--- gcc-4.4.0.orig/libjava/configure    2009-04-21 02:08:08.000000000 -0700
++++ gcc-4.4.0/libjava/configure 2009-04-21 09:55:36.884096662 -0700
+@@ -18919,8 +18919,8 @@
  echo $ECHO_N "checking whether 'ld' is at least 2.13... $ECHO_C" >&6
  LD_PROG=`$CC --print-prog-name=ld`
@@ -175 +176 @@
    LD_OK="ok"
  else
-diff -Naur gcc-4.3.3.orig/libjava/mingwld.m4 gcc-4.3.3/libjava/mingwld.m4
---- gcc-4.3.3.orig/libjava/mingwld.m4   2005-08-22 15:36:35.000000000 -0700
-+++ gcc-4.3.3/libjava/mingwld.m4        2009-01-25 00:53:32.492753177 -0800
+diff -Naur gcc-4.4.0.orig/libjava/mingwld.m4 gcc-4.4.0/libjava/mingwld.m4
+--- gcc-4.4.0.orig/libjava/mingwld.m4   2005-08-22 15:36:35.000000000 -0700
++++ gcc-4.4.0/libjava/mingwld.m4        2009-04-21 09:55:36.892097500 -0700
 @@ -3,8 +3,8 @@
  AC_MSG_CHECKING(whether 'ld' is at least 2.13)
@@ -189 +190 @@
    LD_OK="ok"
  else
-diff -Naur gcc-4.3.3.orig/libstdc++-v3/acinclude.m4 gcc-4.3.3/libstdc++-v3/acinclude.m4
---- gcc-4.3.3.orig/libstdc++-v3/acinclude.m4    2008-04-25 09:52:57.000000000 -0700
-+++ gcc-4.3.3/libstdc++-v3/acinclude.m4 2009-01-25 00:53:32.500956558 -0800
-@@ -234,7 +234,7 @@
-   if test x"$with_gnu_ld" = x"yes"; then
-     AC_MSG_CHECKING([for ld version])
-     changequote(,)
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
+diff -Naur gcc-4.4.0.orig/libstdc++-v3/acinclude.m4 gcc-4.4.0/libstdc++-v3/acinclude.m4
+--- gcc-4.4.0.orig/libstdc++-v3/acinclude.m4    2009-02-23 12:42:53.000000000 -0800
++++ gcc-4.4.0/libstdc++-v3/acinclude.m4 2009-04-21 09:57:46.768419611 -0700
+@@ -238,7 +238,7 @@
+     if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then
+       glibcxx_ld_is_gold=yes
+     fi
+-    ldver=`$LD --version 2>/dev/null | head -1 | \
++    ldver=`$LD --version 2>/dev/null | head -n 1 | \
+            sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'`
      changequote([,])
      glibcxx_gnu_ld_version=`echo $ldver | \
-diff -Naur gcc-4.3.3.orig/libstdc++-v3/configure gcc-4.3.3/libstdc++-v3/configure
---- gcc-4.3.3.orig/libstdc++-v3/configure       2008-07-07 12:49:54.000000000 -0700
-+++ gcc-4.3.3/libstdc++-v3/configure    2009-01-25 00:53:32.582987288 -0800
-@@ -17490,7 +17490,7 @@
-     echo "$as_me:$LINENO: checking for ld version" >&5
- echo $ECHO_N "checking for ld version... $ECHO_C" >&6
- 
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
- 
-     glibcxx_gnu_ld_version=`echo $ldver | \
-@@ -42215,7 +42215,7 @@
-     echo "$as_me:$LINENO: checking for ld version" >&5
- echo $ECHO_N "checking for ld version... $ECHO_C" >&6
- 
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
- 
-     glibcxx_gnu_ld_version=`echo $ldver | \
-@@ -84606,7 +84606,7 @@
-     echo "$as_me:$LINENO: checking for ld version" >&5
- echo $ECHO_N "checking for ld version... $ECHO_C" >&6
- 
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
- 
-     glibcxx_gnu_ld_version=`echo $ldver | \
-@@ -85622,7 +85622,7 @@
-     echo "$as_me:$LINENO: checking for ld version" >&5
- echo $ECHO_N "checking for ld version... $ECHO_C" >&6
- 
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
- 
-     glibcxx_gnu_ld_version=`echo $ldver | \
-@@ -86610,7 +86610,7 @@
-     echo "$as_me:$LINENO: checking for ld version" >&5
- echo $ECHO_N "checking for ld version... $ECHO_C" >&6
- 
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
- 
-     glibcxx_gnu_ld_version=`echo $ldver | \
-@@ -109089,7 +109089,7 @@
-     echo "$as_me:$LINENO: checking for ld version" >&5
- echo $ECHO_N "checking for ld version... $ECHO_C" >&6
- 
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
- 
-     glibcxx_gnu_ld_version=`echo $ldver | \
-@@ -109934,7 +109934,7 @@
-     echo "$as_me:$LINENO: checking for ld version" >&5
- echo $ECHO_N "checking for ld version... $ECHO_C" >&6
- 
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
- 
-     glibcxx_gnu_ld_version=`echo $ldver | \
-@@ -110828,7 +110828,7 @@
-     echo "$as_me:$LINENO: checking for ld version" >&5
- echo $ECHO_N "checking for ld version... $ECHO_C" >&6
- 
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
- 
-     glibcxx_gnu_ld_version=`echo $ldver | \
-@@ -112114,7 +112114,7 @@
-     echo "$as_me:$LINENO: checking for ld version" >&5
- echo $ECHO_N "checking for ld version... $ECHO_C" >&6
- 
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
- 
-     glibcxx_gnu_ld_version=`echo $ldver | \
-@@ -112850,7 +112850,7 @@
-     echo "$as_me:$LINENO: checking for ld version" >&5
- echo $ECHO_N "checking for ld version... $ECHO_C" >&6
- 
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
- 
-     glibcxx_gnu_ld_version=`echo $ldver | \
-@@ -113351,7 +113351,7 @@
-     echo "$as_me:$LINENO: checking for ld version" >&5
- echo $ECHO_N "checking for ld version... $ECHO_C" >&6
- 
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
- 
-     glibcxx_gnu_ld_version=`echo $ldver | \
+diff -Naur gcc-4.4.0.orig/libstdc++-v3/configure gcc-4.4.0/libstdc++-v3/configure
+--- gcc-4.4.0.orig/libstdc++-v3/configure       2009-03-01 09:49:31.000000000 -0800
++++ gcc-4.4.0/libstdc++-v3/configure    2009-04-21 09:57:27.527186478 -0700
+@@ -23489,7 +23489,7 @@
+     if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then
+       glibcxx_ld_is_gold=yes
+     fi
+-    ldver=`$LD --version 2>/dev/null | head -1 | \
++    ldver=`$LD --version 2>/dev/null | head -n 1 | \
+            sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'`
+ 
+     glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -42055,7 +42055,7 @@
+     if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then
+       glibcxx_ld_is_gold=yes
+     fi
+-    ldver=`$LD --version 2>/dev/null | head -1 | \
++    ldver=`$LD --version 2>/dev/null | head -n 1 | \
+            sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'`
+ 
+     glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -76333,7 +76333,7 @@
+     if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then
+       glibcxx_ld_is_gold=yes
+     fi
+-    ldver=`$LD --version 2>/dev/null | head -1 | \
++    ldver=`$LD --version 2>/dev/null | head -n 1 | \
+            sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'`
+ 
+     glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -76645,7 +76645,7 @@
+     if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then
+       glibcxx_ld_is_gold=yes
+     fi
+-    ldver=`$LD --version 2>/dev/null | head -1 | \
++    ldver=`$LD --version 2>/dev/null | head -n 1 | \
+            sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'`
+ 
+     glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -77328,7 +77328,7 @@
+     if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then
+       glibcxx_ld_is_gold=yes
+     fi
+-    ldver=`$LD --version 2>/dev/null | head -1 | \
++    ldver=`$LD --version 2>/dev/null | head -n 1 | \
+            sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'`
+ 
+     glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -95080,7 +95080,7 @@
+     if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then
+       glibcxx_ld_is_gold=yes
+     fi
+-    ldver=`$LD --version 2>/dev/null | head -1 | \
++    ldver=`$LD --version 2>/dev/null | head -n 1 | \
+            sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'`
+ 
+     glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -112274,7 +112274,7 @@
+     if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then
+       glibcxx_ld_is_gold=yes
+     fi
+-    ldver=`$LD --version 2>/dev/null | head -1 | \
++    ldver=`$LD --version 2>/dev/null | head -n 1 | \
+            sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'`
+ 
+     glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -112493,7 +112493,7 @@
+     if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then
+       glibcxx_ld_is_gold=yes
+     fi
+-    ldver=`$LD --version 2>/dev/null | head -1 | \
++    ldver=`$LD --version 2>/dev/null | head -n 1 | \
+            sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'`
+ 
+     glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -112678,7 +112678,7 @@
+     if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then
+       glibcxx_ld_is_gold=yes
+     fi
+-    ldver=`$LD --version 2>/dev/null | head -1 | \
++    ldver=`$LD --version 2>/dev/null | head -n 1 | \
+            sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'`
+ 
+     glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -112899,7 +112899,7 @@
+     if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then
+       glibcxx_ld_is_gold=yes
+     fi
+-    ldver=`$LD --version 2>/dev/null | head -1 | \
++    ldver=`$LD --version 2>/dev/null | head -n 1 | \
+            sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'`
+ 
+     glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -113121,7 +113121,7 @@
+     if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then
+       glibcxx_ld_is_gold=yes
+     fi
+-    ldver=`$LD --version 2>/dev/null | head -1 | \
++    ldver=`$LD --version 2>/dev/null | head -n 1 | \
+            sed -e 's/GNU \(go\)\{0,1\}ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\4/'`
+ 
+     glibcxx_gnu_ld_version=`echo $ldver | \

patches/gcc-4.4.0-pure64-1.patch

@@ -1 +1 @@
 Submitted By: Jim Gifford (jim at cross-lfs dot org)
-Date: 01-25-2009
-Initial Package Version: 4.3.3
+Date: 04-21-2009
+Initial Package Version: 4.4.0
 Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
         the Pure LFS project.
 Upstream Status: Not Applied
-Description: This patch modifies the location of the dynamic linker for gcc-4.3.3.
+Description: This patch modifies the location of the dynamic linker for gcc-4.4.0.
 
-diff -Naur gcc-4.3.3.orig/gcc/config/i386/linux64.h gcc-4.3.3/gcc/config/i386/linux64.h
---- gcc-4.3.3.orig/gcc/config/i386/linux64.h    2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/i386/linux64.h 2009-01-25 00:49:04.956938399 -0800
-@@ -53,8 +53,8 @@
+diff -Naur gcc-4.4.0.orig/gcc/config/i386/linux64.h gcc-4.4.0/gcc/config/i386/linux64.h
+--- gcc-4.4.0.orig/gcc/config/i386/linux64.h    2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.0/gcc/config/i386/linux64.h 2009-04-21 10:12:45.639047632 -0700
+@@ -58,8 +58,8 @@
     When the -shared link option is used a final link is not being
     done.  */
@@ -19 +19 @@
 +#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
  
- #if TARGET_64BIT_DEFAULT
- #define SPEC_32 "m32"
-diff -Naur gcc-4.3.3.orig/gcc/config/i386/t-linux64 gcc-4.3.3/gcc/config/i386/t-linux64
---- gcc-4.3.3.orig/gcc/config/i386/t-linux64    2007-09-27 12:56:06.000000000 -0700
-+++ gcc-4.3.3/gcc/config/i386/t-linux64 2009-01-25 00:49:11.211799413 -0800
-@@ -13,7 +13,7 @@
+ #undef ASM_SPEC
+ #define ASM_SPEC "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} \
+diff -Naur gcc-4.4.0.orig/gcc/config/i386/t-linux64 gcc-4.4.0/gcc/config/i386/t-linux64
+--- gcc-4.4.0.orig/gcc/config/i386/t-linux64    2008-07-02 08:59:19.000000000 -0700
++++ gcc-4.4.0/gcc/config/i386/t-linux64 2009-04-21 10:12:52.642213438 -0700
+@@ -7,7 +7,7 @@
  
  MULTILIB_OPTIONS = m64/m32
@@ -33 +33 @@
  LIBGCC = stmp-multilib
  INSTALL_LIBGCC = install-multilib
-diff -Naur gcc-4.3.3.orig/gcc/config/linux.h gcc-4.3.3/gcc/config/linux.h
---- gcc-4.3.3.orig/gcc/config/linux.h   2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/linux.h        2009-01-25 00:49:09.037979047 -0800
-@@ -113,7 +113,7 @@
+diff -Naur gcc-4.4.0.orig/gcc/config/linux.h gcc-4.4.0/gcc/config/linux.h
+--- gcc-4.4.0.orig/gcc/config/linux.h   2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.0/gcc/config/linux.h        2009-04-21 10:12:49.548334684 -0700
+@@ -118,7 +118,7 @@
     GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
     supporting both 32-bit and 64-bit compilation.  */
@@ -45 +45 @@
  #define LINUX_DYNAMIC_LINKER \
    CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
-diff -Naur gcc-4.3.3.orig/gcc/config/mips/linux64.h gcc-4.3.3/gcc/config/mips/linux64.h
---- gcc-4.3.3.orig/gcc/config/mips/linux64.h    2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/mips/linux64.h 2009-01-25 00:49:09.124111188 -0800
-@@ -38,10 +38,10 @@
+diff -Naur gcc-4.4.0.orig/gcc/config/mips/linux64.h gcc-4.4.0/gcc/config/mips/linux64.h
+--- gcc-4.4.0.orig/gcc/config/mips/linux64.h    2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/config/mips/linux64.h 2009-04-21 10:12:49.630265960 -0700
+@@ -35,10 +35,10 @@
  %{!shared: \
    %{profile:-lc_p} %{!profile:-lc}}"
@@ -63 +63 @@
    CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32)
  
-diff -Naur gcc-4.3.3.orig/gcc/config/mips/t-linux64 gcc-4.3.3/gcc/config/mips/t-linux64
---- gcc-4.3.3.orig/gcc/config/mips/t-linux64    2006-06-06 05:51:24.000000000 -0700
-+++ gcc-4.3.3/gcc/config/mips/t-linux64 2009-01-25 00:49:11.265119430 -0800
+diff -Naur gcc-4.4.0.orig/gcc/config/mips/t-linux64 gcc-4.4.0/gcc/config/mips/t-linux64
+--- gcc-4.4.0.orig/gcc/config/mips/t-linux64    2006-06-06 05:51:24.000000000 -0700
++++ gcc-4.4.0/gcc/config/mips/t-linux64 2009-04-21 10:12:52.704637799 -0700
 @@ -1,6 +1,6 @@
  MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
@@ -74 +74 @@
  EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
  
-diff -Naur gcc-4.3.3.orig/gcc/config/rs6000/linux64.h gcc-4.3.3/gcc/config/rs6000/linux64.h
---- gcc-4.3.3.orig/gcc/config/rs6000/linux64.h  2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/rs6000/linux64.h       2009-01-25 00:49:01.265542673 -0800
-@@ -339,9 +339,9 @@
+diff -Naur gcc-4.4.0.orig/gcc/config/rs6000/linux64.h gcc-4.4.0/gcc/config/rs6000/linux64.h
+--- gcc-4.4.0.orig/gcc/config/rs6000/linux64.h  2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.0/gcc/config/rs6000/linux64.h       2009-04-21 10:12:42.311081157 -0700
+@@ -342,9 +342,9 @@
  #undef LINK_OS_DEFAULT_SPEC
  #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
@@ -90 +90 @@
  #if UCLIBC_DEFAULT
  #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
-diff -Naur gcc-4.3.3.orig/gcc/config/rs6000/t-linux64 gcc-4.3.3/gcc/config/rs6000/t-linux64
---- gcc-4.3.3.orig/gcc/config/rs6000/t-linux64  2007-09-27 12:56:06.000000000 -0700
-+++ gcc-4.3.3/gcc/config/rs6000/t-linux64       2009-01-25 00:49:11.137970107 -0800
+diff -Naur gcc-4.4.0.orig/gcc/config/rs6000/t-linux64 gcc-4.4.0/gcc/config/rs6000/t-linux64
+--- gcc-4.4.0.orig/gcc/config/rs6000/t-linux64  2007-09-27 12:56:06.000000000 -0700
++++ gcc-4.4.0/gcc/config/rs6000/t-linux64       2009-04-21 10:12:52.552479957 -0700
 @@ -19,7 +19,7 @@
  MULTILIB_EXTRA_OPTS     = fPIC mstrict-align
@@ -102 +102 @@
  
  softfp_wrap_start := '\#ifndef __powerpc64__'
-diff -Naur gcc-4.3.3.orig/gcc/config/s390/linux.h gcc-4.3.3/gcc/config/s390/linux.h
---- gcc-4.3.3.orig/gcc/config/s390/linux.h      2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/s390/linux.h   2009-01-25 00:49:04.058697303 -0800
+diff -Naur gcc-4.4.0.orig/gcc/config/s390/linux.h gcc-4.4.0/gcc/config/s390/linux.h
+--- gcc-4.4.0.orig/gcc/config/s390/linux.h      2007-08-02 03:49:31.000000000 -0700
++++ gcc-4.4.0/gcc/config/s390/linux.h   2009-04-21 10:12:44.800229083 -0700
 @@ -72,7 +72,7 @@
  #define MULTILIB_DEFAULTS { "m31" }
@@ -114 +114 @@
  
  #undef  LINK_SPEC
-diff -Naur gcc-4.3.3.orig/gcc/config/s390/t-linux64 gcc-4.3.3/gcc/config/s390/t-linux64
---- gcc-4.3.3.orig/gcc/config/s390/t-linux64    2006-02-06 09:41:54.000000000 -0800
-+++ gcc-4.3.3/gcc/config/s390/t-linux64 2009-01-25 00:49:11.178985891 -0800
+diff -Naur gcc-4.4.0.orig/gcc/config/s390/t-linux64 gcc-4.4.0/gcc/config/s390/t-linux64
+--- gcc-4.4.0.orig/gcc/config/s390/t-linux64    2006-02-06 09:41:54.000000000 -0800
++++ gcc-4.4.0/gcc/config/s390/t-linux64 2009-04-21 10:12:52.607098757 -0700
 @@ -1,6 +1,6 @@
  MULTILIB_OPTIONS = m64/m31
@@ -125 +125 @@
  LIBGCC = stmp-multilib
  INSTALL_LIBGCC = install-multilib
-diff -Naur gcc-4.3.3.orig/gcc/config/sparc/linux64.h gcc-4.3.3/gcc/config/sparc/linux64.h
---- gcc-4.3.3.orig/gcc/config/sparc/linux64.h   2007-10-18 21:29:38.000000000 -0700
-+++ gcc-4.3.3/gcc/config/sparc/linux64.h        2009-01-25 00:49:10.604768822 -0800
-@@ -144,9 +144,9 @@
+diff -Naur gcc-4.4.0.orig/gcc/config/sparc/linux64.h gcc-4.4.0/gcc/config/sparc/linux64.h
+--- gcc-4.4.0.orig/gcc/config/sparc/linux64.h   2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/config/sparc/linux64.h        2009-04-21 10:12:52.029679006 -0700
+@@ -109,8 +109,8 @@
  
  /* If ELF is the default format, we should not use /lib/elf.  */
@@ -134 +134 @@
 -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
 -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
--#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
 +#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
 +#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2"
-+#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0"
- #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
- #if UCLIBC_DEFAULT
- #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
-@@ -167,7 +167,7 @@
+ 
+ #ifdef SPARC_BI_ARCH
+ 
+@@ -121,7 +121,7 @@
    { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },       \
    { "link_arch",        LINK_ARCH_SPEC },
  
--#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib32 %{shared:-shared} \
+-#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: \
-@@ -176,7 +176,7 @@
+@@ -130,7 +130,7 @@
          %{static:-static}}} \
  "
  
--#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
-+#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib %{shared:-shared} \
+-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
++#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib %{shared:-shared} \
    %{!shared: \
      %{!ibcs: \
        %{!static: \
-@@ -257,7 +257,7 @@
+@@ -211,7 +211,7 @@
  #else /* !SPARC_BI_ARCH */
  
  #undef LINK_SPEC
--#define LINK_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
-+#define LINK_SPEC "-m elf64_sparc -Y P,/usr/lib %{shared:-shared} \
+-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
++#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib %{shared:-shared} \
    %{!shared: \
      %{!ibcs: \
        %{!static: \
-diff -Naur gcc-4.3.3.orig/gcc/config/sparc/linux.h gcc-4.3.3/gcc/config/sparc/linux.h
---- gcc-4.3.3.orig/gcc/config/sparc/linux.h     2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/sparc/linux.h  2009-01-25 00:49:10.863168878 -0800
-@@ -132,7 +132,7 @@
- 
+diff -Naur gcc-4.4.0.orig/gcc/config/sparc/linux.h gcc-4.4.0/gcc/config/sparc/linux.h
+--- gcc-4.4.0.orig/gcc/config/sparc/linux.h     2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/config/sparc/linux.h  2009-04-21 10:12:52.271571169 -0700
+@@ -86,7 +86,7 @@
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
  
  #undef  LINK_SPEC
@@ -180 +178 @@
    %{!shared: \
      %{!ibcs: \
-diff -Naur gcc-4.3.3.orig/gcc/config/sparc/t-linux64 gcc-4.3.3/gcc/config/sparc/t-linux64
---- gcc-4.3.3.orig/gcc/config/sparc/t-linux64   2006-02-07 23:19:43.000000000 -0800
-+++ gcc-4.3.3/gcc/config/sparc/t-linux64        2009-01-25 00:49:11.314338874 -0800
+diff -Naur gcc-4.4.0.orig/gcc/config/sparc/t-linux64 gcc-4.4.0/gcc/config/sparc/t-linux64
+--- gcc-4.4.0.orig/gcc/config/sparc/t-linux64   2006-02-07 23:19:43.000000000 -0800
++++ gcc-4.4.0/gcc/config/sparc/t-linux64        2009-04-21 10:12:52.755357174 -0700
 @@ -1,6 +1,6 @@
  MULTILIB_OPTIONS = m64/m32

patches/gcc-4.4.0-pure64_specs-1.patch

@@ -1 +1 @@
 Submitted By: Jim Gifford (jim at cross-lfs dot org)
-Date: 01-25-2009
-Initial Package Version: 4.3.3
+Date: 04-21-2009
+Initial Package Version: 4.4.0
 Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
         the Pure LFS project.
 Upstream Status: Not Applied
-Description: This patch modifies the location of the dynamic linker for gcc-4.3.3.
+Description: This patch modifies the location of the dynamic linker for gcc-4.4.0.
 
-diff -Naur gcc-4.3.3.orig/gcc/config/alpha/gnu.h gcc-4.3.3/gcc/config/alpha/gnu.h
---- gcc-4.3.3.orig/gcc/config/alpha/gnu.h       2004-09-07 17:17:19.000000000 -0700
-+++ gcc-4.3.3/gcc/config/alpha/gnu.h    2009-01-25 00:46:43.363275038 -0800
+diff -Naur gcc-4.4.0.orig/gcc/config/alpha/gnu.h gcc-4.4.0/gcc/config/alpha/gnu.h
+--- gcc-4.4.0.orig/gcc/config/alpha/gnu.h       2004-09-07 17:17:19.000000000 -0700
++++ gcc-4.4.0/gcc/config/alpha/gnu.h    2009-04-21 10:09:46.008647019 -0700
 @@ -11,7 +11,7 @@
      } while (0)
@@ -19 +19 @@
  #undef STARTFILE_SPEC
  #define STARTFILE_SPEC \
-diff -Naur gcc-4.3.3.orig/gcc/config/alpha/linux-elf.h gcc-4.3.3/gcc/config/alpha/linux-elf.h
---- gcc-4.3.3.orig/gcc/config/alpha/linux-elf.h 2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/alpha/linux-elf.h      2009-01-25 00:46:43.506828048 -0800
+diff -Naur gcc-4.4.0.orig/gcc/config/alpha/linux-elf.h gcc-4.4.0/gcc/config/alpha/linux-elf.h
+--- gcc-4.4.0.orig/gcc/config/alpha/linux-elf.h 2007-08-02 03:49:31.000000000 -0700
++++ gcc-4.4.0/gcc/config/alpha/linux-elf.h      2009-04-21 10:09:46.121789915 -0700
 @@ -27,8 +27,8 @@
  #define EXTRA_SPECS \
@@ -33 +33 @@
  #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
  #else
-diff -Naur gcc-4.3.3.orig/gcc/config/arm/linux-eabi.h gcc-4.3.3/gcc/config/arm/linux-eabi.h
---- gcc-4.3.3.orig/gcc/config/arm/linux-eabi.h  2007-11-08 05:44:09.000000000 -0800
-+++ gcc-4.3.3/gcc/config/arm/linux-eabi.h       2009-01-25 00:46:48.034939237 -0800
+diff -Naur gcc-4.4.0.orig/gcc/config/arm/linux-eabi.h gcc-4.4.0/gcc/config/arm/linux-eabi.h
+--- gcc-4.4.0.orig/gcc/config/arm/linux-eabi.h  2007-11-08 05:44:09.000000000 -0800
++++ gcc-4.4.0/gcc/config/arm/linux-eabi.h       2009-04-21 10:09:50.440732227 -0700
 @@ -61,7 +61,7 @@
  /* Use ld-linux.so.3 so that it will be possible to run "classic"
@@ -45 +45 @@
  /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
     use the GNU/Linux version, not the generic BPABI version.  */
-diff -Naur gcc-4.3.3.orig/gcc/config/arm/linux-elf.h gcc-4.3.3/gcc/config/arm/linux-elf.h
---- gcc-4.3.3.orig/gcc/config/arm/linux-elf.h   2007-11-08 05:44:09.000000000 -0800
-+++ gcc-4.3.3/gcc/config/arm/linux-elf.h        2009-01-25 00:46:47.747830702 -0800
+diff -Naur gcc-4.4.0.orig/gcc/config/arm/linux-elf.h gcc-4.4.0/gcc/config/arm/linux-elf.h
+--- gcc-4.4.0.orig/gcc/config/arm/linux-elf.h   2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/config/arm/linux-elf.h        2009-04-21 10:09:50.233952787 -0700
 @@ -62,7 +62,7 @@
  
@@ -57 +57 @@
  #define LINUX_TARGET_LINK_SPEC  "%{h*} %{version:-v} \
     %{b} \
-diff -Naur gcc-4.3.3.orig/gcc/config/bfin/linux.h gcc-4.3.3/gcc/config/bfin/linux.h
---- gcc-4.3.3.orig/gcc/config/bfin/linux.h      2007-09-05 17:09:05.000000000 -0700
-+++ gcc-4.3.3/gcc/config/bfin/linux.h   2009-01-25 00:46:40.418363458 -0800
+diff -Naur gcc-4.4.0.orig/gcc/config/bfin/linux.h gcc-4.4.0/gcc/config/bfin/linux.h
+--- gcc-4.4.0.orig/gcc/config/bfin/linux.h      2008-11-27 01:11:50.000000000 -0800
++++ gcc-4.4.0/gcc/config/bfin/linux.h   2009-04-21 10:09:43.316621596 -0700
 @@ -22,7 +22,7 @@
    %{shared:-G -Bdynamic} \
@@ -69 +69 @@
  
  #define MD_UNWIND_SUPPORT "config/bfin/linux-unwind.h"
-diff -Naur gcc-4.3.3.orig/gcc/config/cris/linux.h gcc-4.3.3/gcc/config/cris/linux.h
---- gcc-4.3.3.orig/gcc/config/cris/linux.h      2008-01-23 09:17:58.000000000 -0800
-+++ gcc-4.3.3/gcc/config/cris/linux.h   2009-01-25 00:46:38.092783349 -0800
-@@ -102,7 +102,7 @@
+diff -Naur gcc-4.4.0.orig/gcc/config/cris/linux.h gcc-4.4.0/gcc/config/cris/linux.h
+--- gcc-4.4.0.orig/gcc/config/cris/linux.h      2009-03-22 08:15:04.000000000 -0700
++++ gcc-4.4.0/gcc/config/cris/linux.h   2009-04-21 10:09:40.257856685 -0700
+@@ -103,7 +103,7 @@
  #undef CRIS_DEFAULT_CPU_VERSION
  #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
@@ -81 +81 @@
  /* We need an -rpath-link to ld.so.1, and presumably to each directory
     specified with -B.  */
-diff -Naur gcc-4.3.3.orig/gcc/config/frv/linux.h gcc-4.3.3/gcc/config/frv/linux.h
---- gcc-4.3.3.orig/gcc/config/frv/linux.h       2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/frv/linux.h    2009-01-25 00:46:37.813879592 -0800
+diff -Naur gcc-4.4.0.orig/gcc/config/frv/linux.h gcc-4.4.0/gcc/config/frv/linux.h
+--- gcc-4.4.0.orig/gcc/config/frv/linux.h       2007-08-02 03:49:31.000000000 -0700
++++ gcc-4.4.0/gcc/config/frv/linux.h    2009-04-21 10:09:39.996456769 -0700
 @@ -35,7 +35,7 @@
  #define ENDFILE_SPEC \
@@ -93 +93 @@
  #undef LINK_SPEC
  #define LINK_SPEC "\
-diff -Naur gcc-4.3.3.orig/gcc/config/i386/gnu.h gcc-4.3.3/gcc/config/i386/gnu.h
---- gcc-4.3.3.orig/gcc/config/i386/gnu.h        2007-08-07 23:35:17.000000000 -0700
-+++ gcc-4.3.3/gcc/config/i386/gnu.h     2009-01-25 00:46:40.849024165 -0800
-@@ -22,7 +22,7 @@
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
--      %{!dynamic-linker:-dynamic-linker /lib/ld.so}} \
-+      %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so}} \
-     %{static:-static}}"
- 
- #undef STARTFILE_SPEC
-diff -Naur gcc-4.3.3.orig/gcc/config/i386/linux64.h gcc-4.3.3/gcc/config/i386/linux64.h
---- gcc-4.3.3.orig/gcc/config/i386/linux64.h    2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/i386/linux64.h 2009-01-25 00:46:40.578323788 -0800
-@@ -53,8 +53,8 @@
+diff -Naur gcc-4.4.0.orig/gcc/config/i386/gnu.h gcc-4.4.0/gcc/config/i386/gnu.h
+--- gcc-4.4.0.orig/gcc/config/i386/gnu.h        2008-11-13 15:28:46.000000000 -0800
++++ gcc-4.4.0/gcc/config/i386/gnu.h     2009-04-21 10:09:43.601430088 -0700
+@@ -21,7 +21,7 @@
+ */
+ 
+ #undef GLIBC_DYNAMIC_LINKER
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so"
+ 
+ #undef TARGET_VERSION
+ #define TARGET_VERSION fprintf (stderr, " (i386 GNU)");
+diff -Naur gcc-4.4.0.orig/gcc/config/i386/linux64.h gcc-4.4.0/gcc/config/i386/linux64.h
+--- gcc-4.4.0.orig/gcc/config/i386/linux64.h    2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.0/gcc/config/i386/linux64.h 2009-04-21 10:09:43.480484706 -0700
+@@ -58,8 +58,8 @@
     When the -shared link option is used a final link is not being
     done.  */
@@ -117 +117 @@
 +#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld-linux-x86-64.so.2"
  
- #if TARGET_64BIT_DEFAULT
- #define SPEC_32 "m32"
-diff -Naur gcc-4.3.3.orig/gcc/config/i386/linux.h gcc-4.3.3/gcc/config/i386/linux.h
---- gcc-4.3.3.orig/gcc/config/i386/linux.h      2007-11-27 17:04:27.000000000 -0800
-+++ gcc-4.3.3/gcc/config/i386/linux.h   2009-01-25 00:46:42.161519765 -0800
+ #undef ASM_SPEC
+ #define ASM_SPEC "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} \
+diff -Naur gcc-4.4.0.orig/gcc/config/i386/linux.h gcc-4.4.0/gcc/config/i386/linux.h
+--- gcc-4.4.0.orig/gcc/config/i386/linux.h      2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/config/i386/linux.h   2009-04-21 10:09:44.806987009 -0700
 @@ -100,7 +100,7 @@
  
@@ -129 +129 @@
 +#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
  
- #undef  SUBTARGET_EXTRA_SPECS
- #define SUBTARGET_EXTRA_SPECS \
-diff -Naur gcc-4.3.3.orig/gcc/config/ia64/linux.h gcc-4.3.3/gcc/config/ia64/linux.h
---- gcc-4.3.3.orig/gcc/config/ia64/linux.h      2006-12-12 07:15:19.000000000 -0800
-+++ gcc-4.3.3/gcc/config/ia64/linux.h   2009-01-25 00:46:43.236127392 -0800
+ #undef  ASM_SPEC
+ #define ASM_SPEC \
+diff -Naur gcc-4.4.0.orig/gcc/config/ia64/linux.h gcc-4.4.0/gcc/config/ia64/linux.h
+--- gcc-4.4.0.orig/gcc/config/ia64/linux.h      2009-02-12 08:30:53.000000000 -0800
++++ gcc-4.4.0/gcc/config/ia64/linux.h   2009-04-21 10:09:45.879897193 -0700
 @@ -37,7 +37,7 @@
  /* Define this for shared library support because it isn't in the main
@@ -143 +143 @@
  #undef LINK_SPEC
  #define LINK_SPEC "\
-diff -Naur gcc-4.3.3.orig/gcc/config/linux.h gcc-4.3.3/gcc/config/linux.h
---- gcc-4.3.3.orig/gcc/config/linux.h   2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/linux.h        2009-01-25 00:46:46.090803184 -0800
-@@ -112,9 +112,9 @@
+diff -Naur gcc-4.4.0.orig/gcc/config/kopensolaris-gnu.h gcc-4.4.0/gcc/config/kopensolaris-gnu.h
+--- gcc-4.4.0.orig/gcc/config/kopensolaris-gnu.h        2009-01-29 10:48:41.000000000 -0800
++++ gcc-4.4.0/gcc/config/kopensolaris-gnu.h     2009-04-21 10:09:51.100084091 -0700
+@@ -33,5 +33,5 @@
+ 
+ #ifdef GLIBC_DYNAMIC_LINKER
+ #undef GLIBC_DYNAMIC_LINKER
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
+ #endif
+diff -Naur gcc-4.4.0.orig/gcc/config/linux.h gcc-4.4.0/gcc/config/linux.h
+--- gcc-4.4.0.orig/gcc/config/linux.h   2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.0/gcc/config/linux.h        2009-04-21 10:09:48.591428691 -0700
+@@ -117,9 +117,9 @@
     GLIBC_DYNAMIC_LINKER must be defined for each target using them, or
     GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
@@ -159 +169 @@
    CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
  #define LINUX_DYNAMIC_LINKER32 \
-diff -Naur gcc-4.3.3.orig/gcc/config/m32r/linux.h gcc-4.3.3/gcc/config/m32r/linux.h
---- gcc-4.3.3.orig/gcc/config/m32r/linux.h      2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/m32r/linux.h   2009-01-25 00:46:40.180472971 -0800
+diff -Naur gcc-4.4.0.orig/gcc/config/m32r/linux.h gcc-4.4.0/gcc/config/m32r/linux.h
+--- gcc-4.4.0.orig/gcc/config/m32r/linux.h      2007-08-02 03:49:31.000000000 -0700
++++ gcc-4.4.0/gcc/config/m32r/linux.h   2009-04-21 10:09:43.059122504 -0700
 @@ -58,7 +58,7 @@
  
@@ -171 +181 @@
  #undef LINK_SPEC
  #if TARGET_LITTLE_ENDIAN
-diff -Naur gcc-4.3.3.orig/gcc/config/m68k/linux.h gcc-4.3.3/gcc/config/m68k/linux.h
---- gcc-4.3.3.orig/gcc/config/m68k/linux.h      2007-09-24 14:07:08.000000000 -0700
-+++ gcc-4.3.3/gcc/config/m68k/linux.h   2009-01-25 00:46:38.769538482 -0800
+diff -Naur gcc-4.4.0.orig/gcc/config/m68k/linux.h gcc-4.4.0/gcc/config/m68k/linux.h
+--- gcc-4.4.0.orig/gcc/config/m68k/linux.h      2007-09-24 14:07:08.000000000 -0700
++++ gcc-4.4.0/gcc/config/m68k/linux.h   2009-04-21 10:09:40.768950971 -0700
 @@ -84,7 +84,7 @@
  
@@ -183 +193 @@
  #undef LINK_SPEC
  #define LINK_SPEC "-m m68kelf %{shared} \
-diff -Naur gcc-4.3.3.orig/gcc/config/mips/linux64.h gcc-4.3.3/gcc/config/mips/linux64.h
---- gcc-4.3.3.orig/gcc/config/mips/linux64.h    2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/mips/linux64.h 2009-01-25 00:46:46.197444615 -0800
-@@ -38,10 +38,10 @@
+diff -Naur gcc-4.4.0.orig/gcc/config/mips/linux64.h gcc-4.4.0/gcc/config/mips/linux64.h
+--- gcc-4.4.0.orig/gcc/config/mips/linux64.h    2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/config/mips/linux64.h 2009-04-21 10:09:48.700669088 -0700
+@@ -35,10 +35,10 @@
  %{!shared: \
    %{profile:-lc_p} %{!profile:-lc}}"
@@ -201 +211 @@
    CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32)
  
-diff -Naur gcc-4.3.3.orig/gcc/config/mips/linux.h gcc-4.3.3/gcc/config/mips/linux.h
---- gcc-4.3.3.orig/gcc/config/mips/linux.h      2007-10-21 02:20:49.000000000 -0700
-+++ gcc-4.3.3/gcc/config/mips/linux.h   2009-01-25 00:46:46.685527587 -0800
+diff -Naur gcc-4.4.0.orig/gcc/config/mips/linux.h gcc-4.4.0/gcc/config/mips/linux.h
+--- gcc-4.4.0.orig/gcc/config/mips/linux.h      2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/config/mips/linux.h   2009-04-21 10:09:49.211763096 -0700
 @@ -64,7 +64,7 @@
  #undef MIPS_DEFAULT_GVALUE
@@ -213 +223 @@
  /* Borrowed from sparc/linux.h */
  #undef LINK_SPEC
-diff -Naur gcc-4.3.3.orig/gcc/config/mn10300/linux.h gcc-4.3.3/gcc/config/mn10300/linux.h
---- gcc-4.3.3.orig/gcc/config/mn10300/linux.h   2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/mn10300/linux.h        2009-01-25 00:46:47.091582902 -0800
+diff -Naur gcc-4.4.0.orig/gcc/config/mn10300/linux.h gcc-4.4.0/gcc/config/mn10300/linux.h
+--- gcc-4.4.0.orig/gcc/config/mn10300/linux.h   2007-08-02 03:49:31.000000000 -0700
++++ gcc-4.4.0/gcc/config/mn10300/linux.h        2009-04-21 10:09:49.613617265 -0700
 @@ -32,7 +32,7 @@
  #undef  ASM_SPEC
@@ -225 +235 @@
  #undef  LINK_SPEC
  #define LINK_SPEC "%{mrelax:--relax} %{shared:-shared} \
-diff -Naur gcc-4.3.3.orig/gcc/config/pa/pa-linux.h gcc-4.3.3/gcc/config/pa/pa-linux.h
---- gcc-4.3.3.orig/gcc/config/pa/pa-linux.h     2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/pa/pa-linux.h  2009-01-25 00:46:45.143347394 -0800
+diff -Naur gcc-4.4.0.orig/gcc/config/pa/pa-linux.h gcc-4.4.0/gcc/config/pa/pa-linux.h
+--- gcc-4.4.0.orig/gcc/config/pa/pa-linux.h     2007-08-02 03:49:31.000000000 -0700
++++ gcc-4.4.0/gcc/config/pa/pa-linux.h  2009-04-21 10:09:47.709694092 -0700
 @@ -44,7 +44,7 @@
  /* Define this for shared library support because it isn't in the main
@@ -237 +247 @@
  #undef LINK_SPEC
  #define LINK_SPEC "\
-diff -Naur gcc-4.3.3.orig/gcc/config/rs6000/linux64.h gcc-4.3.3/gcc/config/rs6000/linux64.h
---- gcc-4.3.3.orig/gcc/config/rs6000/linux64.h  2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/rs6000/linux64.h       2009-01-25 00:46:36.037907528 -0800
-@@ -339,10 +339,10 @@
+diff -Naur gcc-4.4.0.orig/gcc/config/rs6000/linux64.h gcc-4.4.0/gcc/config/rs6000/linux64.h
+--- gcc-4.4.0.orig/gcc/config/rs6000/linux64.h  2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.0/gcc/config/rs6000/linux64.h       2009-04-21 10:09:38.246016484 -0700
+@@ -342,10 +342,10 @@
  #undef LINK_OS_DEFAULT_SPEC
  #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
@@ -255 +265 @@
  #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
  #else
-diff -Naur gcc-4.3.3.orig/gcc/config/rs6000/sysv4.h gcc-4.3.3/gcc/config/rs6000/sysv4.h
---- gcc-4.3.3.orig/gcc/config/rs6000/sysv4.h    2007-08-08 12:33:24.000000000 -0700
-+++ gcc-4.3.3/gcc/config/rs6000/sysv4.h 2009-01-25 00:46:36.316812403 -0800
-@@ -891,8 +891,8 @@
+diff -Naur gcc-4.4.0.orig/gcc/config/rs6000/sysv4.h gcc-4.4.0/gcc/config/rs6000/sysv4.h
+--- gcc-4.4.0.orig/gcc/config/rs6000/sysv4.h    2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.0/gcc/config/rs6000/sysv4.h 2009-04-21 10:09:38.529498813 -0700
+@@ -901,8 +901,8 @@
  
  #define LINK_START_LINUX_SPEC ""
@@ -269 +279 @@
  #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
  #else
-@@ -934,7 +934,7 @@
+@@ -944,7 +944,7 @@
  
  #define LINK_OS_GNU_SPEC "-m elf32ppclinux %{!shared: %{!static: \
@@ -278 +288 @@
  #define CPP_OS_GNU_SPEC "-D__unix__ -D__gnu_hurd__ -D__GNU__   \
  %{!undef:                                                      \
-diff -Naur gcc-4.3.3.orig/gcc/config/s390/linux.h gcc-4.3.3/gcc/config/s390/linux.h
---- gcc-4.3.3.orig/gcc/config/s390/linux.h      2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/s390/linux.h   2009-01-25 00:46:39.536529682 -0800
+diff -Naur gcc-4.4.0.orig/gcc/config/s390/linux.h gcc-4.4.0/gcc/config/s390/linux.h
+--- gcc-4.4.0.orig/gcc/config/s390/linux.h      2007-08-02 03:49:31.000000000 -0700
++++ gcc-4.4.0/gcc/config/s390/linux.h   2009-04-21 10:09:42.454394469 -0700
 @@ -72,8 +72,8 @@
  #define MULTILIB_DEFAULTS { "m31" }
@@ -292 +302 @@
  #undef  LINK_SPEC
  #define LINK_SPEC \
-diff -Naur gcc-4.3.3.orig/gcc/config/sh/linux.h gcc-4.3.3/gcc/config/sh/linux.h
---- gcc-4.3.3.orig/gcc/config/sh/linux.h        2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/sh/linux.h     2009-01-25 00:46:44.454287190 -0800
+diff -Naur gcc-4.4.0.orig/gcc/config/sh/linux.h gcc-4.4.0/gcc/config/sh/linux.h
+--- gcc-4.4.0.orig/gcc/config/sh/linux.h        2007-08-02 03:49:31.000000000 -0700
++++ gcc-4.4.0/gcc/config/sh/linux.h     2009-04-21 10:09:47.046441123 -0700
 @@ -47,7 +47,7 @@
  
@@ -304 +314 @@
  #undef SUBTARGET_LINK_EMUL_SUFFIX
  #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
-diff -Naur gcc-4.3.3.orig/gcc/config/sparc/linux64.h gcc-4.3.3/gcc/config/sparc/linux64.h
---- gcc-4.3.3.orig/gcc/config/sparc/linux64.h   2007-10-18 21:29:38.000000000 -0700
-+++ gcc-4.3.3/gcc/config/sparc/linux64.h        2009-01-25 00:46:48.145679843 -0800
-@@ -144,10 +144,10 @@
+diff -Naur gcc-4.4.0.orig/gcc/config/sparc/linux64.h gcc-4.4.0/gcc/config/sparc/linux64.h
+--- gcc-4.4.0.orig/gcc/config/sparc/linux64.h   2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/config/sparc/linux64.h        2009-04-21 10:09:50.518762676 -0700
+@@ -109,8 +109,8 @@
  
  /* If ELF is the default format, we should not use /lib/elf.  */
@@ -313 +323 @@
 -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
 -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
--#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
--#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
 +#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-linux.so.2"
 +#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld-linux.so.2"
-+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
- #if UCLIBC_DEFAULT
- #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
- #else
-@@ -167,7 +167,7 @@
+ 
+ #ifdef SPARC_BI_ARCH
+ 
+@@ -121,7 +121,7 @@
    { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },       \
    { "link_arch",        LINK_ARCH_SPEC },
  
--#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/tools/lib32 %{shared:-shared} \
+-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
++#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/tools/lib32 %{shared:-shared} \
    %{!shared: \
      %{!ibcs: \
        %{!static: \
-@@ -176,7 +176,7 @@
+@@ -130,7 +130,7 @@
          %{static:-static}}} \
  "
  
--#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
-+#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/tools/lib %{shared:-shared} \
+-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
++#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/tools/lib %{shared:-shared} \
    %{!shared: \
      %{!ibcs: \
        %{!static: \
-@@ -257,7 +257,7 @@
+@@ -211,7 +211,7 @@
  #else /* !SPARC_BI_ARCH */
  
  #undef LINK_SPEC
--#define LINK_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
-+#define LINK_SPEC "-m elf64_sparc -Y P,/tools/lib %{shared:-shared} \
+-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
++#define LINK_SPEC "-m elf64_sparc -Y P,%R/tools/lib %{shared:-shared} \
    %{!shared: \
      %{!ibcs: \
        %{!static: \
-diff -Naur gcc-4.3.3.orig/gcc/config/sparc/linux.h gcc-4.3.3/gcc/config/sparc/linux.h
---- gcc-4.3.3.orig/gcc/config/sparc/linux.h     2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/sparc/linux.h  2009-01-25 00:46:48.494310657 -0800
-@@ -120,8 +120,8 @@
+diff -Naur gcc-4.4.0.orig/gcc/config/sparc/linux.h gcc-4.4.0/gcc/config/sparc/linux.h
+--- gcc-4.4.0.orig/gcc/config/sparc/linux.h     2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/config/sparc/linux.h  2009-04-21 10:09:50.838684733 -0700
+@@ -83,10 +83,10 @@
  
  /* If ELF is the default format, we should not use /lib/elf.  */
  
 -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
--#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
-+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
- #if UCLIBC_DEFAULT
- #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
- #else
-@@ -132,7 +132,7 @@
- 
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
  
  #undef  LINK_SPEC
@@ -372 +371 @@
    %{!shared: \
      %{!ibcs: \
-diff -Naur gcc-4.3.3.orig/gcc/config/xtensa/linux.h gcc-4.3.3/gcc/config/xtensa/linux.h
---- gcc-4.3.3.orig/gcc/config/xtensa/linux.h    2008-01-17 17:37:53.000000000 -0800
-+++ gcc-4.3.3/gcc/config/xtensa/linux.h 2009-01-25 00:46:37.658018717 -0800
+diff -Naur gcc-4.4.0.orig/gcc/config/xtensa/linux.h gcc-4.4.0/gcc/config/xtensa/linux.h
+--- gcc-4.4.0.orig/gcc/config/xtensa/linux.h    2008-01-17 17:37:53.000000000 -0800
++++ gcc-4.4.0/gcc/config/xtensa/linux.h 2009-04-21 10:09:39.836497556 -0700
 @@ -43,7 +43,7 @@
    %{mlongcalls:--longcalls} \

patches/gcc-4.4.0-specs-1.patch

@@ -1 +1 @@
 Submitted By: Jim Gifford (jim at cross-lfs dot org)
-Date: 01-25-2009
-Initial Package Version: 4.3.3
+Date: 04-21-2009
+Initial Package Version: 4.4.0
 Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
         the Pure LFS project.
 Upstream Status: Not Applied
-Description: This patch modifies the location of the dynamic linker for gcc-4.3.3.
+Description: This patch modifies the location of the dynamic linker for gcc-4.4.0.
 
-diff -Naur gcc-4.3.3.orig/gcc/config/alpha/gnu.h gcc-4.3.3/gcc/config/alpha/gnu.h
---- gcc-4.3.3.orig/gcc/config/alpha/gnu.h       2004-09-07 17:17:19.000000000 -0700
-+++ gcc-4.3.3/gcc/config/alpha/gnu.h    2009-01-25 00:44:15.387601620 -0800
+diff -Naur gcc-4.4.0.orig/gcc/config/alpha/gnu.h gcc-4.4.0/gcc/config/alpha/gnu.h
+--- gcc-4.4.0.orig/gcc/config/alpha/gnu.h       2004-09-07 17:17:19.000000000 -0700
++++ gcc-4.4.0/gcc/config/alpha/gnu.h    2009-04-21 10:05:33.058642828 -0700
 @@ -11,7 +11,7 @@
      } while (0)
@@ -19 +19 @@
  #undef STARTFILE_SPEC
  #define STARTFILE_SPEC \
-diff -Naur gcc-4.3.3.orig/gcc/config/alpha/linux-elf.h gcc-4.3.3/gcc/config/alpha/linux-elf.h
---- gcc-4.3.3.orig/gcc/config/alpha/linux-elf.h 2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/alpha/linux-elf.h      2009-01-25 00:44:15.527054895 -0800
+diff -Naur gcc-4.4.0.orig/gcc/config/alpha/linux-elf.h gcc-4.4.0/gcc/config/alpha/linux-elf.h
+--- gcc-4.4.0.orig/gcc/config/alpha/linux-elf.h 2007-08-02 03:49:31.000000000 -0700
++++ gcc-4.4.0/gcc/config/alpha/linux-elf.h      2009-04-21 10:05:33.167886578 -0700
 @@ -27,8 +27,8 @@
  #define EXTRA_SPECS \
@@ -33 +33 @@
  #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
  #else
-diff -Naur gcc-4.3.3.orig/gcc/config/arm/linux-eabi.h gcc-4.3.3/gcc/config/arm/linux-eabi.h
---- gcc-4.3.3.orig/gcc/config/arm/linux-eabi.h  2007-11-08 05:44:09.000000000 -0800
-+++ gcc-4.3.3/gcc/config/arm/linux-eabi.h       2009-01-25 00:44:20.001844391 -0800
+diff -Naur gcc-4.4.0.orig/gcc/config/arm/linux-eabi.h gcc-4.4.0/gcc/config/arm/linux-eabi.h
+--- gcc-4.4.0.orig/gcc/config/arm/linux-eabi.h  2007-11-08 05:44:09.000000000 -0800
++++ gcc-4.4.0/gcc/config/arm/linux-eabi.h       2009-04-21 10:05:37.592169299 -0700
 @@ -61,7 +61,7 @@
  /* Use ld-linux.so.3 so that it will be possible to run "classic"
@@ -45 +45 @@
  /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
     use the GNU/Linux version, not the generic BPABI version.  */
-diff -Naur gcc-4.3.3.orig/gcc/config/arm/linux-elf.h gcc-4.3.3/gcc/config/arm/linux-elf.h
---- gcc-4.3.3.orig/gcc/config/arm/linux-elf.h   2007-11-08 05:44:09.000000000 -0800
-+++ gcc-4.3.3/gcc/config/arm/linux-elf.h        2009-01-25 00:44:19.714736136 -0800
+diff -Naur gcc-4.4.0.orig/gcc/config/arm/linux-elf.h gcc-4.4.0/gcc/config/arm/linux-elf.h
+--- gcc-4.4.0.orig/gcc/config/arm/linux-elf.h   2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/config/arm/linux-elf.h        2009-04-21 10:05:37.389291242 -0700
 @@ -62,7 +62,7 @@
  
@@ -57 +57 @@
  #define LINUX_TARGET_LINK_SPEC  "%{h*} %{version:-v} \
     %{b} \
-diff -Naur gcc-4.3.3.orig/gcc/config/bfin/linux.h gcc-4.3.3/gcc/config/bfin/linux.h
---- gcc-4.3.3.orig/gcc/config/bfin/linux.h      2007-09-05 17:09:05.000000000 -0700
-+++ gcc-4.3.3/gcc/config/bfin/linux.h   2009-01-25 00:44:12.614954881 -0800
+diff -Naur gcc-4.4.0.orig/gcc/config/bfin/linux.h gcc-4.4.0/gcc/config/bfin/linux.h
+--- gcc-4.4.0.orig/gcc/config/bfin/linux.h      2008-11-27 01:11:50.000000000 -0800
++++ gcc-4.4.0/gcc/config/bfin/linux.h   2009-04-21 10:05:29.793102668 -0700
 @@ -22,7 +22,7 @@
    %{shared:-G -Bdynamic} \
@@ -69 +69 @@
  
  #define MD_UNWIND_SUPPORT "config/bfin/linux-unwind.h"
-diff -Naur gcc-4.3.3.orig/gcc/config/cris/linux.h gcc-4.3.3/gcc/config/cris/linux.h
---- gcc-4.3.3.orig/gcc/config/cris/linux.h      2008-01-23 09:17:58.000000000 -0800
-+++ gcc-4.3.3/gcc/config/cris/linux.h   2009-01-25 00:44:10.547772593 -0800
-@@ -102,7 +102,7 @@
+diff -Naur gcc-4.4.0.orig/gcc/config/cris/linux.h gcc-4.4.0/gcc/config/cris/linux.h
+--- gcc-4.4.0.orig/gcc/config/cris/linux.h      2009-03-22 08:15:04.000000000 -0700
++++ gcc-4.4.0/gcc/config/cris/linux.h   2009-04-21 10:05:27.167401313 -0700
+@@ -103,7 +103,7 @@
  #undef CRIS_DEFAULT_CPU_VERSION
  #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
@@ -81 +81 @@
  /* We need an -rpath-link to ld.so.1, and presumably to each directory
     specified with -B.  */
-diff -Naur gcc-4.3.3.orig/gcc/config/frv/linux.h gcc-4.3.3/gcc/config/frv/linux.h
---- gcc-4.3.3.orig/gcc/config/frv/linux.h       2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/frv/linux.h    2009-01-25 00:44:10.199141500 -0800
+diff -Naur gcc-4.4.0.orig/gcc/config/frv/linux.h gcc-4.4.0/gcc/config/frv/linux.h
+--- gcc-4.4.0.orig/gcc/config/frv/linux.h       2007-08-02 03:49:31.000000000 -0700
++++ gcc-4.4.0/gcc/config/frv/linux.h    2009-04-21 10:05:26.843578992 -0700
 @@ -35,7 +35,7 @@
  #define ENDFILE_SPEC \
@@ -93 +93 @@
  #undef LINK_SPEC
  #define LINK_SPEC "\
-diff -Naur gcc-4.3.3.orig/gcc/config/i386/gnu.h gcc-4.3.3/gcc/config/i386/gnu.h
---- gcc-4.3.3.orig/gcc/config/i386/gnu.h        2007-08-07 23:35:17.000000000 -0700
-+++ gcc-4.3.3/gcc/config/i386/gnu.h     2009-01-25 00:44:12.893860874 -0800
-@@ -22,7 +22,7 @@
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
--      %{!dynamic-linker:-dynamic-linker /lib/ld.so}} \
-+      %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so}} \
-     %{static:-static}}"
- 
- #undef STARTFILE_SPEC
-diff -Naur gcc-4.3.3.orig/gcc/config/i386/linux64.h gcc-4.3.3/gcc/config/i386/linux64.h
---- gcc-4.3.3.orig/gcc/config/i386/linux64.h    2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/i386/linux64.h 2009-01-25 00:44:12.770812683 -0800
-@@ -53,8 +53,8 @@
+diff -Naur gcc-4.4.0.orig/gcc/config/i386/gnu.h gcc-4.4.0/gcc/config/i386/gnu.h
+--- gcc-4.4.0.orig/gcc/config/i386/gnu.h        2008-11-13 15:28:46.000000000 -0800
++++ gcc-4.4.0/gcc/config/i386/gnu.h     2009-04-21 10:05:30.113024445 -0700
+@@ -21,7 +21,7 @@
+ */
+ 
+ #undef GLIBC_DYNAMIC_LINKER
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so"
+ 
+ #undef TARGET_VERSION
+ #define TARGET_VERSION fprintf (stderr, " (i386 GNU)");
+diff -Naur gcc-4.4.0.orig/gcc/config/i386/linux64.h gcc-4.4.0/gcc/config/i386/linux64.h
+--- gcc-4.4.0.orig/gcc/config/i386/linux64.h    2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.0/gcc/config/i386/linux64.h 2009-04-21 10:05:29.968667692 -0700
+@@ -58,8 +58,8 @@
     When the -shared link option is used a final link is not being
     done.  */
@@ -117 +117 @@
 +#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld-linux-x86-64.so.2"
  
- #if TARGET_64BIT_DEFAULT
- #define SPEC_32 "m32"
-diff -Naur gcc-4.3.3.orig/gcc/config/i386/linux.h gcc-4.3.3/gcc/config/i386/linux.h
---- gcc-4.3.3.orig/gcc/config/i386/linux.h      2007-11-27 17:04:27.000000000 -0800
-+++ gcc-4.3.3/gcc/config/i386/linux.h   2009-01-25 00:44:14.194051683 -0800
+ #undef ASM_SPEC
+ #define ASM_SPEC "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} \
+diff -Naur gcc-4.4.0.orig/gcc/config/i386/linux.h gcc-4.4.0/gcc/config/i386/linux.h
+--- gcc-4.4.0.orig/gcc/config/i386/linux.h      2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/config/i386/linux.h   2009-04-21 10:05:31.665813103 -0700
 @@ -100,7 +100,7 @@
  
@@ -129 +129 @@
 +#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
  
- #undef  SUBTARGET_EXTRA_SPECS
- #define SUBTARGET_EXTRA_SPECS \
-diff -Naur gcc-4.3.3.orig/gcc/config/ia64/linux.h gcc-4.3.3/gcc/config/ia64/linux.h
---- gcc-4.3.3.orig/gcc/config/ia64/linux.h      2006-12-12 07:15:19.000000000 -0800
-+++ gcc-4.3.3/gcc/config/ia64/linux.h   2009-01-25 00:44:15.260453415 -0800
+ #undef  ASM_SPEC
+ #define ASM_SPEC \
+diff -Naur gcc-4.4.0.orig/gcc/config/ia64/linux.h gcc-4.4.0/gcc/config/ia64/linux.h
+--- gcc-4.4.0.orig/gcc/config/ia64/linux.h      2009-02-12 08:30:53.000000000 -0800
++++ gcc-4.4.0/gcc/config/ia64/linux.h   2009-04-21 10:05:32.933795782 -0700
 @@ -37,7 +37,7 @@
  /* Define this for shared library support because it isn't in the main
@@ -143 +143 @@
  #undef LINK_SPEC
  #define LINK_SPEC "\
-diff -Naur gcc-4.3.3.orig/gcc/config/linux.h gcc-4.3.3/gcc/config/linux.h
---- gcc-4.3.3.orig/gcc/config/linux.h   2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/linux.h        2009-01-25 00:44:18.070013688 -0800
-@@ -112,9 +112,9 @@
+diff -Naur gcc-4.4.0.orig/gcc/config/kopensolaris-gnu.h gcc-4.4.0/gcc/config/kopensolaris-gnu.h
+--- gcc-4.4.0.orig/gcc/config/kopensolaris-gnu.h        2009-01-29 10:48:41.000000000 -0800
++++ gcc-4.4.0/gcc/config/kopensolaris-gnu.h     2009-04-21 10:05:38.232013132 -0700
+@@ -33,5 +33,5 @@
+ 
+ #ifdef GLIBC_DYNAMIC_LINKER
+ #undef GLIBC_DYNAMIC_LINKER
+-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
+ #endif
+diff -Naur gcc-4.4.0.orig/gcc/config/linux.h gcc-4.4.0/gcc/config/linux.h
+--- gcc-4.4.0.orig/gcc/config/linux.h   2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.0/gcc/config/linux.h        2009-04-21 10:05:35.793583462 -0700
+@@ -117,9 +117,9 @@
     GLIBC_DYNAMIC_LINKER must be defined for each target using them, or
     GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
@@ -159 +169 @@
    CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
  #define LINUX_DYNAMIC_LINKER32 \
-diff -Naur gcc-4.3.3.orig/gcc/config/m32r/linux.h gcc-4.3.3/gcc/config/m32r/linux.h
---- gcc-4.3.3.orig/gcc/config/m32r/linux.h      2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/m32r/linux.h   2009-01-25 00:44:12.389370023 -0800
+diff -Naur gcc-4.4.0.orig/gcc/config/m32r/linux.h gcc-4.4.0/gcc/config/m32r/linux.h
+--- gcc-4.4.0.orig/gcc/config/m32r/linux.h      2007-08-02 03:49:31.000000000 -0700
++++ gcc-4.4.0/gcc/config/m32r/linux.h   2009-04-21 10:05:29.512193603 -0700
 @@ -58,7 +58,7 @@
  
@@ -171 +181 @@
  #undef LINK_SPEC
  #if TARGET_LITTLE_ENDIAN
-diff -Naur gcc-4.3.3.orig/gcc/config/m68k/linux.h gcc-4.3.3/gcc/config/m68k/linux.h
---- gcc-4.3.3.orig/gcc/config/m68k/linux.h      2007-09-24 14:07:08.000000000 -0700
-+++ gcc-4.3.3/gcc/config/m68k/linux.h   2009-01-25 00:44:11.044059784 -0800
+diff -Naur gcc-4.4.0.orig/gcc/config/m68k/linux.h gcc-4.4.0/gcc/config/m68k/linux.h
+--- gcc-4.4.0.orig/gcc/config/m68k/linux.h      2007-09-24 14:07:08.000000000 -0700
++++ gcc-4.4.0/gcc/config/m68k/linux.h   2009-04-21 10:05:27.799443777 -0700
 @@ -84,7 +84,7 @@
  
@@ -183 +193 @@
  #undef LINK_SPEC
  #define LINK_SPEC "-m m68kelf %{shared} \
-diff -Naur gcc-4.3.3.orig/gcc/config/mips/linux64.h gcc-4.3.3/gcc/config/mips/linux64.h
---- gcc-4.3.3.orig/gcc/config/mips/linux64.h    2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/mips/linux64.h 2009-01-25 00:44:18.176655119 -0800
-@@ -38,10 +38,10 @@
+diff -Naur gcc-4.4.0.orig/gcc/config/mips/linux64.h gcc-4.4.0/gcc/config/mips/linux64.h
+--- gcc-4.4.0.orig/gcc/config/mips/linux64.h    2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/config/mips/linux64.h 2009-04-21 10:05:35.898926387 -0700
+@@ -35,10 +35,10 @@
  %{!shared: \
    %{profile:-lc_p} %{!profile:-lc}}"
@@ -201 +211 @@
    CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32)
  
-diff -Naur gcc-4.3.3.orig/gcc/config/mips/linux.h gcc-4.3.3/gcc/config/mips/linux.h
---- gcc-4.3.3.orig/gcc/config/mips/linux.h      2007-10-21 02:20:49.000000000 -0700
-+++ gcc-4.3.3/gcc/config/mips/linux.h   2009-01-25 00:44:18.652435256 -0800
+diff -Naur gcc-4.4.0.orig/gcc/config/mips/linux.h gcc-4.4.0/gcc/config/mips/linux.h
+--- gcc-4.4.0.orig/gcc/config/mips/linux.h      2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/config/mips/linux.h   2009-04-21 10:05:36.394414304 -0700
 @@ -64,7 +64,7 @@
  #undef MIPS_DEFAULT_GVALUE
@@ -213 +223 @@
  /* Borrowed from sparc/linux.h */
  #undef LINK_SPEC
-diff -Naur gcc-4.3.3.orig/gcc/config/mn10300/linux.h gcc-4.3.3/gcc/config/mn10300/linux.h
---- gcc-4.3.3.orig/gcc/config/mn10300/linux.h   2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/mn10300/linux.h        2009-01-25 00:44:19.054386646 -0800
+diff -Naur gcc-4.4.0.orig/gcc/config/mn10300/linux.h gcc-4.4.0/gcc/config/mn10300/linux.h
+--- gcc-4.4.0.orig/gcc/config/mn10300/linux.h   2007-08-02 03:49:31.000000000 -0700
++++ gcc-4.4.0/gcc/config/mn10300/linux.h        2009-04-21 10:05:36.792364856 -0700
 @@ -32,7 +32,7 @@
  #undef  ASM_SPEC
@@ -225 +235 @@
  #undef  LINK_SPEC
  #define LINK_SPEC "%{mrelax:--relax} %{shared:-shared} \
-diff -Naur gcc-4.3.3.orig/gcc/config/pa/pa-linux.h gcc-4.3.3/gcc/config/pa/pa-linux.h
---- gcc-4.3.3.orig/gcc/config/pa/pa-linux.h     2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/pa/pa-linux.h  2009-01-25 00:44:17.138963542 -0800
+diff -Naur gcc-4.4.0.orig/gcc/config/pa/pa-linux.h gcc-4.4.0/gcc/config/pa/pa-linux.h
+--- gcc-4.4.0.orig/gcc/config/pa/pa-linux.h     2007-08-02 03:49:31.000000000 -0700
++++ gcc-4.4.0/gcc/config/pa/pa-linux.h  2009-04-21 10:05:34.931355497 -0700
 @@ -44,7 +44,7 @@
  /* Define this for shared library support because it isn't in the main
@@ -237 +247 @@
  #undef LINK_SPEC
  #define LINK_SPEC "\
-diff -Naur gcc-4.3.3.orig/gcc/config/rs6000/linux64.h gcc-4.3.3/gcc/config/rs6000/linux64.h
---- gcc-4.3.3.orig/gcc/config/rs6000/linux64.h  2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/rs6000/linux64.h       2009-01-25 00:44:08.140163989 -0800
-@@ -339,10 +339,10 @@
+diff -Naur gcc-4.4.0.orig/gcc/config/rs6000/linux64.h gcc-4.4.0/gcc/config/rs6000/linux64.h
+--- gcc-4.4.0.orig/gcc/config/rs6000/linux64.h  2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.0/gcc/config/rs6000/linux64.h       2009-04-21 10:05:24.642748987 -0700
+@@ -342,10 +342,10 @@
  #undef LINK_OS_DEFAULT_SPEC
  #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
@@ -255 +265 @@
  #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
  #else
-diff -Naur gcc-4.3.3.orig/gcc/config/rs6000/sysv4.h gcc-4.3.3/gcc/config/rs6000/sysv4.h
---- gcc-4.3.3.orig/gcc/config/rs6000/sysv4.h    2007-08-08 12:33:24.000000000 -0700
-+++ gcc-4.3.3/gcc/config/rs6000/sysv4.h 2009-01-25 00:44:08.414967174 -0800
-@@ -891,8 +891,8 @@
+diff -Naur gcc-4.4.0.orig/gcc/config/rs6000/sysv4.h gcc-4.4.0/gcc/config/rs6000/sysv4.h
+--- gcc-4.4.0.orig/gcc/config/rs6000/sysv4.h    2009-04-09 16:23:07.000000000 -0700
++++ gcc-4.4.0/gcc/config/rs6000/sysv4.h 2009-04-21 10:05:25.034773572 -0700
+@@ -901,8 +901,8 @@
  
  #define LINK_START_LINUX_SPEC ""
@@ -269 +279 @@
  #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
  #else
-@@ -934,7 +934,7 @@
+@@ -944,7 +944,7 @@
  
  #define LINK_OS_GNU_SPEC "-m elf32ppclinux %{!shared: %{!static: \
@@ -278 +288 @@
  #define CPP_OS_GNU_SPEC "-D__unix__ -D__gnu_hurd__ -D__GNU__   \
  %{!undef:                                                      \
-diff -Naur gcc-4.3.3.orig/gcc/config/s390/linux.h gcc-4.3.3/gcc/config/s390/linux.h
---- gcc-4.3.3.orig/gcc/config/s390/linux.h      2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/s390/linux.h   2009-01-25 00:44:11.774138007 -0800
+diff -Naur gcc-4.4.0.orig/gcc/config/s390/linux.h gcc-4.4.0/gcc/config/s390/linux.h
+--- gcc-4.4.0.orig/gcc/config/s390/linux.h      2007-08-02 03:49:31.000000000 -0700
++++ gcc-4.4.0/gcc/config/s390/linux.h   2009-04-21 10:05:28.673376171 -0700
 @@ -72,8 +72,8 @@
  #define MULTILIB_DEFAULTS { "m31" }
@@ -292 +302 @@
  #undef  LINK_SPEC
  #define LINK_SPEC \
-diff -Naur gcc-4.3.3.orig/gcc/config/sh/linux.h gcc-4.3.3/gcc/config/sh/linux.h
---- gcc-4.3.3.orig/gcc/config/sh/linux.h        2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/sh/linux.h     2009-01-25 00:44:16.458105601 -0800
+diff -Naur gcc-4.4.0.orig/gcc/config/sh/linux.h gcc-4.4.0/gcc/config/sh/linux.h
+--- gcc-4.4.0.orig/gcc/config/sh/linux.h        2007-08-02 03:49:31.000000000 -0700
++++ gcc-4.4.0/gcc/config/sh/linux.h     2009-04-21 10:05:34.264203940 -0700
 @@ -47,7 +47,7 @@
  
@@ -304 +314 @@
  #undef SUBTARGET_LINK_EMUL_SUFFIX
  #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
-diff -Naur gcc-4.3.3.orig/gcc/config/sparc/linux64.h gcc-4.3.3/gcc/config/sparc/linux64.h
---- gcc-4.3.3.orig/gcc/config/sparc/linux64.h   2007-10-18 21:29:38.000000000 -0700
-+++ gcc-4.3.3/gcc/config/sparc/linux64.h        2009-01-25 00:44:20.108482748 -0800
-@@ -144,10 +144,10 @@
+diff -Naur gcc-4.4.0.orig/gcc/config/sparc/linux64.h gcc-4.4.0/gcc/config/sparc/linux64.h
+--- gcc-4.4.0.orig/gcc/config/sparc/linux64.h   2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/config/sparc/linux64.h        2009-04-21 10:05:37.666298087 -0700
+@@ -109,8 +109,8 @@
  
  /* If ELF is the default format, we should not use /lib/elf.  */
@@ -313 +323 @@
 -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
 -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
--#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
--#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
 +#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-linux.so.2"
 +#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld-linux.so.2"
-+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
- #if UCLIBC_DEFAULT
- #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
- #else
-@@ -167,7 +167,7 @@
+ 
+ #ifdef SPARC_BI_ARCH
+ 
+@@ -121,7 +121,7 @@
    { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },       \
    { "link_arch",        LINK_ARCH_SPEC },
  
--#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/tools/lib %{shared:-shared} \
+-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
++#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/tools/lib %{shared:-shared} \
    %{!shared: \
      %{!ibcs: \
        %{!static: \
-@@ -176,7 +176,7 @@
+@@ -130,7 +130,7 @@
          %{static:-static}}} \
  "
  
--#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
-+#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/tools/lib64 %{shared:-shared} \
+-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
++#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/tools/lib64 %{shared:-shared} \
    %{!shared: \
      %{!ibcs: \
        %{!static: \
-@@ -257,7 +257,7 @@
+@@ -211,7 +211,7 @@
  #else /* !SPARC_BI_ARCH */
  
  #undef LINK_SPEC
--#define LINK_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
-+#define LINK_SPEC "-m elf64_sparc -Y P,/tools/lib64 %{shared:-shared} \
+-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
++#define LINK_SPEC "-m elf64_sparc -Y P,%R/tools/lib64 %{shared:-shared} \
    %{!shared: \
      %{!ibcs: \
        %{!static: \
-diff -Naur gcc-4.3.3.orig/gcc/config/sparc/linux.h gcc-4.3.3/gcc/config/sparc/linux.h
---- gcc-4.3.3.orig/gcc/config/sparc/linux.h     2007-08-02 03:49:31.000000000 -0700
-+++ gcc-4.3.3/gcc/config/sparc/linux.h  2009-01-25 00:44:20.453014666 -0800
-@@ -120,8 +120,8 @@
+diff -Naur gcc-4.4.0.orig/gcc/config/sparc/linux.h gcc-4.4.0/gcc/config/sparc/linux.h
+--- gcc-4.4.0.orig/gcc/config/sparc/linux.h     2009-02-20 07:20:38.000000000 -0800
++++ gcc-4.4.0/gcc/config/sparc/linux.h  2009-04-21 10:05:37.978417377 -0700
+@@ -83,10 +83,10 @@
  
  /* If ELF is the default format, we should not use /lib/elf.  */
  
 -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
--#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
-+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
- #if UCLIBC_DEFAULT
- #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
- #else
-@@ -132,7 +132,7 @@
- 
++#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
  
  #undef  LINK_SPEC
@@ -372 +371 @@
    %{!shared: \
      %{!ibcs: \
-diff -Naur gcc-4.3.3.orig/gcc/config/xtensa/linux.h gcc-4.3.3/gcc/config/xtensa/linux.h
---- gcc-4.3.3.orig/gcc/config/xtensa/linux.h    2008-01-17 17:37:53.000000000 -0800
-+++ gcc-4.3.3/gcc/config/xtensa/linux.h 2009-01-25 00:44:10.043282860 -0800
+diff -Naur gcc-4.4.0.orig/gcc/config/xtensa/linux.h gcc-4.4.0/gcc/config/xtensa/linux.h
+--- gcc-4.4.0.orig/gcc/config/xtensa/linux.h    2008-01-17 17:37:53.000000000 -0800
++++ gcc-4.4.0/gcc/config/xtensa/linux.h 2009-04-21 10:05:26.652405923 -0700
 @@ -43,7 +43,7 @@
    %{mlongcalls:--longcalls} \