diff --git a/ChangeLog b/ChangeLog
index 8d457005b..3a200afb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-05  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.in (noconfigdirs): Don't disable libgcj on
+	sparc64-*-solaris* and sparcv9-*-solaris*.
+
 2002-05-03  Alexandre Oliva  <aoliva@redhat.com>
 
 	* configure.in: Revert 2002-04-18's patch; fixed in libjava.
diff --git a/configure.in b/configure.in
index f21ffe8a4..2569cc2ec 100644
--- a/configure.in
+++ b/configure.in
@@ -1019,7 +1019,7 @@ case "${target}" in
            use_gnu_ld=no
     fi
     ;;
-  sparc-*-solaris*)
+  sparc-*-solaris* | sparc64-*-solaris* | sparcv9-*-solaris*)
     ;;
   v810-*-*)
     noconfigdirs="$noconfigdirs bfd binutils gas gcc gdb ld ${libstdcxx_version} opcodes target-libgloss ${libgcj}"