diff --git a/.cvsignore b/.cvsignore
index c425e14..290bf29 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-gcc-4.3.0-20071220.tar.bz2
+gcc-4.3.0-20080110.tar.bz2
 fastjar-0.95.tar.gz
diff --git a/gcc43-libjava-xulrunner.patch b/gcc43-libjava-xulrunner.patch
deleted file mode 100644
index 99aa1a9..0000000
--- a/gcc43-libjava-xulrunner.patch
+++ /dev/null
@@ -1,520 +0,0 @@
---- libjava/classpath/configure.ac.jj	2007-09-05 21:38:54.000000000 +0200
-+++ libjava/classpath/configure.ac	2007-12-20 23:49:43.000000000 +0100
-@@ -619,7 +619,7 @@ if test "x${COMPILE_JNI}" = xyes; then
- 
-   dnl Check for AWT related Qt4
-   if test "x${COMPILE_QT_PEER}" = xyes; then
--    PKG_CHECK_MODULES(QT, QtCore QtGui >= 4.1.0, HAVE_QT4="yes", HAVE_QT4="no")
-+    PKG_CHECK_MODULES(QT, QtCore QtGui >= 4.1.0, , HAVE_QT4="yes", HAVE_QT4="no")
-     if test "x$HAVE_QT4" = "xyes"; then
-       dnl Check needed because in some cases the QtGui includedir
-       dnl doesn't contain the subsystem dir.
-@@ -702,21 +702,24 @@ if test "x${COMPILE_JNI}" = xyes; then
- 
-   dnl Check for plugin support headers and libraries.
-   if test "x${COMPILE_PLUGIN}" = xyes; then
--    PKG_CHECK_MODULES(MOZILLA, mozilla-plugin, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
-+    PKG_CHECK_MODULES(MOZILLA, mozilla-plugin mozilla-xpcom, --define-variable=includetype=unstable, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
-     if test "x${MOZILLA_FOUND}" = xno; then
--      PKG_CHECK_MODULES(MOZILLA, firefox-plugin firefox-xpcom, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
-+      PKG_CHECK_MODULES(MOZILLA, mozilla-plugin, , [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
-     fi
-     if test "x${MOZILLA_FOUND}" = xno; then
--      PKG_CHECK_MODULES(MOZILLA, xulrunner-plugin xulrunner-xpcom, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
-+      PKG_CHECK_MODULES(MOZILLA, firefox-plugin firefox-xpcom, , [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
-     fi
-     if test "x${MOZILLA_FOUND}" = xno; then
--      PKG_CHECK_MODULES(MOZILLA, mozilla-firefox-plugin mozilla-firefox-xpcom, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
-+      PKG_CHECK_MODULES(MOZILLA, xulrunner-plugin xulrunner-xpcom, --define-variable=includetype=unstable, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
-     fi
-     if test "x${MOZILLA_FOUND}" = xno; then
--      PKG_CHECK_MODULES(MOZILLA, seamonkey-plugin seamonkey-xpcom, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
-+      PKG_CHECK_MODULES(MOZILLA, mozilla-firefox-plugin mozilla-firefox-xpcom, , [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
-     fi
-     if test "x${MOZILLA_FOUND}" = xno; then
--      PKG_CHECK_MODULES(MOZILLA, iceape-plugin iceape-xpcom, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
-+      PKG_CHECK_MODULES(MOZILLA, seamonkey-plugin seamonkey-xpcom, , [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
-+    fi
-+    if test "x${MOZILLA_FOUND}" = xno; then
-+      PKG_CHECK_MODULES(MOZILLA, iceape-plugin iceape-xpcom, , [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
-     fi
-     if test "x${MOZILLA_FOUND}" = xno; then
-       AC_MSG_ERROR([Couldn't find plugin support headers and libraries, try --disable-plugin])
---- libjava/classpath/configure.jj	2007-09-05 21:38:54.000000000 +0200
-+++ libjava/classpath/configure	2007-12-20 23:49:54.000000000 +0100
-@@ -19611,13 +19611,13 @@ echo "${ECHO_T}yes" >&6
- 
-             echo "$as_me:$LINENO: checking XML_CFLAGS" >&5
- echo $ECHO_N "checking XML_CFLAGS... $ECHO_C" >&6
--            XML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.6.8"`
-+            XML_CFLAGS=`$PKG_CONFIG --cflags  "libxml-2.0 >= 2.6.8"`
-             echo "$as_me:$LINENO: result: $XML_CFLAGS" >&5
- echo "${ECHO_T}$XML_CFLAGS" >&6
- 
-             echo "$as_me:$LINENO: checking XML_LIBS" >&5
- echo $ECHO_N "checking XML_LIBS... $ECHO_C" >&6
--            XML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.6.8"`
-+            XML_LIBS=`$PKG_CONFIG --libs  "libxml-2.0 >= 2.6.8"`
-             echo "$as_me:$LINENO: result: $XML_LIBS" >&5
- echo "${ECHO_T}$XML_LIBS" >&6
-         else
-@@ -19709,13 +19709,13 @@ echo "${ECHO_T}yes" >&6
- 
-             echo "$as_me:$LINENO: checking XSLT_CFLAGS" >&5
- echo $ECHO_N "checking XSLT_CFLAGS... $ECHO_C" >&6
--            XSLT_CFLAGS=`$PKG_CONFIG --cflags "libxslt >= 1.1.11"`
-+            XSLT_CFLAGS=`$PKG_CONFIG --cflags  "libxslt >= 1.1.11"`
-             echo "$as_me:$LINENO: result: $XSLT_CFLAGS" >&5
- echo "${ECHO_T}$XSLT_CFLAGS" >&6
- 
-             echo "$as_me:$LINENO: checking XSLT_LIBS" >&5
- echo $ECHO_N "checking XSLT_LIBS... $ECHO_C" >&6
--            XSLT_LIBS=`$PKG_CONFIG --libs "libxslt >= 1.1.11"`
-+            XSLT_LIBS=`$PKG_CONFIG --libs  "libxslt >= 1.1.11"`
-             echo "$as_me:$LINENO: result: $XSLT_LIBS" >&5
- echo "${ECHO_T}$XSLT_LIBS" >&6
-         else
-@@ -21365,13 +21365,13 @@ echo "${ECHO_T}yes" >&6
- 
-             echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5
- echo $ECHO_N "checking GTK_CFLAGS... $ECHO_C" >&6
--            GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.8 gthread-2.0 >= 2.2 gdk-pixbuf-2.0"`
-+            GTK_CFLAGS=`$PKG_CONFIG --cflags  "gtk+-2.0 >= 2.8 gthread-2.0 >= 2.2 gdk-pixbuf-2.0"`
-             echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5
- echo "${ECHO_T}$GTK_CFLAGS" >&6
- 
-             echo "$as_me:$LINENO: checking GTK_LIBS" >&5
- echo $ECHO_N "checking GTK_LIBS... $ECHO_C" >&6
--            GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.8 gthread-2.0 >= 2.2 gdk-pixbuf-2.0"`
-+            GTK_LIBS=`$PKG_CONFIG --libs  "gtk+-2.0 >= 2.8 gthread-2.0 >= 2.2 gdk-pixbuf-2.0"`
-             echo "$as_me:$LINENO: result: $GTK_LIBS" >&5
- echo "${ECHO_T}$GTK_LIBS" >&6
-         else
-@@ -21463,13 +21463,13 @@ echo "${ECHO_T}yes" >&6
- 
-             echo "$as_me:$LINENO: checking FREETYPE2_CFLAGS" >&5
- echo $ECHO_N "checking FREETYPE2_CFLAGS... $ECHO_C" >&6
--            FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags "freetype2"`
-+            FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags  "freetype2"`
-             echo "$as_me:$LINENO: result: $FREETYPE2_CFLAGS" >&5
- echo "${ECHO_T}$FREETYPE2_CFLAGS" >&6
- 
-             echo "$as_me:$LINENO: checking FREETYPE2_LIBS" >&5
- echo $ECHO_N "checking FREETYPE2_LIBS... $ECHO_C" >&6
--            FREETYPE2_LIBS=`$PKG_CONFIG --libs "freetype2"`
-+            FREETYPE2_LIBS=`$PKG_CONFIG --libs  "freetype2"`
-             echo "$as_me:$LINENO: result: $FREETYPE2_LIBS" >&5
- echo "${ECHO_T}$FREETYPE2_LIBS" >&6
-         else
-@@ -21561,13 +21561,13 @@ echo "${ECHO_T}yes" >&6
- 
-             echo "$as_me:$LINENO: checking PANGOFT2_CFLAGS" >&5
- echo $ECHO_N "checking PANGOFT2_CFLAGS... $ECHO_C" >&6
--            PANGOFT2_CFLAGS=`$PKG_CONFIG --cflags "pangoft2"`
-+            PANGOFT2_CFLAGS=`$PKG_CONFIG --cflags  "pangoft2"`
-             echo "$as_me:$LINENO: result: $PANGOFT2_CFLAGS" >&5
- echo "${ECHO_T}$PANGOFT2_CFLAGS" >&6
- 
-             echo "$as_me:$LINENO: checking PANGOFT2_LIBS" >&5
- echo $ECHO_N "checking PANGOFT2_LIBS... $ECHO_C" >&6
--            PANGOFT2_LIBS=`$PKG_CONFIG --libs "pangoft2"`
-+            PANGOFT2_LIBS=`$PKG_CONFIG --libs  "pangoft2"`
-             echo "$as_me:$LINENO: result: $PANGOFT2_LIBS" >&5
- echo "${ECHO_T}$PANGOFT2_LIBS" >&6
-         else
-@@ -21659,13 +21659,13 @@ echo "${ECHO_T}yes" >&6
- 
-             echo "$as_me:$LINENO: checking CAIRO_CFLAGS" >&5
- echo $ECHO_N "checking CAIRO_CFLAGS... $ECHO_C" >&6
--            CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= 1.1.8"`
-+            CAIRO_CFLAGS=`$PKG_CONFIG --cflags  "cairo >= 1.1.8"`
-             echo "$as_me:$LINENO: result: $CAIRO_CFLAGS" >&5
- echo "${ECHO_T}$CAIRO_CFLAGS" >&6
- 
-             echo "$as_me:$LINENO: checking CAIRO_LIBS" >&5
- echo $ECHO_N "checking CAIRO_LIBS... $ECHO_C" >&6
--            CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= 1.1.8"`
-+            CAIRO_LIBS=`$PKG_CONFIG --libs  "cairo >= 1.1.8"`
-             echo "$as_me:$LINENO: result: $CAIRO_LIBS" >&5
- echo "${ECHO_T}$CAIRO_LIBS" >&6
-         else
-@@ -21927,13 +21927,13 @@ echo "${ECHO_T}yes" >&6
- 
-             echo "$as_me:$LINENO: checking GCONF_CFLAGS" >&5
- echo $ECHO_N "checking GCONF_CFLAGS... $ECHO_C" >&6
--            GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= 2.6.0"`
-+            GCONF_CFLAGS=`$PKG_CONFIG --cflags  "gconf-2.0 >= 2.6.0"`
-             echo "$as_me:$LINENO: result: $GCONF_CFLAGS" >&5
- echo "${ECHO_T}$GCONF_CFLAGS" >&6
- 
-             echo "$as_me:$LINENO: checking GCONF_LIBS" >&5
- echo $ECHO_N "checking GCONF_LIBS... $ECHO_C" >&6
--            GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 >= 2.6.0"`
-+            GCONF_LIBS=`$PKG_CONFIG --libs  "gconf-2.0 >= 2.6.0"`
-             echo "$as_me:$LINENO: result: $GCONF_LIBS" >&5
- echo "${ECHO_T}$GCONF_LIBS" >&6
-         else
-@@ -22027,13 +22027,13 @@ echo "${ECHO_T}yes" >&6
- 
-             echo "$as_me:$LINENO: checking GDK_CFLAGS" >&5
- echo $ECHO_N "checking GDK_CFLAGS... $ECHO_C" >&6
--            GDK_CFLAGS=`$PKG_CONFIG --cflags "gdk-2.0 >= 2.8"`
-+            GDK_CFLAGS=`$PKG_CONFIG --cflags  "gdk-2.0 >= 2.8"`
-             echo "$as_me:$LINENO: result: $GDK_CFLAGS" >&5
- echo "${ECHO_T}$GDK_CFLAGS" >&6
- 
-             echo "$as_me:$LINENO: checking GDK_LIBS" >&5
- echo $ECHO_N "checking GDK_LIBS... $ECHO_C" >&6
--            GDK_LIBS=`$PKG_CONFIG --libs "gdk-2.0 >= 2.8"`
-+            GDK_LIBS=`$PKG_CONFIG --libs  "gdk-2.0 >= 2.8"`
-             echo "$as_me:$LINENO: result: $GDK_LIBS" >&5
- echo "${ECHO_T}$GDK_LIBS" >&6
-         else
-@@ -22137,13 +22137,13 @@ echo "${ECHO_T}yes" >&6
- 
-             echo "$as_me:$LINENO: checking GSTREAMER_CFLAGS" >&5
- echo $ECHO_N "checking GSTREAMER_CFLAGS... $ECHO_C" >&6
--            GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-$GST_MAJORMINOR >= $GST_REQUIRED"`
-+            GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags  "gstreamer-$GST_MAJORMINOR >= $GST_REQUIRED"`
-             echo "$as_me:$LINENO: result: $GSTREAMER_CFLAGS" >&5
- echo "${ECHO_T}$GSTREAMER_CFLAGS" >&6
- 
-             echo "$as_me:$LINENO: checking GSTREAMER_LIBS" >&5
- echo $ECHO_N "checking GSTREAMER_LIBS... $ECHO_C" >&6
--            GSTREAMER_LIBS=`$PKG_CONFIG --libs "gstreamer-$GST_MAJORMINOR >= $GST_REQUIRED"`
-+            GSTREAMER_LIBS=`$PKG_CONFIG --libs  "gstreamer-$GST_MAJORMINOR >= $GST_REQUIRED"`
-             echo "$as_me:$LINENO: result: $GSTREAMER_LIBS" >&5
- echo "${ECHO_T}$GSTREAMER_LIBS" >&6
-         else
-@@ -22238,13 +22238,13 @@ echo "${ECHO_T}yes" >&6
- 
-             echo "$as_me:$LINENO: checking GSTREAMER_BASE_CFLAGS" >&5
- echo $ECHO_N "checking GSTREAMER_BASE_CFLAGS... $ECHO_C" >&6
--            GSTREAMER_BASE_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-base-$GST_MAJORMINOR >= $GST_REQUIRED"`
-+            GSTREAMER_BASE_CFLAGS=`$PKG_CONFIG --cflags  "gstreamer-base-$GST_MAJORMINOR >= $GST_REQUIRED"`
-             echo "$as_me:$LINENO: result: $GSTREAMER_BASE_CFLAGS" >&5
- echo "${ECHO_T}$GSTREAMER_BASE_CFLAGS" >&6
- 
-             echo "$as_me:$LINENO: checking GSTREAMER_BASE_LIBS" >&5
- echo $ECHO_N "checking GSTREAMER_BASE_LIBS... $ECHO_C" >&6
--            GSTREAMER_BASE_LIBS=`$PKG_CONFIG --libs "gstreamer-base-$GST_MAJORMINOR >= $GST_REQUIRED"`
-+            GSTREAMER_BASE_LIBS=`$PKG_CONFIG --libs  "gstreamer-base-$GST_MAJORMINOR >= $GST_REQUIRED"`
-             echo "$as_me:$LINENO: result: $GSTREAMER_BASE_LIBS" >&5
- echo "${ECHO_T}$GSTREAMER_BASE_LIBS" >&6
-         else
-@@ -22339,13 +22339,13 @@ echo "${ECHO_T}yes" >&6
- 
-             echo "$as_me:$LINENO: checking GSTREAMER_PLUGINS_BASE_CFLAGS" >&5
- echo $ECHO_N "checking GSTREAMER_PLUGINS_BASE_CFLAGS... $ECHO_C" >&6
--            GSTREAMER_PLUGINS_BASE_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQUIRED"`
-+            GSTREAMER_PLUGINS_BASE_CFLAGS=`$PKG_CONFIG --cflags  "gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQUIRED"`
-             echo "$as_me:$LINENO: result: $GSTREAMER_PLUGINS_BASE_CFLAGS" >&5
- echo "${ECHO_T}$GSTREAMER_PLUGINS_BASE_CFLAGS" >&6
- 
-             echo "$as_me:$LINENO: checking GSTREAMER_PLUGINS_BASE_LIBS" >&5
- echo $ECHO_N "checking GSTREAMER_PLUGINS_BASE_LIBS... $ECHO_C" >&6
--            GSTREAMER_PLUGINS_BASE_LIBS=`$PKG_CONFIG --libs "gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQUIRED"`
-+            GSTREAMER_PLUGINS_BASE_LIBS=`$PKG_CONFIG --libs  "gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQUIRED"`
-             echo "$as_me:$LINENO: result: $GSTREAMER_PLUGINS_BASE_LIBS" >&5
- echo "${ECHO_T}$GSTREAMER_PLUGINS_BASE_LIBS" >&6
-         else
-@@ -22450,13 +22450,13 @@ echo "${ECHO_T}yes" >&6
- 
-             echo "$as_me:$LINENO: checking QT_CFLAGS" >&5
- echo $ECHO_N "checking QT_CFLAGS... $ECHO_C" >&6
--            QT_CFLAGS=`$PKG_CONFIG --cflags "QtCore QtGui >= 4.1.0"`
-+            QT_CFLAGS=`$PKG_CONFIG --cflags  "QtCore QtGui >= 4.1.0"`
-             echo "$as_me:$LINENO: result: $QT_CFLAGS" >&5
- echo "${ECHO_T}$QT_CFLAGS" >&6
- 
-             echo "$as_me:$LINENO: checking QT_LIBS" >&5
- echo $ECHO_N "checking QT_LIBS... $ECHO_C" >&6
--            QT_LIBS=`$PKG_CONFIG --libs "QtCore QtGui >= 4.1.0"`
-+            QT_LIBS=`$PKG_CONFIG --libs  "QtCore QtGui >= 4.1.0"`
-             echo "$as_me:$LINENO: result: $QT_LIBS" >&5
- echo "${ECHO_T}$QT_LIBS" >&6
-         else
-@@ -22904,6 +22904,103 @@ fi
-   else
-      PKG_CONFIG_MIN_VERSION=0.9.0
-      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-+        echo "$as_me:$LINENO: checking for mozilla-plugin mozilla-xpcom" >&5
-+echo $ECHO_N "checking for mozilla-plugin mozilla-xpcom... $ECHO_C" >&6
-+
-+        if $PKG_CONFIG --exists "mozilla-plugin mozilla-xpcom" ; then
-+            echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+            succeeded=yes
-+
-+            echo "$as_me:$LINENO: checking MOZILLA_CFLAGS" >&5
-+echo $ECHO_N "checking MOZILLA_CFLAGS... $ECHO_C" >&6
-+            MOZILLA_CFLAGS=`$PKG_CONFIG --cflags --define-variable=includetype=unstable "mozilla-plugin mozilla-xpcom"`
-+            echo "$as_me:$LINENO: result: $MOZILLA_CFLAGS" >&5
-+echo "${ECHO_T}$MOZILLA_CFLAGS" >&6
-+
-+            echo "$as_me:$LINENO: checking MOZILLA_LIBS" >&5
-+echo $ECHO_N "checking MOZILLA_LIBS... $ECHO_C" >&6
-+            MOZILLA_LIBS=`$PKG_CONFIG --libs --define-variable=includetype=unstable "mozilla-plugin mozilla-xpcom"`
-+            echo "$as_me:$LINENO: result: $MOZILLA_LIBS" >&5
-+echo "${ECHO_T}$MOZILLA_LIBS" >&6
-+        else
-+            MOZILLA_CFLAGS=""
-+            MOZILLA_LIBS=""
-+            ## If we have a custom action on failure, don't print errors, but
-+            ## do set a variable so people can do so.
-+            MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-plugin mozilla-xpcom"`
-+
-+        fi
-+
-+
-+
-+     else
-+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-+     fi
-+  fi
-+
-+  if test $succeeded = yes; then
-+     MOZILLA_FOUND=yes
-+  else
-+     MOZILLA_FOUND=no
-+  fi
-+
-+    if test "x${MOZILLA_FOUND}" = xno; then
-+
-+  succeeded=no
-+
-+  if test -z "$PKG_CONFIG"; then
-+    # Extract the first word of "pkg-config", so it can be a program name with args.
-+set dummy pkg-config; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $PKG_CONFIG in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+
-+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-+  ;;
-+esac
-+fi
-+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-+
-+if test -n "$PKG_CONFIG"; then
-+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-+echo "${ECHO_T}$PKG_CONFIG" >&6
-+else
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+  fi
-+
-+  if test "$PKG_CONFIG" = "no" ; then
-+     echo "*** The pkg-config script could not be found. Make sure it is"
-+     echo "*** in your path, or set the PKG_CONFIG environment variable"
-+     echo "*** to the full path to pkg-config."
-+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-+  else
-+     PKG_CONFIG_MIN_VERSION=0.9.0
-+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-         echo "$as_me:$LINENO: checking for mozilla-plugin" >&5
- echo $ECHO_N "checking for mozilla-plugin... $ECHO_C" >&6
- 
-@@ -22914,13 +23011,13 @@ echo "${ECHO_T}yes" >&6
- 
-             echo "$as_me:$LINENO: checking MOZILLA_CFLAGS" >&5
- echo $ECHO_N "checking MOZILLA_CFLAGS... $ECHO_C" >&6
--            MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "mozilla-plugin"`
-+            MOZILLA_CFLAGS=`$PKG_CONFIG --cflags  "mozilla-plugin"`
-             echo "$as_me:$LINENO: result: $MOZILLA_CFLAGS" >&5
- echo "${ECHO_T}$MOZILLA_CFLAGS" >&6
- 
-             echo "$as_me:$LINENO: checking MOZILLA_LIBS" >&5
- echo $ECHO_N "checking MOZILLA_LIBS... $ECHO_C" >&6
--            MOZILLA_LIBS=`$PKG_CONFIG --libs "mozilla-plugin"`
-+            MOZILLA_LIBS=`$PKG_CONFIG --libs  "mozilla-plugin"`
-             echo "$as_me:$LINENO: result: $MOZILLA_LIBS" >&5
- echo "${ECHO_T}$MOZILLA_LIBS" >&6
-         else
-@@ -22946,6 +23043,7 @@ echo "${ECHO_T}$MOZILLA_LIBS" >&6
-      MOZILLA_FOUND=no
-   fi
- 
-+    fi
-     if test "x${MOZILLA_FOUND}" = xno; then
- 
-   succeeded=no
-@@ -23011,13 +23109,13 @@ echo "${ECHO_T}yes" >&6
- 
-             echo "$as_me:$LINENO: checking MOZILLA_CFLAGS" >&5
- echo $ECHO_N "checking MOZILLA_CFLAGS... $ECHO_C" >&6
--            MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "firefox-plugin firefox-xpcom"`
-+            MOZILLA_CFLAGS=`$PKG_CONFIG --cflags  "firefox-plugin firefox-xpcom"`
-             echo "$as_me:$LINENO: result: $MOZILLA_CFLAGS" >&5
- echo "${ECHO_T}$MOZILLA_CFLAGS" >&6
- 
-             echo "$as_me:$LINENO: checking MOZILLA_LIBS" >&5
- echo $ECHO_N "checking MOZILLA_LIBS... $ECHO_C" >&6
--            MOZILLA_LIBS=`$PKG_CONFIG --libs "firefox-plugin firefox-xpcom"`
-+            MOZILLA_LIBS=`$PKG_CONFIG --libs  "firefox-plugin firefox-xpcom"`
-             echo "$as_me:$LINENO: result: $MOZILLA_LIBS" >&5
- echo "${ECHO_T}$MOZILLA_LIBS" >&6
-         else
-@@ -23109,13 +23207,13 @@ echo "${ECHO_T}yes" >&6
- 
-             echo "$as_me:$LINENO: checking MOZILLA_CFLAGS" >&5
- echo $ECHO_N "checking MOZILLA_CFLAGS... $ECHO_C" >&6
--            MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "xulrunner-plugin xulrunner-xpcom"`
-+            MOZILLA_CFLAGS=`$PKG_CONFIG --cflags --define-variable=includetype=unstable "xulrunner-plugin xulrunner-xpcom"`
-             echo "$as_me:$LINENO: result: $MOZILLA_CFLAGS" >&5
- echo "${ECHO_T}$MOZILLA_CFLAGS" >&6
- 
-             echo "$as_me:$LINENO: checking MOZILLA_LIBS" >&5
- echo $ECHO_N "checking MOZILLA_LIBS... $ECHO_C" >&6
--            MOZILLA_LIBS=`$PKG_CONFIG --libs "xulrunner-plugin xulrunner-xpcom"`
-+            MOZILLA_LIBS=`$PKG_CONFIG --libs --define-variable=includetype=unstable "xulrunner-plugin xulrunner-xpcom"`
-             echo "$as_me:$LINENO: result: $MOZILLA_LIBS" >&5
- echo "${ECHO_T}$MOZILLA_LIBS" >&6
-         else
-@@ -23207,13 +23305,13 @@ echo "${ECHO_T}yes" >&6
- 
-             echo "$as_me:$LINENO: checking MOZILLA_CFLAGS" >&5
- echo $ECHO_N "checking MOZILLA_CFLAGS... $ECHO_C" >&6
--            MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "mozilla-firefox-plugin mozilla-firefox-xpcom"`
-+            MOZILLA_CFLAGS=`$PKG_CONFIG --cflags  "mozilla-firefox-plugin mozilla-firefox-xpcom"`
-             echo "$as_me:$LINENO: result: $MOZILLA_CFLAGS" >&5
- echo "${ECHO_T}$MOZILLA_CFLAGS" >&6
- 
-             echo "$as_me:$LINENO: checking MOZILLA_LIBS" >&5
- echo $ECHO_N "checking MOZILLA_LIBS... $ECHO_C" >&6
--            MOZILLA_LIBS=`$PKG_CONFIG --libs "mozilla-firefox-plugin mozilla-firefox-xpcom"`
-+            MOZILLA_LIBS=`$PKG_CONFIG --libs  "mozilla-firefox-plugin mozilla-firefox-xpcom"`
-             echo "$as_me:$LINENO: result: $MOZILLA_LIBS" >&5
- echo "${ECHO_T}$MOZILLA_LIBS" >&6
-         else
-@@ -23305,13 +23403,13 @@ echo "${ECHO_T}yes" >&6
- 
-             echo "$as_me:$LINENO: checking MOZILLA_CFLAGS" >&5
- echo $ECHO_N "checking MOZILLA_CFLAGS... $ECHO_C" >&6
--            MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-plugin seamonkey-xpcom"`
-+            MOZILLA_CFLAGS=`$PKG_CONFIG --cflags  "seamonkey-plugin seamonkey-xpcom"`
-             echo "$as_me:$LINENO: result: $MOZILLA_CFLAGS" >&5
- echo "${ECHO_T}$MOZILLA_CFLAGS" >&6
- 
-             echo "$as_me:$LINENO: checking MOZILLA_LIBS" >&5
- echo $ECHO_N "checking MOZILLA_LIBS... $ECHO_C" >&6
--            MOZILLA_LIBS=`$PKG_CONFIG --libs "seamonkey-plugin seamonkey-xpcom"`
-+            MOZILLA_LIBS=`$PKG_CONFIG --libs  "seamonkey-plugin seamonkey-xpcom"`
-             echo "$as_me:$LINENO: result: $MOZILLA_LIBS" >&5
- echo "${ECHO_T}$MOZILLA_LIBS" >&6
-         else
-@@ -23403,13 +23501,13 @@ echo "${ECHO_T}yes" >&6
- 
-             echo "$as_me:$LINENO: checking MOZILLA_CFLAGS" >&5
- echo $ECHO_N "checking MOZILLA_CFLAGS... $ECHO_C" >&6
--            MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "iceape-plugin iceape-xpcom"`
-+            MOZILLA_CFLAGS=`$PKG_CONFIG --cflags  "iceape-plugin iceape-xpcom"`
-             echo "$as_me:$LINENO: result: $MOZILLA_CFLAGS" >&5
- echo "${ECHO_T}$MOZILLA_CFLAGS" >&6
- 
-             echo "$as_me:$LINENO: checking MOZILLA_LIBS" >&5
- echo $ECHO_N "checking MOZILLA_LIBS... $ECHO_C" >&6
--            MOZILLA_LIBS=`$PKG_CONFIG --libs "iceape-plugin iceape-xpcom"`
-+            MOZILLA_LIBS=`$PKG_CONFIG --libs  "iceape-plugin iceape-xpcom"`
-             echo "$as_me:$LINENO: result: $MOZILLA_LIBS" >&5
- echo "${ECHO_T}$MOZILLA_LIBS" >&6
-         else
-@@ -23506,13 +23604,13 @@ echo "${ECHO_T}yes" >&6
- 
-             echo "$as_me:$LINENO: checking GLIB_CFLAGS" >&5
- echo $ECHO_N "checking GLIB_CFLAGS... $ECHO_C" >&6
--            GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0"`
-+            GLIB_CFLAGS=`$PKG_CONFIG --cflags  "glib-2.0"`
-             echo "$as_me:$LINENO: result: $GLIB_CFLAGS" >&5
- echo "${ECHO_T}$GLIB_CFLAGS" >&6
- 
-             echo "$as_me:$LINENO: checking GLIB_LIBS" >&5
- echo $ECHO_N "checking GLIB_LIBS... $ECHO_C" >&6
--            GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0"`
-+            GLIB_LIBS=`$PKG_CONFIG --libs  "glib-2.0"`
-             echo "$as_me:$LINENO: result: $GLIB_LIBS" >&5
- echo "${ECHO_T}$GLIB_LIBS" >&6
-         else
-@@ -23604,13 +23702,13 @@ echo "${ECHO_T}yes" >&6
- 
-             echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5
- echo $ECHO_N "checking GTK_CFLAGS... $ECHO_C" >&6
--            GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.8 gthread-2.0 >= 2.2 gdk-pixbuf-2.0"`
-+            GTK_CFLAGS=`$PKG_CONFIG --cflags  "gtk+-2.0 >= 2.8 gthread-2.0 >= 2.2 gdk-pixbuf-2.0"`
-             echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5
- echo "${ECHO_T}$GTK_CFLAGS" >&6
- 
-             echo "$as_me:$LINENO: checking GTK_LIBS" >&5
- echo $ECHO_N "checking GTK_LIBS... $ECHO_C" >&6
--            GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.8 gthread-2.0 >= 2.2 gdk-pixbuf-2.0"`
-+            GTK_LIBS=`$PKG_CONFIG --libs  "gtk+-2.0 >= 2.8 gthread-2.0 >= 2.2 gdk-pixbuf-2.0"`
-             echo "$as_me:$LINENO: result: $GTK_LIBS" >&5
- echo "${ECHO_T}$GTK_LIBS" >&6
-         else
---- libjava/classpath/m4/pkg.m4.jj	2006-10-05 00:29:54.000000000 +0200
-+++ libjava/classpath/m4/pkg.m4	2007-12-20 23:38:46.000000000 +0100
-@@ -1,5 +1,5 @@
- 
--dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
-+dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, , action-if, action-not)
- dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
- dnl also defines GSTUFF_PKG_ERRORS on error
- AC_DEFUN([PKG_CHECK_MODULES], [
-@@ -24,11 +24,11 @@ AC_DEFUN([PKG_CHECK_MODULES], [
-             succeeded=yes
- 
-             AC_MSG_CHECKING($1_CFLAGS)
--            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
-+            $1_CFLAGS=`$PKG_CONFIG --cflags $3 "$2"`
-             AC_MSG_RESULT($$1_CFLAGS)
- 
-             AC_MSG_CHECKING($1_LIBS)
--            $1_LIBS=`$PKG_CONFIG --libs "$2"`
-+            $1_LIBS=`$PKG_CONFIG --libs $3 "$2"`
-             AC_MSG_RESULT($$1_LIBS)
-         else
-             $1_CFLAGS=""
-@@ -36,7 +36,7 @@ AC_DEFUN([PKG_CHECK_MODULES], [
-             ## If we have a custom action on failure, don't print errors, but 
-             ## do set a variable so people can do so.
-             $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
--            ifelse([$4], ,echo $$1_PKG_ERRORS,)
-+            ifelse([$5], ,echo $$1_PKG_ERRORS,)
-         fi
- 
-         AC_SUBST($1_CFLAGS)
-@@ -48,9 +48,9 @@ AC_DEFUN([PKG_CHECK_MODULES], [
-   fi
- 
-   if test $succeeded = yes; then
--     ifelse([$3], , :, [$3])
-+     ifelse([$4], , :, [$4])
-   else
--     ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
-+     ifelse([$5], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$5])
-   fi
- ])
- 
diff --git a/gcc43-pr29484.patch b/gcc43-pr29484.patch
deleted file mode 100644
index 09a371e..0000000
--- a/gcc43-pr29484.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-2007-12-20  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/29484
-	* tree-inline.c (inline_forbidden_p_2): New function.
-	(inline_forbidden_p): Disallow inlining if some static var
-	has an address of a local LABEL_DECL in its initializer.
-
-	* gcc.c-torture/execute/20071220-1.c: New test.
-	* gcc.c-torture/execute/20071220-2.c: New test.
-
---- gcc/tree-inline.c.jj	2007-12-04 16:39:22.000000000 +0100
-+++ gcc/tree-inline.c	2007-12-20 13:46:18.000000000 +0100
-@@ -1951,6 +1951,27 @@ inline_forbidden_p_1 (tree *nodep, int *
-   return NULL_TREE;
- }
- 
-+static tree
-+inline_forbidden_p_2 (tree *nodep, int *walk_subtrees,
-+		      void *fnp)
-+{
-+  tree node = *nodep;
-+  tree fn = (tree) fnp;
-+
-+  if (TREE_CODE (node) == LABEL_DECL && DECL_CONTEXT (node) == fn)
-+    {
-+      inline_forbidden_reason
-+	= G_("function %q+F can never be inlined "
-+	     "because it saves address of local label in a static variable");
-+      return node;
-+    }
-+
-+  if (TYPE_P (node))
-+    *walk_subtrees = 0;
-+
-+  return NULL_TREE;
-+}
-+
- /* Return subexpression representing possible alloca call, if any.  */
- static tree
- inline_forbidden_p (tree fndecl)
-@@ -1959,16 +1980,31 @@ inline_forbidden_p (tree fndecl)
-   block_stmt_iterator bsi;
-   basic_block bb;
-   tree ret = NULL_TREE;
-+  struct function *fun = DECL_STRUCT_FUNCTION (fndecl);
-+  tree step;
- 
--  FOR_EACH_BB_FN (bb, DECL_STRUCT_FUNCTION (fndecl))
-+  FOR_EACH_BB_FN (bb, fun)
-     for (bsi = bsi_start (bb); !bsi_end_p (bsi); bsi_next (&bsi))
-       {
- 	ret = walk_tree_without_duplicates (bsi_stmt_ptr (bsi),
--				    inline_forbidden_p_1, fndecl);
-+					    inline_forbidden_p_1, fndecl);
- 	if (ret)
- 	  goto egress;
-       }
- 
-+  for (step = fun->unexpanded_var_list; step; step = TREE_CHAIN (step))
-+    {
-+      tree decl = TREE_VALUE (step);
-+      if (TREE_CODE (decl) == VAR_DECL
-+	  && TREE_STATIC (decl)
-+	  && !DECL_EXTERNAL (decl)
-+	  && DECL_INITIAL (decl))
-+	ret = walk_tree_without_duplicates (&DECL_INITIAL (decl),
-+					    inline_forbidden_p_2, fndecl);
-+	if (ret)
-+	  goto egress;
-+    }
-+
- egress:
-   input_location = saved_loc;
-   return ret;
---- gcc/testsuite/gcc.c-torture/execute/20071220-1.c.jj	2007-12-20 14:29:04.000000000 +0100
-+++ gcc/testsuite/gcc.c-torture/execute/20071220-1.c	2007-12-20 14:28:12.000000000 +0100
-@@ -0,0 +1,40 @@
-+/* PR tree-optimization/29484 */
-+
-+extern void abort (void);
-+
-+void *__attribute__((noinline))
-+baz (void **lab)
-+{
-+  asm volatile ("" : "+r" (lab));
-+  return *lab;
-+}
-+
-+static inline
-+int bar (void)
-+{
-+  static void *b[] = { &&addr };
-+  void *p = baz (b);
-+  goto *p;
-+addr:
-+  return 17;
-+}
-+
-+int __attribute__((noinline))
-+f1 (void)
-+{
-+  return bar ();
-+}
-+
-+int __attribute__((noinline))
-+f2 (void)
-+{
-+  return bar ();
-+}
-+
-+int
-+main (void)
-+{
-+  if (f1 () != 17 || f1 () != 17 || f2 () != 17 || f2 () != 17)
-+    abort ();
-+  return 0;
-+}
---- gcc/testsuite/gcc.c-torture/execute/20071220-2.c.jj	2007-12-20 14:29:13.000000000 +0100
-+++ gcc/testsuite/gcc.c-torture/execute/20071220-2.c	2007-12-20 14:28:30.000000000 +0100
-@@ -0,0 +1,39 @@
-+/* PR tree-optimization/29484 */
-+
-+extern void abort (void);
-+
-+void *__attribute__((noinline))
-+baz (void **lab)
-+{
-+  asm volatile ("" : "+r" (lab));
-+  return *lab;
-+}
-+
-+static inline
-+int bar (void)
-+{
-+  static void *b[] = { &&addr };
-+  baz (b);
-+addr:
-+  return 17;
-+}
-+
-+int __attribute__((noinline))
-+f1 (void)
-+{
-+  return bar ();
-+}
-+
-+int __attribute__((noinline))
-+f2 (void)
-+{
-+  return bar ();
-+}
-+
-+int
-+main (void)
-+{
-+  if (f1 () != 17 || f1 () != 17 || f2 () != 17 || f2 () != 17)
-+    abort ();
-+  return 0;
-+}
diff --git a/gcc43-pr34111.patch b/gcc43-pr34111.patch
deleted file mode 100644
index 96541e1..0000000
--- a/gcc43-pr34111.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-2007-12-20  Jason Merrill  <jason@redhat.com>
-
-	PR c++/34111
-	* call.c (standard_conversion): Derived-to-base is considered a
-	standard conversion.
-
---- gcc/cp/call.c	(revision 131106)
-+++ gcc/cp/call.c	(revision 131107)
-@@ -861,14 +861,7 @@ standard_conversion (tree to, tree from,
-   else if (fcode == VECTOR_TYPE && tcode == VECTOR_TYPE
- 	   && vector_types_convertible_p (from, to, false))
-     return build_conv (ck_std, to, conv);
--  /* A derived-to-base conversion sequence is a user-defined conversion
--     because it involves a constructor call, even though it has the rank of
--     a standard conversion, so we don't consider it if we aren't allowing
--     user-defined conversions.  But if we're binding directly to a
--     reference, it's only a pointer conversion.  */
--  else if ((!(flags & LOOKUP_NO_CONVERSION)
--	    || (flags & LOOKUP_NO_TEMP_BIND))
--	   && IS_AGGR_TYPE (to) && IS_AGGR_TYPE (from)
-+  else if (IS_AGGR_TYPE (to) && IS_AGGR_TYPE (from)
- 	   && is_properly_derived_from (from, to))
-     {
-       if (conv->kind == ck_rvalue)
---- gcc/testsuite/g++.dg/overload/arg5.C	(revision 0)
-+++ gcc/testsuite/g++.dg/overload/arg5.C	(revision 131107)
-@@ -0,0 +1,24 @@
-+// PR c++/34111
-+
-+class QChar
-+{
-+};
-+struct QString
-+{
-+  QString(QChar);
-+};
-+struct QPainter
-+{
-+  void drawText (int x, int y, const QString &);
-+};
-+
-+  class KHEChar:public QChar
-+  {
-+  public:KHEChar (QChar C);
-+  };
-+
-+void
-+drawByte (QPainter * P, char, KHEChar B)
-+{
-+  P->drawText (0, 0, B);
-+}
diff --git a/gcc43-pr34281.patch b/gcc43-pr34281.patch
deleted file mode 100644
index b1fa5c8..0000000
--- a/gcc43-pr34281.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-2007-12-13  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/34281
-	* config/arm/arm.c (arm_setup_incoming_varargs): If last named
-	argument needs double word alignment and cum->nregs is odd, account
-	for the inserted padding.
-
-	* gcc.c-torture/execute/20071213-1.c: New test.
-
---- gcc/config/arm/arm.c.jj	2007-12-11 00:23:29.000000000 +0100
-+++ gcc/config/arm/arm.c	2007-12-13 15:26:01.000000000 +0100
-@@ -17765,14 +17765,20 @@ arm_output_load_gr (rtx *operands)
- 
- static void
- arm_setup_incoming_varargs (CUMULATIVE_ARGS *cum,
--			    enum machine_mode mode ATTRIBUTE_UNUSED,
--			    tree type ATTRIBUTE_UNUSED,
-+			    enum machine_mode mode,
-+			    tree type,
- 			    int *pretend_size,
- 			    int second_time ATTRIBUTE_UNUSED)
- {
-+  int nregs = cum->nregs;
-+  if (nregs & 1
-+      && ARM_DOUBLEWORD_ALIGN
-+      && arm_needs_doubleword_align (mode, type))
-+    nregs++;
-+
-   cfun->machine->uses_anonymous_args = 1;
--  if (cum->nregs < NUM_ARG_REGS)
--    *pretend_size = (NUM_ARG_REGS - cum->nregs) * UNITS_PER_WORD;
-+  if (nregs < NUM_ARG_REGS)
-+    *pretend_size = (NUM_ARG_REGS - nregs) * UNITS_PER_WORD;
- }
- 
- /* Return nonzero if the CONSUMER instruction (a store) does not need
---- gcc/testsuite/gcc.c-torture/execute/20071213-1.c.jj	2007-12-13 16:47:49.000000000 +0100
-+++ gcc/testsuite/gcc.c-torture/execute/20071213-1.c	2007-12-13 16:47:12.000000000 +0100
-@@ -0,0 +1,53 @@
-+/* PR target/34281 */
-+
-+#include <stdarg.h>
-+
-+extern void abort (void);
-+
-+void
-+h (int x, va_list ap)
-+{
-+  switch (x)
-+    {
-+    case 1:
-+      if (va_arg (ap, int) != 3 || va_arg (ap, int) != 4)
-+	abort ();
-+      return;
-+    case 5:
-+      if (va_arg (ap, int) != 9 || va_arg (ap, int) != 10)
-+	abort ();
-+      return;
-+    default:
-+      abort ();
-+    }
-+}
-+
-+void
-+f1 (int i, long long int j, ...)
-+{
-+  va_list ap;
-+  va_start (ap, j);
-+  h (i, ap);
-+  if (i != 1 || j != 2)
-+    abort ();
-+  va_end (ap);
-+}
-+
-+void
-+f2 (int i, int j, int k, long long int l, ...)
-+{
-+  va_list ap;
-+  va_start (ap, l);
-+  h (i, ap);
-+  if (i != 5 || j != 6 || k != 7 || l != 8)
-+    abort ();
-+  va_end (ap);
-+}
-+
-+int
-+main ()
-+{
-+  f1 (1, 2, 3, 4);
-+  f2 (5, 6, 7, 8, 9, 10);
-+  return 0;
-+}
diff --git a/gcc43-pr34448.patch b/gcc43-pr34448.patch
deleted file mode 100644
index e698bce..0000000
--- a/gcc43-pr34448.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-2007-12-17  Aldy Hernandez  <aldyh@redhat.com>
-
-	PR tree-optimization/34448
-	PR tree-optimization/34465
-	* gimplify.c (gimplify_init_constructor): Add new parameter
-	notify_temp_creation.  Use it.
-	(gimplify_modify_expr_rhs): Take volatiles into account when
-	optimizing constructors.
-	Do not optimize constructors if gimplify_init_constructor will dump to
-	memory.
-	* gcc.dg/tree-ssa/pr32901.c: Tests const volatiles.
-	* gcc.c-torture/compile/pr34448.c: New.
-
---- gcc/gimplify.c	(revision 130934)
-+++ gcc/gimplify.c	(local)
-@@ -3119,11 +3119,18 @@ gimplify_init_ctor_eval (tree object, VE
- 
-    Note that we still need to clear any elements that don't have explicit
-    initializers, so if not all elements are initialized we keep the
--   original MODIFY_EXPR, we just remove all of the constructor elements.  */
-+   original MODIFY_EXPR, we just remove all of the constructor elements.
-+
-+   If NOTIFY_TEMP_CREATION is true, do not gimplify, just return
-+   GS_ERROR if we would have to create a temporary when gimplifying
-+   this constructor.  Otherwise, return GS_OK.
-+
-+   If NOTIFY_TEMP_CREATION is false, just do the gimplification.  */
- 
- static enum gimplify_status
- gimplify_init_constructor (tree *expr_p, tree *pre_p,
--			   tree *post_p, bool want_value)
-+			   tree *post_p, bool want_value,
-+			   bool notify_temp_creation)
- {
-   tree object;
-   tree ctor = GENERIC_TREE_OPERAND (*expr_p, 1);
-@@ -3134,10 +3141,13 @@ gimplify_init_constructor (tree *expr_p,
-   if (TREE_CODE (ctor) != CONSTRUCTOR)
-     return GS_UNHANDLED;
- 
--  ret = gimplify_expr (&GENERIC_TREE_OPERAND (*expr_p, 0), pre_p, post_p,
--		       is_gimple_lvalue, fb_lvalue);
--  if (ret == GS_ERROR)
--    return ret;
-+  if (!notify_temp_creation)
-+    {
-+      ret = gimplify_expr (&GENERIC_TREE_OPERAND (*expr_p, 0), pre_p, post_p,
-+			   is_gimple_lvalue, fb_lvalue);
-+      if (ret == GS_ERROR)
-+	return ret;
-+    }
-   object = GENERIC_TREE_OPERAND (*expr_p, 0);
- 
-   elts = CONSTRUCTOR_ELTS (ctor);
-@@ -3159,7 +3169,11 @@ gimplify_init_constructor (tree *expr_p,
- 	   individual elements.  The exception is that a CONSTRUCTOR node
- 	   with no elements indicates zero-initialization of the whole.  */
- 	if (VEC_empty (constructor_elt, elts))
--	  break;
-+	  {
-+	    if (notify_temp_creation)
-+	      return GS_OK;
-+	    break;
-+	  }
- 
- 	/* Fetch information about the constructor to direct later processing.
- 	   We might want to make static versions of it in various cases, and
-@@ -3175,6 +3189,8 @@ gimplify_init_constructor (tree *expr_p,
- 	    && TREE_READONLY (object)
- 	    && TREE_CODE (object) == VAR_DECL)
- 	  {
-+	    if (notify_temp_creation)
-+	      return GS_ERROR;
- 	    DECL_INITIAL (object) = ctor;
- 	    TREE_STATIC (object) = 1;
- 	    if (!DECL_NAME (object))
-@@ -3251,7 +3267,12 @@ gimplify_init_constructor (tree *expr_p,
- 
- 	    if (size > 0 && !can_move_by_pieces (size, align))
- 	      {
--		tree new = create_tmp_var_raw (type, "C");
-+		tree new;
-+
-+		if (notify_temp_creation)
-+		  return GS_ERROR;
-+
-+		new = create_tmp_var_raw (type, "C");
- 
- 		gimple_add_tmp_var (new);
- 		TREE_STATIC (new) = 1;
-@@ -3273,6 +3294,9 @@ gimplify_init_constructor (tree *expr_p,
- 	      }
- 	  }
- 
-+	if (notify_temp_creation)
-+	  return GS_OK;
-+
- 	/* If there are nonzero elements, pre-evaluate to capture elements
- 	   overlapping with the lhs into temporaries.  We must do this before
- 	   clearing to fetch the values before they are zeroed-out.  */
-@@ -3312,6 +3336,9 @@ gimplify_init_constructor (tree *expr_p,
-       {
- 	tree r, i;
- 
-+	if (notify_temp_creation)
-+	  return GS_OK;
-+
- 	/* Extract the real and imaginary parts out of the ctor.  */
- 	gcc_assert (VEC_length (constructor_elt, elts) == 2);
- 	r = VEC_index (constructor_elt, elts, 0)->value;
-@@ -3348,6 +3375,9 @@ gimplify_init_constructor (tree *expr_p,
- 	unsigned HOST_WIDE_INT ix;
- 	constructor_elt *ce;
- 
-+	if (notify_temp_creation)
-+	  return GS_OK;
-+
- 	/* Go ahead and simplify constant constructors to VECTOR_CST.  */
- 	if (TREE_CONSTANT (ctor))
- 	  {
-@@ -3488,10 +3518,28 @@ gimplify_modify_expr_rhs (tree *expr_p, 
- 	   constructor expression to the RHS of the MODIFY_EXPR.  */
- 	if (DECL_INITIAL (*from_p)
- 	    && TYPE_READONLY (TREE_TYPE (*from_p))
-+	    && !TREE_THIS_VOLATILE (*from_p)
- 	    && TREE_CODE (DECL_INITIAL (*from_p)) == CONSTRUCTOR)
- 	  {
--	    *from_p = DECL_INITIAL (*from_p);
--	    ret = GS_OK;
-+	    tree old_from = *from_p;
-+
-+	    /* Move the constructor into the RHS.  */
-+	    *from_p = DECL_INITIAL (*from_p);
-+
-+	    /* Let's see if gimplify_init_constructor will need to put
-+	       it in memory.  If so, revert the change.  */
-+	    ret = gimplify_init_constructor (expr_p, NULL, NULL, false, true);
-+	    if (ret == GS_ERROR)
-+	      {
-+		*from_p = old_from;
-+		/* Fall through.  */
-+	      }
-+	    else
-+	      {
-+		*from_p = unshare_expr (*from_p);
-+		ret = GS_OK;
-+		break;
-+	      }
- 	  }
- 	ret = GS_UNHANDLED;
- 	break;
-@@ -3551,7 +3599,8 @@ gimplify_modify_expr_rhs (tree *expr_p, 
-       case CONSTRUCTOR:
- 	/* If we're initializing from a CONSTRUCTOR, break this into
- 	   individual MODIFY_EXPRs.  */
--	return gimplify_init_constructor (expr_p, pre_p, post_p, want_value);
-+	return gimplify_init_constructor (expr_p, pre_p, post_p, want_value,
-+					  false);
- 
-       case COND_EXPR:
- 	/* If we're assigning to a non-register type, push the assignment
---- gcc/testsuite/gcc.c-torture/compile/pr34448.c	(revision 130934)
-+++ gcc/testsuite/gcc.c-torture/compile/pr34448.c	(local)
-@@ -0,0 +1,34 @@
-+/* { dg-do compile } */
-+/* { dg-options "-O" } */
-+
-+typedef struct chunk_t chunk_t;
-+struct chunk_t
-+{
-+  unsigned char *ptr;
-+  long unsigned int len;
-+};
-+extern chunk_t asn1_wrap (chunk_t c, ...);
-+typedef struct linked_list_t linked_list_t;
-+chunk_t ietfAttr_list_encode (linked_list_t * list);
-+extern linked_list_t *groups;
-+static unsigned char ASN1_group_oid_str[] = {
-+    0x06
-+};
-+static const chunk_t ASN1_group_oid = {
-+  ASN1_group_oid_str, sizeof (ASN1_group_oid_str)
-+};
-+static chunk_t
-+build_attribute_type (const chunk_t type, chunk_t content)
-+{
-+  return type;
-+}
-+static chunk_t
-+build_attributes (void)
-+{
-+  return asn1_wrap (build_attribute_type (ASN1_group_oid,
-+					  ietfAttr_list_encode (groups)));
-+}
-+void build_attr_cert (void)
-+{
-+  asn1_wrap (build_attributes ());
-+}
---- gcc/testsuite/gcc.dg/tree-ssa/pr32901.c	(revision 130934)
-+++ gcc/testsuite/gcc.dg/tree-ssa/pr32901.c	(local)
-@@ -7,7 +7,7 @@ struct foo {
-         unsigned : 4;
- };
- 
--extern struct foo thefoo;
-+extern struct foo thefoo, theotherfoo;
- 
- void setup_foo(void)
- {
-@@ -15,10 +15,16 @@ void setup_foo(void)
-                 .a1 = 1,
-                 .a2 = 5,
-         };
-+	volatile const struct foo volinit = {
-+		.a1 = 0,
-+		.a2 = 6
-+	};
-         thefoo = init;
-+	theotherfoo = volinit;
- }
- 
--/* { dg-final { scan-tree-dump-times "thefoo.0 = \{\}" 1 "gimple"} } */
--/* { dg-final { scan-tree-dump-times "thefoo.0.a1 = 1" 1 "gimple"} } */
--/* { dg-final { scan-tree-dump-times "thefoo.0.a2 = 5" 1 "gimple"} } */
-+/* { dg-final { scan-tree-dump-times "thefoo.* = {}" 1 "gimple"} } */
-+/* { dg-final { scan-tree-dump-times "thefoo.* = 1" 1 "gimple"} } */
-+/* { dg-final { scan-tree-dump-times "thefoo.* = 5" 1 "gimple"} } */
-+/* { dg-final { scan-tree-dump-times "theotherfoo = volinit" 1 "gimple"} } */
- /* { dg-final { cleanup-tree-dump "gimple" } } */
diff --git a/gcc43-pr34535.patch b/gcc43-pr34535.patch
deleted file mode 100644
index 4a3d59f..0000000
--- a/gcc43-pr34535.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-2007-12-20  Jakub Jelinek  <jakub@redhat.com>
-
-	PR debug/34535
-	* tree-mudflap.c (mf_make_builtin): Make decl artificial
-	and don't emit debug info for it.
-
-	PR debug/34535
-	* cp-lang.c (cp_classify_record): Check TYPE_LANG_SPECIFIC
-	is non-NULL before testing CLASSTYPE_DECLARED_CLASS.
-
---- gcc/cp/cp-lang.c.jj	2007-12-16 12:36:16.000000000 +0100
-+++ gcc/cp/cp-lang.c	2007-12-20 10:58:19.000000000 +0100
-@@ -159,7 +159,7 @@ cxx_dwarf_name (tree t, int verbosity)
- static enum classify_record
- cp_classify_record (tree type)
- {
--  if (CLASSTYPE_DECLARED_CLASS (type))
-+  if (TYPE_LANG_SPECIFIC (type) && CLASSTYPE_DECLARED_CLASS (type))
-     return RECORD_IS_CLASS;
- 
-   return RECORD_IS_STRUCT;
---- gcc/tree-mudflap.c.jj	2007-08-13 15:11:18.000000000 +0200
-+++ gcc/tree-mudflap.c	2007-12-20 11:15:01.000000000 +0100
-@@ -301,6 +301,10 @@ mf_make_builtin (enum tree_code category
-   TREE_PUBLIC (decl) = 1;
-   DECL_EXTERNAL (decl) = 1;
-   lang_hooks.decls.pushdecl (decl);
-+  /* The decl was declared by the compiler.  */
-+  DECL_ARTIFICIAL (decl) = 1;
-+  /* And we don't want debug info for it.  */
-+  DECL_IGNORED_P (decl) = 1;
-   return decl;
- }
- 
diff --git a/gcc43.spec b/gcc43.spec
index d303b85..5541727 100644
--- a/gcc43.spec
+++ b/gcc43.spec
@@ -1,6 +1,6 @@
-%define DATE 20071220
+%define DATE 20080110
 %define gcc_version 4.3.0
-%define gcc_release 0.4
+%define gcc_release 0.5
 %define _unpackaged_files_terminate_build 0
 %define multilib_64_archs sparc64 ppc64 s390x x86_64
 %define include_gappletviewer 1
@@ -136,14 +136,8 @@ Patch6: gcc43-ppc64-ia64-GNU-stack.patch
 Patch7: gcc43-pr27898.patch
 Patch8: gcc43-pr32139.patch
 Patch9: gcc43-pr33763.patch
-Patch10: gcc43-pr29484.patch
-Patch11: gcc43-rh330771.patch
-Patch12: gcc43-rh341221.patch
-Patch13: gcc43-pr34281.patch
-Patch14: gcc43-pr34448.patch
-Patch15: gcc43-pr34535.patch
-Patch16: gcc43-libjava-xulrunner.patch
-Patch17: gcc43-pr34111.patch
+Patch10: gcc43-rh330771.patch
+Patch11: gcc43-rh341221.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -436,14 +430,8 @@ which are required to run programs compiled with the GNAT.
 %patch7 -p0 -b .pr27898~
 %patch8 -p0 -b .pr32139~
 %patch9 -p0 -b .pr33763~
-%patch10 -p0 -b .pr29484~
-%patch11 -p0 -b .rh330771~
-%patch12 -p0 -b .rh341221~
-%patch13 -p0 -b .pr34281~
-%patch14 -p0 -b .pr34448~
-%patch15 -p0 -b .pr34535~
-#%patch16 -p0 -b .libjava-xulrunner~
-%patch17 -p0 -b .pr34111~
+%patch10 -p0 -b .rh330771~
+%patch11 -p0 -b .rh341221~
 
 tar xzf %{SOURCE4}
 
@@ -911,8 +899,11 @@ ln -sf ../../../../../lib64/libobjc.so.2 64/libobjc.so
 ln -sf ../`echo ../../../../lib/libstdc++.so.6.* | sed s~/lib/~/lib64/~` 64/libstdc++.so
 ln -sf ../`echo ../../../../lib/libgfortran.so.3.* | sed s~/lib/~/lib64/~` 64/libgfortran.so
 ln -sf ../`echo ../../../../lib/libgomp.so.1.* | sed s~/lib/~/lib64/~` 64/libgomp.so
-ln -sf ../`echo ../../../../lib/libmudflap.so.0.* | sed s~/lib/~/lib64/~` 64/libmudflap.so
-ln -sf ../`echo ../../../../lib/libmudflapth.so.0.* | sed s~/lib/~/lib64/~` 64/libmudflapth.so
+rm -f libmudflap.so libmudflapth.so
+echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libmudflap.so.0.* | sed 's,^.*libm,libm,'`' )' > libmudflap.so
+echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libmudflapth.so.0.* | sed 's,^.*libm,libm,'`' )' > libmudflapth.so
+echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libmudflap.so.0.* | sed 's,^.*libm,libm,'`' )' > 64/libmudflap.so
+echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libmudflapth.so.0.* | sed 's,^.*libm,libm,'`' )' > 64/libmudflapth.so
 %if %{build_java}
 ln -sf ../`echo ../../../../lib/libgcj.so.9.* | sed s~/lib/~/lib64/~` 64/libgcj.so
 ln -sf ../`echo ../../../../lib/libgcj-tools.so.9.* | sed s~/lib/~/lib64/~` 64/libgcj-tools.so
@@ -937,8 +928,11 @@ ln -sf ../../../../libobjc.so.2 32/libobjc.so
 ln -sf ../`echo ../../../../lib64/libstdc++.so.6.* | sed s~/../lib64/~/~` 32/libstdc++.so
 ln -sf ../`echo ../../../../lib64/libgfortran.so.3.* | sed s~/../lib64/~/~` 32/libgfortran.so
 ln -sf ../`echo ../../../../lib64/libgomp.so.1.* | sed s~/../lib64/~/~` 32/libgomp.so
-ln -sf ../`echo ../../../../lib64/libmudflap.so.0.* | sed s~/../lib64/~/~` 32/libmudflap.so
-ln -sf ../`echo ../../../../lib64/libmudflapth.so.0.* | sed s~/../lib64/~/~` 32/libmudflapth.so
+rm -f libmudflap.so libmudflapth.so
+echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libmudflap.so.0.* | sed 's,^.*libm,libm,'`' )' > libmudflap.so
+echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libmudflapth.so.0.* | sed 's,^.*libm,libm,'`' )' > libmudflapth.so
+echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libmudflap.so.0.* | sed 's,^.*libm,libm,'`' )' > 32/libmudflap.so
+echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libmudflapth.so.0.* | sed 's,^.*libm,libm,'`' )' > 32/libmudflapth.so
 %if %{build_java}
 ln -sf ../`echo ../../../../lib64/libgcj.so.9.* | sed s~/../lib64/~/~` 32/libgcj.so
 ln -sf ../`echo ../../../../lib64/libgcj-tools.so.9.* | sed s~/../lib64/~/~` 32/libgcj-tools.so
@@ -1651,6 +1645,10 @@ fi
 %doc rpm.doc/changelogs/libmudflap/ChangeLog*
 
 %changelog
+* Thu Jan 10 2008 Jakub Jelinek <jakub@redhat.com> 4.3.0-0.5
+- update from the trunk
+- don't require on ppc/ppc64 libmudflap in gcc subpackage
+
 * Thu Dec 20 2007 Jakub Jelinek <jakub@redhat.com> 4.3.0-0.4
 - update from the trunk
 - adjustments to build against xulrunner-devel
diff --git a/sources b/sources
index 1bfa2db..a6f1cbe 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-c29e437a88678a93a9750caf304b69bc  gcc-4.3.0-20071220.tar.bz2
+7c36a96cc44b241ec68e4b287a2abd68  gcc-4.3.0-20080110.tar.bz2
 92a70f9e56223b653bce0f58f90cf950  fastjar-0.95.tar.gz