[src/trunk]: src/external/gpl3/gcc/dist/gcc/config/rs6000 PR port-powerpc/513...

[rin <rin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/19a1bcfd68e4
branches:  trunk
changeset: 819807:19a1bcfd68e4
user:      rin <rin%NetBSD.org@localhost>
date:      Sun Dec 18 03:00:58 2016 +0000

description:
PR port-powerpc/51366 kernel for powerpc/ibm4xx miscompiled by gcc >= 4.8.5
backport fix from upstream:

URL: https://gcc.gnu.org/viewcvs?rev=238789&root=gcc&view=rev
Log:
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.

Modified:
    branches/gcc-5-branch/gcc/ChangeLog
    branches/gcc-5-branch/gcc/config/rs6000/rs6000.c

diffstat:

 external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (14 lines):

diff -r 2a196ecdb915 -r 19a1bcfd68e4 external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c
--- a/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c Sun Dec 18 02:26:12 2016 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c Sun Dec 18 03:00:58 2016 +0000
@@ -5185,8 +5185,8 @@
     }
 
 #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_DIRECT_MOVE) != 0)