diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3b3f434b5728..2c8180962475 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2001-06-09  Alexandre Oliva  <aoliva@redhat.com>
+
+	* config.gcc: Re-enable bi-arch sparc on Solaris 7 and above.
+
 2001-06-09  Peter Jakubek <pjak@snafu.de>
 
 	* config/m68k/m68k.md (ashrdi_const): Fix right shift by 16.
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 42082e7ee9df..3f708a4df7ff 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2946,19 +2946,18 @@ sparc-*-solaris2*)
 		tmake_file="$tmake_file t-slibgcc-sld"
 	fi
 	extra_parts="crt1.o crti.o crtn.o gcrt1.o gmon.o crtbegin.o crtend.o"
-# At the moment, 32-to-64 cross compilation doesn't work.
-#	case $machine in
-#	*-*-solaris2.[0-6] | *-*-solaris2.[0-6].*) ;;
-#	*-*-solaris2*)
-#		if test x$gnu_ld = xyes
-#		then
-#			tm_file=sparc/sol2-64.h
-#		else
-#			tm_file=sparc/sol2-sld-64.h
-#		fi
-#		tmake_file="$tmake_file sparc/t-sol2-64"
-#		;;
-#	esac
+	case $machine in
+	*-*-solaris2.[0-6] | *-*-solaris2.[0-6].*) ;;
+	*-*-solaris2*)
+		if test x$gnu_ld = xyes
+		then
+			tm_file=sparc/sol2-64.h
+		else
+			tm_file=sparc/sol2-sld-64.h
+		fi
+		tmake_file="$tmake_file sparc/t-sol2-64"
+		;;
+	esac
 	case $machine in
 	*-*-solaris2.[0-4])
 		float_format=i128