Module Name: src
Committed By: mrg
Date: Mon Feb 4 08:36:43 UTC 2019
Modified Files:
src/sys/external/isc/atheros_hal/conf: files.ath_hal
src/sys/modules/ath_hal: Makefile
Log Message:
apply -Wno-error=implicit-fallthrough to ar5212_xmit.c and ar5416_xmit.c.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/external/isc/atheros_hal/conf/files.ath_hal
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/ath_hal/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/isc/atheros_hal/conf/files.ath_hal
diff -u src/sys/external/isc/atheros_hal/conf/files.ath_hal:1.6 src/sys/external/isc/atheros_hal/conf/files.ath_hal:1.7
--- src/sys/external/isc/atheros_hal/conf/files.ath_hal:1.6 Tue Oct 14 08:17:27 2014
+++ src/sys/external/isc/atheros_hal/conf/files.ath_hal Mon Feb 4 08:36:43 2019
@@ -1,4 +1,4 @@
-# $NetBSD: files.ath_hal,v 1.6 2014/10/14 08:17:27 uebayasi Exp $
+# $NetBSD: files.ath_hal,v 1.7 2019/02/04 08:36:43 mrg Exp $
defflag opt_athhal.h ATHHAL_ASSERT ATHHAL_DEBUG ATHHAL_DEBUG_ALQ
defflag opt_athhal.h ATHHAL_WRITE_EEPROM ATHHAL_WRITE_REGDOMAIN
@@ -93,6 +93,8 @@ file external/isc/atheros_hal/dist/ar521
file external/isc/atheros_hal/dist/ar5212/ar5212_rfgain.c ath & athhal_ar5212_subr
file external/isc/atheros_hal/dist/ar5212/ar5212_xmit.c ath & athhal_ar5212_subr
+makeoptions ath "CWARNFLAGS.ar5212_xmit.c"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} == 7:? -Wno-error=implicit-fallthrough :}"
+
# Atheros AR5312 family
#
defflag opt_athhal.h ATHHAL_AR5312: athhal_eeprom_v3, athhal_ar5212_subr
@@ -140,6 +142,8 @@ file external/isc/atheros_hal/dist/ar541
file external/isc/atheros_hal/dist/ar5416/ar9285_attach.c ath & athhal_ar5416
file external/isc/atheros_hal/dist/ar5416/ar9285_reset.c ath & athhal_ar5416
+makeoptions ath "CWARNFLAGS.ar5416_xmit.c"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} == 7:? -Wno-error=implicit-fallthrough :}"
+
#
#
makeoptions ath CPPFLAGS+="-I${S}/external/isc/atheros_hal/dist"
Index: src/sys/modules/ath_hal/Makefile
diff -u src/sys/modules/ath_hal/Makefile:1.4 src/sys/modules/ath_hal/Makefile:1.5
--- src/sys/modules/ath_hal/Makefile:1.4 Sun Aug 28 15:48:19 2011
+++ src/sys/modules/ath_hal/Makefile Mon Feb 4 08:36:43 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/08/28 15:48:19 jmcneill Exp $
+# $NetBSD: Makefile,v 1.5 2019/02/04 08:36:43 mrg Exp $
.include "../Makefile.inc"
@@ -96,5 +96,10 @@ SRCS+= ar2133.c \
.include "Makefile.inc"
+.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+COPTS.ar5212_xmit.c+= -Wno-error=implicit-fallthrough
+COPTS.ar5416_xmit.c+= -Wno-error=implicit-fallthrough
+.endif
+
.include <bsd.kmodule.mk>
KMODSCRIPT= ${S}/modules/ath_hal/ath_hal.ldscript
