diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dc3476a6dbe8f02b699e9d6dfa5568bc5b65c7f5..65b1c29868b428eb2e7202225ea0d27f493d024a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-30  David O'Brien  <obrien@FreeBSD.org>
+
+	* config.gcc: Include sparc/biarch64.h rather than sparc/sparc_bi.h.
+	* config/sparc/sparc_bi.h: Remove file.
+	* config/sparc/biarch64.h: New file (rename of sparc_bi.h).
+
 2002-01-30  Richard Henderson  <rth@redhat.com>
 
 	* sched-deps.c (sched_analyze): Make a call read the frame pointer.
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 63cef2b6c824f38e1c2adc65fc386cd1ef784291..23c6aa15840578295e3e5d5d5b0a0667c08c4210 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2900,7 +2900,7 @@ sparc-tti-*)
 	xm_defines=POSIX
 	;;
 sparc64-wrs-vxworks*)
-        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sol2.h sparc/elf.h sparc/sparc_bi.h gofast.h sparc/vxsparc64.h"
+        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sol2.h sparc/elf.h sparc/biarch64.h gofast.h sparc/vxsparc64.h"
         tmake_file=sparc/t-vxsparc64
         use_collect2=yes
         ;;
@@ -3163,7 +3163,7 @@ sparc64-*-freebsd*|ultrasparc-*-freebsd*)
 	;;
 sparc64-*-linux*)		# 64-bit Sparc's running GNU/Linux
 	tmake_file="t-slibgcc-elf-ver t-linux sparc/t-linux64"
-	tm_file="sparc/sparc_bi.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/linux64.h"
+	tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/linux64.h"
 	extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
 	gnu_ld=yes
 	if test x$enable_threads = xyes; then
diff --git a/gcc/config/sparc/sparc_bi.h b/gcc/config/sparc/biarch64.h
similarity index 100%
rename from gcc/config/sparc/sparc_bi.h
rename to gcc/config/sparc/biarch64.h