diff -ru gcc-4.0.2.orig/libjava/Makefile.in gcc-4.0.2/libjava/Makefile.in
--- gcc-4.0.2.orig/libjava/Makefile.in	2005-09-28 08:16:38.000000000 +0200
+++ gcc-4.0.2/libjava/Makefile.in	2006-03-16 11:58:26.000000000 +0100
@@ -6271,7 +6271,7 @@
 	$(LTGCJCOMPILE) -o $@ -c @${<:.stamp=.lolist}
 
 $(all_java_stamp_files): %.stamp: %.list
-	$(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(BOOTCLASSPATH) -d $(here) \
+	$(JAVAC) $(JCFLAGS) --classpath '' --bootclasspath $(BOOTCLASSPATH) -d $(here) \
 		-MD -MF ${@:.stamp=.deps} @$<
 	echo timestamp > $@
 
diff -ru gcc-4.0.2.orig/libjava/configure.host gcc-4.0.2/libjava/configure.host
--- gcc-4.0.2.orig/libjava/configure.host	2005-08-19 16:59:38.000000000 +0200
+++ gcc-4.0.2/libjava/configure.host	2006-03-16 23:20:35.000000000 +0100
@@ -239,11 +239,16 @@
 	    ;;
 	esac
 	;;
-  powerpc*-*-darwin*)
+  powerpc-*-darwin*)
 	enable_hash_synchronization_default=yes
 	slow_pthread_self=
 	can_unwind_signal=yes
 	;;
+  i?86-*-darwin*)
+	enable_hash_synchronization_default=yes
+	slow_pthread_self=
+	can_unwind_signal=no
+	;;
   *-*-freebsd*)
 	slow_pthread_self=
 	;;