From nobody Sun Apr 9 21:35:28 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pvll521WVz44JRk; Sun, 9 Apr 2023 21:35:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pvll473rFz4MQq; Sun, 9 Apr 2023 21:35:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681076129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hb94c2Rqqgu6eWFdRXnzUXoGL+DPgMYEEIIa06r6tSk=; b=Ddg3eTIgNiPUdQD8kblfotIqG34oOZA49LH+0iArTv50SKxEjBXAlu2JW2QQ4/Z/sM1L3I b12leQQToTZLBgpkrWp3cYhcVlKKKvueNAkdtprQ7YnleaNGobI9lDZ/BbsyhcSVKalWxX SbGrwkTZBHA0dCWrwngCLmFnFxQn5rWpSBqm/4geJJt9HOXbDd1Bsh/4ZDyvTxs9xH+fBh 2sj+AcuCEVKbk1V3VHo4nPbhid1JBSffTKkBuoI77ttP/cVDjyUan+By3f2+dFFAEWyjgp YBvczfyQyOyA7b8TZVWD4129Ulxxs8YlsGSPfroLgyqJuzOxjh5K0OqDPG7mAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681076129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hb94c2Rqqgu6eWFdRXnzUXoGL+DPgMYEEIIa06r6tSk=; b=dv7Q+IOfhZorV4SUqq72Nppj0o5aXYMjqovUAh9WDyg8BFoFxI0f7HbVeNmqHzBxKpPz2e ztqcYHcboeCPfZqWbjI4vln4DKGF5GW5FWvm7gEmZdFQoRy3qWSyfSUlQxP8RcrfH0wm4R Boqdg/v/94FpfyEhI5rBI2cU72xd7GHJ9Dtgzocc3xOhyrTZtgykjlFCHIbR/qjYDCOfIQ rm4TufYgAI5RJY3q1L2C+klJsPuD5d5HdBSsbDYPLklvzDSM/TJs4AlxBHXDPNkE6zpvec FTc1c23AcdO5kKm8N/epvroJhmKxr9So64zOj4UYd0zW2UbG+jflo3ZduK8kqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681076129; a=rsa-sha256; cv=none; b=Ij2rlX+lss6oyIxTQO95YCPND4FmDRKvVUOOLttzc+JNm3TBq4nQYd6t26pMi8TLn+b76y aaj9yDD4H181vu2+bpe4DvrmUBNgdNElZPQr8LJXl3NCJjNJFXpnJR6uzKs9jM1rmxWMzm jC4RvPeykeXrAG7To5LRHajqeetn0TL4m/U0yFwhN7tUxpOIMfztCJp0MN21uVs35UKX7H iD9sVBxil12JkYSajo9kNYQLBunXhax8Pk5xIE+CFsk1/lA+yQg0gMQVtfJq1APknGgAEO JNxSHXqeyk6mX0SRZNrj2zNcsgDcADixug/CarxnlR/hH7BcYg9Onw1HFsRMJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pvll41H6WzPKW; Sun, 9 Apr 2023 21:35:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 339LZS9c081743; Sun, 9 Apr 2023 21:35:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 339LZSB7081742; Sun, 9 Apr 2023 21:35:28 GMT (envelope-from git) Date: Sun, 9 Apr 2023 21:35:28 GMT Message-Id: <202304092135.339LZSB7081742@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 31f9f7037bc7 - stable/13 - Properly conditionalize clang 15-only flags List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 31f9f7037bc786afd40fe204b0eefedfbcec4915 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=31f9f7037bc786afd40fe204b0eefedfbcec4915 commit 31f9f7037bc786afd40fe204b0eefedfbcec4915 Author: Warner Losh AuthorDate: 2023-02-13 15:19:00 +0000 Commit: Dimitry Andric CommitDate: 2023-04-09 14:56:23 +0000 Properly conditionalize clang 15-only flags Sponsored by: Netflix Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D38550 (cherry picked from commit b9f235ba3178e5315cc1c77c87febd033cf69b3e) --- sys/conf/files | 20 ++++++++++---------- sys/conf/kern.pre.mk | 5 +++++ 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index d1024ae8b8bb..2258acd4c9e7 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -4142,34 +4142,34 @@ libkern/strvalid.c standard libkern/timingsafe_bcmp.c standard contrib/zlib/adler32.c optional crypto | geom_uzip | \ mxge | ddb_ctf | gzio | zfs | zlib \ - compile-with "${NORMAL_C} -Wno-deprecated-non-prototype" + compile-with "${ZLIB_C}" contrib/zlib/compress.c optional crypto | geom_uzip | \ mxge | ddb_ctf | gzio | zfs | zlib \ - compile-with "${NORMAL_C} -Wno-cast-qual -Wno-deprecated-non-prototype" + compile-with "${ZLIB_C}" contrib/zlib/crc32.c optional crypto | geom_uzip | \ mxge | ddb_ctf | gzio | zfs | zlib \ - compile-with "${NORMAL_C} ${NO_WSTRICT_PROTOTYPES}" + compile-with "${ZLIB_C}" contrib/zlib/deflate.c optional crypto | geom_uzip | \ mxge | ddb_ctf | gzio | zfs | zlib \ - compile-with "${NORMAL_C} -Wno-cast-qual -Wno-deprecated-non-prototype" + compile-with "${ZLIB_C}" contrib/zlib/inffast.c optional crypto | geom_uzip | \ mxge | ddb_ctf | gzio | zfs | zlib \ - compile-with "${NORMAL_C} -Wno-deprecated-non-prototype" + compile-with "${ZLIB_C}" contrib/zlib/inflate.c optional crypto | geom_uzip | \ mxge | ddb_ctf | gzio | zfs | zlib \ - compile-with "${NORMAL_C} -Wno-deprecated-non-prototype" + compile-with "${ZLIB_C}" contrib/zlib/inftrees.c optional crypto | geom_uzip | \ mxge | ddb_ctf | gzio | zfs | zlib \ - compile-with "${NORMAL_C} -Wno-deprecated-non-prototype" + compile-with "${ZLIB_C}" contrib/zlib/trees.c optional crypto | geom_uzip | \ mxge | ddb_ctf | gzio | zfs | zlib \ - compile-with "${NORMAL_C} ${NO_WSTRICT_PROTOTYPES}" + compile-with "${ZLIB_C}" contrib/zlib/uncompr.c optional crypto | geom_uzip | \ mxge | ddb_ctf | gzio | zfs | zlib \ - compile-with "${NORMAL_C} -Wno-cast-qual -Wno-deprecated-non-prototype" + compile-with "${ZLIB_C}" contrib/zlib/zutil.c optional crypto | geom_uzip | \ mxge | ddb_ctf | gzio | zfs | zlib \ - compile-with "${NORMAL_C} ${NO_WSTRICT_PROTOTYPES}" + compile-with "${ZLIB_C}" dev/zlib/zlib_mod.c optional crypto | geom_uzip | \ mxge | ddb_ctf | gzio | zfs | zlib dev/zlib/zcalloc.c optional crypto | geom_uzip | \ diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 5fba3e58295b..a12aff2c2816 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -296,6 +296,11 @@ DTRACE_ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${DTRACE_CFLAGS} DTRACE_C= ${CC} -c ${DTRACE_CFLAGS} ${WERROR} ${PROF} ${.IMPSRC} DTRACE_S= ${CC} -c ${DTRACE_ASM_CFLAGS} ${WERROR} ${.IMPSRC} +# zlib code supports systems that are quite old, but will fix this issue once C2x gets radified. +# see https://github.com/madler/zlib/issues/633 for details +ZLIB_CFLAGS= -Wno-cast-qual ${NO_WDEPRECATED_NON_PROTOTYPE} -Wno-strict-prototypes +ZLIB_C= ${CC} -c ${CFLAGS} ${WERROR} ${ZLIB_CFLAGS} ${.IMPSRC} + # Special flags for managing the compat compiles for DTrace/FBT FBT_CFLAGS= -DBUILDING_DTRACE -nostdinc -I$S/cddl/dev/fbt/${MACHINE_CPUARCH} -I$S/cddl/dev/fbt ${CDDL_CFLAGS} -I$S/cddl/compat/opensolaris -I$S/cddl/contrib/opensolaris/uts/common .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"