diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 670e0f8ad36..758abeddd8e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-21  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* config/sparc/t-linux64 (EXTRA_MULTILIB_PARTS): Add crtfastmath.o.
+
 2002-06-21  Neil Booth  <neil@daikokuya.co.uk>
 
 	* cpperror.c (cpp_error): For traditional CPP, default to
@@ -78,6 +82,7 @@
 	* config/sparc/t-crtfm (crtfastmath.o): Prefix with $(T) for
 	multilibs.
 	* config/sparc/t-sol2-64 (EXTRA_MULTILIB_PARTS): Add crtfastmath.o.
+	Fixes PR other/6836.
 
 Thu Jun 20 19:42:21 CEST 2002  Jan Hubicka  <jh@suse.cz>
 			       Pavel Nejedly  <bim@atrey.karlin.mff.cuni.cz>
diff --git a/gcc/config/sparc/t-linux64 b/gcc/config/sparc/t-linux64
index c93ff25a3ff..a6486263835 100644
--- a/gcc/config/sparc/t-linux64
+++ b/gcc/config/sparc/t-linux64
@@ -7,7 +7,8 @@ MULTILIB_EXCLUSIONS = m32/!m64/mno-app-regs m32/!m64/mcmodel=medany
 LIBGCC = stmp-multilib
 INSTALL_LIBGCC = install-multilib
 
-EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
+EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o \
+	crtfastmath.o
 
 SHLIB_SLIBDIR_SUFFIXES = 64:64 32: