upstream: Prepare for gcc 3 leaving the building, COMPILER_VERSION

can no longer get set to "gcc3".

OpenBSD-Regress-ID: 02351ea947975b80be60b9a8c6e4dbb57789e890

diff --git a/regress/misc/sk-dummy/Makefile b/regress/misc/sk-dummy/Makefile
index 18b0a243f66412b8b79e77288bfd6d393cbeb4b3..4e6babc6885ab7cc5fddf9ae2a707f0507ceff59 100644 (file)
--- a/regress/misc/sk-dummy/Makefile
+++ b/regress/misc/sk-dummy/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.3 2023/01/15 23:35:10 djm Exp $
+#      $OpenBSD: Makefile,v 1.4 2025/10/23 19:06:10 miod Exp $
 
 .include <bsd.own.mk>
 .include <bsd.obj.mk>
@@ -36,6 +36,7 @@ CDIAGFLAGS+=  -Wimplicit
 CDIAGFLAGS+=   -Winline
 CDIAGFLAGS+=   -Wmissing-declarations
 CDIAGFLAGS+=   -Wmissing-prototypes
+CDIAGFLAGS+=   -Wold-style-definition
 CDIAGFLAGS+=   -Wparentheses
 CDIAGFLAGS+=   -Wpointer-arith
 CDIAGFLAGS+=   -Wreturn-type
@@ -48,9 +49,6 @@ CDIAGFLAGS+=  -Wtrigraphs
 CDIAGFLAGS+=   -Wuninitialized
 CDIAGFLAGS+=   -Wunused
 CDIAGFLAGS+=   -Wno-unused-parameter
-.if ${COMPILER_VERSION:L} != "gcc3"
-CDIAGFLAGS+=   -Wold-style-definition
-.endif
 
 CFLAGS+=-I${.CURDIR}/${SSHREL}
 

diff --git a/regress/misc/ssh-verify-attestation/Makefile b/regress/misc/ssh-verify-attestation/Makefile
index 06fb8aac4e987a91e0eece0d8d334ab6c08bc685..4665555cdaf642fd09fdecab0865b38862bc9b6e 100644 (file)
--- a/regress/misc/ssh-verify-attestation/Makefile
+++ b/regress/misc/ssh-verify-attestation/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.2 2025/05/06 06:05:48 djm Exp $
+#      $OpenBSD: Makefile,v 1.3 2025/10/23 19:06:10 miod Exp $
 
 .include <bsd.own.mk>
 .include <bsd.obj.mk>
@@ -46,6 +46,7 @@ CDIAGFLAGS+=  -Wimplicit
 CDIAGFLAGS+=   -Winline
 CDIAGFLAGS+=   -Wmissing-declarations
 CDIAGFLAGS+=   -Wmissing-prototypes
+CDIAGFLAGS+=   -Wold-style-definition
 CDIAGFLAGS+=   -Wparentheses
 CDIAGFLAGS+=   -Wpointer-arith
 CDIAGFLAGS+=   -Wreturn-type
@@ -58,9 +59,6 @@ CDIAGFLAGS+=  -Wtrigraphs
 CDIAGFLAGS+=   -Wuninitialized
 CDIAGFLAGS+=   -Wunused
 CDIAGFLAGS+=   -Wno-unused-parameter
-.if ${COMPILER_VERSION:L} != "gcc3"
-CDIAGFLAGS+=   -Wold-style-definition
-.endif
 
 CFLAGS+=-I${.CURDIR}/${SSHREL}
 

diff --git a/regress/unittests/Makefile.inc b/regress/unittests/Makefile.inc
index 5fcf7a950a39db2de5e27176df83603c01deac7e..a5c2e8c21188fb1046acd5e0b8a3b707d167ac1d 100644 (file)
--- a/regress/unittests/Makefile.inc
+++ b/regress/unittests/Makefile.inc
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.inc,v 1.18 2025/05/06 06:05:48 djm Exp $
+#      $OpenBSD: Makefile.inc,v 1.19 2025/10/23 19:06:10 miod Exp $
 
 .include <bsd.own.mk>
 .include <bsd.obj.mk>
@@ -38,6 +38,7 @@ CDIAGFLAGS+=  -Wimplicit
 CDIAGFLAGS+=   -Winline
 CDIAGFLAGS+=   -Wmissing-declarations
 CDIAGFLAGS+=   -Wmissing-prototypes
+CDIAGFLAGS+=   -Wold-style-definition
 CDIAGFLAGS+=   -Wparentheses
 CDIAGFLAGS+=   -Wpointer-arith
 CDIAGFLAGS+=   -Wreturn-type
@@ -50,9 +51,6 @@ CDIAGFLAGS+=  -Wtrigraphs
 CDIAGFLAGS+=   -Wuninitialized
 CDIAGFLAGS+=   -Wunused
 CDIAGFLAGS+=   -Wno-unused-parameter
-.if ${COMPILER_VERSION:L} != "gcc3"
-CDIAGFLAGS+=   -Wold-style-definition
-.endif
 
 SSHREL=../../../../../usr.bin/ssh