aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog10
-rw-r--r--gcc/config/rs6000/rs6000.c4
2 files changed, 12 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index acde3e9..9549613 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2017-12-04 Segher Boessenkool <segher@kernel.crashing.org>
+
+ PR bootstrap/83265
+ Revert
+ 2017-12-01 Segher Boessenkool <segher@kernel.crashing.org>
+
+ PR target/43871
+ * config/rs6000/rs6000.c (rs6000_option_override_internal): Set
+ rs6000_cpu based on cpu_index, not tune_index.
+
2017-12-04 Richard Biener <rguenther@suse.de>
PR tree-optimization/83238
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index ed668d0..045a014 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -4184,8 +4184,8 @@ rs6000_option_override_internal (bool global_init_p)
}
}
- gcc_assert (cpu_index >= 0);
- rs6000_cpu = processor_target_table[cpu_index].processor;
+ gcc_assert (tune_index >= 0);
+ rs6000_cpu = processor_target_table[tune_index].processor;
if (rs6000_cpu == PROCESSOR_PPCE300C2 || rs6000_cpu == PROCESSOR_PPCE300C3
|| rs6000_cpu == PROCESSOR_PPCE500MC || rs6000_cpu == PROCESSOR_PPCE500MC64