--- /dev/null
+--- gcc-4.1.0-20060223/libjava/classpath/native/jni/qt-peer/componentevent.cpp.orig 2005-11-16 00:20:01.000000000 +0100
++++ gcc-4.1.0-20060223/libjava/classpath/native/jni/qt-peer/componentevent.cpp 2006-02-26 17:59:49.285101500 +0100
+@@ -39,6 +39,7 @@
+ #include <QWidget>
+ #include <QPoint>
+
++#include <assert.h>
+ #include "componentevent.h"
+
+ AWTInitEvent::AWTInitEvent(JNIEnv *env, jobject obj) : AWTEvent()
+--- gcc-4.1.0-20060223/libjava/classpath/gnu/java/awt/peer/qt/QtToolkit.java.orig 2005-11-16 00:20:01.000000000 +0100
++++ gcc-4.1.0-20060223/libjava/classpath/gnu/java/awt/peer/qt/QtToolkit.java 2006-02-26 17:28:33.311860500 +0100
+@@ -137,7 +137,7 @@
+ eventQueue = new EventQueue();
+ repaintThread = new QtRepaintThread();
+ if (Configuration.INIT_LOAD_LIBRARY)
+- System.loadLibrary("qtpeer");
++ System.loadLibrary("-gnu-java-awt-peer-qt");
+
+ String theme = null;
+ try
+--- gcc-4.1.0-20060223/libjava/classpath/configure.ac.orig 2005-12-01 21:09:06.000000000 +0100
++++ gcc-4.1.0-20060223/libjava/classpath/configure.ac 2006-02-26 17:59:25.255599750 +0100
+@@ -372,6 +372,9 @@
+ if test "x${COMPILE_QT_PEER}" = xyes; then
+ PKG_CHECK_MODULES(QT, QtGui >= 4.0.1, HAVE_QT4="yes", HAVE_QT4="no")
+ if test "x$HAVE_QT4" = "xyes"; then
++ AC_ARG_WITH([qt4dir],
++ [AS_HELP_STRING([--with-qt4dir=DIR],[Qt4 installation directory.])],
++ [QT4DIR=$withval])
+ dnl Check needed because in some cases the QtGui includedir
+ dnl doesn't contain the subsystem dir.
+ QT_INCLUDE_DIR=$($PKG_CONFIG --variable=includedir QtGui)
+@@ -381,18 +384,13 @@
+ AC_CHECK_FILE([$EXTRA_QT_INCLUDE_DIR/QWidget],
+ QT_CFLAGS="$QT_CFLAGS -I$EXTRA_QT_INCLUDE_DIR",
+ AC_MSG_WARN([QWidget not found])))
+- AC_CHECK_PROG(MOC, [moc], [moc])
++ AC_CHECK_PROG(MOC, [moc], [$QT4DIR/bin/moc], [], $QT4DIR/bin)
++ QT_CFLAGS="$QT_CFLAGS -I\$(top_srcdir)/../../builddir/\$(shell cat \$(top_srcdir)/../../builddir/Makefile |grep ^TARGET_SUBDIR |awk '{ print \$\$3; }')/libstdc++-v3/include -I\$(top_srcdir)/../../builddir/\$(shell cat \$(top_srcdir)/../../builddir/Makefile |grep ^TARGET_SUBDIR |awk '{ print \$\$3; }')/libstdc++-v3/include/\$(shell cat \$(top_srcdir)/../../builddir/Makefile |grep ^TARGET_SUBDIR |awk '{ print \$\$3; }') -I\$(top_srcdir)/../../libstdc++-v3/libsupc++ -I/usr/include/qt4/Qt"
+ fi
+ if test "x$HAVE_QT4" = "xno"; then
+ AC_MSG_NOTICE([Looking for QT_CFLAGS and QT_LIBS without pkg-config])
+ case "$host_os" in
+ darwin*)
+- AC_ARG_WITH([qt4dir],
+- [AS_HELP_STRING([--with-qt4dir=DIR],
+- [Qt4 installation directory used for OS-X.
+- For other systems use pkg-config.])],
+- [QT4DIR=$withval]
+- )
+ if test x"$QT4DIR" = x ; then
+ AC_MSG_ERROR([*** No path for Qt4 --with-qt4dir option given])
+ fi
--- /dev/null
+--- gcc/libjava/configure.ac 2006-01-23 18:53:45.000000000 +0100
++++ gcc/libjava/configure.ac 2006-02-26 16:02:13.828163000 +0100
+@@ -84,6 +84,21 @@
+ *) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
+ esac], [multilib=yes])dnl
+
++# Default to --enable-libjava-multilib
++AC_ARG_ENABLE(libjava-multilib,
++ AS_HELP_STRING([--enable-libjava-multilib],
++ [build many library versions (default)]),
++[case "${enableval}" in
++ yes) multilib=yes ;;
++ no) multilib=no ;;
++ *) AC_MSG_ERROR(bad value ${enableval} for libjava-multilib option) ;;
++ esac], [multilib=yes])dnl
++if test "$multilib" = no; then
++ # Reset also --enable-multilib state, as that is what is looked at
++ # by config-ml.in
++ ac_configure_args="$ac_configure_args --disable-multilib"
++fi
++
+ # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
+ GCC_NO_EXECUTABLES
+
--- /dev/null
+--- gcc/gcc/config/rs6000/t-linux64 2003-06-03 05:11:45.000000000 -0400
++++ gcc/gcc/config/rs6000/t-linux64 2003-06-11 17:07:16.000000000 -0400
+@@ -4,13 +4,13 @@ LIB2FUNCS_EXTRA = tramp.S $(srcdir)/conf
+ # Modify the shared lib version file
+ SHLIB_MKMAP_OPTS = -v dotsyms=1
+
+-MULTILIB_OPTIONS = m64/m32 msoft-float
+-MULTILIB_DIRNAMES = 64 32 nof
++MULTILIB_OPTIONS = m64/m32
++MULTILIB_DIRNAMES = 64 32
+ MULTILIB_EXTRA_OPTS = fPIC mstrict-align
+-MULTILIB_EXCEPTIONS = m64/msoft-float
+-MULTILIB_EXCLUSIONS = m64/!m32/msoft-float
+-MULTILIB_OSDIRNAMES = ../lib64 ../lib nof
+-MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT)
++MULTILIB_EXCEPTIONS =
++MULTILIB_EXCLUSIONS =
++MULTILIB_OSDIRNAMES = ../lib64 ../lib
++MULTILIB_MATCHES =
+
+ TARGET_LIBGCC2_CFLAGS = -mno-minimal-toc -fPIC
+
--- /dev/null
+--- gcc-3.4.5/gcc/cp/g++spec.c.orig 2004-09-29 04:18:58.000000000 +0200
++++ gcc-3.4.5/gcc/cp/g++spec.c 2005-12-09 04:26:21.215120000 +0100
+@@ -222,6 +222,11 @@ lang_specific_driver (int *in_argc, cons
+ {
+ if ((len <= 2 || strcmp (argv[i] + (len - 2), ".H") != 0)
+ && (len <= 2 || strcmp (argv[i] + (len - 2), ".h") != 0)
++ && (len <= 4 || strcmp (argv[i] + (len - 4), ".hpp") != 0)
++ && (len <= 3 || strcmp (argv[i] + (len - 3), ".hp") != 0)
++ && (len <= 4 || strcmp (argv[i] + (len - 4), ".hxx") != 0)
++ && (len <= 4 || strcmp (argv[i] + (len - 4), ".h++") != 0)
++ && (len <= 4 || strcmp (argv[i] + (len - 4), ".HPP") != 0)
+ && (len <= 3 || strcmp (argv[i] + (len - 3), ".hh") != 0))
+ library = 1;
+ }
+--- gcc-4_1-branch/gcc/cp/lang-specs.h.orig 2005-11-30 12:09:14.000000000 +0100
++++ gcc-4_1-branch/gcc/cp/lang-specs.h 2005-12-09 04:51:49.225120000 +0100
+@@ -34,6 +34,12 @@ Boston, MA 02110-1301, USA. */
+ {".C", "@c++", 0, 0, 0},
+ {".CPP", "@c++", 0, 0, 0},
+ {".H", "@c++-header", 0, 0, 0},
++ {".hpp", "@c++-header", 0, 0, 0},
++ {".hp", "@c++-header", 0, 0, 0},
++ {".hxx", "@c++-header", 0, 0, 0},
++ {".h++", "@c++-header", 0, 0, 0},
++ {".hpp", "@c++-header", 0, 0, 0},
++ {".HPP", "@c++-header", 0, 0, 0},
+ {".hh", "@c++-header", 0, 0, 0},
+ {"@c++-header",
+ "%{E|M|MM:cc1plus -E %(cpp_options) %2 %(cpp_debug_options)}\
+--- gcc-3.4.5/gcc/doc/invoke.texi.orig 2005-10-08 02:22:20.000000000 +0200
++++ gcc-3.4.5/gcc/doc/invoke.texi 2005-12-09 04:24:19.085120000 +0100
+@@ -750,6 +750,11 @@ the last two letters must both be litera
+ @samp{.C} refers to a literal capital C@.
+
+ @item @var{file}.hh
++@itemx @var{file}.hp
++@itemx @var{file}.hxx
++@itemx @var{file}.hpp
++@itemx @var{file}.HPP
++@itemx @var{file}.h++
+ @itemx @var{file}.H
+ C++ header file to be turned into a precompiled header.
+