Module Name: src
Committed By: christos
Date: Tue Apr 27 14:18:25 UTC 2021
Modified Files:
src/external/gpl3/gcc/usr.bin/cc1objplus: Makefile
src/external/gpl3/gcc/usr.bin/cc1plus: Makefile
Log Message:
Revert the change for the c-common.c hack. It is meant to be only for 32
bit mips. (Thanks Rin)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/usr.bin/cc1objplus/Makefile
cvs rdiff -u -r1.16 -r1.17 src/external/gpl3/gcc/usr.bin/cc1plus/Makefile
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/usr.bin/cc1objplus/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1objplus/Makefile:1.2 src/external/gpl3/gcc/usr.bin/cc1objplus/Makefile:1.3
--- src/external/gpl3/gcc/usr.bin/cc1objplus/Makefile:1.2 Sun Apr 25 18:25:00 2021
+++ src/external/gpl3/gcc/usr.bin/cc1objplus/Makefile Tue Apr 27 10:18:25 2021
@@ -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.cc1obj-checksum.c+=-O0
COPTS.decl.c+=-O0
.endif
-.if ${MACHINE_MIPS64}
+.if ${MACHINE_ARCH} == "mipseb" || ${MACHINE_ARCH} == "mipsel"
COPTS.c-common.c+=-O3
.endif
Index: src/external/gpl3/gcc/usr.bin/cc1plus/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.16 src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.17
--- src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.16 Sun Apr 25 18:25:55 2021
+++ src/external/gpl3/gcc/usr.bin/cc1plus/Makefile Tue Apr 27 10:18:25 2021
@@ -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.c-ubsan.c+=-O0
COPTS.cc1plus-checksum.c+=-O0
.endif
-.if ${MACHINE_MIPS64}
+.if ${MACHINE_ARCH} == "mipseb" || ${MACHINE_ARCH} == "mipsel"
COPTS.c-common.c+=-O3
.endif
