aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorSegher Boessenkool <segher@kernel.crashing.org>2016-07-22 15:08:19 +0200
committerSegher Boessenkool <segher@gcc.gnu.org>2016-07-22 15:08:19 +0200
commit01a0d7f57b8a0e87cde0aac7e0693bcaa5745898 (patch)
tree5289b1458a53ca8392b65489e91cf8143221538a /gcc
parent1603ebe016da010dcfe264901c4f9a07f9d89e63 (diff)
downloadgcc-01a0d7f57b8a0e87cde0aac7e0693bcaa5745898.zip
gcc-01a0d7f57b8a0e87cde0aac7e0693bcaa5745898.tar.gz
gcc-01a0d7f57b8a0e87cde0aac7e0693bcaa5745898.tar.bz2
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. From-SVN: r238639
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/config/rs6000/rs6000.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f889abd..b44bae6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2016-07-22 Segher Boessenkool <segher@kernel.crashing.org>
+
+ * config/rs6000/rs6000.c (rs6000_file_start): Fix condition for
+ when to emit a ".machine" pseudo-op.
+
2016-07-22 Martin Liska <mliska@suse.cz>
PR gcov-profile/69028
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 6fe94d5..7d47f45 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)