--- gcc-4.2.0/libgomp/testsuite/libgomp.c++/pr30703.C.org	2007-02-07 08:37:29.000000000 -0500
+++ gcc-4.2.0/libgomp/testsuite/libgomp.c++/pr30703.C	2007-05-17 19:48:03.000000000 -0400
@@ -1,5 +1,6 @@
 // PR c++/30703
 // { dg-do run }
+// { dg-options "-shared-libgcc" { target *-*-darwin* } }
 
 #include <omp.h>
 
--- gcc-4.2-20060822/gcc/testsuite/lib/prune.exp.org	2006-08-23 18:33:56.000000000 -0400
+++ gcc-4.2-20060822/gcc/testsuite/lib/prune.exp	2006-08-23 18:41:28.000000000 -0400
@@ -43,6 +43,7 @@
     regsub -all "(^|\n)\[^\n\]*file path prefix \[^\n\]* never used" $text "" text
     regsub -all "(^|\n)\[^\n\]*linker input file unused since linking not done" $text "" text
 
+    regsub -all "(^|\n)can't find atom for N_GSYM stabs \[^\n\]* in \[^\n\]*" $text "" text
     #send_user "After:$text\n"
 
     return $text
--- gcc-4.2-20060825/libstdc++-v3/testsuite/lib/prune.exp.org   2006-08-26 11:22:52.000000000 -0400
+++ gcc-4.2-20060825/libstdc++-v3/testsuite/lib/prune.exp       2006-08-26 11:23:39.000000000 -0400
@@ -29,5 +29,7 @@
     regsub -all "(^|\n)\[^\n\]*: Additional NOP may be necessary to workaround Itanium processor A/B step errata" $text "" text
     regsub -all "(^|\n)\[^\n*\]*: Assembler messages:\[^\n\]*" $text "" text
 
+    regsub -all "(^|\n)can't find atom for N_GSYM stabs \[^\n\]* in \[^\n\]*" $text "" text
+
     return $text
 }
--- gcc-4.2.4/libjava/configure.orig	2008-05-19 10:28:07.000000000 -0400
+++ gcc-4.2.4/libjava/configure	2009-08-01 17:28:43.000000000 -0400
@@ -859,6 +859,7 @@
   --enable-dependency-tracking   do not reject slow dependency extractors
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
+  --enable-libjava-multilib build libjava as multilib
   --enable-libgcj-debug   enable runtime debugging code
   --enable-java-awt       list of AWT peer implementations to be built
   --enable-shared=PKGS  build shared libraries default=yes
@@ -1662,6 +1663,16 @@
 
 fi;
 
+# Check whether --enable-libjava-multilib was given.
+if test "${enable_libjava_multilib+set}" = set; then
+  enableval=$enable_libjava_multilib;
+fi
+
+if test "$enable_libjava_multilib" = no; then
+  multilib=no
+  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-4.2.4/libjava/configure.ac.orig	2007-07-23 08:54:02.000000000 -0400
+++ gcc-4.2.4/libjava/configure.ac	2009-08-01 17:25:02.000000000 -0400
@@ -77,6 +77,13 @@
     [gconf_enabled=no]
 )
 
+AC_ARG_ENABLE(libjava-multilib,
+	AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
+if test "$enable_libjava_multilib" = no; then
+  multilib=no
+  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