diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 720d485bdb6..880cdbddd3b 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-03  Hans-Peter Nilsson  <hp@axis.com>
+
+	* config.host (crisv32-*-none, cris-*-none): Remove.
+	(crisv32-*-elf): Append to tmake_file, don't just set it.
+	(cris-*-elf): Add missing t-fdpbit to tmake_file.
+
 2011-11-03  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
 	* config/rs6000/t-ppccomm (ecrti$(objext)): Use $<.
diff --git a/libgcc/config.host b/libgcc/config.host
index c62e8308c95..a979721bc11 100644
--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -425,18 +425,10 @@ bfin*-*)
 	extra_parts="crtbegin.o crtend.o crti.o crtn.o"
         ;;
 crisv32-*-elf)
-	tmake_file="cris/t-cris t-fdpbit"
+	tmake_file="$tmake_file cris/t-cris t-fdpbit"
  	;;
-crisv32-*-none)
-	tmake_file="cris/t-cris t-fdpbit"
-	extra_parts="crtbegin.o crtend.o"
-	;;
 cris-*-elf)
-	tmake_file="$tmake_file cris/t-cris cris/t-elfmulti"
-	;;
-cris-*-none)
-	tmake_file="$tmake_file cris/t-cris cris/t-elfmulti"
- 	extra_parts="crtbegin.o crtend.o"
+	tmake_file="$tmake_file cris/t-cris t-fdpbit cris/t-elfmulti"
 	;;
 cris-*-linux* | crisv32-*-linux*)
 	tmake_file="$tmake_file cris/t-cris t-fdpbit cris/t-linux"