From 660633dba6ae7801c67efd93fe7eb5f99f924bb3 Mon Sep 17 00:00:00 2001 From: segher Date: Fri, 22 Jul 2016 13:08:19 +0000 Subject: [PATCH] Subject: [PATCH] rs6000: Fix logic for when to emit .machine (PR71216) The current logic determining whether to use .machine in the generated asm code puts it there if the compiler is not configured with a default target cpu, _or_ no -mcpu= was given on the command line. It should be "and" instead. PR target/71216 * config/rs6000/rs6000.c (rs6000_file_start): Fix condition for when to emit a ".machine" pseudo-op. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@238639 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 5 +++++ gcc/config/rs6000/rs6000.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f889abd32126..b44bae6d32ae 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2016-07-22 Segher Boessenkool + + * config/rs6000/rs6000.c (rs6000_file_start): Fix condition for + when to emit a ".machine" pseudo-op. + 2016-07-22 Martin Liska PR gcov-profile/69028 diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index 6fe94d5084c0..7d47f45989e8 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -5794,8 +5794,8 @@ rs6000_file_start (void) } #ifdef USING_ELFOS_H - if (rs6000_default_cpu == 0 || rs6000_default_cpu[0] == '\0' - || !global_options_set.x_rs6000_cpu_index) + if (!(rs6000_default_cpu && rs6000_default_cpu[0]) + && !global_options_set.x_rs6000_cpu_index) { fputs ("\t.machine ", asm_out_file); if ((rs6000_isa_flags & OPTION_MASK_MODULO) != 0) -- 2.47.3