diff --git a/ChangeLog b/ChangeLog
index 3e4a49f6e7e37f11910d890d30772274c377d9b6..292ec1e994272a2c48e70484ecf2d3985952e2a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-08  Tom Tromey  <tromey@redhat.com>
+
+	* configure.in: Add FLAGS_FOR_TARGET to GCJ_FOR_TARGET.
+	Fixes PR libgcj/6068.
+
 2002-03-30  Krister Walfridsson  <cato@df.lth.se>
 
 	* configure.in (i*86-*-netbsdelf*): Don't disable libgcj.
diff --git a/configure.in b/configure.in
index c2c5d3fbf8296cc5a68fba5d9b6f4614fec587a2..27a141bca80a77ad3513f2056728e0e104b25ace 100644
--- a/configure.in
+++ b/configure.in
@@ -1553,6 +1553,10 @@ elif test "$host" = "$target"; then
 else
   GCJ_FOR_TARGET=`echo gcj | sed -e 's/x/x/' ${program_transform_name}`
 fi
+case $GCJ_FOR_TARGET in
+*' $(FLAGS_FOR_TARGET)') ;;
+*) GCJ_FOR_TARGET=$GCJ_FOR_TARGET' $(FLAGS_FOR_TARGET)' ;;
+esac
 
 if test "x${CXX_FOR_TARGET+set}" = xset; then
   :