From 43392796bf60c8b4e9eac3ffbf226c894045ad9e Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Mon, 1 Apr 2019 10:54:47 +0200
Subject: [PATCH] Clean up some gcc50 remains.

---
 gnu/usr.bin/cc47/Makefile.inc | 2 +-
 share/mk/bsd.sys.mk           | 4 ++--
 sys/conf/kern.pre.mk          | 2 +-
 sys/conf/kmod.mk              | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/usr.bin/cc47/Makefile.inc b/gnu/usr.bin/cc47/Makefile.inc
index 218078987c..2166c00e26 100644
--- a/gnu/usr.bin/cc47/Makefile.inc
+++ b/gnu/usr.bin/cc47/Makefile.inc
@@ -58,7 +58,7 @@ CFLAGS+=	-DPREFIX2=\"${USRDATA_PREFIX}/usr\"
 CFLAGS+= -DCROSS_COMPILE
 .endif
 
-# when building with gcc50 creates just too much noise
+# when building with newer GCCs it creates just too much noise
 .if ${CCVER:Mgcc*} && !${CCVER:Mgcc4[789]}
 CWARNFLAGS+=	-Wno-switch-bool
 .endif
diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
index 572a69951c..1ff7a002b2 100644
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -34,7 +34,7 @@ _cnowarnflags=
 . if defined(WARNS)
 .  if ${WARNS} >= 1
 CWARNFLAGS	+=	-Wmissing-include-dirs -Wsystem-headers
-.   if !defined(NO_WERROR) && (${_WCCVER} == "gcc47" || ${_WCCVER} == "gcc50" || ${_WCCVER} == "gcc80")
+.   if !defined(NO_WERROR) && (${_WCCVER} == "gcc47" || ${_WCCVER} == "gcc80")
 CWARNFLAGS	+=	-Werror
 .   endif
 .  endif
@@ -118,7 +118,7 @@ WFORMAT		=	1
 . if defined(WFORMAT)
 .  if ${WFORMAT} > 0
 CWARNFLAGS	+=	-Wformat=2
-.   if !defined(NO_WERROR) && (${_WCCVER} == "gcc47" || ${_WCCVER} == "gcc50")
+.   if !defined(NO_WERROR) && (${_WCCVER} == "gcc47" || ${_WCCVER} == "gcc80")
 CWARNFLAGS	+=	-Werror
 .   endif
 .  endif
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index a68b7269ef..1dd4c33bf7 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -87,7 +87,7 @@ NORMAL_M= awk -f $S/tools/makeobjops.awk -- -c $<; \
 NORMAL_FW= uudecode -o ${.TARGET} ${.ALLSRC}
 NORMAL_FWO= ${LD} -b binary -d -warn-common -r -o ${.TARGET} ${.ALLSRC:M*.fw}
 
-.if !defined(NO_WERROR) && (${CCVER} == "gcc47" || ${CCVER} == "gcc50" || ${CCVER} == "gcc80")
+.if !defined(NO_WERROR) && (${CCVER} == "gcc47" || ${CCVER} == "gcc80")
 WERROR=-Werror
 .endif
 
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 1c6c58c732..86db82a584 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -77,7 +77,7 @@ KMODMODE?=	${BINMODE}
 
 .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S
 
-.if !defined(NO_WERROR) && (${CCVER} == "gcc47" || ${CCVER} == "gcc50" || ${CCVER} == "gcc80")
+.if !defined(NO_WERROR) && (${CCVER} == "gcc47" || ${CCVER} == "gcc80")
 WERROR=-Werror
 .endif
 
-- 
2.41.0