Module Name: src Committed By: rin Date: Sun Dec 18 03:00:58 UTC 2016
Modified Files: src/external/gpl3/gcc/dist/gcc/config/rs6000: rs6000.c Log Message: 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 To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 \ src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c diff -u src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c:1.15 src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c:1.16 --- src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c:1.15 Tue Jun 7 06:14:17 2016 +++ src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c Sun Dec 18 03:00:58 2016 @@ -5185,8 +5185,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_DIRECT_MOVE) != 0)