Module Name:    src
Committed By:   kalvisd
Date:           Sun Sep 29 16:45:29 UTC 2024

Modified Files:
        src/external/gpl3/gcc/usr.bin/backend: Makefile
        src/external/gpl3/gcc/usr.bin/cc1: Makefile
        src/external/gpl3/gcc/usr.bin/cc1obj: Makefile
        src/external/gpl3/gcc/usr.bin/cc1plus: Makefile

Log Message:
gcc: vax: reenable optimisation of compiler's code

    OK rin@


To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/external/gpl3/gcc/usr.bin/backend/Makefile
cvs rdiff -u -r1.24 -r1.25 src/external/gpl3/gcc/usr.bin/cc1/Makefile
cvs rdiff -u -r1.21 -r1.22 src/external/gpl3/gcc/usr.bin/cc1obj/Makefile
cvs rdiff -u -r1.19 -r1.20 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/backend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/backend/Makefile:1.75 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.76
--- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.75	Sun Sep 29 15:56:42 2024
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile	Sun Sep 29 16:45:29 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.75 2024/09/29 15:56:42 kalvisd Exp $
+#	$NetBSD: Makefile,v 1.76 2024/09/29 16:45:29 kalvisd Exp $
 
 HOSTPROG_CXX=	1
 LIBISPRIVATE=	yes
@@ -509,70 +509,72 @@ i386.d i386.o: pass_manager.h
 #COPTS.insn-recog.cc+=-Wno-error
 .endif
 
-.if ${GCC_MACHINE_ARCH} == "vax" && 0
+.if ${GCC_MACHINE_ARCH} == "vax"
 CPPFLAGS+=-I${.CURDIR}/../../lib/libgcc/libgcov/arch/${GCC_MACHINE_ARCH}
-COPTS.builtins.c+=-O0
-COPTS.calls.c+=-O0
-COPTS.convert.c+=-O0
-COPTS.data-streamer-out.c+=-O0
-COPTS.dse.c+=-O0					# XXX port-vax/51967
-COPTS.dwarf2out.c+=-O0
-COPTS.expmed.c+=-O0
-COPTS.expr.c+=-O0 -Wno-error=tautological-compare
-COPTS.fixed-value.c+=-O0
-COPTS.fold-const.c+=-O0
-COPTS.generic-match.c+=-O0
-COPTS.gimple-fold.c+=-O0
-COPTS.gimple-match.c+=-O0
-COPTS.gimple-ssa-strength-reduction.c+=-O0
-COPTS.gimple-ssa-warn-restrict.c+=-O0
-COPTS.gimple.c+=-O0
-COPTS.internal-fn.c+=-O0
-COPTS.lto-streamer-out.c+=-O0
-COPTS.omp-low.c+=-O0
-COPTS.predict.c+=-O0
-COPTS.range-op.cc+=-O0
-COPTS.recog.c+=-O0
-COPTS.sanopt.c+=-O0
-COPTS.stmt.c+=-O0
-COPTS.stor-layout.c+=-O0
-COPTS.targhooks.c+=-O0
-COPTS.tree-affine.c+=-O0
-COPTS.tree-cfg.c+=-O0
-COPTS.tree-data-ref.c+=-O0
-COPTS.tree-eh.c+=-O0
-COPTS.tree-if-conv.c+=-O0
-COPTS.tree-object-size.c+=-O0
-COPTS.tree-parloops.c+=-O0
-COPTS.tree-predcom.c+=-O0
-COPTS.tree-pretty-print.c+=-O0
-COPTS.tree-ssa-alias.c+=-O0
-COPTS.tree-ssa-ccp.c+=-O0
-COPTS.tree-ssa-forwprop.c+=-O0
-COPTS.tree-ssa-loop-ivopts.c+=-O0
-COPTS.tree-ssa-loop-manip.c+=-O0
-COPTS.tree-ssa-loop-niter.c+=-O0
-COPTS.tree-ssa-math-opts.c+=-O0
-COPTS.tree-ssa-phiopt.c+= -O0
-COPTS.tree-ssa-pre.c+=-O0
-COPTS.tree-ssa-reassoc.c+=-O0
-COPTS.tree-ssa-strlen.c+=-O0
-COPTS.tree-ssa-uninit.c+=-O0
-COPTS.tree-ssa.c+=-O0
-COPTS.tree-switch-conversion.c+=-O0
-COPTS.tree-vect-data-refs.c+=-O0
-COPTS.tree-vect-loop-manip.c+=-O0
-COPTS.tree-vect-loop.c+=-O0
-COPTS.tree-vect-patterns.c+=-O0
-COPTS.tree-vect-stmts.c+=-O0
-COPTS.tree-vrp.c+=-O0
-COPTS.tree.c+=-O0
-COPTS.ubsan.c+=-O0
-COPTS.varasm.c+=-O0
-COPTS.vr-values.c+=-O0
-COPTS.web.c+=-O0
-COPTS.wide-int-range.cc+=-O0
-COPTS.wide-int.cc+=-O0
+#COPTS.builtins.c+=-O0
+# COPTS.calls.c+=-O0
+# COPTS.convert.c+=-O0
+# COPTS.data-streamer-out.c+=-O0
+COPTS.dse.c+=-O1					# XXX port-vax/51967
+# COPTS.dwarf2out.c+=-O0
+#COPTS.expmed.c+=-O0
+#COPTS.expr.c+=-O0 -Wno-error=tautological-compare
+COPTS.expmed.c+=-Wno-error=tautological-compare
+COPTS.expr.c+=-Wno-error=tautological-compare
+# COPTS.fixed-value.c+=-O0
+# COPTS.fold-const.c+=-O0
+# COPTS.generic-match.c+=-O0
+# COPTS.gimple-fold.c+=-O0
+# COPTS.gimple-match.c+=-O0
+# COPTS.gimple-ssa-strength-reduction.c+=-O0
+# COPTS.gimple-ssa-warn-restrict.c+=-O0
+# COPTS.gimple.c+=-O0
+# COPTS.internal-fn.c+=-O0
+# COPTS.lto-streamer-out.c+=-O0
+# COPTS.omp-low.c+=-O0
+# COPTS.predict.c+=-O0
+# COPTS.range-op.cc+=-O0
+# COPTS.recog.c+=-O0
+# COPTS.sanopt.c+=-O0
+# COPTS.stmt.c+=-O0
+# COPTS.stor-layout.c+=-O0
+# COPTS.targhooks.c+=-O0
+# COPTS.tree-affine.c+=-O0
+# COPTS.tree-cfg.c+=-O0
+# COPTS.tree-data-ref.c+=-O0
+# COPTS.tree-eh.c+=-O0
+# COPTS.tree-if-conv.c+=-O0
+# COPTS.tree-object-size.c+=-O0
+# COPTS.tree-parloops.c+=-O0
+# COPTS.tree-predcom.c+=-O0
+# COPTS.tree-pretty-print.c+=-O0
+# COPTS.tree-ssa-alias.c+=-O0
+# COPTS.tree-ssa-ccp.c+=-O0
+# COPTS.tree-ssa-forwprop.c+=-O0
+# COPTS.tree-ssa-loop-ivopts.c+=-O0
+# COPTS.tree-ssa-loop-manip.c+=-O0
+# COPTS.tree-ssa-loop-niter.c+=-O0
+# COPTS.tree-ssa-math-opts.c+=-O0
+# COPTS.tree-ssa-phiopt.c+= -O0
+# COPTS.tree-ssa-pre.c+=-O0
+# COPTS.tree-ssa-reassoc.c+=-O0
+# COPTS.tree-ssa-strlen.c+=-O0
+# COPTS.tree-ssa-uninit.c+=-O0
+# COPTS.tree-ssa.c+=-O0
+# COPTS.tree-switch-conversion.c+=-O0
+# COPTS.tree-vect-data-refs.c+=-O0
+# COPTS.tree-vect-loop-manip.c+=-O0
+# COPTS.tree-vect-loop.c+=-O0
+# COPTS.tree-vect-patterns.c+=-O0
+# COPTS.tree-vect-stmts.c+=-O0
+# COPTS.tree-vrp.c+=-O0
+# COPTS.tree.c+=-O0
+# COPTS.ubsan.c+=-O0
+# COPTS.varasm.c+=-O0
+# COPTS.vr-values.c+=-O0
+# COPTS.web.c+=-O0
+# COPTS.wide-int-range.cc+=-O0
+# COPTS.wide-int.cc+=-O0
 .endif
 
 COPTS.tree.cc+=	${${ACTIVE_CC} == "clang" :? -O0 :}

Index: src/external/gpl3/gcc/usr.bin/cc1/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.24 src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.25
--- src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.24	Sun Sep 29 16:02:32 2024
+++ src/external/gpl3/gcc/usr.bin/cc1/Makefile	Sun Sep 29 16:45:29 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.24 2024/09/29 16:02:32 kalvisd Exp $
+#	$NetBSD: Makefile,v 1.25 2024/09/29 16:45:29 kalvisd Exp $
 
 PROG=		cc1
 SRCS=		${G_C_OBJS:S,c-family/,,:S,c/,,:S,known-headers.o,known-headers.cc,:S,c-spellcheck.o,c-spellcheck.cc,:Nlibcpp.a:.o=.cc}
@@ -48,11 +48,11 @@ BUILDSYMLINKS+= ${GNUHOSTDIST}/gcc/confi
 .endif
 
 .if ${MACHINE_CPU} == "vax" && 0
-COPTS.c-decl.c+=-O0
-COPTS.c-typeck.c+=-O0
+#COPTS.c-decl.c+=-O0
+#COPTS.c-typeck.c+=-O0
 #COPTS.c-array-notation.c+=-O0
-COPTS.c-common.c+=-O0
-COPTS.c-ada-spec.c+=-O0
+#COPTS.c-common.c+=-O0
+#COPTS.c-ada-spec.c+=-O0
 #COPTS.cilk.c+=-O0
 #COPTS.c-ubsan.c+=-O0
 #COPTS.cc1-checksum.c+=-O0

Index: src/external/gpl3/gcc/usr.bin/cc1obj/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.21 src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.22
--- src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.21	Sun Sep 29 16:02:32 2024
+++ src/external/gpl3/gcc/usr.bin/cc1obj/Makefile	Sun Sep 29 16:45:29 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.21 2024/09/29 16:02:32 kalvisd Exp $
+#	$NetBSD: Makefile,v 1.22 2024/09/29 16:45:29 kalvisd Exp $
 
 MYOBJS=		${G_OBJC_OBJS} ${G_C_AND_OBJC_OBJS} 
 PROG=		cc1obj
@@ -47,11 +47,11 @@ COPTS.objc-gnu-runtime-abi-01.cc+=	-Wno-
 COPTS.objc-next-runtime-abi-01.cc+=	-Wno-error=stack-protector
 
 .if ${MACHINE_ARCH} == "vax" && 0
-COPTS.c-decl.c+=-O0
-COPTS.c-typeck.c+=-O0
+#COPTS.c-decl.c+=-O0
+#COPTS.c-typeck.c+=-O0
 #COPTS.c-array-notation.c+=-O0
-COPTS.c-common.c+=-O0
-COPTS.c-ada-spec.c+=-O0
+#COPTS.c-common.c+=-O0
+#COPTS.c-ada-spec.c+=-O0
 #COPTS.cilk.c+=-O0
 #COPTS.c-ubsan.c+=-O0
 #COPTS.cc1obj-checksum.c+=-O0

Index: src/external/gpl3/gcc/usr.bin/cc1plus/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.19 src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.20
--- src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.19	Sun Sep 29 16:02:32 2024
+++ src/external/gpl3/gcc/usr.bin/cc1plus/Makefile	Sun Sep 29 16:45:29 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.19 2024/09/29 16:02:32 kalvisd Exp $
+#	$NetBSD: Makefile,v 1.20 2024/09/29 16:45:29 kalvisd 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=.cc}
@@ -35,17 +35,17 @@ CHECKSUM_OBJS= ${LIBBACKTRACEOBJ}/libbac
 CFLAGS+=	-Wno-error=stack-protector
 
 .if ${MACHINE_ARCH} == "vax" && 0
-COPTS.call.c+=-O0
-COPTS.decl.c+=-O0
+#COPTS.call.c+=-O0
+#COPTS.decl.c+=-O0
 #COPTS.typeck2.c+=-O0
 #COPTS.class.c+=-O0
-COPTS.typeck.c+=-O0
-COPTS.init.c+=-O0
-COPTS.semantics.c+=-O0
+#COPTS.typeck.c+=-O0
+#COPTS.init.c+=-O0
+#COPTS.semantics.c+=-O0
 #COPTS.mangle.c+=-O0
-COPTS.constexpr.c+=-O0
-COPTS.c-common.c+=-O0
-COPTS.c-ada-spec.c+=-O0
+#COPTS.constexpr.c+=-O0
+#COPTS.c-common.c+=-O0
+#COPTS.c-ada-spec.c+=-O0
 #COPTS.cilk.c+=-O0
 #COPTS.c-ubsan.c+=-O0
 #COPTS.cc1plus-checksum.c+=-O0

Reply via email to