[src/trunk]: src/external/gpl3/gcc/dist/gcc/config/rs6000 Revert our local fi...

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

details:   https://anonhg.NetBSD.org/src/rev/555b621e2f2f
branches:  trunk
changeset: 368647:555b621e2f2f
user:      rin <rin%NetBSD.org@localhost>
date:      Sun Jul 24 10:53:17 2022 +0000

description:
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).

diffstat:

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

diffs (14 lines):

diff -r 91f2bb46fee3 -r 555b621e2f2f external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c
--- a/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c Sun Jul 24 07:38:15 2022 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c Sun Jul 24 10:53:17 2022 +0000
@@ -5707,9 +5707,7 @@
 
 #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)