diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 650867041d9..30b53c94ea8 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-03  Uros Bizjak  <ubizjak@gmail.com>
+
+	* config/i386/crtfastmath.c: Compile only for !_SOFT_FLOAT.
+	* config/i386/crtprec.c: Ditto.
+
 2013-10-31  Chung-Ju Wu  <jasonwucj@gmail.com>
 	    Shiva Chen  <shiva0217@gmail.com>
 
@@ -154,8 +159,8 @@
 	(__gcov_indirect_call_counters): Likewise.
 
 2013-08-16  Maciej W. Rozycki  <macro@codesourcery.com>
-            Catherine Moore  <clm@codesourcery.com>
-            Richard Sandiford <rdsandiford@googlemail.com>
+	    Catherine Moore  <clm@codesourcery.com>
+	    Richard Sandiford <rdsandiford@googlemail.com>
 
 	* config/mips/mips16.S (CE_STARTFN, CE_ENDFN): New macros.
 	(RET_FUNCTION): Use them in place of STARTFN and ENDFN.
diff --git a/libgcc/config/i386/crtfastmath.c b/libgcc/config/i386/crtfastmath.c
index 991f531fe7d..5a267c3b1a5 100644
--- a/libgcc/config/i386/crtfastmath.c
+++ b/libgcc/config/i386/crtfastmath.c
@@ -21,6 +21,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#ifndef _SOFT_FLOAT
 #define MXCSR_DAZ (1 << 6)	/* Enable denormals are zero mode */
 #define MXCSR_FTZ (1 << 15)	/* Enable flush to zero mode */
 
@@ -134,3 +135,4 @@ set_fast_math (void)
   __builtin_ia32_ldmxcsr (mxcsr);
 #endif
 }
+#endif
diff --git a/libgcc/config/i386/crtprec.c b/libgcc/config/i386/crtprec.c
index f0c1fbe7228..f8f9962b13b 100644
--- a/libgcc/config/i386/crtprec.c
+++ b/libgcc/config/i386/crtprec.c
@@ -21,6 +21,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
+#ifndef _SOFT_FLOAT
 #if __PREC == 32
  #define X87CW		(0 << 8)	/* Single precision (24 bits) */
 #elif __PREC == 64
@@ -45,3 +46,4 @@ set_precision (void)
 
   asm volatile ("fldcw\t%0" : : "m" (cwd));
 }
+#endif