From 8d8dd767d3c9279bef43640e3e1a8c601b0a0e8f Mon Sep 17 00:00:00 2001
From: jsg <jsg@openbsd.org>
Date: Mon, 17 Apr 2017 11:02:31 +0000
Subject: [PATCH] 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.

---
 regress/usr.bin/ssh/misc/kexfuzz/Makefile  | 4 ++--
 regress/usr.bin/ssh/unittests/Makefile.inc | 4 ++--
 usr.bin/ssh/Makefile.inc                   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/regress/usr.bin/ssh/misc/kexfuzz/Makefile b/regress/usr.bin/ssh/misc/kexfuzz/Makefile
index 3018b632f0f..d0aca8dfe7e 100644
--- a/regress/usr.bin/ssh/misc/kexfuzz/Makefile
+++ b/regress/usr.bin/ssh/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/usr.bin/ssh/unittests/Makefile.inc b/regress/usr.bin/ssh/unittests/Makefile.inc
index 74f7fe7d42c..a56294be978 100644
--- a/regress/usr.bin/ssh/unittests/Makefile.inc
+++ b/regress/usr.bin/ssh/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 $
 
 REGRESS_FAIL_EARLY?=	yes
 
@@ -50,7 +50,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/usr.bin/ssh/Makefile.inc b/usr.bin/ssh/Makefile.inc
index f14f280a6b5..e7c88f41f7c 100644
--- a/usr.bin/ssh/Makefile.inc
+++ b/usr.bin/ssh/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.50 2015/07/01 23:10:47 djm Exp $
+#	$OpenBSD: Makefile.inc,v 1.51 2017/04/17 11:02:31 jsg Exp $
 
 .include <bsd.own.mk>
 
@@ -26,7 +26,7 @@ CDIAGFLAGS+=	-Wswitch
 CDIAGFLAGS+=	-Wtrigraphs
 CDIAGFLAGS+=	-Wuninitialized
 CDIAGFLAGS+=	-Wunused
-.if ${COMPILER_VERSION} == "gcc4"
+.if ${COMPILER_VERSION:L} != "gcc3"
 CDIAGFLAGS+=	-Wold-style-definition
 .endif
 CDIAGFLAGS+=	-Wno-unused-parameter # Not clean for this yet
-- 
2.20.1