Module Name:    src
Committed By:   rin
Date:           Sun Jul 24 10:53:18 UTC 2022

Modified Files:
        src/external/gpl3/gcc/dist/gcc/config/rs6000: rs6000.c

Log Message:
Revert our local fix for GCC 10.3 introduced in rev. 1.25:
http://cvsweb.netbsd.org/bsdweb.cgi/src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c#rev1.25

The problem has been fixed differently by upstream:
- master: 
https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=77eccbf39ed55297802bb66dff5f62507a7239e3
- gcc-10: 
https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=6142d65f4f528067f31e86bb97c07a661f2d66e7

No regression observed for ATF on oea (sandpoint), booke (evbppc), and
405 (evbppc). The system boots successfully on 403 (evbppc).


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 \
    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.30 src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c:1.31
--- src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c:1.30	Fri Jul 22 20:22:35 2022
+++ src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c	Sun Jul 24 10:53:17 2022
@@ -5707,9 +5707,7 @@ rs6000_file_start (void)
 
 #ifdef USING_ELFOS_H
   rs6000_machine = rs6000_machine_from_flags ();
-  if (!(rs6000_default_cpu && rs6000_default_cpu[0])
-	&& !global_options_set.x_rs6000_cpu_index)
-    emit_asm_machine ();
+  emit_asm_machine ();
 #endif
 
   if (DEFAULT_ABI == ABI_ELFv2)

Reply via email to