upstream commit

Change COMPILER_VERSION tests which limited additional
warnings to gcc4 to instead skip them on gcc3 as clang can handle
-Wpointer-sign and -Wold-style-definition.

Upstream-Regress-ID: e48d7dc13e48d9334b8195ef884dfbc51316012f

diff --git a/regress/misc/kexfuzz/Makefile b/regress/misc/kexfuzz/Makefile
index 3018b632f0fed5b9245bc204b880fc98a14f0981..d0aca8dfe7e7c688108637b18e24809d7db15ded 100644 (file)
--- a/regress/misc/kexfuzz/Makefile
+++ b/regress/misc/kexfuzz/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.1 2016/03/04 02:30:37 djm Exp $
+#      $OpenBSD: Makefile,v 1.2 2017/04/17 11:02:31 jsg Exp $
 
 .include <bsd.own.mk>
 .include <bsd.obj.mk>
@@ -49,7 +49,7 @@ CDIAGFLAGS+=  -Wswitch
 CDIAGFLAGS+=   -Wtrigraphs
 CDIAGFLAGS+=   -Wuninitialized
 CDIAGFLAGS+=   -Wunused
-.if ${COMPILER_VERSION} == "gcc4"
+.if ${COMPILER_VERSION:L} != "gcc3"
 CDIAGFLAGS+=   -Wpointer-sign
 CDIAGFLAGS+=   -Wold-style-definition
 .endif

diff --git a/regress/unittests/Makefile.inc b/regress/unittests/Makefile.inc
index 3d9eaba5c94eddb0fce4b59c6cf58337ddc4a1f0..00c9dd19180abfced29dfdf6b25a54bf4678687a 100644 (file)
--- a/regress/unittests/Makefile.inc
+++ b/regress/unittests/Makefile.inc
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile.inc,v 1.9 2016/11/01 13:43:27 tb Exp $
+#      $OpenBSD: Makefile.inc,v 1.10 2017/04/17 11:02:31 jsg Exp $
 
 .include <bsd.own.mk>
 .include <bsd.obj.mk>
@@ -30,7 +30,7 @@ CDIAGFLAGS+=  -Wswitch
 CDIAGFLAGS+=   -Wtrigraphs
 CDIAGFLAGS+=   -Wuninitialized
 CDIAGFLAGS+=   -Wunused
-.if ${COMPILER_VERSION} == "gcc4"
+.if ${COMPILER_VERSION:L} != "gcc3"
 CDIAGFLAGS+=   -Wpointer-sign
 CDIAGFLAGS+=   -Wold-style-definition
 .endif