From nobody Sat Jul 09 05:03:31 2022 X-Original-To: dev-commits-src-main@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 F009C3E5BB0; Sat, 9 Jul 2022 05:03:31 +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 4Lfyhz3yJ5z3N5Z; Sat, 9 Jul 2022 05:03:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657343011; 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=csrvQxGWPtkuByoQwjBJNbUOmKbm7d2JQoZ8SP84yyQ=; b=bPxJoD0A4fGKF2npdpfHkm5M6XWy5Pbfta+aTyO/Ar/raHrG4t3akfJhe5/tKDwvEcKRFz 7S8aqCU6zTKevYdLfBdEE/FkAfo0xNMJNjGn1WnEKUVtldOA7xmLqVMfh5P+V0JBr/SEvQ xkg4/8K2Cyu56Q3wmvgwpIk21zKeKfWB8WaJKh2hnYGQVGUjXCjKQRcwoptGEB5eRDEwVr QWqpC+CyVRozhzNbW1DMppIjlrxEfyEavTkr474kxrngs1xCKhksWyePuQiNButshDLuoy 0KLnBRphLiyDw2qspzw3+0zdtz9GFfk2AOS5PuJDJdGn9xeV1/hOa3sjvctQ9g== 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 4Lfyhz3486zZJS; Sat, 9 Jul 2022 05:03:31 +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 26953VZZ099983; Sat, 9 Jul 2022 05:03:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26953VPv099982; Sat, 9 Jul 2022 05:03:31 GMT (envelope-from git) Date: Sat, 9 Jul 2022 05:03:31 GMT Message-Id: <202207090503.26953VPv099982@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: 119c786f7b5a - main - stand: Compile zfs_zstd.c directly now List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 119c786f7b5ac05d7ee7b2a01eef392093d6724a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657343011; 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=csrvQxGWPtkuByoQwjBJNbUOmKbm7d2JQoZ8SP84yyQ=; b=qML/ReU40P8ej9ehSsOYS2iqAQnFaIw0q3MbLQTcqwm7a4uI9wAFcmuIX3Xzgt/s7tBdBE 6IQExXB6iLoRI5qzu/Lw34yqpBiRDOAm2qar7IpJtZaSDe3d4H6p+eMPQoJhvIZvtM5a41 QKW4hBqy1eOmlB6sAjU4yZvAa/vU0TVwTGRDJmNZS1AXRF7QXp6GucNt2e5kSMwFgi98wk 6czuTHavizSs2hp+h4yfgX3CGaBnz/7wU7c1N57U3VeyzZgRBrxpJYOEaI1tJS9tTDUMGM eeiJ5Egx0rMyzSANmrxx5iYvhiGn8RiFa/5D8Hv6bG77G5EeScx7/E0LX8/t+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657343011; a=rsa-sha256; cv=none; b=AUDgIzuzvh0qIZy+QnioC9HOkN/Qxi7353AUDCwVEMXhMjX7zdoK1dQkuZq+NsHF3WzMSf y5Let6xT/6gAX8vgQzRY/jpkKuk/hQiZ2KTL4PVdZd70rGsXLT/SvIwLNYBKS4zGQwLr02 Un7hrl3O1EOaKL5e8FNcJAE7ShOHJgNKn1ycbF3avEAgPlAxJFBCbEDfwcbgDarlrc+0t8 JB+t16yWbeYSy8QQrx1gUnOthJxirSs1MrVUt7GhLkNlmuQ1tY1AfUkBtnRAt2NAEEgydC c42hEbZTifwYkl8Jn7bpoHE30OtiSPfsGs3NFxxAhRDMOARGpks5wK8fFXotPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=119c786f7b5ac05d7ee7b2a01eef392093d6724a commit 119c786f7b5ac05d7ee7b2a01eef392093d6724a Author: Warner Losh AuthorDate: 2022-07-08 23:34:58 +0000 Commit: Warner Losh CommitDate: 2022-07-09 04:49:56 +0000 stand: Compile zfs_zstd.c directly now Now that we have the ability to work around all the issues that zstd_stub.c worked around, compile zfs_std.c directly. Sponsored by: Netflix Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D35750 --- stand/libsa/zfs/Makefile.inc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/stand/libsa/zfs/Makefile.inc b/stand/libsa/zfs/Makefile.inc index 411e0e4638d7..3f28c39c69da 100644 --- a/stand/libsa/zfs/Makefile.inc +++ b/stand/libsa/zfs/Makefile.inc @@ -3,11 +3,12 @@ .PATH: ${ZFSSRC} .PATH: ${SYSDIR}/crypto/skein .PATH: ${ZFSOSSRC}/spl +.PATH: ${OZFS}/module/zstd .PATH: ${OZFS}/module/zstd/lib/common .PATH: ${OZFS}/module/zstd/lib/compress .PATH: ${OZFS}/module/zstd/lib/decompress ZFS_SRC= zfs.c nvlist.c skein.c skein_block.c list.c -ZFS_SRC+= zstd_shim.c +ZFS_SRC+= zfs_zstd.c ZSTD_SRC+= entropy_common.c error_private.c ZSTD_SRC+= fse_compress.c fse_decompress.c hist.c ZSTD_SRC+= huf_compress.c huf_decompress.c pool.c xxhash.c @@ -30,12 +31,12 @@ ZFS_EARLY= -I${ZFSSRC}/spl \ -I${ZFSOSINC}/zfs .for i in ${ZFS_SRC} ${ZSTD_SRC} -CFLAGS.$i+= -include ${ZFSOSINC}/spl/sys/ccompile.h -CFLAGS.$i+= -Wformat -Wall +CFLAGS.$i+= -include ${ZFSOSINC}/spl/sys/ccompile.h -Wformat -Wall -I${OZFS}/include \ + -DNEED_SOLARIS_BOOLEAN .endfor CFLAGS_EARLY.list.c+= ${ZFS_EARLY} -CFLAGS_EARLY.zstd_shim.c+= ${ZFS_EARLY} +CFLAGS_EARLY.zfs_zstd.c+= ${ZFS_EARLY} # Can't use the early flags because there's two conflicting definitions of boolean_t in # the zfs code that need to be unified. @@ -53,7 +54,7 @@ CFLAGS.zfs.c+= -I${ZFSOSINC}/spl \ CFLAGS.$i+= -U__BMI__ ${NO_WBITWISE_INSTEAD_OF_LOGICAL} .endfor -CFLAGS.zstd_shim.c+= -DIN_BASE -DIN_LIBSA -I${OZFS}/include +CFLAGS.zfs_zstd.c+= -DIN_BASE -DIN_LIBSA # Do not unroll skein loops, reduce code size CFLAGS.skein_block.c+= -DSKEIN_LOOP=111