summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorlukem <lukem@NetBSD.org>2023-06-03 21:33:01 +0000
committerlukem <lukem@NetBSD.org>2023-06-03 21:33:01 +0000
commit13eb6a3078f7a6162b738c348c493b55ee1dbd27 (patch)
tree77d8b1fa16df331453b7e9cb8c1295e8e1d6eec2 /external
parent75c33a368a0d60a33857c90e9e9dcd5a6d179831 (diff)
adapt to ${CC_WNO_STRINGOP_OVERFLOW}
Use ${CC_WNO_STRINGOP_OVERFLOW} instead of the older style more complex expressions. Remove workarounds if they were only for gcc < 10.
Diffstat (limited to 'external')
-rw-r--r--external/apache2/llvm/Makefile.inc5
-rw-r--r--external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64/Makefile4
-rw-r--r--external/bsd/openldap/lib/slapd/back-mdb/Makefile4
-rw-r--r--external/mit/xorg/lib/libGL.old/Makefile6
-rw-r--r--external/mit/xorg/lib/libGL/Makefile6
-rw-r--r--external/mpl/dhcp/bin/server/Makefile4
6 files changed, 11 insertions, 18 deletions
diff --git a/external/apache2/llvm/Makefile.inc b/external/apache2/llvm/Makefile.inc
index 12dcc559576..2ebbfa6d0d0 100644
--- a/external/apache2/llvm/Makefile.inc
+++ b/external/apache2/llvm/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2022/02/28 16:30:10 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.7 2023/06/03 21:33:01 lukem Exp $
.if !defined(LLVM_TOPLEVEL_MK)
LLVM_TOPLEVEL_MK=
@@ -19,9 +19,6 @@ CONFIG_DIR:= ${.PARSEDIR}/autoconf
CPPFLAGS+= -I. -I${CLANG_SRCDIR}/include -I${LLVM_SRCDIR}/include
-# Bogus warning with -O2 in GCC 7 and 8.
-CWARNFLAGS.gcc+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} < 9:? -Wno-stringop-overflow :}
-
MODULES_CXXFLAGS= -fmodules -fcxx-modules -Werror=incomplete-umbrella \
-fmodules-validate-system-headers \
-Xclang -fmodules-local-submodule-visibility \
diff --git a/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64/Makefile b/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64/Makefile
index 95e7db4db01..4e9d36bd154 100644
--- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64/Makefile
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/09/17 02:18:05 christos Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/03 21:33:02 lukem Exp $
.include "../common.mk"
.include "../sources.mk"
@@ -25,7 +25,7 @@ CPPFLAGS+= -I${TOPDIR}/lib
CPPFLAGS+= -I${TOPDIR}/include
CWARNFLAGS.clang+= -Wno-error=cast-qual-unrelated
-CWARNFLAGS.gcc+= -Wno-error=stringop-overflow
+CWARNFLAGS.gcc+= ${CC_WNO_STRINGOP_OVERFLOW}
COPTS+= -fPIC
diff --git a/external/bsd/openldap/lib/slapd/back-mdb/Makefile b/external/bsd/openldap/lib/slapd/back-mdb/Makefile
index d625cef374f..4aff16dd01b 100644
--- a/external/bsd/openldap/lib/slapd/back-mdb/Makefile
+++ b/external/bsd/openldap/lib/slapd/back-mdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/12/28 17:05:44 christos Exp $
+# $NetBSD: Makefile,v 1.2 2023/06/03 21:33:02 lukem Exp $
USE_FORT=yes
LIBISPRIVATE=yes
@@ -13,7 +13,7 @@ LMDB=${LDAP_DISTDIR}/libraries/liblmdb
.PATH: ${BACK_MDB} ${LMDB}
-COPTS.mdb.c += -Wno-error=stringop-overflow
+COPTS.mdb.c += ${CC_WNO_STRINGOP_OVERFLOW}
CPPFLAGS+=-I${SLAPD} -I${BACK_MDB} -I${LMDB}
diff --git a/external/mit/xorg/lib/libGL.old/Makefile b/external/mit/xorg/lib/libGL.old/Makefile
index 3f5dc4b39ad..5b64cef0485 100644
--- a/external/mit/xorg/lib/libGL.old/Makefile
+++ b/external/mit/xorg/lib/libGL.old/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/09/29 18:58:04 rjs Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/03 21:33:02 lukem Exp $
.include <bsd.own.mk>
@@ -231,9 +231,7 @@ PKGCONFIG_SED_FLAGS= \
CWARNFLAGS.clang+= -Wno-tautological-compare -Wno-format -Wno-constant-conversion \
-Wno-error=incompatible-pointer-types -Wno-error=atomic-alignment
-.if ${HAVE_GCC:U0} >= 7
-CWARNFLAGS.gcc+= -Wno-error=stringop-overflow
-.endif
+CWARNFLAGS.gcc+= ${CC_WNO_STRINGOP_OVERFLOW}
.include <bsd.x11.mk>
.include <bsd.lib.mk>
diff --git a/external/mit/xorg/lib/libGL/Makefile b/external/mit/xorg/lib/libGL/Makefile
index dfa489dc749..87b177942c2 100644
--- a/external/mit/xorg/lib/libGL/Makefile
+++ b/external/mit/xorg/lib/libGL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2021/07/11 20:52:06 mrg Exp $
+# $NetBSD: Makefile,v 1.33 2023/06/03 21:33:02 lukem Exp $
.include <bsd.own.mk>
@@ -231,9 +231,7 @@ PKGCONFIG_SED_FLAGS= \
CWARNFLAGS.clang+= -Wno-tautological-compare -Wno-format -Wno-constant-conversion \
-Wno-error=incompatible-pointer-types -Wno-error=atomic-alignment
-.if ${HAVE_GCC:U0} >= 7
-CWARNFLAGS.gcc+= -Wno-error=stringop-overflow
-.endif
+CWARNFLAGS.gcc+= ${CC_WNO_STRINGOP_OVERFLOW}
.include <bsd.x11.mk>
.include <bsd.lib.mk>
diff --git a/external/mpl/dhcp/bin/server/Makefile b/external/mpl/dhcp/bin/server/Makefile
index a89cd5f3dd6..cd310db4ce6 100644
--- a/external/mpl/dhcp/bin/server/Makefile
+++ b/external/mpl/dhcp/bin/server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2023/06/03 21:27:11 lukem Exp $
+# $NetBSD: Makefile,v 1.10 2023/06/03 21:33:02 lukem Exp $
.include <bsd.own.mk>
@@ -16,7 +16,7 @@ FILES= dhcpd.conf
.endif
.if !empty(MACHINE_ARCH:Msh3*) || ${MACHINE_ARCH} == "m68000"
-COPTS.ddns.c +=-Wno-stringop-overflow
+COPTS.ddns.c += ${CC_WNO_STRINGOP_OVERFLOW}
.endif
COPTS.omapi.c += -Wno-stack-protector