diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 63b20e5f978..9ebf3410540 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-21  David S. Miller  <davem@davemloft.net>
+
+	* config.gcc (sparc-*-linux*): Always include sparc/t-linux in
+	tmake_file.
+
 2008-05-21  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* cfgexpand.c (tree_expand_cfg): Zap the EH throw statement table
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 6a527dba104..c2fd4efea02 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2360,13 +2360,14 @@ sparc-*-elf*)
 sparc-*-linux*)		# SPARC's running GNU/Linux, libc6
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h linux.h"
 	extra_options="${extra_options} sparc/long-double-switch.opt"
+	tmake_file="${tmake_file} sparc/t-linux"
 	if test x$enable_targets = xall; then
 		tm_file="sparc/biarch64.h ${tm_file} sparc/linux64.h"
-		tmake_file="${tmake_file} sparc/t-linux64 sparc/t-crtfm"
+		tmake_file="${tmake_file} sparc/t-linux64"
 	else
 		tm_file="${tm_file} sparc/linux.h"
-		tmake_file="${tmake_file} sparc/t-linux sparc/t-crtfm"
 	fi
+	tmake_file="${tmake_file} sparc/t-crtfm"
 	;;
 sparc-*-rtems*)
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sp-elf.h sparc/rtemself.h rtems.h"