diff --git a/ChangeLog b/ChangeLog
index c97e3731385..f7783322ca6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR libjava/32098
+	* libtool.m4 (_LT_LANG_GCJ_CONFIG): Use gcc to test gcj features.
+
 2007-05-30  Richard Guenther  <rguenther@suse.de>
 
 	* MAINTAINERS (Various Maintainers): Add myself as
diff --git a/libtool.m4 b/libtool.m4
index 46d59635dfa..e4986cadf79 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -6757,9 +6757,14 @@ _LT_TAG_COMPILER
 _LT_COMPILER_BOILERPLATE
 _LT_LINKER_BOILERPLATE
 
+# We can't call gcj to test gcj features when building libjava in gcc
+# since gcj may depend on ecj1 which may not be available yet.  We use
+# gcc to test gcj features.
+ac_ext=c
+lt_simple_compile_test_code="int some_variable = 0;"
+lt_simple_link_test_code='int main(){return(0);}'
+
 # Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${GCJ-"gcj"}
 compiler=$CC
 _LT_TAGVAR(compiler, $1)=$CC
 _LT_CC_BASENAME([$compiler])
@@ -6786,7 +6791,6 @@ if test -n "$compiler"; then
 fi
 
 AC_LANG_RESTORE
-CC="$lt_save_CC"
 ])# _LT_LANG_GCJ_CONFIG