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.
This commit is contained in:
parent
230c41e44c
commit
58beaa2b43
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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}
|
||||
|
|
|
@ -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}
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: files.i915drmkms,v 1.89 2023/06/03 21:30:22 lukem Exp $
|
||||
# $NetBSD: files.i915drmkms,v 1.90 2023/06/03 21:31:46 lukem Exp $
|
||||
|
||||
version 20180827
|
||||
|
||||
|
@ -48,9 +48,9 @@ makeoptions i915drmkms "CWARNFLAGS.i915_pci.c"+="${${ACTIVE_CC} == gcc:? -Wno-
|
|||
makeoptions i915drmkms "CWARNFLAGS.i915_pci.c"+="${${ACTIVE_CC} == clang:? -Wno-initializer-overrides :}"
|
||||
makeoptions i915drmkms "CWARNFLAGS.i915_sw_fence.c"+="${${ACTIVE_CC} == clang :? -Wno-unused-function :}"
|
||||
|
||||
makeoptions i915drmkms "CWARNFLAGS.intel_sprite.c"+="${${ACTIVE_CC} == gcc:? -Wno-maybe-uninitialized :}"
|
||||
makeoptions i915drmkms "CWARNFLAGS.intel_sprite.c"+="${CC_WNO_MAYBE_UNINITIALIZED}"
|
||||
|
||||
makeoptions i915drmkms "CWARNFLAGS.intel_ddi.c"+="${${ACTIVE_CC} == gcc && ${HAVE_GCC:U0} >= 10:? -Wno-maybe-uninitialized :} ${CC_WNO_IMPLICIT_FALLTHROUGH}"
|
||||
makeoptions i915drmkms "CWARNFLAGS.intel_ddi.c"+="${CC_WNO_MAYBE_UNINITIALIZED} ${CC_WNO_IMPLICIT_FALLTHROUGH}"
|
||||
makeoptions i915drmkms "CWARNFLAGS.intel_display.c"+="${CC_WNO_IMPLICIT_FALLTHROUGH}"
|
||||
makeoptions i915drmkms "CWARNFLAGS.intel_guc_submission.c"+="${${ACTIVE_CC} == clang :? -Wno-unused-function :}"
|
||||
makeoptions i915drmkms "CWARNFLAGS.intel_hdmi.c"+="${${ACTIVE_CC} == clang :? -Wno-unused-function :}"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: files.radeon,v 1.38 2023/06/03 21:30:22 lukem Exp $
|
||||
# $NetBSD: files.radeon,v 1.39 2023/06/03 21:31:47 lukem Exp $
|
||||
|
||||
version 20180827
|
||||
|
||||
|
@ -34,7 +34,7 @@ makeoptions radeon "CWARNFLAGS.radeon"+="-Wno-pointer-arith"
|
|||
makeoptions radeon "CWARNFLAGS.radeon"+="-Wno-shadow"
|
||||
makeoptions radeon "CWARNFLAGS.radeon"+="-Wno-unused-const-variable"
|
||||
|
||||
makeoptions radeon "CWARNFLAGS.radeon"+="${${ACTIVE_CC} == gcc:? -Wno-maybe-uninitialized :}"
|
||||
makeoptions radeon "CWARNFLAGS.radeon"+="${CC_WNO_MAYBE_UNINITIALIZED}"
|
||||
|
||||
#makeoptions radeon "CWARNFLAGS.radeon_cs.c"+="${CC_WNO_IMPLICIT_FALLTHROUGH}"
|
||||
makeoptions radeon "CWARNFLAGS.radeon_evergreen_cs.c"+="${CC_WNO_IMPLICIT_FALLTHROUGH}"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.21 2023/06/03 09:09:14 lukem Exp $
|
||||
# $NetBSD: Makefile,v 1.22 2023/06/03 21:31:47 lukem Exp $
|
||||
|
||||
.include "../Makefile.inc"
|
||||
.include "../drmkms/Makefile.inc"
|
||||
|
@ -59,7 +59,7 @@ CWARNFLAGS+= -Wno-shadow
|
|||
COPTS.i915_pci.c+= ${${ACTIVE_CC} == "gcc":? -Wno-override-init :}
|
||||
COPTS.i915_pci.c+= ${${ACTIVE_CC} == "clang":? -Wno-initializer-overrides :}
|
||||
COPTS.i915_sw_fence.c+= ${${ACTIVE_CC} == "clang":? -Wno-unused-function :}
|
||||
COPTS.intel_sprite.c+= ${${ACTIVE_CC} == "gcc":? -Wno-maybe-uninitialized :}
|
||||
COPTS.intel_sprite.c+= ${CC_WNO_MAYBE_UNINITIALIZED}
|
||||
COPTS.intel_ddi.c+= ${CC_WNO_MAYBE_UNINITIALIZED}
|
||||
COPTS.intel_ddi.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
|
||||
COPTS.intel_display.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.19 2023/06/02 19:09:11 riastradh Exp $
|
||||
# $NetBSD: Makefile,v 1.20 2023/06/03 21:31:47 lukem Exp $
|
||||
#
|
||||
|
||||
NOMAN= # defined
|
||||
|
@ -31,7 +31,7 @@ TESTS_C+= t_dlerror-cleared t_dlerror-false t_dlinfo t_dlvsym t_ifunc
|
|||
TESTS_C+= t_rtld_r_debug
|
||||
TESTS_C+= t_tls_extern
|
||||
|
||||
COPTS.t_rtld_r_debug.c += ${${ACTIVE_CC} == "gcc" :? -Wno-maybe-uninitialized :}
|
||||
COPTS.t_rtld_r_debug.c += ${CC_WNO_MAYBE_UNINITIALIZED}
|
||||
|
||||
LDADD.t_dlerror-false= -Wl,-rpath,/var/nonexistent/lib
|
||||
LDADD.t_dlvsym= -Wl,-rpath,${TESTSDIR}/h_helper_symver_dso2
|
||||
|
|
Loading…
Reference in New Issue