From nobody Mon Feb 13 15:23:16 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 4PFp5061CHz3rGyd; Mon, 13 Feb 2023 15:23:16 +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 4PFp505YM2z4PxW; Mon, 13 Feb 2023 15:23:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676301796; 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=3qIUAdkdqOUTuzd+aYq78kTKZItTdrTpsDNLDtJAJ/c=; b=sPdXnKCW6d2yulmWtonAO6hghS1/avqtj46sMsysBT8N/+jRUTGTe3N1bj1Y9zfZ0rJd3G Fc39B9poRch2iZp+jWmM3z9vOW0QkoIhCOGtipBjxJITx2tOAEfqQ5LVRD/joJn9vGm+sh hIEAcdidHOHtJF0k82hpwxJJ3yoHZgVKHdefNlx5+YI8XCyiM8yUttK3MmmuxI2WOmb/m6 tZQg0uVnYjqXZdme0Q1EKkJyg2cZ+wiLCnACvZynVNWZdmPS4XToNA55Cgse9mvXQl3RKF FOOodMWFY2Vj2O6z3vlvEN5hp/4MQO+9gXSEyd12bqqmof7e62QynSbhb1DFkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676301796; 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=3qIUAdkdqOUTuzd+aYq78kTKZItTdrTpsDNLDtJAJ/c=; b=AKiKE/P4Zj8Q/4JqssMQPQ4nezEG4OEEig5zWygjYEL9xqJPqS04M8GifV0usMoDA/68rA QLky7rvUSySfjvTLU2jYjJWw3/zYe7N3tpphdnEcMZVl0fjLDkfks3LVIKq2xzXXsm14J6 0jVMcLDfyGMvSl4sr9qa+Yb8RZCTtTRzfzv7NwAUrzoA1cQBLmMObKQAt6Viltto7IAJ2f QKr2AHtAl4d8+fAvKsbo2ZIGO7gNKFkOJcxRYNzCvthJ9vE+o1E0HmQv08jGaXk4jfpPqF IcSU1L2wtL6Pi1bxCLZQY5cU06XenXtjqFdleF6K5Q6bXRS5fcL4U4nTvkqaJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676301796; a=rsa-sha256; cv=none; b=fDn7e08MDZ9naeBqpQl2Q3NRQf8irpQkOAe027R/k5g1EVT8LSihDvSGDV3cDGYAIe0yvl r7TmVQE5Nt3BtDRG8CDgnUOSuzVCpR/tp9m83vmzmk0oADPOgksIFA4rY2RqjsaOBBcxnj j3LqRWlQpd5OJPmXKCgIwFonnDJmvv+BP34pKq7oeNEKPvRpM4XY1MTLgsygNhNZ0Ga5wJ 3tqHj7bYLrmv18abn5Mq0zjAo5JSyqHr1FYZ/1YC8+UnHGfNXCiGaOxMLDZwDUBqH+9jgO V10KORLa9XDYx/iyfAswn6Zv7Fpx3bTOcs+HFdZ9qnfMHp7KmL6Eq3fp2pJZ2w== 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 4PFp504XRrzNYm; Mon, 13 Feb 2023 15:23:16 +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 31DFNGHG068062; Mon, 13 Feb 2023 15:23:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31DFNGiW068061; Mon, 13 Feb 2023 15:23:16 GMT (envelope-from git) Date: Mon, 13 Feb 2023 15:23:16 GMT Message-Id: <202302131523.31DFNGiW068061@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: b9f235ba3178 - main - 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9f235ba3178e5315cc1c77c87febd033cf69b3e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b9f235ba3178e5315cc1c77c87febd033cf69b3e commit b9f235ba3178e5315cc1c77c87febd033cf69b3e Author: Warner Losh AuthorDate: 2023-02-13 15:19:00 +0000 Commit: Warner Losh CommitDate: 2023-02-13 15:19:00 +0000 Properly conditionalize clang 15-only flags Sponsored by: Netflix Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D38550 --- 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 53f90f7afc22..952aab6f1b6e 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -4100,34 +4100,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 49437ac6c2da..1a94709eaded 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -278,6 +278,11 @@ DTRACE_ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${DTRACE_CFLAGS} DTRACE_C= ${CC} -c ${DTRACE_CFLAGS} ${WERROR} ${.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"