diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 1f7356bb029..0e99994c059 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-09  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* config.host (i[34567]86-*-cygwin*): Move i386/t-mingw-pthread ...
+	(i[34567]86-*-mingw*): ... here.
+	(x86_64-*-mingw*): ... here.
+
 2011-11-08  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
 	* config/c6x/t-elf (LIB2ADD): Add instead of assigning.
diff --git a/libgcc/config.host b/libgcc/config.host
index 8af99f57987..03f94d972df 100644
--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -593,11 +593,6 @@ i[34567]86-*-cygwin*)
 		tmake_dlldir_file="i386/t-dlldir-x"
 	fi
 	tmake_file="${tmake_file} ${tmake_eh_file} ${tmake_dlldir_file} i386/t-slibgcc-cygming i386/t-cygming i386/t-cygwin i386/t-crtfm i386/t-chkstk t-dfprules"
-	case ${target_thread_file} in
-	  posix)
-	    tmake_file="i386/t-mingw-pthread $tmake_file"
-	    ;;
-	esac
 	;;
 i[34567]86-*-mingw*)
 	extra_parts="crtbegin.o crtend.o crtfastmath.o"
@@ -605,6 +600,9 @@ i[34567]86-*-mingw*)
 	  win32)
 	    tmake_file="$tmake_file i386/t-gthr-win32"
 	    ;;
+	  posix)
+	    tmake_file="i386/t-mingw-pthread $tmake_file"
+	    ;;
 	esac
 	# This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h
 	if test x$enable_sjlj_exceptions = xyes; then
@@ -626,6 +624,9 @@ x86_64-*-mingw*)
 	  win32)
 	    tmake_file="$tmake_file i386/t-gthr-win32"
 	    ;;
+	  posix)
+	    tmake_file="i386/t-mingw-pthread $tmake_file"
+	    ;;
 	esac
 	# This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h
 	if test x$enable_sjlj_exceptions = xyes; then