Module Name: src
Committed By: lukem
Date: Sat Jun 3 21:33:02 UTC 2023
Modified Files:
src/external/apache2/llvm: Makefile.inc
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64:
Makefile
src/external/bsd/openldap/lib/slapd/back-mdb: Makefile
src/external/mit/xorg/lib/libGL: Makefile
src/external/mit/xorg/lib/libGL.old: Makefile
src/external/mpl/dhcp/bin/server: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/apache2/llvm/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/openldap/lib/slapd/back-mdb/Makefile
cvs rdiff -u -r1.32 -r1.33 src/external/mit/xorg/lib/libGL/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libGL.old/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/mpl/dhcp/bin/server/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/llvm/Makefile.inc
diff -u src/external/apache2/llvm/Makefile.inc:1.6 src/external/apache2/llvm/Makefile.inc:1.7
--- src/external/apache2/llvm/Makefile.inc:1.6 Mon Feb 28 16:30:10 2022
+++ src/external/apache2/llvm/Makefile.inc Sat Jun 3 21:33:01 2023
@@ -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 \
Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64/Makefile:1.3 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64/Makefile:1.4
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64/Makefile:1.3 Fri Sep 17 02:18:05 2021
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/xray-profiling-m64/Makefile Sat Jun 3 21:33:02 2023
@@ -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
Index: src/external/bsd/openldap/lib/slapd/back-mdb/Makefile
diff -u src/external/bsd/openldap/lib/slapd/back-mdb/Makefile:1.1 src/external/bsd/openldap/lib/slapd/back-mdb/Makefile:1.2
--- src/external/bsd/openldap/lib/slapd/back-mdb/Makefile:1.1 Tue Dec 28 17:05:44 2021
+++ src/external/bsd/openldap/lib/slapd/back-mdb/Makefile Sat Jun 3 21:33:02 2023
@@ -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}
Index: src/external/mit/xorg/lib/libGL/Makefile
diff -u src/external/mit/xorg/lib/libGL/Makefile:1.32 src/external/mit/xorg/lib/libGL/Makefile:1.33
--- src/external/mit/xorg/lib/libGL/Makefile:1.32 Sun Jul 11 20:52:06 2021
+++ src/external/mit/xorg/lib/libGL/Makefile Sat Jun 3 21:33:02 2023
@@ -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>
Index: src/external/mit/xorg/lib/libGL.old/Makefile
diff -u src/external/mit/xorg/lib/libGL.old/Makefile:1.3 src/external/mit/xorg/lib/libGL.old/Makefile:1.4
--- src/external/mit/xorg/lib/libGL.old/Makefile:1.3 Thu Sep 29 18:58:04 2022
+++ src/external/mit/xorg/lib/libGL.old/Makefile Sat Jun 3 21:33:02 2023
@@ -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>
Index: src/external/mpl/dhcp/bin/server/Makefile
diff -u src/external/mpl/dhcp/bin/server/Makefile:1.9 src/external/mpl/dhcp/bin/server/Makefile:1.10
--- src/external/mpl/dhcp/bin/server/Makefile:1.9 Sat Jun 3 21:27:11 2023
+++ src/external/mpl/dhcp/bin/server/Makefile Sat Jun 3 21:33:02 2023
@@ -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
