diff options
| author | lukem <lukem@NetBSD.org> | 2023-06-03 21:31:45 +0000 |
|---|---|---|
| committer | lukem <lukem@NetBSD.org> | 2023-06-03 21:31:45 +0000 |
| commit | 75c33a368a0d60a33857c90e9e9dcd5a6d179831 (patch) | |
| tree | 271ce1d4f915433abe4c0b7e69faacb33fa18a52 /external | |
| parent | bf78d24f392cabe409a8996d69a3aa31cfa05bf5 (diff) | |
adapt to ${CC_WNO_MAYBE_UNINITIALIZED}
Use ${CC_WNO_MAYBE_UNINITIALIZED} instead of
the older style more complex expressions.
Remove workarounds if they were for a specific
version of gcc < 10.
Diffstat (limited to 'external')
| -rw-r--r-- | external/bsd/atf/lib/tools/Makefile | 6 | ||||
| -rw-r--r-- | external/bsd/file/lib/Makefile | 4 | ||||
| -rw-r--r-- | external/bsd/ipf/bin/ipsend/Makefile | 4 | ||||
| -rw-r--r-- | external/bsd/ntp/bin/ntpd/Makefile | 4 | ||||
| -rw-r--r-- | external/cddl/osnet/lib/libdtrace/Makefile | 12 | ||||
| -rw-r--r-- | external/gpl3/gcc.old/usr.bin/backend/Makefile | 4 | ||||
| -rw-r--r-- | external/gpl3/gcc/lib/libubsan/Makefile | 4 | ||||
| -rw-r--r-- | external/gpl3/gcc/usr.bin/backend/Makefile | 4 |
8 files changed, 15 insertions, 27 deletions
diff --git a/external/bsd/atf/lib/tools/Makefile b/external/bsd/atf/lib/tools/Makefile index 54bbfce553d..d8f85882e9a 100644 --- a/external/bsd/atf/lib/tools/Makefile +++ b/external/bsd/atf/lib/tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2019/09/29 23:44:58 mrg Exp $ +# $NetBSD: Makefile,v 1.8 2023/06/03 21:31:45 lukem Exp $ NOLINT= # defined @@ -36,8 +36,6 @@ SRCS= application.cpp \ ui.cpp \ user.cpp -.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc" -COPTS.parser.cpp += -Wno-error=maybe-uninitialized -.endif +COPTS.parser.cpp += ${CC_WNO_MAYBE_UNINITIALIZED} .include <bsd.lib.mk> diff --git a/external/bsd/file/lib/Makefile b/external/bsd/file/lib/Makefile index 77465a74b17..d903b157b31 100644 --- a/external/bsd/file/lib/Makefile +++ b/external/bsd/file/lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2019/12/17 18:59:39 christos Exp $ +# $NetBSD: Makefile,v 1.16 2023/06/03 21:31:45 lukem Exp $ # USE_FORT?= yes # data driven bugs? @@ -42,6 +42,4 @@ magic.h: magic.h.in ${TOOL_SED} -e "s/X.YY/${VERSION:S/.//g}/" < ${.ALLSRC} > ${.TARGET} CLEANFILES+= magic.h -CFLAGS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} == 8:? -Wno-maybe-uninitialized :} - .include <bsd.lib.mk> diff --git a/external/bsd/ipf/bin/ipsend/Makefile b/external/bsd/ipf/bin/ipsend/Makefile index af797790118..d3c42340174 100644 --- a/external/bsd/ipf/bin/ipsend/Makefile +++ b/external/bsd/ipf/bin/ipsend/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2020/02/12 00:30:48 fox Exp $ +# $NetBSD: Makefile,v 1.6 2023/06/03 21:31:45 lukem Exp $ .include <bsd.own.mk> .include "../Makefile.inc" @@ -25,8 +25,6 @@ DPSRCS+= iplang_y.h .PATH: ${UDIST}/ipsend \ ${UDIST}/iplang -COPTS.ipsopt.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} == 8:? -Wno-error=maybe-uninitialized :} - iplang_y.c: iplang_y.y ${_MKTARGET_CREATE} ${YACC} -d ${.ALLSRC} diff --git a/external/bsd/ntp/bin/ntpd/Makefile b/external/bsd/ntp/bin/ntpd/Makefile index 8f44e642107..547309a428e 100644 --- a/external/bsd/ntp/bin/ntpd/Makefile +++ b/external/bsd/ntp/bin/ntpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2023/06/03 09:09:04 lukem Exp $ +# $NetBSD: Makefile,v 1.32 2023/06/03 21:31:46 lukem Exp $ .include <bsd.own.mk> @@ -87,7 +87,7 @@ CPPFLAGS+=-I${IDIST}/include -I${IDIST}/sntp/libopts -I${IDIST}/ntpd -I. .PATH: ${DIST} YHEADER=1 -COPTS.ntp_control.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 7:? -Wno-error=maybe-uninitialized :} +COPTS.ntp_control.c+= ${CC_WNO_MAYBE_UNINITIALIZED} COPTS.ntp_loopfilter.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 8:? -Wno-error=restrict :} COPTS.ntp_loopfilter.c+= ${CC_WNO_FORMAT_TRUNCATION} COPTS.ntp_crypto.c+= ${CC_WNO_FORMAT_TRUNCATION} diff --git a/external/cddl/osnet/lib/libdtrace/Makefile b/external/cddl/osnet/lib/libdtrace/Makefile index 5a49c631ebf..2a18714be21 100644 --- a/external/cddl/osnet/lib/libdtrace/Makefile +++ b/external/cddl/osnet/lib/libdtrace/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2023/06/03 09:09:05 lukem Exp $ +# $NetBSD: Makefile,v 1.32 2023/06/03 21:31:46 lukem Exp $ # $FreeBSD: head/cddl/lib/libdtrace/Makefile 314654 2017-03-04 11:30:04Z ngie $ @@ -89,24 +89,18 @@ COPTS.dt_lex.c += ${CC_WNO_STRINGOP_TRUNCATION} COPTS.dt_pid.c += ${CC_WNO_STRINGOP_TRUNCATION} COPTS.dt_consume.c += -Wno-parentheses -COPTS.dt_consume.c += ${${ACTIVE_CC} == "gcc" :? -Wno-maybe-uninitialized :} +COPTS.dt_consume.c += ${CC_WNO_MAYBE_UNINITIALIZED} COPTS.dt_options.c += -Wno-parentheses COPTS.dt_pid.c += ${${ACTIVE_CC} == "gcc" :? -Wno-unused-but-set-variable :} COPTS.dt_isadep.c += -Wno-unused-variable -.if (${MKLIBCSANITIZER:Uno} == "yes") -.if (${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} == 8) -COPTS.dt_proc.c+= -Wno-error=maybe-uninitialized -.endif -.endif - .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" CPPFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel CPPFLAGS+= -I${.CURDIR}/../../dev/dtrace/x86 .PATH: ${.CURDIR}/../../dist/lib/libdtrace/i386 ${.CURDIR}/../../dev/dtrace/x86 SRCS+= dis_tables.c COPTS.dis_tables.c += -Wno-parentheses -COPTS.dis_tables.c += ${${ACTIVE_CC} == "gcc" :? -Wno-maybe-uninitialized :} +COPTS.dis_tables.c += ${CC_WNO_MAYBE_UNINITIALIZED} .elif ${MACHINE_ARCH} == "sparc64" CPPFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc .elif ${MACHINE_ARCH} == "aarch64" diff --git a/external/gpl3/gcc.old/usr.bin/backend/Makefile b/external/gpl3/gcc.old/usr.bin/backend/Makefile index e462ea8a7cd..3f9bed3c8f3 100644 --- a/external/gpl3/gcc.old/usr.bin/backend/Makefile +++ b/external/gpl3/gcc.old/usr.bin/backend/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2023/05/19 23:28:21 lukem Exp $ +# $NetBSD: Makefile,v 1.18 2023/06/03 21:31:46 lukem Exp $ HOSTPROG_CXX= 1 LIBISPRIVATE= yes @@ -601,7 +601,7 @@ COPTS.tree.c= ${${ACTIVE_CC} == "clang" :? -O0 :} CFLAGS+= -Wno-stack-protector -COPTS.dwarf2out.c+=-Wno-error=maybe-uninitialized +COPTS.dwarf2out.c+=${CC_WNO_MAYBE_UNINITIALIZED} .if ${GCC_MACHINE_ARCH} == "m68000" || ${GCC_MACHINE_ARCH} == "m68k" || \ ${GCC_MACHINE_ARCH} == "coldfire" diff --git a/external/gpl3/gcc/lib/libubsan/Makefile b/external/gpl3/gcc/lib/libubsan/Makefile index 361def81288..b428fc42026 100644 --- a/external/gpl3/gcc/lib/libubsan/Makefile +++ b/external/gpl3/gcc/lib/libubsan/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2021/04/12 00:05:56 mrg Exp $ +# $NetBSD: Makefile,v 1.20 2023/06/03 21:31:46 lukem Exp $ UNSUPPORTED_COMPILER.clang= # defined LIBISCXX = yes @@ -38,6 +38,6 @@ LIBDPLIBS+= pthread ${NETBSDSRCDIR}/lib/libpthread CPPFLAGS+=-DCAN_SANITIZE_UB=1 # XXX -COPTS.ubsan_handlers.cc+=-Wno-error=maybe-uninitialized +COPTS.ubsan_handlers.cc+=${CC_WNO_MAYBE_UNINITIALIZED} .include <bsd.lib.mk> diff --git a/external/gpl3/gcc/usr.bin/backend/Makefile b/external/gpl3/gcc/usr.bin/backend/Makefile index 6ee44035ccb..98775ef28a4 100644 --- a/external/gpl3/gcc/usr.bin/backend/Makefile +++ b/external/gpl3/gcc/usr.bin/backend/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2023/05/19 23:28:20 lukem Exp $ +# $NetBSD: Makefile,v 1.68 2023/06/03 21:31:46 lukem Exp $ HOSTPROG_CXX= 1 LIBISPRIVATE= yes @@ -601,7 +601,7 @@ COPTS.tree.c= ${${ACTIVE_CC} == "clang" :? -O0 :} CFLAGS+= -Wno-stack-protector -COPTS.dwarf2out.c+=-Wno-error=maybe-uninitialized +COPTS.dwarf2out.c+=${CC_WNO_MAYBE_UNINITIALIZED} .if ${GCC_MACHINE_ARCH} == "m68000" || ${GCC_MACHINE_ARCH} == "m68k" || \ ${GCC_MACHINE_ARCH} == "coldfire" |
