[src/trunk]: src/external/gpl3/gcc/usr.bin Revert the change for the c-common...

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

details:   https://anonhg.NetBSD.org/src/rev/18b173cfc5e9
branches:  trunk
changeset: 962016:18b173cfc5e9
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Apr 27 14:18:25 2021 +0000

description:
Revert the change for the c-common.c hack. It is meant to be only for 32
bit mips. (Thanks Rin)

diffstat:

 external/gpl3/gcc/usr.bin/cc1objplus/Makefile |  4 ++--
 external/gpl3/gcc/usr.bin/cc1plus/Makefile    |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 1ad6ef9340ef -r 18b173cfc5e9 external/gpl3/gcc/usr.bin/cc1objplus/Makefile
--- a/external/gpl3/gcc/usr.bin/cc1objplus/Makefile     Tue Apr 27 09:14:24 2021 +0000
+++ b/external/gpl3/gcc/usr.bin/cc1objplus/Makefile     Tue Apr 27 14:18:25 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2021/04/25 22:25:00 christos Exp $
+#      $NetBSD: Makefile,v 1.3 2021/04/27 14:18:25 christos Exp $
 
 # XXX: Pull this (G_OBJCXX_OBJS) out with mknative-gcc.  Needs some
 # minor re-org of cc1plus and perhaps cc1obj.  G_CXX_AND_OBJCXX_OBJS
@@ -81,7 +81,7 @@
 COPTS.decl.c+=-O0
 .endif
 
-.if ${MACHINE_MIPS64}
+.if ${MACHINE_ARCH} == "mipseb" || ${MACHINE_ARCH} == "mipsel"
 COPTS.c-common.c+=-O3
 .endif
 
diff -r 1ad6ef9340ef -r 18b173cfc5e9 external/gpl3/gcc/usr.bin/cc1plus/Makefile
--- a/external/gpl3/gcc/usr.bin/cc1plus/Makefile        Tue Apr 27 09:14:24 2021 +0000
+++ b/external/gpl3/gcc/usr.bin/cc1plus/Makefile        Tue Apr 27 14:18:25 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.16 2021/04/25 22:25:55 christos Exp $
+#      $NetBSD: Makefile,v 1.17 2021/04/27 14:18:25 christos Exp $
 
 PROG=          cc1plus
 SRCS=          
${G_CXX_OBJS:S,c-family/,,:S,cp/,,:S,constraint.o,constraint.cc,:S,logic.o,logic.cc,:S,known-headers.o,known-headers.cc,:S,c-spellcheck.o,c-spellcheck.cc,:S,coroutines.o,coroutines.cc,:Nlibcpp.a:.o=.c}
@@ -48,7 +48,7 @@
 COPTS.cc1plus-checksum.c+=-O0
 .endif
 
-.if ${MACHINE_MIPS64}
+.if ${MACHINE_ARCH} == "mipseb" || ${MACHINE_ARCH} == "mipsel"
 COPTS.c-common.c+=-O3
 .endif