Module Name:    src
Committed By:   mrg
Date:           Mon Sep  7 00:29:15 UTC 2020

Modified Files:
        src/tests/fs/common: Makefile
        src/tests/lib/libc/misc: Makefile

Log Message:
avoid new GCC 9 warnings.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/tests/fs/common/Makefile
cvs rdiff -u -r1.6 -r1.7 src/tests/lib/libc/misc/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/fs/common/Makefile
diff -u src/tests/fs/common/Makefile:1.14 src/tests/fs/common/Makefile:1.15
--- src/tests/fs/common/Makefile:1.14	Mon Jun  1 14:42:03 2020
+++ src/tests/fs/common/Makefile	Mon Sep  7 00:29:14 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.14 2020/06/01 14:42:03 christos Exp $
+#	$NetBSD: Makefile,v 1.15 2020/09/07 00:29:14 mrg Exp $
 #
 
 .include <bsd.own.mk>
@@ -40,6 +40,7 @@ CPPFLAGS+=	-DMOUNT_NOMAIN -DMOUNTNFS_RET
 CPPFLAGS+=	-DUSE_RUMP -DLFS_CLEANER_AS_LIB
 
 CWARNFLAGS.clang+=	-Wno-error=absolute-value
+CWARNFLAGS.gcc+=	${GCC_NO_ADDR_OF_PACKED_MEMBER}
 COPTS.fstest_nfs.c+=	${GCC_NO_FORMAT_TRUNCATION}
 COPTS.clnt_bcast.c+=	${GCC_NO_CAST_FUNCTION_TYPE}
 COPTS.clnt_generic.c+=	${GCC_NO_CAST_FUNCTION_TYPE}

Index: src/tests/lib/libc/misc/Makefile
diff -u src/tests/lib/libc/misc/Makefile:1.6 src/tests/lib/libc/misc/Makefile:1.7
--- src/tests/lib/libc/misc/Makefile:1.6	Thu Jan 30 00:42:58 2020
+++ src/tests/lib/libc/misc/Makefile	Mon Sep  7 00:29:14 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2020/01/30 00:42:58 christos Exp $
+# $NetBSD: Makefile,v 1.7 2020/09/07 00:29:14 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -28,12 +28,14 @@ CWARNFLAGS.clang+=	-Wno-nullability-comp
 .endif
 COPTS.t_ubsan.c += -Wno-stack-protector
 COPTS.t_ubsanxx.cpp += -Wno-stack-protector
-COPTS.ubsan.c+=    ${${ACTIVE_CC} == "clang" && ${MACHINE_ARCH} == "powerpc":?  -O0 :}
-
+COPTS.ubsan.c+=    ${${ACTIVE_CC} == "clang" && ${MACHINE_ARCH} == "powerpc":? -O0 :}
 
 .if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
-COPTS.t_ubsan.c+=	-Wno-int-in-bool-context
-COPTS.t_ubsanxx.cpp+=	-Wno-int-in-bool-context
+COPTS.t_ubsan.c+=	${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 7:? -Wno-int-in-bool-context :}
+COPTS.t_ubsanxx.cpp+=	${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 7:? -Wno-int-in-bool-context :}
 .endif
 
+# XXX
+COPTS.ubsan.c+=    	${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 9:? -Wno-error=builtin-declaration-mismatch :}
+
 .include <bsd.test.mk>

Reply via email to