PR target/55175

	* config/i386/32/sfp-machine.h: Guard exception handling and
	rounding handling code with _SOFT_FLOAT.
	* config/i386/64/sfp-machine.h: Ditto.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@193140 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index a9ed0e8..c91be9a 100644 (file)
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,10 @@
+2012-11-04  Uros Bizjak  <ubizjak@gmail.com>
+
+       PR target/55175
+       * config/i386/32/sfp-machine.h: Guard exception handling and
+       rounding handling code with _SOFT_FLOAT.
+       * config/i386/64/sfp-machine.h: Ditto.
+
 2012-10-31  Joel Sherrill  <joel.sherrill@oarcorp.com>
 
        * config.host (m32r-*-rtems*): Include crtinit.o and crtfinit.o
@@ -9,7 +16,7 @@
 
 2012-10-25  Ralf Corsépius <ralf.corsepius@rtems.org>
 
-       * config.host (sh*-*-rtems*): Add sh*-*-elf*'s extra_parts. 
+       * config.host (sh*-*-rtems*): Add sh*-*-elf*'s extra_parts.
 
 2012-10-25  Sebastian Huber  <sebastian.huber@embedded-brains.de>
 
@@ -22,7 +29,7 @@
        * unwind-dw2-fde-dip.c: Don't include <elf.h> on OpenBSD.
        (USE_PT_GNU_EH_FRAME): Define for OpenBSD.
        (ElfW): Likewise.
-                               
+
 2012-09-20  Release Manager
 
        * GCC 4.7.2 released.
@@ -30,7 +37,7 @@
 2012-09-05  Georg-Johann Lay  <avr@gjlay.de>
 
        Backport from 2012-09-05 mainline r190697.
-       
+
        PR target/54461
        * config.host (tmake_file,host=avr-*-*): Add avr/t-avrlibc if
        configured --with-avrlibc.

diff --git a/libgcc/config/i386/32/sfp-machine.h b/libgcc/config/i386/32/sfp-machine.h
index 1600a7f..131b2c4 100644 (file)
--- a/libgcc/config/i386/32/sfp-machine.h
+++ b/libgcc/config/i386/32/sfp-machine.h
@@ -107,6 +107,7 @@ typedef int __gcc_CMPtype __attribute__ ((mode (__libgcc_cmp_return__)));
     R##_c = FP_CLS_NAN;                                                \
   } while (0)
 
+#ifndef _SOFT_FLOAT
 #define FP_EX_INVALID          0x01
 #define FP_EX_DENORM           0x02
 #define FP_EX_DIVZERO          0x04
@@ -187,6 +188,7 @@ struct fenv
   } while (0)
 
 #define FP_ROUNDMODE           (_fcw & 0xc00)
+#endif
 
 #define        __LITTLE_ENDIAN 1234
 #define        __BIG_ENDIAN    4321

diff --git a/libgcc/config/i386/64/sfp-machine.h b/libgcc/config/i386/64/sfp-machine.h
index 7a2a4be..f90305a 100644 (file)
--- a/libgcc/config/i386/64/sfp-machine.h
+++ b/libgcc/config/i386/64/sfp-machine.h
@@ -49,6 +49,7 @@ typedef int __gcc_CMPtype __attribute__ ((mode (__libgcc_cmp_return__)));
     R##_c = FP_CLS_NAN;                                                \
   } while (0)
 
+#ifndef _SOFT_FLOAT
 #define FP_EX_INVALID          0x01
 #define FP_EX_DENORM           0x02
 #define FP_EX_DIVZERO          0x04
@@ -133,6 +134,7 @@ struct fenv
   } while (0)
 
 #define FP_ROUNDMODE           (_fcw & 0xc00)
+#endif
 
 #define        __LITTLE_ENDIAN 1234
 #define        __BIG_ENDIAN    4321