Don't override -ffp-contract=fast if -funsafe-math-optimizations

From-SVN: r208474

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 7d49933c287bb6d0ce5162aeeb6dc4cf347cefdb..0a3e0ad25c2c92633d0ad7d7cd2834afa55820d2 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-11  Ian Bolton  <ian.bolton@arm.com>
+
+       * c-opts.c (c_common_post_options): Don't override
+       -ffp-contract=fast if unsafe-math-optimizations is on.
+
 2014-03-08  Paulo Matos  <paulo@matos-sorge.com>
 
     * c.opt: Enable LTO FE for fshort-double.

diff --git a/gcc/c-family/c-opts.c b/gcc/c-family/c-opts.c
index b7478f3a2d637f2e9ccd7d16cbf5bbcf38de74cd..92ba481390df90cf133d0659fedc2daf95a48eec 100644 (file)
--- a/gcc/c-family/c-opts.c
+++ b/gcc/c-family/c-opts.c
@@ -834,7 +834,8 @@ c_common_post_options (const char **pfilename)
   if (flag_iso
       && !c_dialect_cxx ()
       && (global_options_set.x_flag_fp_contract_mode
-         == (enum fp_contract_mode) 0))
+         == (enum fp_contract_mode) 0)
+      && flag_unsafe_math_optimizations == 0)
     flag_fp_contract_mode = FP_CONTRACT_OFF;
 
   /* By default we use C99 inline semantics in GNU99 or C99 mode.  C99