diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 002f696ae67..fffbbd8b21e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -36,9 +36,10 @@
 
 2009-06-22  Kai Tietz  <kai.tietz@onevision.com>
 
-	* config.gcc: Add for x86 and x64 mingw targets t-fprules-soft
-	and t-softfp support.
-	* config/i386/mingw32.h (LIBGCC2_HAS_TF_MODE): Enable TFmode.
+	* config.gcc (i[34567]86-*-mingw*, x86_64-*-mingw*): Add
+	i386/t-fprules-softfp and soft-fp/t-softfp to tmake_file.
+
+	* config/i386/mingw32.h (LIBGCC2_HAS_TF_MODE): Define.
 	(LIBGCC2_TF_CEXT): Define.
 	(TF_SIZE): Define.
 
@@ -49,9 +50,9 @@
 
 2009-06-22  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>
 
-       * config/arm/arm.c (arm_override_options): Disable -mcaller-super-interworking
-       and -mcallee-super-interworking.
-       * doc/invoke.texi (ARM Options): Document this.
+	* config/arm/arm.c (arm_override_options): Disable
+	-mcaller-super-interworking and -mcallee-super-interworking.
+	* doc/invoke.texi (ARM Options): Document this.
 
 2009-06-22  Nathan Sidwell  <nathan@codesourcery.com>
 
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 7078a13880a..d788dc14641 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,19 +1,20 @@
 2009-06-22  Kai Tietz  <kai.tietz@onevision.com>
 
-	* config.host: Add soft emulation for x86 and x64 mingw targets.
-	* config/i386/64/_divtc3.c: Disable for mingw targets usage of
-	.symver assembly symbol.
+	* config.host: Add i386/${host_address}/t-fprules-softfp and
+	t-softfp to tmake_file for i[34567]86-*-mingw*, x86_64-*-mingw*.	
+
+	* config/i386/64/_divtc3.c: Disable usage of .symver assembly symbol
+	for mingw targets.
 	* config/i386/64/_multc3.c: Likewise.
 	* config/i386/64/_powitf2.c: Likewise.
 	* config/i386/64/eqtf2.c: Likewise.
 	* config/i386/64/getf2.c: Likewise.
 	* config/i386/64/letf2.c: Likewise.
 	* config/i386/64/letf2.c: Likewise.
-	* config/i386/64/sfp-machine.h (_FP_W_TYPE): Define it
-	for x64 mingw target as unsigned long long.
-	(_FP_WS_TYPE): Define it for x64 mingw target as signed long
-	long.
-	(_FP_I_TYPE): Define it for x64 mingw target as long long.
+	* config/i386/64/sfp-machine.h (_FP_W_TYPE): Define as
+	unsigned long long for x64 mingw targets.
+	(_FP_WS_TYPE): Define as signed long long for x64 mingw target.
+	(_FP_I_TYPE): Define as long long for x64 mingw target.
 
 2009-06-10  Maciej W. Rozycki  <macro@linux-mips.org>