Fix breakage introduced by r276985.

	* config/avr/avr.c (avr_option_override): Remove set of
	PARAM_ALLOW_STORE_DATA_RACES.
	* common/config/avr/avr-common.c (avr_option_optimization_table)
	[OPT_LEVELS_ALL]: Turn on -fallow-store-data-races.

From-SVN: r277115

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7cc72d7ee021b23b817c009fed3a50225df1196c..2d91ec1938bd142a9e7ddd1005aa8fe9784e6278 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2019-10-17  Georg-Johann Lay  <avr@gjlay.de>
+
+       Fix breakage introduced by r276985.
+
+       * config/avr/avr.c (avr_option_override): Remove set of
+       PARAM_ALLOW_STORE_DATA_RACES.
+       * common/config/avr/avr-common.c (avr_option_optimization_table)
+       [OPT_LEVELS_ALL]: Turn on -fallow-store-data-races.
+
 2019-10-17  H.J. Lu  <hongjiu.lu@intel.com>
 
        * config/i386/i386.h (processor_costs): Add clear_ratio.

diff --git a/gcc/common/config/avr/avr-common.c b/gcc/common/config/avr/avr-common.c
index 15ba440321668efb0c825fc9c416f7999e87f4fe..dae42e7d46dcdb60b200bc4430d28e92ea749fee 100644 (file)
--- a/gcc/common/config/avr/avr-common.c
+++ b/gcc/common/config/avr/avr-common.c
@@ -38,6 +38,11 @@ static const struct default_options avr_option_optimization_table[] =
     { OPT_LEVELS_ALL, OPT_fcaller_saves, NULL, 0 },
     { OPT_LEVELS_1_PLUS_NOT_DEBUG, OPT_mgas_isr_prologues, NULL, 1 },
     { OPT_LEVELS_1_PLUS, OPT_mmain_is_OS_task, NULL, 1 },
+    /* Allow optimizer to introduce store data races. This used to be the
+       default -- it was changed because bigger targets did not see any
+       performance decrease. For the AVR though, disallowing data races
+       introduces additional code in LIM and increases reg pressure.  */
+    { OPT_LEVELS_ALL, OPT_fallow_store_data_races, NULL, 1 },
     { OPT_LEVELS_NONE, 0, NULL, 0 }
   };
 

diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c
index 3ccff8ebedc4633373c6c3951a93977fabff7ef8..c630a309229b2e997ef801b563c39b7fedaf5e40 100644 (file)
--- a/gcc/config/avr/avr.c
+++ b/gcc/config/avr/avr.c
@@ -741,15 +741,6 @@ avr_option_override (void)
   if (avr_strict_X)
     flag_caller_saves = 0;
 
-  /* Allow optimizer to introduce store data races. This used to be the
-     default - it was changed because bigger targets did not see any
-     performance decrease. For the AVR though, disallowing data races
-     introduces additional code in LIM and increases reg pressure.  */
-
-  maybe_set_param_value (PARAM_ALLOW_STORE_DATA_RACES, 1,
-                         global_options.x_param_values,
-                         global_options_set.x_param_values);
-
   /* Unwind tables currently require a frame pointer for correctness,
      see toplev.c:process_options().  */