backport: opts.c (OPT_fif_conversion, [...]): Disable for Og.

2014-05-03  Joey Ye  <joey.ye@arm.com>

        Backport from mainline r209463
        2014-04-17  Joey Ye  <joey.ye@arm.com>

        * opts.c (OPT_fif_conversion, OPT_fif_conversion2): Disable for Og.

From-SVN: r210048

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fafed2afb37095384460667a79a0545080c87932..e548d548799fe3bddcf295269d15ee92d0fdb621 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2014-05-03  Joey Ye  <joey.ye@arm.com>
+
+       Backport from mainline r209463
+       2014-04-17  Joey Ye  <joey.ye@arm.com>
+
+       * opts.c (OPT_fif_conversion, OPT_fif_conversion2): Disable for Og.
+
 2014-05-03  Oleg Endo  <olegendo@gcc.gnu.org>
 
        Back port from mainline

diff --git a/gcc/opts.c b/gcc/opts.c
index 45b12fecb8e472d3e464e67d1dc5781da722e1e5..55cd965282d5a8af478feb5c528e23e97a881633 100644 (file)
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -425,8 +425,8 @@ static const struct default_options default_options_table[] =
     { OPT_LEVELS_1_PLUS, OPT_fguess_branch_probability, NULL, 1 },
     { OPT_LEVELS_1_PLUS, OPT_fcprop_registers, NULL, 1 },
     { OPT_LEVELS_1_PLUS, OPT_fforward_propagate, NULL, 1 },
-    { OPT_LEVELS_1_PLUS, OPT_fif_conversion, NULL, 1 },
-    { OPT_LEVELS_1_PLUS, OPT_fif_conversion2, NULL, 1 },
+    { OPT_LEVELS_1_PLUS_NOT_DEBUG, OPT_fif_conversion, NULL, 1 },
+    { OPT_LEVELS_1_PLUS_NOT_DEBUG, OPT_fif_conversion2, NULL, 1 },
     { OPT_LEVELS_1_PLUS, OPT_fipa_pure_const, NULL, 1 },
     { OPT_LEVELS_1_PLUS, OPT_fipa_reference, NULL, 1 },
     { OPT_LEVELS_1_PLUS, OPT_fipa_profile, NULL, 1 },