From f0a83823138d7ce97cc0f83a7bc40cae54322a69 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@dv9000.openelec.tv>
Date: Sun, 26 Apr 2009 20:56:05 +0200
Subject: [PATCH] update to gcc-4.4.0, various fixes

---
 packages/toolchain/lang/gcc-final/build       |   1 +
 .../lang/gcc/099-gcc-4.3.3-posix-1.diff       | 304 ------------------
 .../toolchain/lang/gcc/100_uclibc-conf.diff   |  13 -
 .../toolchain/lang/gcc/995-short-enums.diff   |  30 --
 .../100-uclibc-conf-gcc-4.4.0.diff            |   0
 .../lang/gcc/patches/100_uclibc-conf.diff     |  13 -
 .../301-missing-execinfo_h-gcc-4.4.0.diff     |   0
 .../lang/gcc/patches/995-short-enums.diff     |  12 -
 packages/toolchain/lang/gcc/url               |   2 +-
 9 files changed, 2 insertions(+), 373 deletions(-)
 delete mode 100644 packages/toolchain/lang/gcc/099-gcc-4.3.3-posix-1.diff
 delete mode 100644 packages/toolchain/lang/gcc/100_uclibc-conf.diff
 delete mode 100644 packages/toolchain/lang/gcc/995-short-enums.diff
 rename packages/toolchain/lang/gcc/{ => patches}/100-uclibc-conf-gcc-4.4.0.diff (100%)
 delete mode 100644 packages/toolchain/lang/gcc/patches/100_uclibc-conf.diff
 rename packages/toolchain/lang/gcc/{ => patches}/301-missing-execinfo_h-gcc-4.4.0.diff (100%)

diff --git a/packages/toolchain/lang/gcc-final/build b/packages/toolchain/lang/gcc-final/build
index 66115dc25d..a3b8215288 100755
--- a/packages/toolchain/lang/gcc-final/build
+++ b/packages/toolchain/lang/gcc-final/build
@@ -25,6 +25,7 @@ cd objdir-$1
              --disable-libmudflap \
              --disable-libssp \
              --disable-multilib \
+             --disable-tls \
              --enable-shared \
              --enable-c99 \
              --enable-long-long \
diff --git a/packages/toolchain/lang/gcc/099-gcc-4.3.3-posix-1.diff b/packages/toolchain/lang/gcc/099-gcc-4.3.3-posix-1.diff
deleted file mode 100644
index 03185b3cc5..0000000000
--- a/packages/toolchain/lang/gcc/099-gcc-4.3.3-posix-1.diff
+++ /dev/null
@@ -1,304 +0,0 @@
-Submitted By: Jim Gifford (jim at cross-lfs dot org)
-Date: 01-25-2009
-Initial Package Version: 4.3.3
-Origin: Jim Gifford
-        Rediffed against 4.1.0 by Chris Staub
-        Rediffed against 4.1.2 by Jim Gifford
-	Rediffed and additions against 4.2.0 by Joe Ciccone
-	Rediffed against 4.3.0 by Joe Ciccone
-	Rediffed against 4.3.3 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:"
--	tail -30 $1/bootstrap > $1/last_bootstrap
-+	tail -n 30 $1/bootstrap > $1/last_bootstrap
- 	freport $1/last_bootstrap
- 	report "grep --context=20 Error bootstrap:"
- 	grep --context=20 Error $1/bootstrap > $1/bootstrap_error
-@@ -420,7 +420,7 @@
- # After selfexec, $TESTING is already set up.  
- if [ -d $TESTING ]; then
-     # The only file in $TESTING is the patch.
--    PATCH=`ls -rt -1 $TESTING | head -1`
-+    PATCH=`ls -rt -1 $TESTING | head -n 1`
-     PATCH=$TESTING/$PATCH
-     if [ -f $PATCH ]; then
- 	bootntest_patched && bootntest_pristine && compare_passes
-@@ -429,7 +429,7 @@
- fi
- 
- 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
-@@ -107,7 +107,7 @@
-     srcdir = configflags;
-     sub(/\/configure .*/, "", srcdir);
-     printf "LAST_UPDATED: ";
--    system("tail -1 " srcdir "/LAST_UPDATED");
-+    system("tail -n 1 " srcdir "/LAST_UPDATED");
-     print "";
- 
-     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 @@
-   # Therefore, use diff -b for the comparisons.
-   if test x$gcc_cv_objdump != x \
-   && $gcc_cv_objdump -s -j .eh_frame conftest.o 2>/dev/null \
--     | tail -3 > conftest.got \
-+     | tail -n 3 > conftest.got \
-   && { diff -b conftest.lit conftest.got > /dev/null 2>&1 \
-     || 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 @@
-   # Therefore, use diff -b for the comparisons.
-   if test x$gcc_cv_objdump != x \
-   && $gcc_cv_objdump -s -j .eh_frame conftest.o 2>/dev/null \
--     | tail -3 > conftest.got \
-+     | tail -n 3 > conftest.got \
-   && { diff -b conftest.lit conftest.got > /dev/null 2>&1 \
-     || 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
-@@ -68,7 +68,7 @@
-   ls ${i}?.adb > ${i}.lst 2> /dev/null
-   ls ${i}*m.adb >> ${i}.lst 2> /dev/null
-   ls ${i}.adb >> ${i}.lst 2> /dev/null
--  main=`tail -1 ${i}.lst`
-+  main=`tail -n 1 ${i}.lst`
- }
- 
- 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.
-   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/'`
-   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.
- 
--  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/'`
- 
-   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 @@
- fi # shortcircut to system "stdint.h"
- # ------------------ PREPARE VARIABLES ------------------------------
- if test "$GCC" = "yes" ; then
--ac_cv_stdint_message="using gnu compiler "`$CC --version | head -1`
-+ac_cv_stdint_message="using gnu compiler "`$CC --version | head -n 1`
- else
- 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
-@@ -153,7 +153,7 @@
-     # If the export-symbols file already is a .def file (1st line
-     # is EXPORTS), use it as is.
-     # If DATA tags from a recent dlltool are present, honour them!
--    archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
-+    archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
-         cp $export_symbols $output_objdir/$soname-def;
-       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
-@@ -156,7 +156,7 @@
-     # If the export-symbols file already is a .def file (1st line
-     # is EXPORTS), use it as is.
-     # If DATA tags from a recent dlltool are present, honour them!
--    archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
-+    archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
-         cp $export_symbols $output_objdir/$soname-def;
-       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
-@@ -217,7 +217,7 @@
- fi # shortcircut to system "stdint.h"
- # ------------------ PREPARE VARIABLES ------------------------------
- if test "$GCC" = "yes" ; then
--ac_cv_stdint_message="using gnu compiler "`$CC --version | head -1`
-+ac_cv_stdint_message="using gnu compiler "`$CC --version | head -n 1`
- else
- 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 @@
- echo $ECHO_N "checking whether 'ld' is at least 2.13... $ECHO_C" >&6
- LD_PROG=`$CC --print-prog-name=ld`
- LD_VERSION=`$LD_PROG --version`
--LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 1 | cut -d ' ' -f 4`
--LD_VERSION_MINOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 2`
-+LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 1 | cut -d ' ' -f 4`
-+LD_VERSION_MINOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 2`
- if expr "$LD_VERSION_MAJOR" \> 2 > /dev/null; then
-   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
-@@ -3,8 +3,8 @@
- AC_MSG_CHECKING(whether 'ld' is at least 2.13)
- LD_PROG=`$CC --print-prog-name=ld`
- LD_VERSION=`$LD_PROG --version`
--LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 1 | cut -d ' ' -f 4`
--LD_VERSION_MINOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 2`
-+LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 1 | cut -d ' ' -f 4`
-+LD_VERSION_MINOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 2`
- if expr "$LD_VERSION_MAJOR" \> 2 > /dev/null; then
-   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/'`
-     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 --git a/packages/toolchain/lang/gcc/100_uclibc-conf.diff b/packages/toolchain/lang/gcc/100_uclibc-conf.diff
deleted file mode 100644
index 6bad179e62..0000000000
--- a/packages/toolchain/lang/gcc/100_uclibc-conf.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- gcc/gcc/config/--- gcc/contrib/regression/objs-gcc.sh
-+++ gcc/contrib/regression/objs-gcc.sh
-@@ -105,6 +105,10 @@
-  then
-   make all-gdb all-dejagnu all-ld || exit 1
-   make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+  make all-gdb all-dejagnu all-ld || exit 1
-+  make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
-   make bootstrap || exit 1
-   make install || exit 1
diff --git a/packages/toolchain/lang/gcc/995-short-enums.diff b/packages/toolchain/lang/gcc/995-short-enums.diff
deleted file mode 100644
index 79afdb8fea..0000000000
--- a/packages/toolchain/lang/gcc/995-short-enums.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-see gcc PR34205
-Index: gcc-4.3.0/gcc/rtl.h
-===================================================================
---- gcc-4.3.0/gcc/rtl.h	(revision 130511)
-+++ gcc-4.3.0/gcc/rtl.h	(working copy)
-@@ -48,9 +48,11 @@
- #include "rtl.def"		/* rtl expressions are documented here */
- #undef DEF_RTL_EXPR
- 
--  LAST_AND_UNUSED_RTX_CODE};	/* A convenient way to get a value for
-+  LAST_AND_UNUSED_RTX_CODE	/* A convenient way to get a value for
- 				   NUM_RTX_CODE.
- 				   Assumes default enum value assignment.  */
-+  ,__LAST_AND_UNUSED_RTX_CODE=32767 /* Force 16bit width.  */
-+};
- 
- #define NUM_RTX_CODE ((int) LAST_AND_UNUSED_RTX_CODE)
- 				/* The cast here, saves many elsewhere.  */
-Index: gcc-4.3.0/gcc/c-common.h
-===================================================================
---- gcc-4.3.0/gcc/c-common.h	(revision 130511)
-+++ gcc-4.3.0/gcc/c-common.h	(working copy)
-@@ -125,6 +125,7 @@
-   RID_LAST_AT = RID_AT_IMPLEMENTATION,
-   RID_FIRST_PQ = RID_IN,
-   RID_LAST_PQ = RID_ONEWAY
-+  ,__LAST_AND_UNUSED_RID=32767 /* Force 16bit width.  */
- };
- 
- #define OBJC_IS_AT_KEYWORD(rid) \
diff --git a/packages/toolchain/lang/gcc/100-uclibc-conf-gcc-4.4.0.diff b/packages/toolchain/lang/gcc/patches/100-uclibc-conf-gcc-4.4.0.diff
similarity index 100%
rename from packages/toolchain/lang/gcc/100-uclibc-conf-gcc-4.4.0.diff
rename to packages/toolchain/lang/gcc/patches/100-uclibc-conf-gcc-4.4.0.diff
diff --git a/packages/toolchain/lang/gcc/patches/100_uclibc-conf.diff b/packages/toolchain/lang/gcc/patches/100_uclibc-conf.diff
deleted file mode 100644
index 6bad179e62..0000000000
--- a/packages/toolchain/lang/gcc/patches/100_uclibc-conf.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- gcc/gcc/config/--- gcc/contrib/regression/objs-gcc.sh
-+++ gcc/contrib/regression/objs-gcc.sh
-@@ -105,6 +105,10 @@
-  then
-   make all-gdb all-dejagnu all-ld || exit 1
-   make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+  make all-gdb all-dejagnu all-ld || exit 1
-+  make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
-   make bootstrap || exit 1
-   make install || exit 1
diff --git a/packages/toolchain/lang/gcc/301-missing-execinfo_h-gcc-4.4.0.diff b/packages/toolchain/lang/gcc/patches/301-missing-execinfo_h-gcc-4.4.0.diff
similarity index 100%
rename from packages/toolchain/lang/gcc/301-missing-execinfo_h-gcc-4.4.0.diff
rename to packages/toolchain/lang/gcc/patches/301-missing-execinfo_h-gcc-4.4.0.diff
diff --git a/packages/toolchain/lang/gcc/patches/995-short-enums.diff b/packages/toolchain/lang/gcc/patches/995-short-enums.diff
index 03c470c9e4..79afdb8fea 100644
--- a/packages/toolchain/lang/gcc/patches/995-short-enums.diff
+++ b/packages/toolchain/lang/gcc/patches/995-short-enums.diff
@@ -1,16 +1,4 @@
 see gcc PR34205
-Index: gcc-4.3.0/gcc/tree.h
-===================================================================
---- gcc-4.3.0/gcc/tree.h	(revision 130511)
-+++ gcc-4.3.0/gcc/tree.h	(working copy)
-@@ -38,6 +38,7 @@
- 
-   LAST_AND_UNUSED_TREE_CODE	/* A convenient way to get a value for
- 				   NUM_TREE_CODES.  */
-+  ,__LAST_AND_UNUSED_TREE_CODE=32767 /* Force 16bit width.  */
- };
- 
- #undef DEFTREECODE
 Index: gcc-4.3.0/gcc/rtl.h
 ===================================================================
 --- gcc-4.3.0/gcc/rtl.h	(revision 130511)
diff --git a/packages/toolchain/lang/gcc/url b/packages/toolchain/lang/gcc/url
index 27801e151b..b4ed9381b0 100644
--- a/packages/toolchain/lang/gcc/url
+++ b/packages/toolchain/lang/gcc/url
@@ -1,2 +1,2 @@
-ftp://ftp.fu-berlin.de/unix/languages/gcc/releases/gcc-4.3.3/gcc-4.3.3.tar.bz2
+ftp://ftp.fu-berlin.de/unix/languages/gcc/releases/gcc-4.4.0/gcc-4.4.0.tar.bz2