Module Name: src
Committed By: mrg
Date: Sun Oct 13 07:28:23 UTC 2019
Modified Files:
src/bin/pax: Makefile
src/crypto/external/bsd/netpgp/bin/netpgpverify: Makefile
src/crypto/external/bsd/netpgp/lib/netpgp: Makefile
src/crypto/external/bsd/netpgp/lib/verify: Makefile
src/crypto/external/bsd/openssh/bin/ssh: Makefile
src/crypto/external/bsd/openssh/bin/ssh-agent: Makefile
src/crypto/external/bsd/openssh/bin/ssh-keygen: Makefile
src/crypto/external/bsd/openssh/bin/sshd: Makefile
src/crypto/external/bsd/openssh/lib: Makefile
src/external/bsd/am-utils/bin/amd: Makefile
src/external/bsd/fetch/lib: Makefile
src/external/bsd/flex/bin: Makefile
src/external/bsd/ipf: Makefile.inc
src/external/bsd/ipf/bin/ipftest: Makefile
src/external/bsd/iscsi/lib: Makefile
src/external/bsd/libarchive/lib/libarchive: Makefile
src/external/bsd/libpcap/lib: Makefile
src/external/bsd/llvm/lib/libLLVMAnalysis: Makefile
src/external/bsd/llvm/lib/libLLVMRuntimeDyld: Makefile
src/external/bsd/mdocml/bin/mandoc: Makefile
src/external/bsd/ntp/bin/ntpd: Makefile
src/external/bsd/ntp/bin/ntpq: Makefile
src/external/bsd/ntp/bin/sntp: Makefile
src/external/bsd/ntp/lib/libntp: Makefile
src/external/bsd/pdisk/bin: Makefile
src/external/bsd/ppp/usr.sbin/pppd: Makefile
src/external/bsd/ppp/usr.sbin/pppstats: Makefile
src/external/bsd/tmux/usr.bin/tmux: Makefile
src/external/bsd/top/bin: Makefile
src/external/cddl/osnet/lib/libdtrace: Makefile
src/external/gpl2/groff/bin/troff: Makefile
src/external/gpl2/xcvs/bin/xcvs: Makefile
src/external/gpl3/gcc/lib/libiberty: Makefile
src/external/mit/xorg/bin/xconsole: Makefile
src/external/mit/xorg/bin/xmh: Makefile
src/external/mit/xorg/lib/libX11: Makefile.ximcp Makefile.xlibi18n
src/external/mit/xorg/lib/libXvMCW: Makefile
src/external/mit/xorg/lib/libxkbfile: Makefile
src/external/mit/xorg/server/drivers/xf86-video-sis: Makefile
src/external/mpl/bind/bin/dnssec/dnssec-verify: Makefile
src/external/mpl/dhcp/bin/relay: Makefile
src/external/mpl/dhcp/lib/common: Makefile
src/external/zlib/pigz/bin/pigz: Makefile
src/games/hack: Makefile
src/games/hunt/hunt: Makefile
src/games/rogue: Makefile
src/games/tetris: Makefile
src/lib/libc/citrus: Makefile.inc
src/lib/libc/net: Makefile.inc
src/lib/libc/resolv: Makefile.inc
src/lib/libc/rpc: Makefile.inc
src/lib/libedit: Makefile
src/lib/libisns: Makefile
src/lib/libpam/modules/pam_lastlog: Makefile
src/lib/librump: Makefile
src/lib/librumpclient: Makefile
src/lib/librumpres: Makefile
src/lib/librumpuser: Makefile
src/lib/libutil: Makefile
src/libexec/ftpd: Makefile
src/libexec/rpc.rquotad: Makefile
src/libexec/rpc.rstatd: Makefile
src/libexec/rpc.rusersd: Makefile
src/libexec/rpc.rwalld: Makefile
src/libexec/rpc.sprayd: Makefile
src/sbin/disklabel: Makefile
src/sbin/dump: Makefile
src/sbin/dump_lfs: Makefile
src/sbin/fdisk: Makefile
src/sbin/init: Makefile
src/sbin/iscsictl: Makefile
src/sbin/pppoectl: Makefile
src/sbin/raidctl: Makefile
src/sbin/restore: Makefile
src/sbin/rndctl: Makefile
src/sbin/route: Makefile
src/sbin/routed: Makefile
src/sbin/umount: Makefile
src/share/mk: bsd.own.mk
src/sys/modules/coredump: Makefile
src/sys/modules/filemon: Makefile
src/sys/modules/ptrace_common: Makefile
src/sys/rump/librump/rumpkern: Makefile.rumpkern
src/sys/rump/net/lib/libnet: Makefile
src/tests/fs/common: Makefile
src/tests/fs/nfs/nfsservice: Makefile
src/tests/lib/libc/rpc: Makefile
src/tests/lib/libc/ssp: Makefile
src/tests/lib/libevent: Makefile
src/usr.bin/btpin: Makefile
src/usr.bin/config: Makefile
src/usr.bin/crunch/crunchgen: Makefile
src/usr.bin/cvslatest: Makefile
src/usr.bin/fstat: Makefile
src/usr.bin/hexdump: Makefile
src/usr.bin/login: Makefile
src/usr.bin/mail: Makefile
src/usr.bin/make: Makefile
src/usr.bin/man: Makefile
src/usr.bin/mklocale: Makefile
src/usr.bin/msgs: Makefile
src/usr.bin/netstat: Makefile
src/usr.bin/quota: Makefile
src/usr.bin/rdist: Makefile
src/usr.bin/rpcgen: Makefile
src/usr.bin/rpcinfo: Makefile
src/usr.bin/rup: Makefile
src/usr.bin/rusers: Makefile
src/usr.bin/rwall: Makefile
src/usr.bin/showmount: Makefile
src/usr.bin/sort: Makefile
src/usr.bin/systat: Makefile
src/usr.bin/telnet: Makefile
src/usr.bin/unifdef: Makefile
src/usr.bin/utoppya: Makefile
src/usr.bin/wall: Makefile
src/usr.sbin/acpitools/amldb: Makefile
src/usr.sbin/altq/libaltq: Makefile
src/usr.sbin/altq/tbrconfig: Makefile
src/usr.sbin/apm: Makefile
src/usr.sbin/apmd: Makefile
src/usr.sbin/btpand: Makefile
src/usr.sbin/catman: Makefile
src/usr.sbin/cnwctl: Makefile
src/usr.sbin/crash: Makefile
src/usr.sbin/edquota: Makefile
src/usr.sbin/eshconfig: Makefile
src/usr.sbin/ifwatchd: Makefile
src/usr.sbin/ipwctl: Makefile
src/usr.sbin/iwictl: Makefile
src/usr.sbin/makefs: Makefile
src/usr.sbin/mopd/common: Makefile
src/usr.sbin/mopd/mopd: Makefile
src/usr.sbin/mountd: Makefile
src/usr.sbin/mrouted: Makefile
src/usr.sbin/perfused: Makefile
src/usr.sbin/rarpd: Makefile
src/usr.sbin/rbootd: Makefile
src/usr.sbin/repquota: Makefile
src/usr.sbin/route6d: Makefile
src/usr.sbin/rpc.bootparamd: Makefile
src/usr.sbin/rpc.lockd: Makefile
src/usr.sbin/rpc.pcnfsd: Makefile
src/usr.sbin/rpc.statd: Makefile
src/usr.sbin/rpc.yppasswdd: Makefile
src/usr.sbin/rpcbind: Makefile
src/usr.sbin/rtadvd: Makefile
src/usr.sbin/rwhod: Makefile
src/usr.sbin/sliplogin: Makefile
src/usr.sbin/spray: Makefile
src/usr.sbin/sup/lib: Makefile
src/usr.sbin/sup/sup: Makefile
src/usr.sbin/sup/supfilesrv: Makefile
src/usr.sbin/sup/supscan: Makefile
src/usr.sbin/sysinst: Makefile.inc
src/usr.sbin/syslogd: Makefile
src/usr.sbin/wiconfig: Makefile
src/usr.sbin/ypbind: Makefile
src/usr.sbin/ypserv/yppush: Makefile
src/usr.sbin/ypserv/ypserv: Makefile
src/usr.sbin/ypserv/ypxfr: Makefile
src/usr.sbin/ypset: Makefile
Log Message:
introduce some common variables for use in GCC warning disables:
GCC_NO_FORMAT_TRUNCATION -Wno-format-truncation (GCC 7/8)
GCC_NO_STRINGOP_TRUNCATION -Wno-stringop-truncation (GCC 8)
GCC_NO_STRINGOP_OVERFLOW -Wno-stringop-overflow (GCC 8)
GCC_NO_CAST_FUNCTION_TYPE -Wno-cast-function-type (GCC 8)
use these to turn off warnings for most GCC-8 complaints. many
of these are false positives, most of the real bugs are already
commited, or are yet to come.
we plan to introduce versions of (some?) of these that use the
"-Wno-error=" form, which still displays the warnings but does
not make it an error, and all of the above will be re-considered
as either being "fix me" (warning still displayed) or "warning
is wrong."
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/bin/pax/Makefile
cvs rdiff -u -r1.17 -r1.18 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/netpgp/lib/netpgp/Makefile
cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/netpgp/lib/verify/Makefile
cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssh/bin/ssh/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssh/bin/ssh-agent/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile
cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/openssh/bin/sshd/Makefile
cvs rdiff -u -r1.28 -r1.29 src/crypto/external/bsd/openssh/lib/Makefile
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/am-utils/bin/amd/Makefile
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/fetch/lib/Makefile
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/flex/bin/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ipf/Makefile.inc
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ipf/bin/ipftest/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/iscsi/lib/Makefile
cvs rdiff -u -r1.10 -r1.11 \
src/external/bsd/libarchive/lib/libarchive/Makefile
cvs rdiff -u -r1.25 -r1.26 src/external/bsd/libpcap/lib/Makefile
cvs rdiff -u -r1.25 -r1.26 src/external/bsd/llvm/lib/libLLVMAnalysis/Makefile
cvs rdiff -u -r1.10 -r1.11 \
src/external/bsd/llvm/lib/libLLVMRuntimeDyld/Makefile
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/mdocml/bin/mandoc/Makefile
cvs rdiff -u -r1.23 -r1.24 src/external/bsd/ntp/bin/ntpd/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/bin/ntpq/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/bin/sntp/Makefile
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/ntp/lib/libntp/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pdisk/bin/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/ppp/usr.sbin/pppd/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/ppp/usr.sbin/pppstats/Makefile
cvs rdiff -u -r1.21 -r1.22 src/external/bsd/tmux/usr.bin/tmux/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/top/bin/Makefile
cvs rdiff -u -r1.23 -r1.24 src/external/cddl/osnet/lib/libdtrace/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/groff/bin/troff/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/gpl2/xcvs/bin/xcvs/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/lib/libiberty/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xconsole/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/bin/xmh/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libX11/Makefile.ximcp
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libX11/Makefile.xlibi18n
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libXvMCW/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libxkbfile/Makefile
cvs rdiff -u -r1.17 -r1.18 \
src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mpl/bind/bin/dnssec/dnssec-verify/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mpl/dhcp/bin/relay/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mpl/dhcp/lib/common/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/zlib/pigz/bin/pigz/Makefile
cvs rdiff -u -r1.45 -r1.46 src/games/hack/Makefile
cvs rdiff -u -r1.9 -r1.10 src/games/hunt/hunt/Makefile
cvs rdiff -u -r1.20 -r1.21 src/games/rogue/Makefile
cvs rdiff -u -r1.7 -r1.8 src/games/tetris/Makefile
cvs rdiff -u -r1.8 -r1.9 src/lib/libc/citrus/Makefile.inc
cvs rdiff -u -r1.90 -r1.91 src/lib/libc/net/Makefile.inc
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/resolv/Makefile.inc
cvs rdiff -u -r1.25 -r1.26 src/lib/libc/rpc/Makefile.inc
cvs rdiff -u -r1.65 -r1.66 src/lib/libedit/Makefile
cvs rdiff -u -r1.5 -r1.6 src/lib/libisns/Makefile
cvs rdiff -u -r1.10 -r1.11 src/lib/libpam/modules/pam_lastlog/Makefile
cvs rdiff -u -r1.5 -r1.6 src/lib/librump/Makefile
cvs rdiff -u -r1.14 -r1.15 src/lib/librumpclient/Makefile
cvs rdiff -u -r1.1 -r1.2 src/lib/librumpres/Makefile
cvs rdiff -u -r1.27 -r1.28 src/lib/librumpuser/Makefile
cvs rdiff -u -r1.84 -r1.85 src/lib/libutil/Makefile
cvs rdiff -u -r1.65 -r1.66 src/libexec/ftpd/Makefile
cvs rdiff -u -r1.9 -r1.10 src/libexec/rpc.rquotad/Makefile
cvs rdiff -u -r1.22 -r1.23 src/libexec/rpc.rstatd/Makefile
cvs rdiff -u -r1.19 -r1.20 src/libexec/rpc.rusersd/Makefile
cvs rdiff -u -r1.10 -r1.11 src/libexec/rpc.rwalld/Makefile
cvs rdiff -u -r1.6 -r1.7 src/libexec/rpc.sprayd/Makefile
cvs rdiff -u -r1.73 -r1.74 src/sbin/disklabel/Makefile
cvs rdiff -u -r1.39 -r1.40 src/sbin/dump/Makefile
cvs rdiff -u -r1.16 -r1.17 src/sbin/dump_lfs/Makefile
cvs rdiff -u -r1.42 -r1.43 src/sbin/fdisk/Makefile
cvs rdiff -u -r1.39 -r1.40 src/sbin/init/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sbin/iscsictl/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sbin/pppoectl/Makefile
cvs rdiff -u -r1.16 -r1.17 src/sbin/raidctl/Makefile
cvs rdiff -u -r1.26 -r1.27 src/sbin/restore/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sbin/rndctl/Makefile
cvs rdiff -u -r1.31 -r1.32 src/sbin/route/Makefile
cvs rdiff -u -r1.25 -r1.26 src/sbin/routed/Makefile
cvs rdiff -u -r1.18 -r1.19 src/sbin/umount/Makefile
cvs rdiff -u -r1.1154 -r1.1155 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/coredump/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/filemon/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/ptrace_common/Makefile
cvs rdiff -u -r1.176 -r1.177 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs rdiff -u -r1.31 -r1.32 src/sys/rump/net/lib/libnet/Makefile
cvs rdiff -u -r1.12 -r1.13 src/tests/fs/common/Makefile
cvs rdiff -u -r1.13 -r1.14 src/tests/fs/nfs/nfsservice/Makefile
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/rpc/Makefile
cvs rdiff -u -r1.9 -r1.10 src/tests/lib/libc/ssp/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libevent/Makefile
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/btpin/Makefile
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/config/Makefile
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/crunch/crunchgen/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/cvslatest/Makefile
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/fstat/Makefile
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/hexdump/Makefile
cvs rdiff -u -r1.57 -r1.58 src/usr.bin/login/Makefile
cvs rdiff -u -r1.38 -r1.39 src/usr.bin/mail/Makefile
cvs rdiff -u -r1.62 -r1.63 src/usr.bin/make/Makefile
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/man/Makefile
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/mklocale/Makefile
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/msgs/Makefile
cvs rdiff -u -r1.46 -r1.47 src/usr.bin/netstat/Makefile
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/quota/Makefile
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/rdist/Makefile
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/rpcgen/Makefile
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/rpcinfo/Makefile
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/rup/Makefile
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/rusers/Makefile
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/rwall/Makefile
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/showmount/Makefile
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/sort/Makefile
cvs rdiff -u -r1.42 -r1.43 src/usr.bin/systat/Makefile
cvs rdiff -u -r1.58 -r1.59 src/usr.bin/telnet/Makefile
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/unifdef/Makefile
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/utoppya/Makefile
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/wall/Makefile
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/acpitools/amldb/Makefile
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/altq/libaltq/Makefile
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/altq/tbrconfig/Makefile
cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/apm/Makefile
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/apmd/Makefile
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/btpand/Makefile
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/catman/Makefile
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/cnwctl/Makefile
cvs rdiff -u -r1.41 -r1.42 src/usr.sbin/crash/Makefile
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/edquota/Makefile
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/eshconfig/Makefile
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/ifwatchd/Makefile
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/ipwctl/Makefile
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/iwictl/Makefile
cvs rdiff -u -r1.36 -r1.37 src/usr.sbin/makefs/Makefile
cvs rdiff -u -r1.20 -r1.21 src/usr.sbin/mopd/common/Makefile
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/mopd/mopd/Makefile
cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/mountd/Makefile
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/mrouted/Makefile
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/perfused/Makefile
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/rarpd/Makefile
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/rbootd/Makefile
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/repquota/Makefile
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/route6d/Makefile
cvs rdiff -u -r1.25 -r1.26 src/usr.sbin/rpc.bootparamd/Makefile
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/rpc.lockd/Makefile
cvs rdiff -u -r1.23 -r1.24 src/usr.sbin/rpc.pcnfsd/Makefile
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/rpc.statd/Makefile
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/rpc.yppasswdd/Makefile
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/rpcbind/Makefile
cvs rdiff -u -r1.22 -r1.23 src/usr.sbin/rtadvd/Makefile
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/rwhod/Makefile
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sliplogin/Makefile
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/spray/Makefile
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/sup/lib/Makefile
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sup/sup/Makefile
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sup/supfilesrv/Makefile
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sup/supscan/Makefile
cvs rdiff -u -r1.26 -r1.27 src/usr.sbin/sysinst/Makefile.inc
cvs rdiff -u -r1.29 -r1.30 src/usr.sbin/syslogd/Makefile
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/wiconfig/Makefile
cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/ypbind/Makefile
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/ypserv/yppush/Makefile
cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/ypserv/ypserv/Makefile
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/ypserv/ypxfr/Makefile
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/ypset/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/pax/Makefile
diff -u src/bin/pax/Makefile:1.40 src/bin/pax/Makefile:1.41
--- src/bin/pax/Makefile:1.40 Thu Aug 15 21:05:16 2019
+++ src/bin/pax/Makefile Sun Oct 13 07:28:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2019/08/15 21:05:16 uwe Exp $
+# $NetBSD: Makefile,v 1.41 2019/10/13 07:28:04 mrg Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
.include <bsd.own.mk>
@@ -50,4 +50,6 @@ LDADD+= -lrmt
DPADD+= ${LIBRMT}
.endif
+COPTS.tar.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.17 src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.18
--- src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.17 Sun Sep 29 23:44:58 2019
+++ src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile Sun Oct 13 07:28:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/09/29 23:44:58 mrg Exp $
+# $NetBSD: Makefile,v 1.18 2019/10/13 07:28:04 mrg Exp $
PROG=netpgpverify
BINDIR= /usr/bin
@@ -32,6 +32,8 @@ EXTDIST=${.CURDIR}/../../dist
COPTS+= -Wno-error=implicit-fallthrough
.endif
+COPTS.libverify.c+= ${GCC_NO_FORMAT_TRUNCATION}
+
.include <bsd.prog.mk>
t tst: ${PROG}
Index: src/crypto/external/bsd/netpgp/lib/netpgp/Makefile
diff -u src/crypto/external/bsd/netpgp/lib/netpgp/Makefile:1.3 src/crypto/external/bsd/netpgp/lib/netpgp/Makefile:1.4
--- src/crypto/external/bsd/netpgp/lib/netpgp/Makefile:1.3 Sun Feb 4 03:19:52 2018
+++ src/crypto/external/bsd/netpgp/lib/netpgp/Makefile Sun Oct 13 07:28:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/02/04 03:19:52 christos Exp $
+# $NetBSD: Makefile,v 1.4 2019/10/13 07:28:05 mrg Exp $
.include <bsd.own.mk>
@@ -26,4 +26,6 @@ LIBDPLIBS+= crypto ${OPENSSL}/lib/libcr
LIBDPLIBS+= z ${NETBSDSRCDIR}/lib/libz
LIBDPLIBS+= bz2 ${NETBSDSRCDIR}/lib/libbz2
+COPTS.crypto.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+
.include <bsd.lib.mk>
Index: src/crypto/external/bsd/netpgp/lib/verify/Makefile
diff -u src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.11 src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.12
--- src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.11 Sun Sep 29 23:44:58 2019
+++ src/crypto/external/bsd/netpgp/lib/verify/Makefile Sun Oct 13 07:28:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/09/29 23:44:58 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2019/10/13 07:28:05 mrg Exp $
LIB=netpgpverify
SRCS+=b64.c
@@ -27,8 +27,7 @@ INCSDIR=/usr/include/netpgp
.include <bsd.own.mk>
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
-COPTS+= -Wno-error=implicit-fallthrough
-.endif
+COPTS+= ${${ACTIVE_CC} == "gcc":? -Wno-implicit-fallthrough :}
+COPTS.libverify.c+= ${GCC_NO_FORMAT_TRUNCATION}
.include <bsd.lib.mk>
Index: src/crypto/external/bsd/openssh/bin/ssh/Makefile
diff -u src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.14 src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.15
--- src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.14 Fri Apr 6 18:58:59 2018
+++ src/crypto/external/bsd/openssh/bin/ssh/Makefile Sun Oct 13 07:28:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2018/04/06 18:58:59 christos Exp $
+# $NetBSD: Makefile,v 1.15 2019/10/13 07:28:05 mrg Exp $
.include <bsd.own.mk>
@@ -23,4 +23,6 @@ LDADD+= -lgssapi -lheimntlm ${LIBKRB5_LD
DPADD+= ${LIBGSSAPI} ${LIBHEIMNTLM} ${LIBKRB5_DPADD}
.endif
+COPTS.sshconnect.c+= ${GCC_NO_FORMAT_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/openssh/bin/ssh-agent/Makefile
diff -u src/crypto/external/bsd/openssh/bin/ssh-agent/Makefile:1.2 src/crypto/external/bsd/openssh/bin/ssh-agent/Makefile:1.3
--- src/crypto/external/bsd/openssh/bin/ssh-agent/Makefile:1.2 Sun Nov 21 19:19:22 2010
+++ src/crypto/external/bsd/openssh/bin/ssh-agent/Makefile Sun Oct 13 07:28:05 2019
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2010/11/21 19:19:22 adam Exp $
+# $NetBSD: Makefile,v 1.3 2019/10/13 07:28:05 mrg Exp $
BINDIR=/usr/bin
PROG= ssh-agent
SRCS= ssh-agent.c ssh-pkcs11-client.c
+COPTS.ssh-agent.c+= ${GCC_NO_FORMAT_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile
diff -u src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile:1.5 src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile:1.6
--- src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile:1.5 Sat Oct 12 18:32:21 2019
+++ src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile Sun Oct 13 07:28:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/10/12 18:32:21 christos Exp $
+# $NetBSD: Makefile,v 1.6 2019/10/13 07:28:05 mrg Exp $
BINDIR= /usr/bin
@@ -7,4 +7,6 @@ SRCS= ssh-keygen.c moduli.c sshsig.c
COPTS.ssh-keygen.c= -Wno-pointer-sign
+COPTS.ssh-keygen.c+= ${GCC_NO_FORMAT_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/openssh/bin/sshd/Makefile
diff -u src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.18 src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.19
--- src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.18 Sat Oct 12 18:32:21 2019
+++ src/crypto/external/bsd/openssh/bin/sshd/Makefile Sun Oct 13 07:28:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/10/12 18:32:21 christos Exp $
+# $NetBSD: Makefile,v 1.19 2019/10/13 07:28:05 mrg Exp $
.include <bsd.own.mk>
@@ -58,8 +58,6 @@ LDADD+= -lldap -lssl -llber
DPADD+= ${LIBLDAP} ${LIBSSL} ${LIBLBER}
.endif
-.include <bsd.prog.mk>
-
LDADD+= -lcrypt -lutil
DPADD+= ${LIBCRYPT} ${LIBUTIL}
@@ -72,3 +70,8 @@ CPPFLAGS+=-DSMALL
LDADD+= -lblacklist
DPADD+= ${LIBBLACKLIST}
.endif
+
+COPTS.sshlogin.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.ldapauth.c+= ${GCC_NO_STRINGOP_TRUNCATION} ${GCC_NO_STRINGOP_OVERFLOW}
+
+.include <bsd.prog.mk>
Index: src/crypto/external/bsd/openssh/lib/Makefile
diff -u src/crypto/external/bsd/openssh/lib/Makefile:1.28 src/crypto/external/bsd/openssh/lib/Makefile:1.29
--- src/crypto/external/bsd/openssh/lib/Makefile:1.28 Sat Oct 12 18:32:22 2019
+++ src/crypto/external/bsd/openssh/lib/Makefile Sun Oct 13 07:28:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2019/10/12 18:32:22 christos Exp $
+# $NetBSD: Makefile,v 1.29 2019/10/13 07:28:05 mrg Exp $
.include <bsd.own.mk>
@@ -120,4 +120,7 @@ COPTS.poly1305.c+= -O0
COPTS.umac.c+= -O0
.endif
+COPTS.hostfile.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.sshkey.c+= ${GCC_NO_FORMAT_TRUNCATION}
+
.include <bsd.lib.mk>
Index: src/external/bsd/am-utils/bin/amd/Makefile
diff -u src/external/bsd/am-utils/bin/amd/Makefile:1.12 src/external/bsd/am-utils/bin/amd/Makefile:1.13
--- src/external/bsd/am-utils/bin/amd/Makefile:1.12 Sun May 21 15:28:38 2017
+++ src/external/bsd/am-utils/bin/amd/Makefile Sun Oct 13 07:28:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2017/05/21 15:28:38 riastradh Exp $
+# $NetBSD: Makefile,v 1.13 2019/10/13 07:28:05 mrg Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -73,5 +73,6 @@ build_version.h: get_args.c
echo '#define BUILD_HOST "'unknown'"' >> ${.TARGET}
echo '#define BUILD_DATE "'unknown'"' >> ${.TARGET}
+COPTS.sun_map.c+= ${GCC_NO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
Index: src/external/bsd/fetch/lib/Makefile
diff -u src/external/bsd/fetch/lib/Makefile:1.14 src/external/bsd/fetch/lib/Makefile:1.15
--- src/external/bsd/fetch/lib/Makefile:1.14 Thu Oct 10 02:30:43 2019
+++ src/external/bsd/fetch/lib/Makefile Sun Oct 13 07:28:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/10/10 02:30:43 kre Exp $
+# $NetBSD: Makefile,v 1.15 2019/10/13 07:28:05 mrg Exp $
LIB= fetch
SRCS= fetch.c common.c ftp.c http.c file.c
@@ -36,8 +36,6 @@ httperr.h: ${LIBFETCHDIR}/http.errors ${
CFLAGS+= -Wno-macro-redefined # _REENTRANT redefined
.endif
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 8 && ${ACTIVE_CC} == "gcc"
-COPTS.http.c += -Wno-error=stringop-truncation
-.endif
+COPTS.http.c+= ${GCC_NO_STRINGOP_TRUNCATION}
.include <bsd.lib.mk>
Index: src/external/bsd/flex/bin/Makefile
diff -u src/external/bsd/flex/bin/Makefile:1.14 src/external/bsd/flex/bin/Makefile:1.15
--- src/external/bsd/flex/bin/Makefile:1.14 Sun Sep 29 23:44:58 2019
+++ src/external/bsd/flex/bin/Makefile Sun Oct 13 07:28:06 2019
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.4 (Berkeley) 6/24/90
-# $NetBSD: Makefile,v 1.14 2019/09/29 23:44:58 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2019/10/13 07:28:06 mrg Exp $
#
# By default, flex will be configured to generate 8-bit scanners only if the
# -8 flag is given. If you want it to always generate 8-bit scanners, add
@@ -78,4 +78,7 @@ COPTS.scan.c+= -O1
. endif
.endif
+COPTS.filter.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.misc.c+= ${GCC_NO_FORMAT_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/external/bsd/ipf/Makefile.inc
diff -u src/external/bsd/ipf/Makefile.inc:1.3 src/external/bsd/ipf/Makefile.inc:1.4
--- src/external/bsd/ipf/Makefile.inc:1.3 Wed Jan 11 12:19:43 2017
+++ src/external/bsd/ipf/Makefile.inc Sun Oct 13 07:28:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3 2017/01/11 12:19:43 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.4 2019/10/13 07:28:06 mrg Exp $
WARNS?= 1 # XXX -Wcast-qual -Wshadow
CWARNFLAGS.clang+= -Wno-format -Wno-tautological-compare \
@@ -32,6 +32,8 @@ LDADD+= -L${IPFOBJDIR} -lipf -lkvm
CLEANFILES+= y.tab.c y.tab.h
+COPTS+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.PATH: ${UDIST} \
${UDIST}/lib \
${UDIST}/tools \
Index: src/external/bsd/ipf/bin/ipftest/Makefile
diff -u src/external/bsd/ipf/bin/ipftest/Makefile:1.6 src/external/bsd/ipf/bin/ipftest/Makefile:1.7
--- src/external/bsd/ipf/bin/ipftest/Makefile:1.6 Sun Sep 29 23:44:58 2019
+++ src/external/bsd/ipf/bin/ipftest/Makefile Sun Oct 13 07:28:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/09/29 23:44:58 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2019/10/13 07:28:06 mrg Exp $
.include <bsd.own.mk>
@@ -109,4 +109,6 @@ COPTS.ipf_y.c+= -O1
. endif
.endif
+COPTS.fil.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+
.include <bsd.prog.mk>
Index: src/external/bsd/iscsi/lib/Makefile
diff -u src/external/bsd/iscsi/lib/Makefile:1.4 src/external/bsd/iscsi/lib/Makefile:1.5
--- src/external/bsd/iscsi/lib/Makefile:1.4 Sun Jan 1 01:19:20 2012
+++ src/external/bsd/iscsi/lib/Makefile Sun Oct 13 07:28:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/01/01 01:19:20 wrstuden Exp $
+# $NetBSD: Makefile,v 1.5 2019/10/13 07:28:06 mrg Exp $
.include <bsd.own.mk>
@@ -23,4 +23,6 @@ ISCSIDIST= ${.CURDIR}/../dist
LIBDPLIBS+= pthread ${.CURDIR}/../../../../lib/libpthread
+COPTS.target.c+= ${GCC_NO_FORMAT_TRUNCATION}
+
.include <bsd.lib.mk>
Index: src/external/bsd/libarchive/lib/libarchive/Makefile
diff -u src/external/bsd/libarchive/lib/libarchive/Makefile:1.10 src/external/bsd/libarchive/lib/libarchive/Makefile:1.11
--- src/external/bsd/libarchive/lib/libarchive/Makefile:1.10 Wed Jul 24 14:07:17 2019
+++ src/external/bsd/libarchive/lib/libarchive/Makefile Sun Oct 13 07:28:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/07/24 14:07:17 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2019/10/13 07:28:06 mrg Exp $
.include <bsd.init.mk>
@@ -455,4 +455,7 @@ COPTS.archive_read_support_format_7zip.c
COPTS.archive_read_support_format_mtree.c += -Wno-error=implicit-fallthrough
.endif
+COPTS.target.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.archive_write_set_format_iso9660.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.lib.mk>
Index: src/external/bsd/libpcap/lib/Makefile
diff -u src/external/bsd/libpcap/lib/Makefile:1.25 src/external/bsd/libpcap/lib/Makefile:1.26
--- src/external/bsd/libpcap/lib/Makefile:1.25 Tue Oct 1 16:02:12 2019
+++ src/external/bsd/libpcap/lib/Makefile Sun Oct 13 07:28:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2019/10/01 16:02:12 christos Exp $
+# $NetBSD: Makefile,v 1.26 2019/10/13 07:28:06 mrg Exp $
USE_SHLIBDIR=yes
.include <bsd.own.mk>
@@ -165,10 +165,9 @@ CLEANFILES+= tokdefs.h scanner.h
COPTS.bpf_image.c+= -Wno-format-nonliteral
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
-COPTS.pcap.c+= -Wno-error=format-truncation
-COPTS.gencode.c+= -Wno-error=implicit-fallthrough
-.endif
+COPTS.gencode.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 7:? -Wno-error=implicit-fallthrough :}
+COPTS.pcap.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.pcap-bpf.c+= ${GCC_NO_STRINGOP_TRUNCATION}
CWARNFLAGS.clang+= -Wno-format-extra-args \
-Wno-unneeded-internal-declaration
Index: src/external/bsd/llvm/lib/libLLVMAnalysis/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMAnalysis/Makefile:1.25 src/external/bsd/llvm/lib/libLLVMAnalysis/Makefile:1.26
--- src/external/bsd/llvm/lib/libLLVMAnalysis/Makefile:1.25 Tue Jul 17 18:55:27 2018
+++ src/external/bsd/llvm/lib/libLLVMAnalysis/Makefile Sun Oct 13 07:28:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2018/07/17 18:55:27 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2019/10/13 07:28:06 mrg Exp $
LIB= LLVMAnalysis
@@ -99,4 +99,5 @@ SRCS+= AliasAnalysis.cpp \
.include <bsd.hostlib.mk>
.else
.include <bsd.lib.mk>
+COPTS.ValueTracking.cpp+= ${GCC_NO_STRINGOP_OVERFLOW}
.endif
Index: src/external/bsd/llvm/lib/libLLVMRuntimeDyld/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMRuntimeDyld/Makefile:1.10 src/external/bsd/llvm/lib/libLLVMRuntimeDyld/Makefile:1.11
--- src/external/bsd/llvm/lib/libLLVMRuntimeDyld/Makefile:1.10 Sun Mar 10 12:14:06 2019
+++ src/external/bsd/llvm/lib/libLLVMRuntimeDyld/Makefile Sun Oct 13 07:28:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/03/10 12:14:06 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2019/10/13 07:28:06 mrg Exp $
LIB= LLVMRuntimeDyld
@@ -21,4 +21,5 @@ SRCS+= RuntimeDyldELFMips.cpp
.include <bsd.hostlib.mk>
.else
.include <bsd.lib.mk>
+COPTS.RuntimeDyldChecker.cpp+= ${GCC_NO_STRINGOP_OVERFLOW}
.endif
Index: src/external/bsd/mdocml/bin/mandoc/Makefile
diff -u src/external/bsd/mdocml/bin/mandoc/Makefile:1.18 src/external/bsd/mdocml/bin/mandoc/Makefile:1.19
--- src/external/bsd/mdocml/bin/mandoc/Makefile:1.18 Mon Mar 11 17:59:28 2019
+++ src/external/bsd/mdocml/bin/mandoc/Makefile Sun Oct 13 07:28:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/03/11 17:59:28 christos Exp $
+# $NetBSD: Makefile,v 1.19 2019/10/13 07:28:06 mrg Exp $
.include <bsd.own.mk>
@@ -46,4 +46,6 @@ SRCS+= ${SRCS.libmandoc} compat_strtonu
COPTS.man_term.c+= -Wno-error=array-bounds
+COPTS.tbl_term.c+= ${GCC_NO_FORMAT_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/external/bsd/ntp/bin/ntpd/Makefile
diff -u src/external/bsd/ntp/bin/ntpd/Makefile:1.23 src/external/bsd/ntp/bin/ntpd/Makefile:1.24
--- src/external/bsd/ntp/bin/ntpd/Makefile:1.23 Fri Oct 4 09:47:27 2019
+++ src/external/bsd/ntp/bin/ntpd/Makefile Sun Oct 13 07:28:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/10/04 09:47:27 mrg Exp $
+# $NetBSD: Makefile,v 1.24 2019/10/13 07:28:07 mrg Exp $
.include <bsd.own.mk>
@@ -93,5 +93,10 @@ COPTS.ntp_control.c+= -Wno-error=maybe-
.endif
COPTS.ntp_loopfilter.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} == 8:? -Wno-error=restrict :}
+COPTS.ntp_loopfilter.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.ntp_crypto.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.refclock_parse.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.refclock_leitch.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.refclock_neoclock4x.c+= ${GCC_NO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
Index: src/external/bsd/ntp/bin/ntpq/Makefile
diff -u src/external/bsd/ntp/bin/ntpq/Makefile:1.7 src/external/bsd/ntp/bin/ntpq/Makefile:1.8
--- src/external/bsd/ntp/bin/ntpq/Makefile:1.7 Sat Dec 28 03:19:43 2013
+++ src/external/bsd/ntp/bin/ntpq/Makefile Sun Oct 13 07:28:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2013/12/28 03:19:43 christos Exp $
+# $NetBSD: Makefile,v 1.8 2019/10/13 07:28:07 mrg Exp $
.include <bsd.own.mk>
@@ -21,4 +21,6 @@ CPPFLAGS+=-I${IDIST}/include -I${IDIST}/
.PATH: ${DIST}
+COPTS.ntpq.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/external/bsd/ntp/bin/sntp/Makefile
diff -u src/external/bsd/ntp/bin/sntp/Makefile:1.6 src/external/bsd/ntp/bin/sntp/Makefile:1.7
--- src/external/bsd/ntp/bin/sntp/Makefile:1.6 Sat Dec 28 03:19:43 2013
+++ src/external/bsd/ntp/bin/sntp/Makefile Sun Oct 13 07:28:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/12/28 03:19:43 christos Exp $
+# $NetBSD: Makefile,v 1.7 2019/10/13 07:28:07 mrg Exp $
USE_FORT?= yes # network client/server
@@ -31,4 +31,6 @@ CPPFLAGS+= -DSAVENAME=\"/var/db/sntp.sta
LDADD+= -L${LIBISC} -liscntp -levent -lm
DPADD+= ${LIBM} ${LIBEVENT}
+COPTS.utilities.c+= ${GCC_NO_FORMAT_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/external/bsd/ntp/lib/libntp/Makefile
diff -u src/external/bsd/ntp/lib/libntp/Makefile:1.20 src/external/bsd/ntp/lib/libntp/Makefile:1.21
--- src/external/bsd/ntp/lib/libntp/Makefile:1.20 Fri Feb 2 01:02:40 2018
+++ src/external/bsd/ntp/lib/libntp/Makefile Sun Oct 13 07:28:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2018/02/02 01:02:40 mrg Exp $
+# $NetBSD: Makefile,v 1.21 2019/10/13 07:28:07 mrg Exp $
LIBISPRIVATE=yes
@@ -99,4 +99,6 @@ CPPFLAGS.ntp_calendar.c += -DMKREPRO_DAT
CPPFLAGS.ntp_calendar.c += -DMKREPRO_TIME=\"${MKREPRO_TIME:Q}\"
.endif
+COPTS.timetoa.c+= ${GCC_NO_FORMAT_TRUNCATION}
+
.include <bsd.lib.mk>
Index: src/external/bsd/pdisk/bin/Makefile
diff -u src/external/bsd/pdisk/bin/Makefile:1.3 src/external/bsd/pdisk/bin/Makefile:1.4
--- src/external/bsd/pdisk/bin/Makefile:1.3 Sun Sep 29 23:44:59 2019
+++ src/external/bsd/pdisk/bin/Makefile Sun Oct 13 07:28:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/09/29 23:44:59 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2019/10/13 07:28:07 mrg Exp $
.include <bsd.own.mk>
WARNS=5
@@ -21,9 +21,12 @@ CPPFLAGS+= -I${SRCDIR}
CPPFLAGS+= -D__unix__
.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
-COPTS.file_media.c+= -Wno-error=implicit-fallthrough
-COPTS.pathname.c+= -Wno-error=implicit-fallthrough
-COPTS.pdisk.c+= -Wno-error=implicit-fallthrough
+COPTS.file_media.c+= -Wno-implicit-fallthrough
+COPTS.pathname.c+= -Wno-implicit-fallthrough
+COPTS.pdisk.c+= -Wno-implicit-fallthrough
.endif
+COPTS.partition_map.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.pdisk.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/external/bsd/ppp/usr.sbin/pppd/Makefile
diff -u src/external/bsd/ppp/usr.sbin/pppd/Makefile:1.1 src/external/bsd/ppp/usr.sbin/pppd/Makefile:1.2
--- src/external/bsd/ppp/usr.sbin/pppd/Makefile:1.1 Thu Nov 28 22:33:43 2013
+++ src/external/bsd/ppp/usr.sbin/pppd/Makefile Sun Oct 13 07:28:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/11/28 22:33:43 christos Exp $
+# $NetBSD: Makefile,v 1.2 2019/10/13 07:28:07 mrg Exp $
.include "../Makefile.inc"
@@ -39,4 +39,6 @@ COPTS.${f}.c+= -Wno-pointer-sign
CWARNFLAGS.clang+= -Wno-tautological-compare
+COPTS.session.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/external/bsd/ppp/usr.sbin/pppstats/Makefile
diff -u src/external/bsd/ppp/usr.sbin/pppstats/Makefile:1.1 src/external/bsd/ppp/usr.sbin/pppstats/Makefile:1.2
--- src/external/bsd/ppp/usr.sbin/pppstats/Makefile:1.1 Thu Nov 28 22:33:43 2013
+++ src/external/bsd/ppp/usr.sbin/pppstats/Makefile Sun Oct 13 07:28:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/11/28 22:33:43 christos Exp $
+# $NetBSD: Makefile,v 1.2 2019/10/13 07:28:07 mrg Exp $
.include "../Makefile.inc"
@@ -9,4 +9,6 @@ MAN= pppstats.8
LINKS= ${BINDIR}/pppstats ${BINDIR}/slstats
MLINKS= pppstats.8 slstats.8
+COPTS.pppstats.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/external/bsd/tmux/usr.bin/tmux/Makefile
diff -u src/external/bsd/tmux/usr.bin/tmux/Makefile:1.21 src/external/bsd/tmux/usr.bin/tmux/Makefile:1.22
--- src/external/bsd/tmux/usr.bin/tmux/Makefile:1.21 Sat Jan 5 21:44:40 2019
+++ src/external/bsd/tmux/usr.bin/tmux/Makefile Sun Oct 13 07:28:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/01/05 21:44:40 christos Exp $
+# $NetBSD: Makefile,v 1.22 2019/10/13 07:28:07 mrg Exp $
.include <bsd.own.mk>
@@ -224,9 +224,6 @@ LDADD+= -levent -lterminfo -lutil -lm
DPADD+= ${LIBEVENT} ${LIBTERMINFO} ${LIBUTIL}
COPTS.format.c += -Wno-format-nonliteral
-#COPTS.cmd-display-message.c += -Wno-format-nonliteral
-#COPTS.cmd-pipe-pane.c += -Wno-format-nonliteral
-#COPTS.server-client.c += -Wno-format-nonliteral
-#COPTS.status.c += -Wno-format-nonliteral
+COPTS.utempter.c+= ${GCC_NO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
Index: src/external/bsd/top/bin/Makefile
diff -u src/external/bsd/top/bin/Makefile:1.10 src/external/bsd/top/bin/Makefile:1.11
--- src/external/bsd/top/bin/Makefile:1.10 Sat Jan 23 21:22:45 2016
+++ src/external/bsd/top/bin/Makefile Sun Oct 13 07:28:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/01/23 21:22:45 christos Exp $
+# $NetBSD: Makefile,v 1.11 2019/10/13 07:28:07 mrg Exp $
.include <bsd.own.mk>
@@ -38,4 +38,7 @@ config.h: config.h.in
${TOOL_SED} -e s/@MACHINE@/${MACHINE}/ < $? > $@
COPTS.display.c = -Wno-format-nonliteral
+
+COPTS.commands.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include <bsd.prog.mk>
Index: src/external/cddl/osnet/lib/libdtrace/Makefile
diff -u src/external/cddl/osnet/lib/libdtrace/Makefile:1.23 src/external/cddl/osnet/lib/libdtrace/Makefile:1.24
--- src/external/cddl/osnet/lib/libdtrace/Makefile:1.23 Thu Oct 10 02:35:45 2019
+++ src/external/cddl/osnet/lib/libdtrace/Makefile Sun Oct 13 07:28:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/10/10 02:35:45 kre Exp $
+# $NetBSD: Makefile,v 1.24 2019/10/13 07:28:08 mrg Exp $
# $FreeBSD: head/cddl/lib/libdtrace/Makefile 314654 2017-03-04 11:30:04Z ngie $
@@ -85,10 +85,8 @@ COPTS.dt_printf.c += -Wno-stack-protecto
COPTS.dt_program.c += -Wno-stack-protector
COPTS.dt_provider.c += -Wno-stack-protector
COPTS.dt_subr.c += -Wno-stack-protector
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 8 && ${ACTIVE_CC} == "gcc"
-COPTS.dt_lex.c += -Wno-error=stringop-truncation
-COPTS.dt_pid.c += -Wno-error=stringop-truncation
-.endif
+COPTS.dt_lex.c += ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.dt_pid.c += ${GCC_NO_STRINGOP_TRUNCATION}
COPTS.dt_consume.c += -Wno-parentheses
COPTS.dt_consume.c += ${${ACTIVE_CC} == "gcc" :? -Wno-maybe-uninitialized :}
@@ -109,7 +107,7 @@ CPPFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/
CPPFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/arm
.PATH: ${.CURDIR}/../../dist/lib/libdtrace/arm
.endif
-COPTS.dt_link.c += ${${ACTIVE_CC} == "gcc" :? -Wno-format-truncation :}
+COPTS.dt_link.c += ${GCC_NO_STRINGOP_TRUNCATION}
LFLAGS+=-l
Index: src/external/gpl2/groff/bin/troff/Makefile
diff -u src/external/gpl2/groff/bin/troff/Makefile:1.2 src/external/gpl2/groff/bin/troff/Makefile:1.3
--- src/external/gpl2/groff/bin/troff/Makefile:1.2 Thu Jan 14 02:30:18 2016
+++ src/external/gpl2/groff/bin/troff/Makefile Sun Oct 13 07:28:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/14 02:30:18 christos Exp $
+# $NetBSD: Makefile,v 1.3 2019/10/13 07:28:08 mrg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/roff/troff/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
@@ -15,6 +15,8 @@ USETBL=
CWARNFLAGS.clang+= -Wno-format-security
+COPTS.input.cpp+= ${GCC_NO_STRINGOP_OVERFLOW}
+
.include <bsd.prog.mk>
majorminor.cpp: ${GROFF_DIST}/VERSION ${GROFF_DIST}/REVISION
Index: src/external/gpl2/xcvs/bin/xcvs/Makefile
diff -u src/external/gpl2/xcvs/bin/xcvs/Makefile:1.6 src/external/gpl2/xcvs/bin/xcvs/Makefile:1.7
--- src/external/gpl2/xcvs/bin/xcvs/Makefile:1.6 Sun Feb 25 00:16:48 2018
+++ src/external/gpl2/xcvs/bin/xcvs/Makefile Sun Oct 13 07:28:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2018/02/25 00:16:48 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2019/10/13 07:28:08 mrg Exp $
.include "${.CURDIR}/../../Makefile.inc"
PROG= xcvs
@@ -33,4 +33,12 @@ SRCS+= gssapi-client.c
DPADD+= ${LIBCRYPT} ${LIBZ}
LDADD+= -lcrypt -lz
+COPTS.commit.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.logmsg.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.ls.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.input.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.tag.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.subr.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.filesubr.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+
.include <bsd.prog.mk>
Index: src/external/gpl3/gcc/lib/libiberty/Makefile
diff -u src/external/gpl3/gcc/lib/libiberty/Makefile:1.8 src/external/gpl3/gcc/lib/libiberty/Makefile:1.9
--- src/external/gpl3/gcc/lib/libiberty/Makefile:1.8 Wed Apr 20 17:18:52 2016
+++ src/external/gpl3/gcc/lib/libiberty/Makefile Sun Oct 13 07:28:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/04/20 17:18:52 christos Exp $
+# $NetBSD: Makefile,v 1.9 2019/10/13 07:28:08 mrg Exp $
LIBISPRIVATE= yes
@@ -29,4 +29,6 @@ CWARNFLAGS.clang+= -Wno-unused-value
.PATH: ${DIST}/libiberty
+COPTS.dyn-string.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.lib.mk>
Index: src/external/mit/xorg/bin/xconsole/Makefile
diff -u src/external/mit/xorg/bin/xconsole/Makefile:1.4 src/external/mit/xorg/bin/xconsole/Makefile:1.5
--- src/external/mit/xorg/bin/xconsole/Makefile:1.4 Mon Mar 17 09:24:11 2014
+++ src/external/mit/xorg/bin/xconsole/Makefile Sun Oct 13 07:28:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/03/17 09:24:11 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2019/10/13 07:28:08 mrg Exp $
.include <bsd.own.mk>
@@ -15,5 +15,7 @@ DPADD+= ${LIBUTIL} ${LIBXAW} ${LIBXMU} $
CPPFLAGS+=-DHAS_OPENPTY -DHAVE_UTIL_H
+COPTS.xconsole.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+
.include <bsd.x11.mk>
.include <bsd.prog.mk>
Index: src/external/mit/xorg/bin/xmh/Makefile
diff -u src/external/mit/xorg/bin/xmh/Makefile:1.7 src/external/mit/xorg/bin/xmh/Makefile:1.8
--- src/external/mit/xorg/bin/xmh/Makefile:1.7 Sun Jul 19 23:15:06 2015
+++ src/external/mit/xorg/bin/xmh/Makefile Sun Oct 13 07:28:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/07/19 23:15:06 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2019/10/13 07:28:08 mrg Exp $
.include <bsd.own.mk>
@@ -23,5 +23,7 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${L
CWARNFLAGS.clang+= -Wno-format
+COPTS+= ${GCC_NO_STRINGOP_OVERFLOW}
+
.include <bsd.x11.mk>
.include <bsd.prog.mk>
Index: src/external/mit/xorg/lib/libX11/Makefile.ximcp
diff -u src/external/mit/xorg/lib/libX11/Makefile.ximcp:1.4 src/external/mit/xorg/lib/libX11/Makefile.ximcp:1.5
--- src/external/mit/xorg/lib/libX11/Makefile.ximcp:1.4 Mon Jun 13 20:03:07 2016
+++ src/external/mit/xorg/lib/libX11/Makefile.ximcp Sun Oct 13 07:28:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ximcp,v 1.4 2016/06/13 20:03:07 ryoon Exp $
+# $NetBSD: Makefile.ximcp,v 1.5 2019/10/13 07:28:08 mrg Exp $
.PATH: ${X11SRCDIR.X11}/modules/im/ximcp
SRCS.ximcp= \
@@ -39,8 +39,10 @@ CPPFLAGS+= \
-DTRANS_CLIENT \
-DHASXDMAUTH
-CPPFLAGS.imDefLkup.c= -Wno-error
-CPPFLAGS.imRm.c= -Wno-error
-CPPFLAGS.imTrans.c= -Wno-error
-CPPFLAGS.imLcLkup.c= -Wno-stack-protector
-CPPFLAGS.imInsClbk.c= -Wno-unused-value
+COPTS.imDefLkup.c= -Wno-error
+COPTS.imRm.c= -Wno-error
+COPTS.imTrans.c= -Wno-error
+COPTS.imLcLkup.c= -Wno-stack-protector
+COPTS.imInsClbk.c= -Wno-unused-value
+
+COPTS.imDefIm.c= ${GCC_NO_STRINGOP_OVERFLOW}
Index: src/external/mit/xorg/lib/libX11/Makefile.xlibi18n
diff -u src/external/mit/xorg/lib/libX11/Makefile.xlibi18n:1.2 src/external/mit/xorg/lib/libX11/Makefile.xlibi18n:1.3
--- src/external/mit/xorg/lib/libX11/Makefile.xlibi18n:1.2 Thu Jun 2 22:41:26 2016
+++ src/external/mit/xorg/lib/libX11/Makefile.xlibi18n Sun Oct 13 07:28:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xlibi18n,v 1.2 2016/06/02 22:41:26 mrg Exp $
+# $NetBSD: Makefile.xlibi18n,v 1.3 2019/10/13 07:28:08 mrg Exp $
.PATH: ${X11SRCDIR.X11}/modules/lc/gen
SRCS.xlibi18n= lcGenConv.c
@@ -10,3 +10,5 @@ CPPFLAGS+= \
CPPFLAGS+= \
${XLOCALE.DEFINES} \
-DHASXDMAUTH
+
+COPTS.lcGenConv.c+= ${GCC_NO_STRINGOP_OVERFLOW}
Index: src/external/mit/xorg/lib/libXvMCW/Makefile
diff -u src/external/mit/xorg/lib/libXvMCW/Makefile:1.2 src/external/mit/xorg/lib/libXvMCW/Makefile:1.3
--- src/external/mit/xorg/lib/libXvMCW/Makefile:1.2 Thu Jun 6 06:18:15 2013
+++ src/external/mit/xorg/lib/libXvMCW/Makefile Sun Oct 13 07:28:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/06/06 06:18:15 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2019/10/13 07:28:08 mrg Exp $
.include <bsd.own.mk>
@@ -17,5 +17,7 @@ CPPFLAGS+= -I${X11SRCDIR.XvMC}/include
LIBDPLIBS= Xext ${.CURDIR}/../libXext \
X11 ${.CURDIR}/../libX11/dynamic
+COPTS.XvMCWrapper.c= ${GCC_NO_STRINGOP_OVERFLOW}
+
.include <bsd.x11.mk>
.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/libxkbfile/Makefile
diff -u src/external/mit/xorg/lib/libxkbfile/Makefile:1.4 src/external/mit/xorg/lib/libxkbfile/Makefile:1.5
--- src/external/mit/xorg/lib/libxkbfile/Makefile:1.4 Tue Dec 25 08:59:06 2018
+++ src/external/mit/xorg/lib/libxkbfile/Makefile Sun Oct 13 07:28:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2018/12/25 08:59:06 maya Exp $
+# $NetBSD: Makefile,v 1.5 2019/10/13 07:28:09 mrg Exp $
.include <bsd.own.mk>
@@ -19,5 +19,7 @@ LIBDPLIBS= X11 ${.CURDIR}/../libX11/dyna
PKGCONFIG= xkbfile
+COPTS.xkbatom.c= ${GCC_NO_STRINGOP_OVERFLOW}
+
.include <bsd.x11.mk>
.include <bsd.lib.mk>
Index: src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.17 src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.18
--- src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.17 Mon Dec 31 12:13:50 2018
+++ src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile Sun Oct 13 07:28:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2018/12/31 12:13:50 mrg Exp $
+# $NetBSD: Makefile,v 1.18 2019/10/13 07:28:09 mrg Exp $
DRIVER= xf86-video-sis
DRIVER_NAME= sis_drv
@@ -24,7 +24,7 @@ CWARNFLAGS.clang+= -Wno-parentheses
# XXX
COPTS.sis_driver.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
-COPTS.sis_utility.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
+COPTS.sis_utility.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :} ${GCC_NO_STRINGOP_OVERFLOW}
COPTS.initextx.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
COPTS.sis_driver.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
COPTS.sis_utility.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
Index: src/external/mpl/bind/bin/dnssec/dnssec-verify/Makefile
diff -u src/external/mpl/bind/bin/dnssec/dnssec-verify/Makefile:1.1 src/external/mpl/bind/bin/dnssec/dnssec-verify/Makefile:1.2
--- src/external/mpl/bind/bin/dnssec/dnssec-verify/Makefile:1.1 Sun Aug 12 13:02:25 2018
+++ src/external/mpl/bind/bin/dnssec/dnssec-verify/Makefile Sun Oct 13 07:28:09 2019
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2018/08/12 13:02:25 christos Exp $
+# $NetBSD: Makefile,v 1.2 2019/10/13 07:28:09 mrg Exp $
BASE= ${.CURDIR:T}
.include "${.CURDIR}/../Makefile.inc"
+COPTS.discover.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/external/mpl/dhcp/bin/relay/Makefile
diff -u src/external/mpl/dhcp/bin/relay/Makefile:1.1 src/external/mpl/dhcp/bin/relay/Makefile:1.2
--- src/external/mpl/dhcp/bin/relay/Makefile:1.1 Sat Apr 7 22:31:37 2018
+++ src/external/mpl/dhcp/bin/relay/Makefile Sun Oct 13 07:28:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2018/04/07 22:31:37 christos Exp $
+# $NetBSD: Makefile,v 1.2 2019/10/13 07:28:09 mrg Exp $
SRCS = dhcrelay.c
PROG = dhcrelay
@@ -6,4 +6,6 @@ MAN = dhcrelay.8
DHCPSRCDIR= relay
+COPTS.dhcrelay.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/external/mpl/dhcp/lib/common/Makefile
diff -u src/external/mpl/dhcp/lib/common/Makefile:1.1 src/external/mpl/dhcp/lib/common/Makefile:1.2
--- src/external/mpl/dhcp/lib/common/Makefile:1.1 Sat Apr 7 22:31:37 2018
+++ src/external/mpl/dhcp/lib/common/Makefile Sun Oct 13 07:28:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2018/04/07 22:31:37 christos Exp $
+# $NetBSD: Makefile,v 1.2 2019/10/13 07:28:09 mrg Exp $
LIBISPRIVATE= yes
@@ -11,4 +11,7 @@ MAN = dhcp-options.5 dhcp-eval.5
DHCPSRCDIR= common
+COPTS.discover.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.parse.c+= ${GCC_NO_FORMAT_TRUNCATION} ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include <bsd.lib.mk>
Index: src/external/zlib/pigz/bin/pigz/Makefile
diff -u src/external/zlib/pigz/bin/pigz/Makefile:1.10 src/external/zlib/pigz/bin/pigz/Makefile:1.11
--- src/external/zlib/pigz/bin/pigz/Makefile:1.10 Tue Feb 26 07:31:49 2019
+++ src/external/zlib/pigz/bin/pigz/Makefile Sun Oct 13 07:28:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/02/26 07:31:49 rin Exp $
+# $NetBSD: Makefile,v 1.11 2019/10/13 07:28:09 mrg Exp $
.include <bsd.own.mk>
@@ -58,3 +58,7 @@ DIST= ${NETBSDSRCDIR}/external/zlib/pig
GZIPDIST= ${NETBSDSRCDIR}/usr.bin/gzip
.PATH: ${GZIPDIST}
.endif
+
+.if !defined(HOSTPROG)
+COPTS.pigz.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+.endif
Index: src/games/hack/Makefile
diff -u src/games/hack/Makefile:1.45 src/games/hack/Makefile:1.46
--- src/games/hack/Makefile:1.45 Wed Aug 24 17:39:32 2011
+++ src/games/hack/Makefile Sun Oct 13 07:28:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2011/08/24 17:39:32 plunky Exp $
+# $NetBSD: Makefile,v 1.46 2019/10/13 07:28:09 mrg Exp $
# @(#)Makefile 8.2 (Berkeley) 4/27/95
.include <bsd.own.mk>
@@ -54,4 +54,7 @@ clobber:
${_MKMSG_REMOVE} "${DESTDIR}/var/games/hackdir/bones*"
rm -f ${DESTDIR}/var/games/hackdir/bones*
+COPTS.hack.objnam.c+= ${GCC_NO_STRINGOP_TRUNCATION} ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.hack.pager.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/games/hunt/hunt/Makefile
diff -u src/games/hunt/hunt/Makefile:1.9 src/games/hunt/hunt/Makefile:1.10
--- src/games/hunt/hunt/Makefile:1.9 Sun Mar 30 02:26:09 2014
+++ src/games/hunt/hunt/Makefile Sun Oct 13 07:28:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2014/03/30 02:26:09 dholland Exp $
+# $NetBSD: Makefile,v 1.10 2019/10/13 07:28:09 mrg Exp $
PROG= hunt
SRCS= connect.c hunt.c otto.c playit.c server.c
@@ -9,4 +9,6 @@ HIDEGAME=hidegame
CPPFLAGS+=-I${.CURDIR}/../include
+COPTS.hunt.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/games/rogue/Makefile
diff -u src/games/rogue/Makefile:1.20 src/games/rogue/Makefile:1.21
--- src/games/rogue/Makefile:1.20 Mon Jun 11 14:18:16 2018
+++ src/games/rogue/Makefile Sun Oct 13 07:28:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2018/06/11 14:18:16 kamil Exp $
+# $NetBSD: Makefile,v 1.21 2019/10/13 07:28:09 mrg Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
PROG= rogue
@@ -14,5 +14,7 @@ MAN= rogue.6
SUBDIR.roff+=USD.doc
+COPTS.score.c+= ${GCC_NO_FORMAT_TRUNCATION}
+
.include <bsd.prog.mk>
.include <bsd.subdir.mk>
Index: src/games/tetris/Makefile
diff -u src/games/tetris/Makefile:1.7 src/games/tetris/Makefile:1.8
--- src/games/tetris/Makefile:1.7 Wed Feb 3 15:34:39 2010
+++ src/games/tetris/Makefile Sun Oct 13 07:28:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/02/03 15:34:39 roy Exp $
+# $NetBSD: Makefile,v 1.8 2019/10/13 07:28:10 mrg Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
PROG= tetris
@@ -9,4 +9,6 @@ LDADD= -lterminfo
HIDEGAME=hidegame
SETGIDGAME=yes
+COPTS.tetris.c+= ${GCC_NO_FORMAT_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/lib/libc/citrus/Makefile.inc
diff -u src/lib/libc/citrus/Makefile.inc:1.8 src/lib/libc/citrus/Makefile.inc:1.9
--- src/lib/libc/citrus/Makefile.inc:1.8 Sun May 30 08:28:53 2010
+++ src/lib/libc/citrus/Makefile.inc Sun Oct 13 07:28:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.8 2010/05/30 08:28:53 tnozaki Exp $
+# $NetBSD: Makefile.inc,v 1.9 2019/10/13 07:28:10 mrg Exp $
# sources
.PATH: ${ARCHDIR}/citrus ${.CURDIR}/citrus
@@ -23,3 +23,7 @@ CPPFLAGS.citrus_lc_monetary.c+= -I${LIBC
CPPFLAGS.citrus_lc_numeric.c+= -I${LIBCDIR}/locale
CPPFLAGS.citrus_lc_time.c+= -I${LIBCDIR}/locale
CPPFLAGS.citrus_lc_messages.c+= -I${LIBCDIR}/locale
+
+COPTS.citrus_iconv.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.citrus_csmapper.c+= ${GCC_NO_FORMAT_TRUNCATION}
+
Index: src/lib/libc/net/Makefile.inc
diff -u src/lib/libc/net/Makefile.inc:1.90 src/lib/libc/net/Makefile.inc:1.91
--- src/lib/libc/net/Makefile.inc:1.90 Thu Oct 10 08:37:16 2019
+++ src/lib/libc/net/Makefile.inc Sun Oct 13 07:28:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.90 2019/10/10 08:37:16 kre Exp $
+# $NetBSD: Makefile.inc,v 1.91 2019/10/13 07:28:10 mrg Exp $
# @(#)Makefile.inc 8.2 (Berkeley) 9/5/93
# net sources
@@ -30,10 +30,6 @@ LPREFIX=_nsyy
YPREFIX=_nsyy
YHEADER=1
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 8 && ${ACTIVE_CC} == "gcc"
-COPTS.getaddrinfo.c += -Wno-error=stringop-overflow
-.endif
-
CLEANFILES+=nsparser.c nslexer.c nsparser.h
nslexer.c: nslexer.l nsparser.h
@@ -154,3 +150,5 @@ MLINKS+=getaddrinfo.3 freeaddrinfo.3 \
MAN+= sctp_bindx.3 sctp_connectx.3 sctp_freepaddrs.3 sctp_getaddrlen.3 \
sctp_getassocid.3 sctp_getpaddrs.3 sctp_opt_info.3 sctp_peeloff.3 \
sctp_recvmsg.3 sctp_send.3 sctp_sendmsg.3
+
+COPTS.getaddrinfo.c+= ${GCC_NO_STRINGOP_OVERFLOW}
Index: src/lib/libc/resolv/Makefile.inc
diff -u src/lib/libc/resolv/Makefile.inc:1.7 src/lib/libc/resolv/Makefile.inc:1.8
--- src/lib/libc/resolv/Makefile.inc:1.7 Thu Oct 10 08:37:16 2019
+++ src/lib/libc/resolv/Makefile.inc Sun Oct 13 07:28:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.7 2019/10/10 08:37:16 kre Exp $
+# $NetBSD: Makefile.inc,v 1.8 2019/10/13 07:28:10 mrg Exp $
# net sources
.PATH: ${.CURDIR}/resolv
@@ -10,6 +10,4 @@ SRCS+= h_errno.c herror.c res_comp.c res
# For COMPAT__RES
SRCS+= res_compat.c
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 8 && ${ACTIVE_CC} == "gcc"
-COPTS.res_query.c += -Wno-error=stringop-overflow
-.endif
+COPTS.res_query.c+= ${GCC_NO_STRINGOP_OVERFLOW}
Index: src/lib/libc/rpc/Makefile.inc
diff -u src/lib/libc/rpc/Makefile.inc:1.25 src/lib/libc/rpc/Makefile.inc:1.26
--- src/lib/libc/rpc/Makefile.inc:1.25 Thu Oct 10 08:37:16 2019
+++ src/lib/libc/rpc/Makefile.inc Sun Oct 13 07:28:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.25 2019/10/10 08:37:16 kre Exp $
+# $NetBSD: Makefile.inc,v 1.26 2019/10/13 07:28:10 mrg Exp $
# librpc sources
.PATH: ${.CURDIR}/rpc
@@ -18,18 +18,6 @@ SRCS+= auth_none.c auth_unix.c authunix_
CPPFLAGS+= -DPORTMAP
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 8 && ${ACTIVE_CC} == "gcc"
-COPTS.clnt_bcast.c += -Wno-error=cast-function-type
-COPTS.clnt_generic.c += -Wno-error=cast-function-type
-COPTS.clnt_vc.c += -Wno-error=cast-function-type
-COPTS.pmap_getmaps.c += -Wno-error=cast-function-type
-COPTS.rpc_generic.c += -Wno-error=cast-function-type
-COPTS.rpcb_clnt.c += -Wno-error=cast-function-type
-COPTS.svc_simple.c += -Wno-error=cast-function-type
-COPTS.xdr_sizeof.c += -Wno-error=cast-function-type
-COPTS.getrpcent.c += -Wno-error=stringop-truncation
-.endif
-
MAN+= bindresvport.3 getnetconfig.3 getnetpath.3 getrpcent.3 getrpcport.3 \
rpc.3 rpc_soc.3 rpc_clnt_auth.3 rpc_clnt_calls.3 rpc_clnt_create.3 \
rpc_svc_calls.3 rpc_svc_create.3 rpc_svc_err.3 rpc_svc_reg.3 \
@@ -179,3 +167,13 @@ MLINKS+= bindresvport.3 bindresvport_sa.
xdr.3 xdr_vector.3 \
xdr.3 xdr_void.3 \
xdr.3 xdr_wrapstring.3
+
+COPTS.clnt_bcast.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.clnt_generic.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.clnt_vc.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.rpcb_clnt.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.xdr_sizeof.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.svc_simple.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.pmap_getmaps.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.rpc_generic.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.getrpcent.c+= ${GCC_NO_STRINGOP_TRUNCATION}
Index: src/lib/libedit/Makefile
diff -u src/lib/libedit/Makefile:1.65 src/lib/libedit/Makefile:1.66
--- src/lib/libedit/Makefile:1.65 Fri Jun 30 20:26:52 2017
+++ src/lib/libedit/Makefile Sun Oct 13 07:28:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2017/06/30 20:26:52 kre Exp $
+# $NetBSD: Makefile,v 1.66 2019/10/13 07:28:10 mrg Exp $
# @(#)Makefile 8.1 (Berkeley) 6/4/93
USE_SHLIBDIR= yes
@@ -137,3 +137,7 @@ COPTS.literal.c+= -Wno-sign-conversion
COPTS.tokenizer.c+= -Wno-cast-qual
COPTS.tokenizern.c+= -Wno-cast-qual
.endif
+
+COPTS.history.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.historyn.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.readline.c+= ${GCC_NO_STRINGOP_TRUNCATION} ${GCC_NO_STRINGOP_OVERFLOW}
Index: src/lib/libisns/Makefile
diff -u src/lib/libisns/Makefile:1.5 src/lib/libisns/Makefile:1.6
--- src/lib/libisns/Makefile:1.5 Wed Sep 11 23:04:10 2013
+++ src/lib/libisns/Makefile Sun Oct 13 07:28:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2013/09/11 23:04:10 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2019/10/13 07:28:10 mrg Exp $
.include <bsd.own.mk>
@@ -15,4 +15,6 @@ WARNS?= 5
LIBDPLIBS+= pthread ${.CURDIR}/../libpthread
+COPTS.isns.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.lib.mk>
Index: src/lib/libpam/modules/pam_lastlog/Makefile
diff -u src/lib/libpam/modules/pam_lastlog/Makefile:1.10 src/lib/libpam/modules/pam_lastlog/Makefile:1.11
--- src/lib/libpam/modules/pam_lastlog/Makefile:1.10 Thu Oct 10 02:39:07 2019
+++ src/lib/libpam/modules/pam_lastlog/Makefile Sun Oct 13 07:28:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/10/10 02:39:07 kre Exp $
+# $NetBSD: Makefile,v 1.11 2019/10/13 07:28:10 mrg Exp $
# Copyright 2001 Mark R V Murray
# All rights reserved.
#
@@ -35,6 +35,4 @@ LIBDPLIBS+= util ${.CURDIR}/../../../lib
.include "${.CURDIR}/../mod.mk"
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 8 && ${ACTIVE_CC} == "gcc"
-COPTS.pam_lastlog.c += -Wno-stringop-truncation
-.endif
+COPTS.pam_lastlog.c+= ${GCC_NO_STRINGOP_TRUNCATION}
Index: src/lib/librump/Makefile
diff -u src/lib/librump/Makefile:1.5 src/lib/librump/Makefile:1.6
--- src/lib/librump/Makefile:1.5 Sun Nov 9 17:39:37 2014
+++ src/lib/librump/Makefile Sun Oct 13 07:28:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/11/09 17:39:37 pooka Exp $
+# $NetBSD: Makefile,v 1.6 2019/10/13 07:28:10 mrg Exp $
#
RUMPTOP= ${.CURDIR}/../../sys/rump
@@ -7,4 +7,9 @@ LIBDPLIBS+= rumpuser ${.CURDIR}/../l
WARNS= 3 # XXX: kernel isn't ready for -Wsign-compare
+COPTS.kern_hook.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.rump.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.subr_pool.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.subr_vmem.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include "${RUMPTOP}/librump/rumpkern/Makefile.rumpkern"
Index: src/lib/librumpclient/Makefile
diff -u src/lib/librumpclient/Makefile:1.14 src/lib/librumpclient/Makefile:1.15
--- src/lib/librumpclient/Makefile:1.14 Thu May 11 04:33:14 2017
+++ src/lib/librumpclient/Makefile Sun Oct 13 07:28:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2017/05/11 04:33:14 sevan Exp $
+# $NetBSD: Makefile,v 1.15 2019/10/13 07:28:11 mrg Exp $
#
.PATH: ${.CURDIR}/../../sys/rump/librump/rumpkern
@@ -33,4 +33,6 @@ COPTS.rump_syscalls.c+= -fno-strict-alia
@ln -s ${NETBSDSRCDIR}/sys/sys srcsys
.endif
+COPTS.rumpclient.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include <bsd.lib.mk>
Index: src/lib/librumpres/Makefile
diff -u src/lib/librumpres/Makefile:1.1 src/lib/librumpres/Makefile:1.2
--- src/lib/librumpres/Makefile:1.1 Tue Oct 10 19:28:33 2017
+++ src/lib/librumpres/Makefile Sun Oct 13 07:28:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/10/10 19:28:33 christos Exp $
+# $NetBSD: Makefile,v 1.2 2019/10/13 07:28:11 mrg Exp $
USE_FORT?= yes
USE_SHLIBDIR= yes
@@ -22,4 +22,6 @@ SRCS+= if_indextoname.c if_nametoindex.
#SRCS+= gethnamaddr.c sethostent.c
CPPFLAGS+= -DRUMP_ACTION
+COPTS.getaddrinfo.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+
.include <bsd.lib.mk>
Index: src/lib/librumpuser/Makefile
diff -u src/lib/librumpuser/Makefile:1.27 src/lib/librumpuser/Makefile:1.28
--- src/lib/librumpuser/Makefile:1.27 Thu May 11 04:33:14 2017
+++ src/lib/librumpuser/Makefile Sun Oct 13 07:28:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2017/05/11 04:33:14 sevan Exp $
+# $NetBSD: Makefile,v 1.28 2019/10/13 07:28:11 mrg Exp $
#
.include <bsd.own.mk>
@@ -54,4 +54,6 @@ INCS= rumpuser_component.h rumpuser_por
CPPFLAGS+= -D_REENTRANT
+COPTS.rumpuser_sp.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include <bsd.lib.mk>
Index: src/lib/libutil/Makefile
diff -u src/lib/libutil/Makefile:1.84 src/lib/libutil/Makefile:1.85
--- src/lib/libutil/Makefile:1.84 Tue Oct 8 18:50:34 2019
+++ src/lib/libutil/Makefile Sun Oct 13 07:28:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2019/10/08 18:50:34 christos Exp $
+# $NetBSD: Makefile,v 1.85 2019/10/13 07:28:11 mrg Exp $
# @(#)Makefile 8.1 (Berkeley) 6/4/93
USE_SHLIBDIR= yes
@@ -39,10 +39,8 @@ CPPFLAGS.sockaddr_snprintf.c+=-DHAVE_UTI
CPPFLAGS.sockaddr_snprintf.c+=-DHAVE_NETATALK_AT_H
CPPFLAGS.sockaddr_snprintf.c+=-DHAVE_NET_IF_DL_H
-.if ${ACTIVE_CC} == "gcc"
-COPTS.logwtmp.c += -Wno-stringop-truncation
-COPTS.logwtmpx.c += -Wno-stringop-truncation
-.endif
+COPTS.logwtmp.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.logwtmpx.c+= ${GCC_NO_STRINGOP_TRUNCATION}
YPREFIX=__pd
.PATH: ${NETBSDSRCDIR}/lib/libc/gen
Index: src/libexec/ftpd/Makefile
diff -u src/libexec/ftpd/Makefile:1.65 src/libexec/ftpd/Makefile:1.66
--- src/libexec/ftpd/Makefile:1.65 Sun Feb 25 00:16:48 2018
+++ src/libexec/ftpd/Makefile Sun Oct 13 07:28:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2018/02/25 00:16:48 mrg Exp $
+# $NetBSD: Makefile,v 1.66 2019/10/13 07:28:11 mrg Exp $
# @(#)Makefile 8.2 (Berkeley) 4/4/94
.include <bsd.own.mk>
@@ -52,4 +52,7 @@ ftpd.o ftpcmd.o: version.h
#
#.endif
+COPTS.ftpd.c+= ${GCC_NO_STRINGOP_TRUNCATION} ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.logwtmp.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/libexec/rpc.rquotad/Makefile
diff -u src/libexec/rpc.rquotad/Makefile:1.9 src/libexec/rpc.rquotad/Makefile:1.10
--- src/libexec/rpc.rquotad/Makefile:1.9 Wed Feb 1 17:53:01 2012
+++ src/libexec/rpc.rquotad/Makefile Sun Oct 13 07:28:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/02/01 17:53:01 dholland Exp $
+# $NetBSD: Makefile,v 1.10 2019/10/13 07:28:11 mrg Exp $
.include <bsd.own.mk>
PROG = rpc.rquotad
@@ -9,4 +9,6 @@ MLINKS = rpc.rquotad.8 rquotad.8
DPADD= ${LIBQUOTA} ${LIBRPCSVC}
LDADD= -lquota -lrpcsvc
+COPTS.rquotad.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include <bsd.prog.mk>
Index: src/libexec/rpc.rstatd/Makefile
diff -u src/libexec/rpc.rstatd/Makefile:1.22 src/libexec/rpc.rstatd/Makefile:1.23
--- src/libexec/rpc.rstatd/Makefile:1.22 Sat Jan 23 21:22:47 2016
+++ src/libexec/rpc.rstatd/Makefile Sun Oct 13 07:28:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2016/01/23 21:22:47 christos Exp $
+# $NetBSD: Makefile,v 1.23 2019/10/13 07:28:11 mrg Exp $
.include <bsd.own.mk>
@@ -13,4 +13,6 @@ MLINKS= rpc.rstatd.8 rstatd.8
DPADD= ${LIBRPCSVC}
LDADD= -lrpcsvc
+COPTS.rstat_proc.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include <bsd.prog.mk>
Index: src/libexec/rpc.rusersd/Makefile
diff -u src/libexec/rpc.rusersd/Makefile:1.19 src/libexec/rpc.rusersd/Makefile:1.20
--- src/libexec/rpc.rusersd/Makefile:1.19 Wed Feb 28 23:45:56 2018
+++ src/libexec/rpc.rusersd/Makefile Sun Oct 13 07:28:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2018/02/28 23:45:56 snj Exp $
+# $NetBSD: Makefile,v 1.20 2019/10/13 07:28:11 mrg Exp $
.include <bsd.own.mk>
@@ -15,5 +15,6 @@ CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/who
DPADD+= ${LIBRPCSVC}
LDADD+= -lrpcsvc
-.include <bsd.prog.mk>
+COPTS.rusers_proc.c+= ${GCC_NO_STRINGOP_TRUNCATION} ${GCC_NO_STRINGOP_OVERFLOW} ${GCC_NO_CAST_FUNCTION_TYPE}
+.include <bsd.prog.mk>
Index: src/libexec/rpc.rwalld/Makefile
diff -u src/libexec/rpc.rwalld/Makefile:1.10 src/libexec/rpc.rwalld/Makefile:1.11
--- src/libexec/rpc.rwalld/Makefile:1.10 Wed Oct 8 09:07:33 1997
+++ src/libexec/rpc.rwalld/Makefile Sun Oct 13 07:28:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1997/10/08 09:07:33 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2019/10/13 07:28:11 mrg Exp $
PROG = rpc.rwalld
SRCS = rwalld.c
@@ -8,4 +8,6 @@ MLINKS= rpc.rwalld.8 rwalld.8
DPADD= ${LIBRPCSVC}
LDADD= -lrpcsvc
+COPTS.rwalld.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include <bsd.prog.mk>
Index: src/libexec/rpc.sprayd/Makefile
diff -u src/libexec/rpc.sprayd/Makefile:1.6 src/libexec/rpc.sprayd/Makefile:1.7
--- src/libexec/rpc.sprayd/Makefile:1.6 Wed Oct 8 09:07:35 1997
+++ src/libexec/rpc.sprayd/Makefile Sun Oct 13 07:28:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1997/10/08 09:07:35 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2019/10/13 07:28:12 mrg Exp $
PROG = rpc.sprayd
SRCS = sprayd.c
@@ -8,5 +8,6 @@ MLINKS= rpc.sprayd.8 sprayd.8
DPADD= ${LIBRPCSVC}
LDADD= -lrpcsvc
-.include <bsd.prog.mk>
+COPTS.sprayd.c+= ${GCC_NO_STRINGOP_TRUNCATION} ${GCC_NO_CAST_FUNCTION_TYPE}
+.include <bsd.prog.mk>
Index: src/sbin/disklabel/Makefile
diff -u src/sbin/disklabel/Makefile:1.73 src/sbin/disklabel/Makefile:1.74
--- src/sbin/disklabel/Makefile:1.73 Wed Jan 24 09:04:42 2018
+++ src/sbin/disklabel/Makefile Sun Oct 13 07:28:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2018/01/24 09:04:42 skrll Exp $
+# $NetBSD: Makefile,v 1.74 2019/10/13 07:28:12 mrg Exp $
# @(#)Makefile 8.2 (Berkeley) 3/17/94
PROG= disklabel
@@ -30,4 +30,7 @@ CPPFLAGS+= -DALPHA_BOOTBLOCK_CKSUM
CPPFLAGS+= -DVAX_ALTLABELS
.endif
+COPTS.main.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.interact.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/sbin/dump/Makefile
diff -u src/sbin/dump/Makefile:1.39 src/sbin/dump/Makefile:1.40
--- src/sbin/dump/Makefile:1.39 Fri Aug 10 12:20:11 2012
+++ src/sbin/dump/Makefile Sun Oct 13 07:28:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2012/08/10 12:20:11 joerg Exp $
+# $NetBSD: Makefile,v 1.40 2019/10/13 07:28:12 mrg Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# dump.h header file
@@ -38,5 +38,6 @@ LDADD+= -lutil
.PATH: ${NETBSDSRCDIR}/sys/ufs/ffs
COPTS.ffs_inode.c+= -Wno-pointer-sign
+COPTS.traverse.c+= ${GCC_NO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
Index: src/sbin/dump_lfs/Makefile
diff -u src/sbin/dump_lfs/Makefile:1.16 src/sbin/dump_lfs/Makefile:1.17
--- src/sbin/dump_lfs/Makefile:1.16 Sat Jun 15 12:29:02 2013
+++ src/sbin/dump_lfs/Makefile Sun Oct 13 07:28:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2013/06/15 12:29:02 christos Exp $
+# $NetBSD: Makefile,v 1.17 2019/10/13 07:28:12 mrg Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# lfs_inode.c LFS filestore-specific routines
@@ -30,4 +30,6 @@ COPTS.lfs_inode.c+= -fno-tree-ter
.PATH: ${NETBSDSRCDIR}/sbin/dump ${NETBSDSRCDIR}/sys/ufs/lfs \
${NETBSDSRCDIR}/sys/ufs/ffs
+COPTS.traverse.c+= ${GCC_NO_FORMAT_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/sbin/fdisk/Makefile
diff -u src/sbin/fdisk/Makefile:1.42 src/sbin/fdisk/Makefile:1.43
--- src/sbin/fdisk/Makefile:1.42 Sat May 5 16:03:55 2012
+++ src/sbin/fdisk/Makefile Sun Oct 13 07:28:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2012/05/05 16:03:55 tsutsui Exp $
+# $NetBSD: Makefile,v 1.43 2019/10/13 07:28:12 mrg Exp $
PROG= fdisk
SRCS= fdisk.c
@@ -20,6 +20,8 @@ CPPFLAGS+= -D_PATH_DEFDISK='"/dev/rsd0d"
CPPFLAGS+= -D_PATH_DEFDISK='"/dev/rwd0c"'
.endif
+COPTS.fdisk.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
.if (${HOSTPROG:U} == "")
Index: src/sbin/init/Makefile
diff -u src/sbin/init/Makefile:1.39 src/sbin/init/Makefile:1.40
--- src/sbin/init/Makefile:1.39 Mon Jul 15 00:18:03 2013
+++ src/sbin/init/Makefile Sun Oct 13 07:28:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2013/07/15 00:18:03 khorben Exp $
+# $NetBSD: Makefile,v 1.40 2019/10/13 07:28:12 mrg Exp $
# @(#)Makefile 8.1 (Berkeley) 7/19/93
PROG= init
@@ -17,4 +17,6 @@ DPADD+= ${LIBCRYPT}
LDADD+= -lcrypt
.endif
+COPTS.init.c+= ${GCC_NO_FORMAT_TRUNCATION} ${GCC_NO_STRINGOP_TRUNCATION} ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include <bsd.prog.mk>
Index: src/sbin/iscsictl/Makefile
diff -u src/sbin/iscsictl/Makefile:1.3 src/sbin/iscsictl/Makefile:1.4
--- src/sbin/iscsictl/Makefile:1.3 Sat May 30 15:57:32 2015
+++ src/sbin/iscsictl/Makefile Sun Oct 13 07:28:12 2019
@@ -13,4 +13,7 @@ CPPFLAGS+= -I${.CURDIR}/../iscsid
MAN= iscsictl.8
+COPTS.iscsic_main.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.iscsic_driverif.c+= ${GCC_NO_FORMAT_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/sbin/pppoectl/Makefile
diff -u src/sbin/pppoectl/Makefile:1.4 src/sbin/pppoectl/Makefile:1.5
--- src/sbin/pppoectl/Makefile:1.4 Sun Sep 23 07:24:19 2018
+++ src/sbin/pppoectl/Makefile Sun Oct 13 07:28:12 2019
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2018/09/23 07:24:19 maxv Exp $
+# $NetBSD: Makefile,v 1.5 2019/10/13 07:28:12 mrg Exp $
PROG= pppoectl
MAN= pppoectl.8
USE_FORT?= yes # network client
+COPTS.pppoectl.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/sbin/raidctl/Makefile
diff -u src/sbin/raidctl/Makefile:1.16 src/sbin/raidctl/Makefile:1.17
--- src/sbin/raidctl/Makefile:1.16 Wed Dec 15 18:37:55 2010
+++ src/sbin/raidctl/Makefile Sun Oct 13 07:28:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2010/12/15 18:37:55 pooka Exp $
+# $NetBSD: Makefile,v 1.17 2019/10/13 07:28:12 mrg Exp $
RUMPPRG=raidctl
SRCS= rf_configure.c raidctl.c
@@ -7,4 +7,6 @@ MAN= raidctl.8
DPADD= ${LIBUTIL}
LDADD= -lutil
+COPTS.raidctl.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/sbin/restore/Makefile
diff -u src/sbin/restore/Makefile:1.26 src/sbin/restore/Makefile:1.27
--- src/sbin/restore/Makefile:1.26 Sat Aug 6 20:46:42 2011
+++ src/sbin/restore/Makefile Sun Oct 13 07:28:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2011/08/06 20:46:42 dholland Exp $
+# $NetBSD: Makefile,v 1.27 2019/10/13 07:28:13 mrg Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
.include <bsd.own.mk>
@@ -12,4 +12,7 @@ MAN= restore.8
MLINKS+=restore.8 rrestore.8
.PATH: ${NETBSDSRCDIR}/sbin/dump
+COPTS.interactive.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.dirs.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/sbin/rndctl/Makefile
diff -u src/sbin/rndctl/Makefile:1.2 src/sbin/rndctl/Makefile:1.3
--- src/sbin/rndctl/Makefile:1.2 Mon Oct 13 14:16:16 1997
+++ src/sbin/rndctl/Makefile Sun Oct 13 07:28:13 2019
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.2 1997/10/13 14:16:16 mycroft Exp $
+# $NetBSD: Makefile,v 1.3 2019/10/13 07:28:13 mrg Exp $
PROG= rndctl
MAN= rndctl.8
+COPTS.rndctl.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/sbin/route/Makefile
diff -u src/sbin/route/Makefile:1.31 src/sbin/route/Makefile:1.32
--- src/sbin/route/Makefile:1.31 Wed Dec 13 17:42:44 2017
+++ src/sbin/route/Makefile Sun Oct 13 07:28:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2017/12/13 17:42:44 christos Exp $
+# $NetBSD: Makefile,v 1.32 2019/10/13 07:28:13 mrg Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
.include <bsd.own.mk>
@@ -29,4 +29,6 @@ DPADD+=${LIBUTIL}
# keywords.c keywords.h : keywords.sh
# ${HOST_SH} keywords.sh
+COPTS.rtutil.c+= ${GCC_NO_FORMAT_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/sbin/routed/Makefile
diff -u src/sbin/routed/Makefile:1.25 src/sbin/routed/Makefile:1.26
--- src/sbin/routed/Makefile:1.25 Thu Aug 25 16:12:37 2011
+++ src/sbin/routed/Makefile Sun Oct 13 07:28:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2011/08/25 16:12:37 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2019/10/13 07:28:13 mrg Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/19/93
USE_FORT?= yes # network client/server
@@ -17,5 +17,7 @@ MLINKS= routed.8 rdisc.8
COPTS.main.c = -Wno-format-nonliteral
COPTS.trace.c = -Wno-format-nonliteral
+COPTS.if.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
.include <bsd.subdir.mk>
Index: src/sbin/umount/Makefile
diff -u src/sbin/umount/Makefile:1.18 src/sbin/umount/Makefile:1.19
--- src/sbin/umount/Makefile:1.18 Mon Jul 1 15:16:33 2013
+++ src/sbin/umount/Makefile Sun Oct 13 07:28:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2013/07/01 15:16:33 christos Exp $
+# $NetBSD: Makefile,v 1.19 2019/10/13 07:28:13 mrg Exp $
# @(#)Makefile 8.4 (Berkeley) 6/22/95
.include <bsd.own.mk>
@@ -16,4 +16,6 @@ CPPFLAGS+= -I${MOUNT}
SRCS+= vfslist.c
.endif
+COPTS.umount.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include <bsd.prog.mk>
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1154 src/share/mk/bsd.own.mk:1.1155
--- src/share/mk/bsd.own.mk:1.1154 Wed Oct 9 13:13:10 2019
+++ src/share/mk/bsd.own.mk Sun Oct 13 07:28:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1154 2019/10/09 13:13:10 jhigh Exp $
+# $NetBSD: bsd.own.mk,v 1.1155 2019/10/13 07:28:13 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -806,6 +806,15 @@ NOPROFILE= # defined
.endif
#
+# GCC warnings with simple disables. Use these with eg
+# COPTS.foo.c+= ${GCC_NO_STRINGOP_TRUNCATION}.
+#
+GCC_NO_FORMAT_TRUNCATION= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 7:? -Wno-format-truncation :}
+GCC_NO_STRINGOP_TRUNCATION= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 8:? -Wno-stringop-truncation :}
+GCC_NO_STRINGOP_OVERFLOW= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 8:? -Wno-stringop-overflow :}
+GCC_NO_CAST_FUNCTION_TYPE= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 8:? -Wno-cast-function-type :}
+
+#
# The ia64 port is incomplete.
#
MKGDB.ia64= no
Index: src/sys/modules/coredump/Makefile
diff -u src/sys/modules/coredump/Makefile:1.4 src/sys/modules/coredump/Makefile:1.5
--- src/sys/modules/coredump/Makefile:1.4 Sun Feb 17 04:05:46 2019
+++ src/sys/modules/coredump/Makefile Sun Oct 13 07:28:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/02/17 04:05:46 rin Exp $
+# $NetBSD: Makefile,v 1.5 2019/10/13 07:28:13 mrg Exp $
.include "../Makefile.inc"
@@ -25,4 +25,6 @@ SRCS+= core_machdep.c
WARNS= 3
+COPTS.kern_core.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include <bsd.kmodule.mk>
Index: src/sys/modules/filemon/Makefile
diff -u src/sys/modules/filemon/Makefile:1.2 src/sys/modules/filemon/Makefile:1.3
--- src/sys/modules/filemon/Makefile:1.2 Thu Aug 20 11:05:01 2015
+++ src/sys/modules/filemon/Makefile Sun Oct 13 07:28:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/08/20 11:05:01 christos Exp $
+# $NetBSD: Makefile,v 1.3 2019/10/13 07:28:13 mrg Exp $
.include "../Makefile.inc"
@@ -9,4 +9,6 @@ IOCONF= filemon.ioconf
SRCS = filemon.c filemon_wrapper.c
NOMAN = no
+COPTS.filemon_wrapper.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include <bsd.kmodule.mk>
Index: src/sys/modules/ptrace_common/Makefile
diff -u src/sys/modules/ptrace_common/Makefile:1.2 src/sys/modules/ptrace_common/Makefile:1.3
--- src/sys/modules/ptrace_common/Makefile:1.2 Sun Feb 17 04:05:56 2019
+++ src/sys/modules/ptrace_common/Makefile Sun Oct 13 07:28:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/02/17 04:05:56 rin Exp $
+# $NetBSD: Makefile,v 1.3 2019/10/13 07:28:13 mrg Exp $
#
.include "../Makefile.inc"
@@ -11,4 +11,6 @@ SRCS= sys_ptrace_common.c
WARNS= 3
+COPTS.sys_ptrace_common.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include <bsd.kmodule.mk>
Index: src/sys/rump/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.176 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.177
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.176 Mon Sep 2 20:09:30 2019
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Sun Oct 13 07:28:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.176 2019/09/02 20:09:30 riastradh Exp $
+# $NetBSD: Makefile.rumpkern,v 1.177 2019/10/13 07:28:14 mrg Exp $
#
IOCONFDIR:= ${.PARSEDIR}
@@ -234,5 +234,11 @@ SRCS+= atomic_cas_generic.c
#SRCS+= rump_atomic_cas_up.c
.endif
+COPTS.if_ethersubr.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.kern_hook.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.subr_vmem.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.subr_pool.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.rump.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include <bsd.lib.mk>
.include <bsd.klinks.mk>
Index: src/sys/rump/net/lib/libnet/Makefile
diff -u src/sys/rump/net/lib/libnet/Makefile:1.31 src/sys/rump/net/lib/libnet/Makefile:1.32
--- src/sys/rump/net/lib/libnet/Makefile:1.31 Wed Dec 12 01:40:20 2018
+++ src/sys/rump/net/lib/libnet/Makefile Sun Oct 13 07:28:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2018/12/12 01:40:20 rin Exp $
+# $NetBSD: Makefile,v 1.32 2019/10/13 07:28:14 mrg Exp $
#
@@ -27,6 +27,8 @@ SRCS+= rtsock_50.c uipc_syscalls_50.c
SRCS+= rtsock_70.c uipc_usrreq_70.c
.endif
+COPTS.if_ethersubr.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include "${.CURDIR}/../libnetinet/Makefile.inc"
.include "${.CURDIR}/../libnetinet6/Makefile.inc"
.include "${.CURDIR}/../libnetmpls/Makefile.inc"
Index: src/tests/fs/common/Makefile
diff -u src/tests/fs/common/Makefile:1.12 src/tests/fs/common/Makefile:1.13
--- src/tests/fs/common/Makefile:1.12 Tue Mar 4 21:06:47 2014
+++ src/tests/fs/common/Makefile Sun Oct 13 07:28:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2014/03/04 21:06:47 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2019/10/13 07:28:14 mrg Exp $
#
.include <bsd.own.mk>
@@ -40,5 +40,11 @@ CPPFLAGS+= -DMOUNT_NOMAIN -DMOUNTNFS_RET
CPPFLAGS+= -DUSE_RUMP -DLFS_CLEANER_AS_LIB
CWARNFLAGS.clang+= -Wno-error=absolute-value
+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}
+COPTS.clnt_vc.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.rpcb_clnt.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.rpc_generic.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
.include <bsd.lib.mk>
Index: src/tests/fs/nfs/nfsservice/Makefile
diff -u src/tests/fs/nfs/nfsservice/Makefile:1.13 src/tests/fs/nfs/nfsservice/Makefile:1.14
--- src/tests/fs/nfs/nfsservice/Makefile:1.13 Thu Aug 15 08:23:45 2019
+++ src/tests/fs/nfs/nfsservice/Makefile Sun Oct 13 07:28:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/08/15 08:23:45 kamil Exp $
+# $NetBSD: Makefile,v 1.14 2019/10/13 07:28:14 mrg Exp $
#
NOMAN= 1
@@ -50,4 +50,10 @@ DPADD+= ${LIBWRAP} ${LIBUTIL}
SANITIZER_RENAME_SYMBOL+= __getmntinfo13
+COPTS.pmap_svc.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.rpcb_svc.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.rpcb_svc_4.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.rpcb_svc_com.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.mountd.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include <bsd.test.mk>
Index: src/tests/lib/libc/rpc/Makefile
diff -u src/tests/lib/libc/rpc/Makefile:1.2 src/tests/lib/libc/rpc/Makefile:1.3
--- src/tests/lib/libc/rpc/Makefile:1.2 Tue Feb 26 17:06:55 2013
+++ src/tests/lib/libc/rpc/Makefile Sun Oct 13 07:28:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/02/26 17:06:55 christos Exp $
+# $NetBSD: Makefile,v 1.3 2019/10/13 07:28:14 mrg Exp $
MKMAN= no
@@ -18,6 +18,8 @@ CPPFLAGS+= -I.
RPC_INCS= ${RPCSRCS:.x=.h}
RPC_XDRFILES= ${RPCSRCS:.x=_xdr.c}
+COPTS.t_rpc.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include <bsd.rpc.mk>
.include <bsd.test.mk>
Index: src/tests/lib/libc/ssp/Makefile
diff -u src/tests/lib/libc/ssp/Makefile:1.9 src/tests/lib/libc/ssp/Makefile:1.10
--- src/tests/lib/libc/ssp/Makefile:1.9 Sun Sep 29 23:45:01 2019
+++ src/tests/lib/libc/ssp/Makefile Sun Oct 13 07:28:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/09/29 23:45:01 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2019/10/13 07:28:14 mrg Exp $
NOMAN= # defined
@@ -48,9 +48,7 @@ PROGS+= h_strncpy
PROGS+= h_vsnprintf
PROGS+= h_vsprintf
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
# Test exercises truncation
-COPTS.h_snprintf.c+= -Wno-error=format-truncation
-.endif
+COPTS.h_snprintf.c+= ${GCC_NO_FORMAT_TRUNCATION}
.include <bsd.test.mk>
Index: src/tests/lib/libevent/Makefile
diff -u src/tests/lib/libevent/Makefile:1.4 src/tests/lib/libevent/Makefile:1.5
--- src/tests/lib/libevent/Makefile:1.4 Sun May 21 15:28:42 2017
+++ src/tests/lib/libevent/Makefile Sun Oct 13 07:28:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2017/05/21 15:28:42 riastradh Exp $
+# $NetBSD: Makefile,v 1.5 2019/10/13 07:28:14 mrg Exp $
TESTSDIR= ${TESTSBASE}/lib/libevent
@@ -26,4 +26,6 @@ CPPFLAGS+= -DLIBEVENT_CRYPTO
DPADD+= ${LIBEVENT} ${LIBEVENT_PTHREADS} ${LIBZ} ${LIBPTHREAD}
LDADD+= -levent_pthreads -levent -lz -lpthread
+COPTS.regress_rpc.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include <bsd.test.mk>
Index: src/usr.bin/btpin/Makefile
diff -u src/usr.bin/btpin/Makefile:1.2 src/usr.bin/btpin/Makefile:1.3
--- src/usr.bin/btpin/Makefile:1.2 Tue Sep 26 19:18:19 2006
+++ src/usr.bin/btpin/Makefile Sun Oct 13 07:28:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/09/26 19:18:19 plunky Exp $
+# $NetBSD: Makefile,v 1.3 2019/10/13 07:28:14 mrg Exp $
PROG= btpin
SRCS= btpin.c
@@ -7,4 +7,6 @@ MAN= btpin.1
DPADD+= ${LIBBLUETOOTH}
LDADD+= -lbluetooth
+COPTS.btpin.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/usr.bin/config/Makefile
diff -u src/usr.bin/config/Makefile:1.10 src/usr.bin/config/Makefile:1.11
--- src/usr.bin/config/Makefile:1.10 Wed Oct 29 19:10:49 2014
+++ src/usr.bin/config/Makefile Sun Oct 13 07:28:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2014/10/29 19:10:49 christos Exp $
+# $NetBSD: Makefile,v 1.11 2019/10/13 07:28:14 mrg Exp $
# from: @(#)Makefile 8.2 (Berkeley) 4/19/94
.include <bsd.own.mk>
@@ -20,6 +20,8 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/usr.bin/cks
.ifndef HOSTPROG
LDADD+=-lutil
DPADD+=${LIBUTIL}
+COPTS.mkheaders.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.sem.c+= ${GCC_NO_FORMAT_TRUNCATION}
.endif
CWARNFLAGS+=-Wno-format-y2k
Index: src/usr.bin/crunch/crunchgen/Makefile
diff -u src/usr.bin/crunch/crunchgen/Makefile:1.15 src/usr.bin/crunch/crunchgen/Makefile:1.16
--- src/usr.bin/crunch/crunchgen/Makefile:1.15 Tue Aug 29 12:50:49 2006
+++ src/usr.bin/crunch/crunchgen/Makefile Sun Oct 13 07:28:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/08/29 12:50:49 christos Exp $
+# $NetBSD: Makefile,v 1.16 2019/10/13 07:28:15 mrg Exp $
PROG= crunchgen
SRCS= crunchgen.c crunched_skel.c
@@ -21,6 +21,8 @@ DPADD+=${LIBUTIL}
CPPFLAGS+= -DNEW_TOOLCHAIN
.endif
+COPTS.crunchgen.c+= ${GCC_NO_FORMAT_TRUNCATION}
+
.else
# Host tool -- We can also pay attention to EXTERNAL_TOOLCHAIN.
Index: src/usr.bin/cvslatest/Makefile
diff -u src/usr.bin/cvslatest/Makefile:1.3 src/usr.bin/cvslatest/Makefile:1.4
--- src/usr.bin/cvslatest/Makefile:1.3 Sat Mar 9 16:18:37 2019
+++ src/usr.bin/cvslatest/Makefile Sun Oct 13 07:28:15 2019
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2019/03/09 16:18:37 christos Exp $
+# $NetBSD: Makefile,v 1.4 2019/10/13 07:28:15 mrg Exp $
WARNS=6
PROG= cvslatest
+COPTS.cvslatest.c+= ${GCC_NO_FORMAT_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/usr.bin/fstat/Makefile
diff -u src/usr.bin/fstat/Makefile:1.25 src/usr.bin/fstat/Makefile:1.26
--- src/usr.bin/fstat/Makefile:1.25 Fri Dec 23 10:19:57 2016
+++ src/usr.bin/fstat/Makefile Sun Oct 13 07:28:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2016/12/23 10:19:57 mrg Exp $
+# $NetBSD: Makefile,v 1.26 2019/10/13 07:28:15 mrg Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
.include <bsd.own.mk>
@@ -23,4 +23,6 @@ DPADD+=${LIBUTIL}
.include "../../compat/exec.mk"
+COPTS.fstat.c+= ${GCC_NO_FORMAT_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/usr.bin/hexdump/Makefile
diff -u src/usr.bin/hexdump/Makefile:1.14 src/usr.bin/hexdump/Makefile:1.15
--- src/usr.bin/hexdump/Makefile:1.14 Sun Aug 14 13:45:34 2011
+++ src/usr.bin/hexdump/Makefile Sun Oct 13 07:28:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2011/08/14 13:45:34 christos Exp $
+# $NetBSD: Makefile,v 1.15 2019/10/13 07:28:15 mrg Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= hexdump
@@ -15,4 +15,6 @@ LINKS= ${BINDIR}/hexdump ${BINDIR}/od
COPTS.conv.c += -Wno-format-nonliteral
COPTS.display.c += -Wno-format-nonliteral
+COPTS.parse.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/usr.bin/login/Makefile
diff -u src/usr.bin/login/Makefile:1.57 src/usr.bin/login/Makefile:1.58
--- src/usr.bin/login/Makefile:1.57 Sun Feb 25 00:16:49 2018
+++ src/usr.bin/login/Makefile Sun Oct 13 07:28:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2018/02/25 00:16:49 mrg Exp $
+# $NetBSD: Makefile,v 1.58 2019/10/13 07:28:15 mrg Exp $
# @(#)Makefile 8.1 (Berkeley) 7/19/93
.include <bsd.own.mk>
@@ -45,5 +45,7 @@ copyrightstr.c: ${NETBSDSRCDIR}/sys/conf
END { print "\"\\n\";" }\
' ${.ALLSRC} > ${.TARGET}
+COPTS.parse.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.common.c+= ${GCC_NO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
Index: src/usr.bin/mail/Makefile
diff -u src/usr.bin/mail/Makefile:1.38 src/usr.bin/mail/Makefile:1.39
--- src/usr.bin/mail/Makefile:1.38 Sun Jun 10 17:55:11 2018
+++ src/usr.bin/mail/Makefile Sun Oct 13 07:28:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2018/06/10 17:55:11 christos Exp $
+# $NetBSD: Makefile,v 1.39 2019/10/13 07:28:15 mrg Exp $
# @(#)Makefile 8.3 (Berkeley) 4/20/95
.include <bsd.own.mk>
@@ -76,7 +76,8 @@ SUBDIR.roff+= USD.doc
CONFIGFILES= mail.rc
FILESDIR_mail.rc= /etc
-COPTS.format.c += -Wno-format-nonliteral
+COPTS.format.c+= -Wno-format-nonliteral
+COPTS.fio.c+= ${GCC_NO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
.include <bsd.subdir.mk>
Index: src/usr.bin/make/Makefile
diff -u src/usr.bin/make/Makefile:1.62 src/usr.bin/make/Makefile:1.63
--- src/usr.bin/make/Makefile:1.62 Sun Sep 29 23:45:01 2019
+++ src/usr.bin/make/Makefile Sun Oct 13 07:28:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2019/09/29 23:45:01 mrg Exp $
+# $NetBSD: Makefile,v 1.63 2019/10/13 07:28:15 mrg Exp $
# @(#)Makefile 5.2 (Berkeley) 12/28/90
PROG= make
@@ -46,9 +46,11 @@ LDADD+=-lutil
DPADD+=${LIBUTIL}
.endif
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
-COPTS.arch.c += -Wno-error=format-truncation
-.endif
+COPTS.arch.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.dir.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.main.c+= ${GCC_NO_FORMAT_TRUNCATION} ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.meta.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.parse.c+= ${GCC_NO_FORMAT_TRUNCATION}
# A simple unit-test driver to help catch regressions
accept test:
Index: src/usr.bin/man/Makefile
diff -u src/usr.bin/man/Makefile:1.15 src/usr.bin/man/Makefile:1.16
--- src/usr.bin/man/Makefile:1.15 Mon Feb 17 03:10:12 2014
+++ src/usr.bin/man/Makefile Sun Oct 13 07:28:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2014/02/17 03:10:12 uwe Exp $
+# $NetBSD: Makefile,v 1.16 2019/10/13 07:28:15 mrg Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
WARNS?= 6
@@ -10,4 +10,6 @@ MAN= man.1 man.conf.5
DPADD+= ${LIBUTIL}
LDADD+= -lutil
+COPTS.man.c+= ${GCC_NO_FORMAT_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/usr.bin/mklocale/Makefile
diff -u src/usr.bin/mklocale/Makefile:1.16 src/usr.bin/mklocale/Makefile:1.17
--- src/usr.bin/mklocale/Makefile:1.16 Tue Apr 14 22:15:24 2009
+++ src/usr.bin/mklocale/Makefile Sun Oct 13 07:28:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/04/14 22:15:24 lukem Exp $
+# $NetBSD: Makefile,v 1.17 2019/10/13 07:28:15 mrg Exp $
WARNS?= 2 # XXX -Wextra -Wsign-compare issues
@@ -22,4 +22,5 @@ YHEADER= 1
.ifndef HOSTPROG
.include <bsd.prog.mk>
+COPTS.man.c+= ${GCC_NO_FORMAT_TRUNCATION}
.endif
Index: src/usr.bin/msgs/Makefile
diff -u src/usr.bin/msgs/Makefile:1.10 src/usr.bin/msgs/Makefile:1.11
--- src/usr.bin/msgs/Makefile:1.10 Wed Feb 3 15:34:45 2010
+++ src/usr.bin/msgs/Makefile Sun Oct 13 07:28:16 2019
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2010/02/03 15:34:45 roy Exp $
+# $NetBSD: Makefile,v 1.11 2019/10/13 07:28:16 mrg Exp $
# @(#)Makefile 8.2 (Berkeley) 4/28/95
PROG= msgs
DPADD= ${LIBTERMINFO}
LDADD= -lterminfo
+COPTS.msgs.c+= ${GCC_NO_FORMAT_TRUNCATION} ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/usr.bin/netstat/Makefile
diff -u src/usr.bin/netstat/Makefile:1.46 src/usr.bin/netstat/Makefile:1.47
--- src/usr.bin/netstat/Makefile:1.46 Sun Aug 18 04:14:40 2019
+++ src/usr.bin/netstat/Makefile Sun Oct 13 07:28:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2019/08/18 04:14:40 kamil Exp $
+# $NetBSD: Makefile,v 1.47 2019/10/13 07:28:16 mrg Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/12/93
.include <bsd.own.mk>
@@ -38,4 +38,8 @@ CPPFLAGS+= -DINET6
.include "../../compat/exec.mk"
+COPTS.atalk.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.inet6.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.rtutil.c+= ${GCC_NO_FORMAT_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/usr.bin/quota/Makefile
diff -u src/usr.bin/quota/Makefile:1.13 src/usr.bin/quota/Makefile:1.14
--- src/usr.bin/quota/Makefile:1.13 Sun Aug 11 06:09:29 2013
+++ src/usr.bin/quota/Makefile Sun Oct 13 07:28:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2013/08/11 06:09:29 dholland Exp $
+# $NetBSD: Makefile,v 1.14 2019/10/13 07:28:16 mrg Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
.include <bsd.own.mk>
@@ -9,4 +9,6 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/usr.bin/quo
DPADD= ${LIBQUOTA} ${LIBRPCSVC}
LDADD= -lquota -lrpcsvc
+COPTS.printquota.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/usr.bin/rdist/Makefile
diff -u src/usr.bin/rdist/Makefile:1.13 src/usr.bin/rdist/Makefile:1.14
--- src/usr.bin/rdist/Makefile:1.13 Sun Sep 29 23:45:01 2019
+++ src/usr.bin/rdist/Makefile Sun Oct 13 07:28:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/09/29 23:45:01 mrg Exp $
+# $NetBSD: Makefile,v 1.14 2019/10/13 07:28:16 mrg Exp $
# from: @(#)Makefile 8.3 (Berkeley) 7/19/93
USE_FORT?= yes # network client/server
@@ -9,8 +9,6 @@ SRCS= docmd.c expand.c gram.y lookup.c m
.include <bsd.own.mk>
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
-COPTS.server.c += -Wno-error=format-truncation
-.endif
+COPTS.server.c+= ${GCC_NO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
Index: src/usr.bin/rpcgen/Makefile
diff -u src/usr.bin/rpcgen/Makefile:1.13 src/usr.bin/rpcgen/Makefile:1.14
--- src/usr.bin/rpcgen/Makefile:1.13 Sun Aug 11 08:03:10 2013
+++ src/usr.bin/rpcgen/Makefile Sun Oct 13 07:28:16 2019
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2013/08/11 08:03:10 dholland Exp $
+# $NetBSD: Makefile,v 1.14 2019/10/13 07:28:16 mrg Exp $
PROG= rpcgen
SRCS= rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c rpc_parse.c rpc_scan.c \
rpc_svcout.c rpc_util.c rpc_sample.c rpc_tblout.c
+COPTS.rpc_cout.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+
.include <bsd.prog.mk>
Index: src/usr.bin/rpcinfo/Makefile
diff -u src/usr.bin/rpcinfo/Makefile:1.15 src/usr.bin/rpcinfo/Makefile:1.16
--- src/usr.bin/rpcinfo/Makefile:1.15 Wed Aug 21 21:05:29 2013
+++ src/usr.bin/rpcinfo/Makefile Sun Oct 13 07:28:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2013/08/21 21:05:29 dholland Exp $
+# $NetBSD: Makefile,v 1.16 2019/10/13 07:28:16 mrg Exp $
# from: @(#)Makefile 5.2 (Berkeley) 5/11/90
.include <bsd.own.mk>
@@ -17,4 +17,6 @@ CPPFLAGS+= -DINET6
.PATH: ${LIBCRPCDIR}
+COPTS.rpcinfo.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include <bsd.prog.mk>
Index: src/usr.bin/rup/Makefile
diff -u src/usr.bin/rup/Makefile:1.8 src/usr.bin/rup/Makefile:1.9
--- src/usr.bin/rup/Makefile:1.8 Tue Apr 14 22:15:25 2009
+++ src/usr.bin/rup/Makefile Sun Oct 13 07:28:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/04/14 22:15:25 lukem Exp $
+# $NetBSD: Makefile,v 1.9 2019/10/13 07:28:16 mrg Exp $
USE_FORT?= yes # network client
@@ -7,4 +7,6 @@ PROG= rup
DPADD= ${LIBRPCSVC}
LDADD= -lrpcsvc
+COPTS.rup.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include <bsd.prog.mk>
Index: src/usr.bin/rusers/Makefile
diff -u src/usr.bin/rusers/Makefile:1.11 src/usr.bin/rusers/Makefile:1.12
--- src/usr.bin/rusers/Makefile:1.11 Mon May 28 12:06:30 2007
+++ src/usr.bin/rusers/Makefile Sun Oct 13 07:28:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/05/28 12:06:30 tls Exp $
+# $NetBSD: Makefile,v 1.12 2019/10/13 07:28:16 mrg Exp $
USE_FORT?= yes # network client
@@ -7,4 +7,6 @@ PROG = rusers
DPADD= ${LIBRPCSVC}
LDADD= -lrpcsvc
+COPTS.rusers.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include <bsd.prog.mk>
Index: src/usr.bin/rwall/Makefile
diff -u src/usr.bin/rwall/Makefile:1.10 src/usr.bin/rwall/Makefile:1.11
--- src/usr.bin/rwall/Makefile:1.10 Tue Apr 14 22:15:25 2009
+++ src/usr.bin/rwall/Makefile Sun Oct 13 07:28:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/04/14 22:15:25 lukem Exp $
+# $NetBSD: Makefile,v 1.11 2019/10/13 07:28:16 mrg Exp $
USE_FORT?= yes # network client
@@ -7,4 +7,6 @@ PROG = rwall
DPADD= ${LIBRPCSVC}
LDADD= -lrpcsvc
+COPTS.rwall.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include <bsd.prog.mk>
Index: src/usr.bin/showmount/Makefile
diff -u src/usr.bin/showmount/Makefile:1.7 src/usr.bin/showmount/Makefile:1.8
--- src/usr.bin/showmount/Makefile:1.7 Mon May 28 12:06:31 2007
+++ src/usr.bin/showmount/Makefile Sun Oct 13 07:28:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/05/28 12:06:31 tls Exp $
+# $NetBSD: Makefile,v 1.8 2019/10/13 07:28:17 mrg Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
USE_FORT?= yes # network client
@@ -6,4 +6,6 @@ USE_FORT?= yes # network client
PROG= showmount
MAN= showmount.8
+COPTS.showmount.c+= ${GCC_NO_STRINGOP_OVERFLOW} ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include <bsd.prog.mk>
Index: src/usr.bin/sort/Makefile
diff -u src/usr.bin/sort/Makefile:1.8 src/usr.bin/sort/Makefile:1.9
--- src/usr.bin/sort/Makefile:1.8 Thu Sep 10 22:02:40 2009
+++ src/usr.bin/sort/Makefile Sun Oct 13 07:28:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/09/10 22:02:40 dsl Exp $
+# $NetBSD: Makefile,v 1.9 2019/10/13 07:28:17 mrg Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= sort
@@ -8,4 +8,6 @@ SRCS+= radix_sort.c
LDADD+=-lutil
DPADD+=${LIBUTIL}
+COPTS.init.c+= ${GCC_NO_FORMAT_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/usr.bin/systat/Makefile
diff -u src/usr.bin/systat/Makefile:1.42 src/usr.bin/systat/Makefile:1.43
--- src/usr.bin/systat/Makefile:1.42 Sun Sep 29 23:45:01 2019
+++ src/usr.bin/systat/Makefile Sun Oct 13 07:28:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2019/09/29 23:45:01 mrg Exp $
+# $NetBSD: Makefile,v 1.43 2019/10/13 07:28:17 mrg Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
.include <bsd.own.mk>
@@ -29,8 +29,8 @@ SRCS+= ip6.c
.include "../../compat/exec.mk"
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
-COPTS.df.c += -Wno-error=format-truncation
-.endif
+COPTS.df.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.ifstat.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.ps.c+= ${GCC_NO_STRINGOP_TRUNCATION} ${GCC_NO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
Index: src/usr.bin/telnet/Makefile
diff -u src/usr.bin/telnet/Makefile:1.58 src/usr.bin/telnet/Makefile:1.59
--- src/usr.bin/telnet/Makefile:1.58 Sun Sep 29 23:45:01 2019
+++ src/usr.bin/telnet/Makefile Sun Oct 13 07:28:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2019/09/29 23:45:01 mrg Exp $
+# $NetBSD: Makefile,v 1.59 2019/10/13 07:28:17 mrg Exp $
#
# Copyright (c) 1990 The Regents of the University of California.
# All rights reserved.
@@ -82,4 +82,6 @@ COPTS.${f}.c+= -Wno-pointer-sign
COPTS.telnet.c+= -Wno-error=implicit-fallthrough
.endif
+COPTS.sys_bsd.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include <bsd.prog.mk>
Index: src/usr.bin/unifdef/Makefile
diff -u src/usr.bin/unifdef/Makefile:1.6 src/usr.bin/unifdef/Makefile:1.7
--- src/usr.bin/unifdef/Makefile:1.6 Fri Aug 1 11:51:14 2003
+++ src/usr.bin/unifdef/Makefile Sun Oct 13 07:28:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/08/01 11:51:14 lukem Exp $
+# $NetBSD: Makefile,v 1.7 2019/10/13 07:28:17 mrg Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= unifdef
@@ -7,4 +7,6 @@ SCRIPTS=unifdefall.sh
MLINKS= unifdef.1 unifdefall.1
+COPTS.unifdef.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/usr.bin/utoppya/Makefile
diff -u src/usr.bin/utoppya/Makefile:1.1 src/usr.bin/utoppya/Makefile:1.2
--- src/usr.bin/utoppya/Makefile:1.1 Mon Apr 3 08:15:48 2006
+++ src/usr.bin/utoppya/Makefile Sun Oct 13 07:28:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2006/04/03 08:15:48 scw Exp $
+# $NetBSD: Makefile,v 1.2 2019/10/13 07:28:17 mrg Exp $
.include <bsd.own.mk>
@@ -9,4 +9,6 @@ CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/ftp
.PATH: ${NETBSDSRCDIR}/usr.bin/ftp
+COPTS.utoppya.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/usr.bin/wall/Makefile
diff -u src/usr.bin/wall/Makefile:1.11 src/usr.bin/wall/Makefile:1.12
--- src/usr.bin/wall/Makefile:1.11 Sat Nov 21 14:59:51 2015
+++ src/usr.bin/wall/Makefile Sun Oct 13 07:28:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2015/11/21 14:59:51 christos Exp $
+# $NetBSD: Makefile,v 1.12 2019/10/13 07:28:17 mrg Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
.include <bsd.own.mk>
@@ -16,4 +16,6 @@ LDADD+=-lutil
CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/who -DSUPPORT_UTMPX -DSUPPORT_UTMP
CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/write
+COPTS.wall.c+= ${GCC_NO_FORMAT_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/usr.sbin/acpitools/amldb/Makefile
diff -u src/usr.sbin/acpitools/amldb/Makefile:1.5 src/usr.sbin/acpitools/amldb/Makefile:1.6
--- src/usr.sbin/acpitools/amldb/Makefile:1.5 Sun Oct 14 13:36:32 2018
+++ src/usr.sbin/acpitools/amldb/Makefile Sun Oct 13 07:28:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2018/10/14 13:36:32 jmcneill Exp $
+# $NetBSD: Makefile,v 1.6 2019/10/13 07:28:17 mrg Exp $
# Id: Makefile,v 1.5 2000/07/14 18:16:30 iwasaki Exp
# $FreeBSD: src/usr.sbin/acpi/amldb/Makefile,v 1.7 2001/10/22 17:25:32 iwasaki Exp $
@@ -13,5 +13,7 @@ CPPFLAGS+= -I${.CURDIR} -D_KERNTYPES
MAN= amldb.8
+COPTS.aml_name.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
.PATH: ${.CURDIR}/../aml
Index: src/usr.sbin/altq/libaltq/Makefile
diff -u src/usr.sbin/altq/libaltq/Makefile:1.12 src/usr.sbin/altq/libaltq/Makefile:1.13
--- src/usr.sbin/altq/libaltq/Makefile:1.12 Tue Aug 16 12:49:13 2011
+++ src/usr.sbin/altq/libaltq/Makefile Sun Oct 13 07:28:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2011/08/16 12:49:13 christos Exp $
+# $NetBSD: Makefile,v 1.13 2019/10/13 07:28:17 mrg Exp $
LIBISPRIVATE= yes
@@ -15,4 +15,6 @@ CPPFLAGS+= -DALTQ
CPPFLAGS+= -DINET6
.endif
+COPTS+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.lib.mk>
Index: src/usr.sbin/altq/tbrconfig/Makefile
diff -u src/usr.sbin/altq/tbrconfig/Makefile:1.4 src/usr.sbin/altq/tbrconfig/Makefile:1.5
--- src/usr.sbin/altq/tbrconfig/Makefile:1.4 Tue Aug 27 14:46:19 2002
+++ src/usr.sbin/altq/tbrconfig/Makefile Sun Oct 13 07:28:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/08/27 14:46:19 lukem Exp $
+# $NetBSD: Makefile,v 1.5 2019/10/13 07:28:17 mrg Exp $
.include <bsd.own.mk> # for MKDYNAMICROOT definition
@@ -12,4 +12,6 @@ LDSTATIC?=-static
CPPFLAGS+= -DALTQ -I${.CURDIR}/../libaltq
+COPTS.tbrconfig.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/usr.sbin/apm/Makefile
diff -u src/usr.sbin/apm/Makefile:1.18 src/usr.sbin/apm/Makefile:1.19
--- src/usr.sbin/apm/Makefile:1.18 Thu May 2 03:56:42 2013
+++ src/usr.sbin/apm/Makefile Sun Oct 13 07:28:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2013/05/02 03:56:42 matt Exp $
+# $NetBSD: Makefile,v 1.19 2019/10/13 07:28:18 mrg Exp $
.include <bsd.own.mk>
@@ -18,4 +18,6 @@ LINKS= ${BINDIR}/apm ${BINDIR}/zzz
MAN= apm.8
MLINKS= apm.8 zzz.8
+COPTS.apm.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/usr.sbin/apmd/Makefile
diff -u src/usr.sbin/apmd/Makefile:1.16 src/usr.sbin/apmd/Makefile:1.17
--- src/usr.sbin/apmd/Makefile:1.16 Thu May 2 03:56:42 2013
+++ src/usr.sbin/apmd/Makefile Sun Oct 13 07:28:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2013/05/02 03:56:42 matt Exp $
+# $NetBSD: Makefile,v 1.17 2019/10/13 07:28:18 mrg Exp $
.include <bsd.own.mk>
@@ -17,4 +17,6 @@ MAN= apmd.8
LDADD+= -lutil
DPADD+= ${LIBUTIL}
+COPTS.apmd.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/usr.sbin/btpand/Makefile
diff -u src/usr.sbin/btpand/Makefile:1.5 src/usr.sbin/btpand/Makefile:1.6
--- src/usr.sbin/btpand/Makefile:1.5 Tue May 12 21:50:38 2009
+++ src/usr.sbin/btpand/Makefile Sun Oct 13 07:28:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/05/12 21:50:38 plunky Exp $
+# $NetBSD: Makefile,v 1.6 2019/10/13 07:28:18 mrg Exp $
#
PROG= btpand
@@ -8,4 +8,6 @@ SRCS= btpand.c bnep.c channel.c client.c
DPADD+= ${LIBBLUETOOTH} ${LIBEVENT} ${LIBUTIL}
LDADD+= -lbluetooth -levent -lutil
+COPTS.tap.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/usr.sbin/catman/Makefile
diff -u src/usr.sbin/catman/Makefile:1.9 src/usr.sbin/catman/Makefile:1.10
--- src/usr.sbin/catman/Makefile:1.9 Tue Aug 16 08:04:17 2011
+++ src/usr.sbin/catman/Makefile Sun Oct 13 07:28:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2011/08/16 08:04:17 christos Exp $
+# $NetBSD: Makefile,v 1.10 2019/10/13 07:28:18 mrg Exp $
.include <bsd.own.mk>
@@ -9,6 +9,6 @@ MAN= catman.8
.PATH: ${NETBSDSRCDIR}/usr.bin/man
CPPFLAGS+= -I${NETBSDSRCDIR}/usr.bin/man
-COPTS.catman.c += -Wno-format-nonliteral
+COPTS.catman.c+= -Wno-format-nonliteral ${GCC_NO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
Index: src/usr.sbin/cnwctl/Makefile
diff -u src/usr.sbin/cnwctl/Makefile:1.2 src/usr.sbin/cnwctl/Makefile:1.3
--- src/usr.sbin/cnwctl/Makefile:1.2 Mon Nov 29 12:55:07 1999
+++ src/usr.sbin/cnwctl/Makefile Sun Oct 13 07:28:18 2019
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.2 1999/11/29 12:55:07 itojun Exp $
+# $NetBSD: Makefile,v 1.3 2019/10/13 07:28:18 mrg Exp $
# PAO2 Id: Makefile,v 1.1.1.1 1997/12/11 14:46:06 itojun Exp
PROG= cnwctl
MAN= cnwctl.8
+COPTS.cnwctl.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/usr.sbin/crash/Makefile
diff -u src/usr.sbin/crash/Makefile:1.41 src/usr.sbin/crash/Makefile:1.42
--- src/usr.sbin/crash/Makefile:1.41 Sat Sep 15 19:47:48 2018
+++ src/usr.sbin/crash/Makefile Sun Oct 13 07:28:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2018/09/15 19:47:48 jakllsch Exp $
+# $NetBSD: Makefile,v 1.42 2019/10/13 07:28:18 mrg Exp $
PROG= crash
MAN= crash.8
@@ -115,5 +115,7 @@ COPTS.kern_timeout.c += -Wno-stack-prote
.include "../../compat/exec.mk"
+COPTS.db_command.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include <bsd.prog.mk>
.include <bsd.klinks.mk>
Index: src/usr.sbin/edquota/Makefile
diff -u src/usr.sbin/edquota/Makefile:1.11 src/usr.sbin/edquota/Makefile:1.12
--- src/usr.sbin/edquota/Makefile:1.11 Wed Feb 1 17:53:01 2012
+++ src/usr.sbin/edquota/Makefile Sun Oct 13 07:28:18 2019
@@ -1,5 +1,5 @@
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $NetBSD: Makefile,v 1.11 2012/02/01 17:53:01 dholland Exp $
+# $NetBSD: Makefile,v 1.12 2019/10/13 07:28:18 mrg Exp $
.include <bsd.own.mk>
@@ -15,4 +15,6 @@ LDADD= -lquota -lrpcsvc
.PATH: ${NETBSDSRCDIR}/usr.bin/quota
SRCS+= printquota.c
+COPTS.printquota.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/usr.sbin/eshconfig/Makefile
diff -u src/usr.sbin/eshconfig/Makefile:1.1 src/usr.sbin/eshconfig/Makefile:1.2
--- src/usr.sbin/eshconfig/Makefile:1.1 Sat May 16 18:55:17 1998
+++ src/usr.sbin/eshconfig/Makefile Sun Oct 13 07:28:18 2019
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.1 1998/05/16 18:55:17 kml Exp $
+# $NetBSD: Makefile,v 1.2 2019/10/13 07:28:18 mrg Exp $
PROG= eshconfig
MAN= eshconfig.8
+COPTS.eshconfig.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/usr.sbin/ifwatchd/Makefile
diff -u src/usr.sbin/ifwatchd/Makefile:1.1 src/usr.sbin/ifwatchd/Makefile:1.2
--- src/usr.sbin/ifwatchd/Makefile:1.1 Mon Nov 19 09:43:03 2001
+++ src/usr.sbin/ifwatchd/Makefile Sun Oct 13 07:28:18 2019
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2001/11/19 09:43:03 martin Exp $
+# $NetBSD: Makefile,v 1.2 2019/10/13 07:28:18 mrg Exp $
PROG=ifwatchd
MAN=ifwatchd.8
+COPTS.ifwatchd.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/usr.sbin/ipwctl/Makefile
diff -u src/usr.sbin/ipwctl/Makefile:1.7 src/usr.sbin/ipwctl/Makefile:1.8
--- src/usr.sbin/ipwctl/Makefile:1.7 Wed Apr 22 15:23:04 2009
+++ src/usr.sbin/ipwctl/Makefile Sun Oct 13 07:28:19 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/04/22 15:23:04 lukem Exp $
+# $NetBSD: Makefile,v 1.8 2019/10/13 07:28:19 mrg Exp $
.if ${MACHINE_ARCH} == "i386"
PROG= ipwctl
@@ -6,4 +6,6 @@ PROG= ipwctl
MAN= ipwctl.8
+COPTS.ipwctl.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/usr.sbin/iwictl/Makefile
diff -u src/usr.sbin/iwictl/Makefile:1.5 src/usr.sbin/iwictl/Makefile:1.6
--- src/usr.sbin/iwictl/Makefile:1.5 Wed Apr 22 15:23:04 2009
+++ src/usr.sbin/iwictl/Makefile Sun Oct 13 07:28:19 2019
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2009/04/22 15:23:04 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2019/10/13 07:28:19 mrg Exp $
PROG = iwictl
MAN = iwictl.8
+COPTS.iwictl.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/usr.sbin/makefs/Makefile
diff -u src/usr.sbin/makefs/Makefile:1.36 src/usr.sbin/makefs/Makefile:1.37
--- src/usr.sbin/makefs/Makefile:1.36 Mon Aug 5 14:41:57 2013
+++ src/usr.sbin/makefs/Makefile Sun Oct 13 07:28:19 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2013/08/05 14:41:57 reinoud Exp $
+# $NetBSD: Makefile,v 1.37 2019/10/13 07:28:19 mrg Exp $
#
WARNS?= 5
@@ -31,6 +31,12 @@ CPPFLAGS+= -I${.CURDIR} -I${MKNODSRC} -I
.if !defined(HOSTPROG)
DPADD+= ${LIBUTIL}
LDADD+= -lutil
+
+COPTS.cd9660.c+= ${GCC_NO_STRINGOP_TRUNCATION} ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.cd9660_conversion.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.udf.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.v7fs_estimate.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.v7fs_populate.c+= ${GCC_NO_STRINGOP_TRUNCATION} ${GCC_NO_FORMAT_TRUNCATION}
.endif
.include <bsd.prog.mk>
Index: src/usr.sbin/mopd/common/Makefile
diff -u src/usr.sbin/mopd/common/Makefile:1.20 src/usr.sbin/mopd/common/Makefile:1.21
--- src/usr.sbin/mopd/common/Makefile:1.20 Sun Jul 27 04:38:03 2014
+++ src/usr.sbin/mopd/common/Makefile Sun Oct 13 07:28:19 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2014/07/27 04:38:03 dholland Exp $
+# $NetBSD: Makefile,v 1.21 2019/10/13 07:28:19 mrg Exp $
LIBISPRIVATE= yes
@@ -21,3 +21,5 @@ version.c: VERSION
.include <bsd.lib.mk>
COPTS.print.c+= -Wno-pointer-sign
+
+COPTS.pf.c+= ${GCC_NO_STRINGOP_TRUNCATION}
Index: src/usr.sbin/mopd/mopd/Makefile
diff -u src/usr.sbin/mopd/mopd/Makefile:1.12 src/usr.sbin/mopd/mopd/Makefile:1.13
--- src/usr.sbin/mopd/mopd/Makefile:1.12 Fri Aug 10 12:10:29 2012
+++ src/usr.sbin/mopd/mopd/Makefile Sun Oct 13 07:28:19 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2012/08/10 12:10:29 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2019/10/13 07:28:19 mrg Exp $
PROG= mopd
SRCS= mopd.c process.c
@@ -9,4 +9,4 @@ DPADD+= ${LIBUTIL}
.include <bsd.prog.mk>
-COPTS.process.c+= -Wno-pointer-sign
+COPTS.process.c+= -Wno-pointer-sign ${GCC_NO_FORMAT_TRUNCATION}
Index: src/usr.sbin/mountd/Makefile
diff -u src/usr.sbin/mountd/Makefile:1.19 src/usr.sbin/mountd/Makefile:1.20
--- src/usr.sbin/mountd/Makefile:1.19 Wed Dec 23 16:19:49 2015
+++ src/usr.sbin/mountd/Makefile Sun Oct 13 07:28:19 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2015/12/23 16:19:49 christos Exp $
+# $NetBSD: Makefile,v 1.20 2019/10/13 07:28:19 mrg Exp $
# @(#)Makefile 8.3 (Berkeley) 1/25/94
USE_FORT?= yes # network server
@@ -15,4 +15,6 @@ DPADD+= ${LIBIPSEC} ${LIBUTIL}
.include <bsd.prog.mk>
+COPTS.mountd.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+
.PATH: ${INETDDIR}
Index: src/usr.sbin/mrouted/Makefile
diff -u src/usr.sbin/mrouted/Makefile:1.15 src/usr.sbin/mrouted/Makefile:1.16
--- src/usr.sbin/mrouted/Makefile:1.15 Thu May 26 12:56:34 2011
+++ src/usr.sbin/mrouted/Makefile Sun Oct 13 07:28:19 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2011/05/26 12:56:34 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2019/10/13 07:28:19 mrg Exp $
# from: Id: Makefile,v 1.5 1993/06/24 05:11:16 deering Exp
.include <bsd.own.mk>
@@ -16,4 +16,7 @@ CPPFLAGS+= -I${.CURDIR}
CWARNFLAGS.clang+= -Wno-format-extra-args
+COPTS.cfparse.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.vif.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/usr.sbin/perfused/Makefile
diff -u src/usr.sbin/perfused/Makefile:1.6 src/usr.sbin/perfused/Makefile:1.7
--- src/usr.sbin/perfused/Makefile:1.6 Sat Jan 23 21:22:50 2016
+++ src/usr.sbin/perfused/Makefile Sun Oct 13 07:28:19 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/01/23 21:22:50 christos Exp $
+# $NetBSD: Makefile,v 1.7 2019/10/13 07:28:19 mrg Exp $
PROG= perfused
@@ -14,5 +14,6 @@ LDADD+= -lperfuse -lpuffs
DPADD+= ${LIBPUFFS}
CWARNFLAGS.clang+= -Wno-format-security
+COPTS.perfused.c+= ${GCC_NO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
Index: src/usr.sbin/rarpd/Makefile
diff -u src/usr.sbin/rarpd/Makefile:1.14 src/usr.sbin/rarpd/Makefile:1.15
--- src/usr.sbin/rarpd/Makefile:1.14 Fri Aug 10 12:10:29 2012
+++ src/usr.sbin/rarpd/Makefile Sun Oct 13 07:28:19 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/08/10 12:10:29 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2019/10/13 07:28:19 mrg Exp $
USE_FORT?= yes # network server
@@ -16,4 +16,6 @@ DPADD+= ${LIBUTIL}
.include <bsd.prog.mk>
+COPTS.rarpd.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
COPTS.mkarp.c+= -Wno-pointer-sign
Index: src/usr.sbin/rbootd/Makefile
diff -u src/usr.sbin/rbootd/Makefile:1.14 src/usr.sbin/rbootd/Makefile:1.15
--- src/usr.sbin/rbootd/Makefile:1.14 Fri Aug 10 12:10:29 2012
+++ src/usr.sbin/rbootd/Makefile Sun Oct 13 07:28:20 2019
@@ -1,5 +1,5 @@
# from: @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $NetBSD: Makefile,v 1.14 2012/08/10 12:10:29 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2019/10/13 07:28:20 mrg Exp $
USE_FORT?= yes # network server
@@ -16,4 +16,6 @@ DPADD+= ${LIBUTIL}
COPTS.utils.c+= -fno-strict-aliasing
.endif
+COPTS.bpf.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/usr.sbin/repquota/Makefile
diff -u src/usr.sbin/repquota/Makefile:1.10 src/usr.sbin/repquota/Makefile:1.11
--- src/usr.sbin/repquota/Makefile:1.10 Mon Feb 13 01:35:09 2012
+++ src/usr.sbin/repquota/Makefile Sun Oct 13 07:28:20 2019
@@ -1,5 +1,5 @@
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $NetBSD: Makefile,v 1.10 2012/02/13 01:35:09 dholland Exp $
+# $NetBSD: Makefile,v 1.11 2019/10/13 07:28:20 mrg Exp $
WARNS ?= 4
.include <bsd.own.mk>
@@ -17,4 +17,6 @@ LDADD= -lquota -lrpcsvc
.PATH: ${NETBSDSRCDIR}/usr.bin/quota
SRCS+= printquota.c
+COPTS.printquota.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/usr.sbin/route6d/Makefile
diff -u src/usr.sbin/route6d/Makefile:1.7 src/usr.sbin/route6d/Makefile:1.8
--- src/usr.sbin/route6d/Makefile:1.7 Mon May 28 12:06:39 2007
+++ src/usr.sbin/route6d/Makefile Sun Oct 13 07:28:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/05/28 12:06:39 tls Exp $
+# $NetBSD: Makefile,v 1.8 2019/10/13 07:28:20 mrg Exp $
USE_FORT?= yes # network server
@@ -10,4 +10,6 @@ CPPFLAGS+=-DINET6
LDADD+= -lutil
DPADD+= ${LIBUTIL}
+COPTS.route6d.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/usr.sbin/rpc.bootparamd/Makefile
diff -u src/usr.sbin/rpc.bootparamd/Makefile:1.25 src/usr.sbin/rpc.bootparamd/Makefile:1.26
--- src/usr.sbin/rpc.bootparamd/Makefile:1.25 Mon May 28 12:06:39 2007
+++ src/usr.sbin/rpc.bootparamd/Makefile Sun Oct 13 07:28:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2007/05/28 12:06:39 tls Exp $
+# $NetBSD: Makefile,v 1.26 2019/10/13 07:28:20 mrg Exp $
.include <bsd.own.mk>
@@ -22,6 +22,8 @@ RPC_XDIR= ${DESTDIR}/usr/include/rpcsvc/
CPPFLAGS+= -I${RPC_XDIR}
+COPTS.bootparam_prot_svc.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include <bsd.rpc.mk>
.include <bsd.prog.mk>
Index: src/usr.sbin/rpc.lockd/Makefile
diff -u src/usr.sbin/rpc.lockd/Makefile:1.16 src/usr.sbin/rpc.lockd/Makefile:1.17
--- src/usr.sbin/rpc.lockd/Makefile:1.16 Wed Apr 22 15:23:07 2009
+++ src/usr.sbin/rpc.lockd/Makefile Sun Oct 13 07:28:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/04/22 15:23:07 lukem Exp $
+# $NetBSD: Makefile,v 1.17 2019/10/13 07:28:20 mrg Exp $
USE_FORT?= yes # network server
@@ -23,4 +23,8 @@ CLEANFILES= test
test: ${.CURDIR}/test.c
cc -o test ${.CURDIR}/test.c -lrpcsvc
+COPTS.lockd_lock.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.lock_proc.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.nlm_prot_svc.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include <bsd.prog.mk>
Index: src/usr.sbin/rpc.pcnfsd/Makefile
diff -u src/usr.sbin/rpc.pcnfsd/Makefile:1.23 src/usr.sbin/rpc.pcnfsd/Makefile:1.24
--- src/usr.sbin/rpc.pcnfsd/Makefile:1.23 Fri Aug 10 12:10:30 2012
+++ src/usr.sbin/rpc.pcnfsd/Makefile Sun Oct 13 07:28:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2012/08/10 12:10:30 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2019/10/13 07:28:20 mrg Exp $
.include <bsd.own.mk>
@@ -31,4 +31,8 @@ COPTS.pcnfsd_v2.c+= -Wno-pointer-sign
CLEANFILES += clnt.pcnfsd pcnfsd_test.o pcnfsd_test.ln pcnfsd_clnt.*
+COPTS.pcnfsd_misc.c+= ${GCC_NO_FORMAT_TRUNCATION} ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.pcnfsd_print.c+= ${GCC_NO_FORMAT_TRUNCATION} ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.pcnfsd_svc.c+= ${GCC_NO_FORMAT_TRUNCATION} ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include <bsd.prog.mk>
Index: src/usr.sbin/rpc.statd/Makefile
diff -u src/usr.sbin/rpc.statd/Makefile:1.11 src/usr.sbin/rpc.statd/Makefile:1.12
--- src/usr.sbin/rpc.statd/Makefile:1.11 Sun Jan 5 19:24:08 2003
+++ src/usr.sbin/rpc.statd/Makefile Sun Oct 13 07:28:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/01/05 19:24:08 sommerfeld Exp $
+# $NetBSD: Makefile,v 1.12 2019/10/13 07:28:20 mrg Exp $
PROG= rpc.statd
SRCS= sm_inter_svc.c statd.c stat_proc.c
@@ -16,6 +16,11 @@ RPC_SVCFILES= sm_inter_svc.c
RPC_SVCFLAGS= -L -m
RPC_XDIR= ${DESTDIR}/usr/include/rpcsvc/
+COPTS.sm_inter_svc.c+= ${GCC_NO_CAST_FUNCTION_TYPE} ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.statd.c+= ${GCC_NO_CAST_FUNCTION_TYPE} ${GCC_NO_FORMAT_TRUNCATION} ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.stat_proc.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.rpcb_svc_4.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include <bsd.rpc.mk>
.include <bsd.prog.mk>
Index: src/usr.sbin/rpc.yppasswdd/Makefile
diff -u src/usr.sbin/rpc.yppasswdd/Makefile:1.6 src/usr.sbin/rpc.yppasswdd/Makefile:1.7
--- src/usr.sbin/rpc.yppasswdd/Makefile:1.6 Wed Nov 10 18:56:17 2010
+++ src/usr.sbin/rpc.yppasswdd/Makefile Sun Oct 13 07:28:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/11/10 18:56:17 christos Exp $
+# $NetBSD: Makefile,v 1.7 2019/10/13 07:28:20 mrg Exp $
PROG= rpc.yppasswdd
SRCS= rpc.yppasswdd.c yppasswdd_mkpw.c
@@ -8,4 +8,6 @@ MLINKS= rpc.yppasswdd.8 yppasswdd.8
DPADD+= ${LIBRPCSVC} ${LIBCRYPT} ${LIBUTIL}
LDADD+= -lrpcsvc -lcrypt -lutil
+COPTS.rpc.yppasswdd.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include <bsd.prog.mk>
Index: src/usr.sbin/rpcbind/Makefile
diff -u src/usr.sbin/rpcbind/Makefile:1.15 src/usr.sbin/rpcbind/Makefile:1.16
--- src/usr.sbin/rpcbind/Makefile:1.15 Wed Apr 24 10:27:49 2019
+++ src/usr.sbin/rpcbind/Makefile Sun Oct 13 07:28:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/04/24 10:27:49 roy Exp $
+# $NetBSD: Makefile,v 1.16 2019/10/13 07:28:20 mrg Exp $
.include <bsd.own.mk>
@@ -29,6 +29,11 @@ CPPFLAGS+= -DYP
LDADD+= -lwrap -lutil
DPADD+= ${LIBWRAP} ${LIBUTIL}
+COPTS.rpcb_svc_4.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.pmap_svc.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.rpcb_svc.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.rpcb_svc_com.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+
.PATH: ${LIBCRPCDIR}
.include <bsd.prog.mk>
Index: src/usr.sbin/rtadvd/Makefile
diff -u src/usr.sbin/rtadvd/Makefile:1.22 src/usr.sbin/rtadvd/Makefile:1.23
--- src/usr.sbin/rtadvd/Makefile:1.22 Fri Jan 11 20:41:53 2019
+++ src/usr.sbin/rtadvd/Makefile Sun Oct 13 07:28:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/01/11 20:41:53 christos Exp $
+# $NetBSD: Makefile,v 1.23 2019/10/13 07:28:21 mrg Exp $
WARNS?= 4
@@ -33,4 +33,7 @@ DPADD.rump+= ${LIBRUMPRES}
CWARNFLAGS.clang+= -Wno-error=address-of-packed-member
+COPTS.if.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+COPTS.config.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/usr.sbin/rwhod/Makefile
diff -u src/usr.sbin/rwhod/Makefile:1.14 src/usr.sbin/rwhod/Makefile:1.15
--- src/usr.sbin/rwhod/Makefile:1.14 Wed Apr 22 15:23:08 2009
+++ src/usr.sbin/rwhod/Makefile Sun Oct 13 07:28:21 2019
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.3 (Berkeley) 5/11/90
-# $NetBSD: Makefile,v 1.14 2009/04/22 15:23:08 lukem Exp $
+# $NetBSD: Makefile,v 1.15 2019/10/13 07:28:21 mrg Exp $
.include <bsd.own.mk>
@@ -15,4 +15,6 @@ CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/who
LDADD+= -lutil
DPADD+= ${LIBUTIL}
+COPTS.rwhod.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/usr.sbin/sliplogin/Makefile
diff -u src/usr.sbin/sliplogin/Makefile:1.7 src/usr.sbin/sliplogin/Makefile:1.8
--- src/usr.sbin/sliplogin/Makefile:1.7 Fri Nov 9 21:33:50 2018
+++ src/usr.sbin/sliplogin/Makefile Sun Oct 13 07:28:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2018/11/09 21:33:50 abs Exp $
+# $NetBSD: Makefile,v 1.8 2019/10/13 07:28:21 mrg Exp $
# from: @(#)Makefile 8.1 (Berkeley) 7/19/93
USE_FORT?= yes # setuid
@@ -14,4 +14,6 @@ FILESDIR= /usr/share/examples/slip
FILES= slip.login
.endif
+COPTS.sliplogin.c+= ${GCC_NO_FORMAT_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/usr.sbin/spray/Makefile
diff -u src/usr.sbin/spray/Makefile:1.4 src/usr.sbin/spray/Makefile:1.5
--- src/usr.sbin/spray/Makefile:1.4 Fri Aug 30 20:12:17 1996
+++ src/usr.sbin/spray/Makefile Sun Oct 13 07:28:21 2019
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.4 1996/08/30 20:12:17 thorpej Exp $
+# $NetBSD: Makefile,v 1.5 2019/10/13 07:28:21 mrg Exp $
PROG= spray
MAN= spray.8
LDADD+= -lrpcsvc
DPADD+= ${LIBRPCSVC}
+COPTS.spray.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include <bsd.prog.mk>
Index: src/usr.sbin/sup/lib/Makefile
diff -u src/usr.sbin/sup/lib/Makefile:1.14 src/usr.sbin/sup/lib/Makefile:1.15
--- src/usr.sbin/sup/lib/Makefile:1.14 Fri Jan 16 07:09:09 2009
+++ src/usr.sbin/sup/lib/Makefile Sun Oct 13 07:28:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2009/01/16 07:09:09 junyoung Exp $
+# $NetBSD: Makefile,v 1.15 2019/10/13 07:28:21 mrg Exp $
LIBISPRIVATE= yes
@@ -12,4 +12,6 @@ SRCS+= atoo.c expand.c ffilecopy.c filec
BUILDSYMLINKS= ${.CURDIR}/../source/netcryptvoid.c netcrypt.c
+COPTS.log.c+= ${GCC_NO_FORMAT_TRUNCATION}
+
.include <bsd.lib.mk>
Index: src/usr.sbin/sup/sup/Makefile
diff -u src/usr.sbin/sup/sup/Makefile:1.5 src/usr.sbin/sup/sup/Makefile:1.6
--- src/usr.sbin/sup/sup/Makefile:1.5 Sat Nov 30 03:10:58 2002
+++ src/usr.sbin/sup/sup/Makefile Sun Oct 13 07:28:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/11/30 03:10:58 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2019/10/13 07:28:21 mrg Exp $
PROG= sup
SRCS= supcmain.c supcvers.c supcparse.c supcname.c supcmisc.c supcmeat.c \
@@ -9,4 +9,6 @@ SRCS= supcmain.c supcvers.c supcparse.c
DPADD= ${LIBSUP} ${LIBCRYPT}
LDADD= ${SUPLIB} -lcrypt
+COPTS+= ${GCC_NO_FORMAT_TRUNCATION} ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/usr.sbin/sup/supfilesrv/Makefile
diff -u src/usr.sbin/sup/supfilesrv/Makefile:1.4 src/usr.sbin/sup/supfilesrv/Makefile:1.5
--- src/usr.sbin/sup/supfilesrv/Makefile:1.4 Thu Jan 18 03:28:20 2001
+++ src/usr.sbin/sup/supfilesrv/Makefile Sun Oct 13 07:28:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/01/18 03:28:20 mycroft Exp $
+# $NetBSD: Makefile,v 1.5 2019/10/13 07:28:21 mrg Exp $
PROG= supfilesrv
SRCS= supfilesrv.c scan.c
@@ -10,4 +10,6 @@ MLINKS= supservers.8 supfilesrv.8 supser
DPADD= ${LIBSUP} ${LIBCRYPT} ${LIBWRAP}
LDADD= ${SUPLIB} -lcrypt -lwrap
+COPTS+= ${GCC_NO_FORMAT_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/usr.sbin/sup/supscan/Makefile
diff -u src/usr.sbin/sup/supscan/Makefile:1.6 src/usr.sbin/sup/supscan/Makefile:1.7
--- src/usr.sbin/sup/supscan/Makefile:1.6 Wed Sep 18 13:31:56 2002
+++ src/usr.sbin/sup/supscan/Makefile Sun Oct 13 07:28:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/09/18 13:31:56 lukem Exp $
+# $NetBSD: Makefile,v 1.7 2019/10/13 07:28:21 mrg Exp $
NOMAN= # defined
@@ -10,4 +10,6 @@ SRCS= supscan.c scan.c
DPADD= ${LIBSUP}
LDADD= ${SUPLIB}
+COPTS+= ${GCC_NO_FORMAT_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/usr.sbin/sysinst/Makefile.inc
diff -u src/usr.sbin/sysinst/Makefile.inc:1.26 src/usr.sbin/sysinst/Makefile.inc:1.27
--- src/usr.sbin/sysinst/Makefile.inc:1.26 Sun Oct 6 00:07:11 2019
+++ src/usr.sbin/sysinst/Makefile.inc Sun Oct 13 07:28:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.26 2019/10/06 00:07:11 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.27 2019/10/13 07:28:21 mrg Exp $
#
# Makefile for sysinst
@@ -122,9 +122,7 @@ COPTS += -Os
CPPFLAGS+=-DINET6
.endif
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
-COPTS+=-Wno-format-truncation
-.endif
+COPTS+= ${GCC_NO_FORMAT_TRUNCATION}
# Host to ftp from. Default:
# "ftp.NetBSD.org"
Index: src/usr.sbin/syslogd/Makefile
diff -u src/usr.sbin/syslogd/Makefile:1.29 src/usr.sbin/syslogd/Makefile:1.30
--- src/usr.sbin/syslogd/Makefile:1.29 Sun Sep 29 23:45:02 2019
+++ src/usr.sbin/syslogd/Makefile Sun Oct 13 07:28:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2019/09/29 23:45:02 mrg Exp $
+# $NetBSD: Makefile,v 1.30 2019/10/13 07:28:22 mrg Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
.include <bsd.own.mk>
@@ -31,8 +31,6 @@ DPADD+= ${LIBWRAP}
LDADD+= -lssl -lcrypto
# Overflow that appears impossible
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
-COPTS.syslogd.c+= -Wno-error=format-truncation
-.endif
+COPTS.syslogd.c+= ${GCC_NO_FORMAT_TRUNCATION} ${GCC_NO_STRINGOP_TRUNCATION}
.include <bsd.prog.mk>
Index: src/usr.sbin/wiconfig/Makefile
diff -u src/usr.sbin/wiconfig/Makefile:1.7 src/usr.sbin/wiconfig/Makefile:1.8
--- src/usr.sbin/wiconfig/Makefile:1.7 Wed Jun 15 13:47:26 2016
+++ src/usr.sbin/wiconfig/Makefile Sun Oct 13 07:28:22 2019
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2016/06/15 13:47:26 riastradh Exp $
+# $NetBSD: Makefile,v 1.8 2019/10/13 07:28:22 mrg Exp $
PROG= wiconfig
MAN= wiconfig.8
+COPTS.wiconfig.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+
.include <bsd.prog.mk>
Index: src/usr.sbin/ypbind/Makefile
diff -u src/usr.sbin/ypbind/Makefile:1.18 src/usr.sbin/ypbind/Makefile:1.19
--- src/usr.sbin/ypbind/Makefile:1.18 Wed Apr 22 15:23:10 2009
+++ src/usr.sbin/ypbind/Makefile Sun Oct 13 07:28:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2009/04/22 15:23:10 lukem Exp $
+# $NetBSD: Makefile,v 1.19 2019/10/13 07:28:22 mrg Exp $
# from: @(#)Makefile 5.8 (Berkeley) 7/28/90
USE_FORT?= yes # network client
@@ -10,4 +10,6 @@ CPPFLAGS+=-DHEURISTIC -DDEBUG
LDADD+= -lutil
DPADD+= ${LIBUTIL}
+COPTS.ypbind.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include <bsd.prog.mk>
Index: src/usr.sbin/ypserv/yppush/Makefile
diff -u src/usr.sbin/ypserv/yppush/Makefile:1.5 src/usr.sbin/ypserv/yppush/Makefile:1.6
--- src/usr.sbin/ypserv/yppush/Makefile:1.5 Thu Oct 2 14:16:42 1997
+++ src/usr.sbin/ypserv/yppush/Makefile Sun Oct 13 07:28:22 2019
@@ -1,7 +1,10 @@
-# $NetBSD: Makefile,v 1.5 1997/10/02 14:16:42 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2019/10/13 07:28:22 mrg Exp $
PROG= yppush
SRCS= yppush.c yppush_err.c yppush_proc.c yppush_svc.c
MAN= yppush.8
+COPTS.yppush.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+COPTS.yppush_svc.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include <bsd.prog.mk>
Index: src/usr.sbin/ypserv/ypserv/Makefile
diff -u src/usr.sbin/ypserv/ypserv/Makefile:1.19 src/usr.sbin/ypserv/ypserv/Makefile:1.20
--- src/usr.sbin/ypserv/ypserv/Makefile:1.19 Thu Aug 15 08:30:19 2019
+++ src/usr.sbin/ypserv/ypserv/Makefile Sun Oct 13 07:28:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/08/15 08:30:19 kamil Exp $
+# $NetBSD: Makefile,v 1.20 2019/10/13 07:28:22 mrg Exp $
.include <bsd.own.mk>
@@ -20,4 +20,6 @@ CPPFLAGS.getnetnamadr.c=-UYP -D_LIBC
SANITIZER_RENAME_SYMBOL+= gethostbyname2
+COPTS.ypserv.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include <bsd.prog.mk>
Index: src/usr.sbin/ypserv/ypxfr/Makefile
diff -u src/usr.sbin/ypserv/ypxfr/Makefile:1.5 src/usr.sbin/ypserv/ypxfr/Makefile:1.6
--- src/usr.sbin/ypserv/ypxfr/Makefile:1.5 Thu Oct 2 14:17:00 1997
+++ src/usr.sbin/ypserv/ypxfr/Makefile Sun Oct 13 07:28:22 2019
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.5 1997/10/02 14:17:00 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2019/10/13 07:28:22 mrg Exp $
PROG= ypxfr
SRCS= ypxfr.c
MAN= ypxfr.8
+COPTS.ypxfr.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include <bsd.prog.mk>
Index: src/usr.sbin/ypset/Makefile
diff -u src/usr.sbin/ypset/Makefile:1.11 src/usr.sbin/ypset/Makefile:1.12
--- src/usr.sbin/ypset/Makefile:1.11 Mon May 28 12:06:43 2007
+++ src/usr.sbin/ypset/Makefile Sun Oct 13 07:28:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/05/28 12:06:43 tls Exp $
+# $NetBSD: Makefile,v 1.12 2019/10/13 07:28:23 mrg Exp $
# from: @(#)Makefile 5.8 (Berkeley) 7/28/90
USE_FORT?= yes # network client
@@ -6,4 +6,6 @@ USE_FORT?= yes # network client
PROG= ypset
MAN= ypset.8
+COPTS.ypset.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
+
.include <bsd.prog.mk>
