From nobody Sun Jul 24 22:55:46 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 4LrdnG3bf5z3yvJN; Sun, 24 Jul 2022 22:55:46 +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 4LrdnG2fMyz41mR; Sun, 24 Jul 2022 22:55:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658703346; 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=ezrzZBpl2paI7nob/7MRa2GwK9Uq8ihHEzh5QH8FKSw=; b=DbCOOhfBoS8E9dCJalKCVqL+0YJf10s4GDxjM2ggkmqC/n3Jo7TbzE4kQaFfZfHu1jLUxY SFwioxEv8gb7MkcT+PvbrGJpZj57UNTvmvxebxT2AH1+mWUZlBopN3uPH/RcomqO9vBIJq RQdvCNJH6bHnjTjcukbbL/MegvD//H16Eld1beOCIPLX763VHVVRxyPrbtiDpqhFsMEKBu qifvSboKHq8ANtHmEEZUVH37ijKb/thz3PYav1RYHqtTokcqB9ZvslDxdlzGIatS/c2Ztn 2r0fxvtf6UuEZYK+5RqvJKzvFDMYoTb62S3zYQpOvRw7F3cxN9oi0pwJZwY7pw== 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 4LrdnG1lNbzbmW; Sun, 24 Jul 2022 22:55:46 +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 26OMtk6w004650; Sun, 24 Jul 2022 22:55:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26OMtkRC004649; Sun, 24 Jul 2022 22:55:46 GMT (envelope-from git) Date: Sun, 24 Jul 2022 22:55:46 GMT Message-Id: <202207242255.26OMtkRC004649@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: 09ace5cefbd2 - main - stand/zfs: Limit flags further for ZFS 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: 09ace5cefbd29c105b2b332b71a19b3f9fd8079b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658703346; 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=ezrzZBpl2paI7nob/7MRa2GwK9Uq8ihHEzh5QH8FKSw=; b=XsOSJd8auT9PUCozsZ/SOXhqgxs88Fc2fXnla/ztQNUw+GmmdrSrQ2086NQO7jYKXQVyGK gUc2CzvIH00EfyOR8GyWgTAKbFqxf6qB7SM7UdMakRBR6RkbLJnDjKImHtWxIAbU9yBELy ll4srI5Yz9cVaruAVoQ815+zB4uaTmHOTjmACNrf8g6+jFt/m/tjXpuE6LHJN9pvAKLD9o 9hYa0povhFO8Y759PPxswKujeUPKFUG59mVxAAhj7pzINsDcESOkq/ku384J92eJcWVEvj YAXffau4Anlmj+/tdr1VLIRDTe94TtqrVgOuygkz9K0lvgU0TR+8VkLMxkjmeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658703346; a=rsa-sha256; cv=none; b=K3HxsNkym4/C8o26ID9I+bO9pNnaKzR/KWK5VSx9lqJeIQp0eCEglJow5Syd60SKMb60tv UvE1ztZvF7X6guuf5m23dLhqTKuELComz5HXTgV3a2mqYBQu6Hu3TQ7Q45iJjAeCrl7/UC jhG6fcV7GV+CbkUtcYPCvfD5CQntOQVuhzvPDdBkGBm4ZXOjs4xwiagwcQ9gT4QqdiUMms ygZ4QGTzh4SGEFWNdrcfJcaTnu9aq02u5T/RNqmYTg0Sjr8cLRUqTH5PF4W7dLCZmrlO+G 7qozm7x/wmb4ryRgE4ntuCNjB8iB53UtO2CRojwBZghATrSCSiUhTPNs88r49w== 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=09ace5cefbd29c105b2b332b71a19b3f9fd8079b commit 09ace5cefbd29c105b2b332b71a19b3f9fd8079b Author: Warner Losh AuthorDate: 2022-07-24 21:51:53 +0000 Commit: Warner Losh CommitDate: 2022-07-24 22:53:35 +0000 stand/zfs: Limit flags further for ZFS Constrain CFLAGS for ZFS: don't add anything globally. Add the includes to only the files that need them. Add -DHAS_ZSTD_ZFS to zfs.c (which includes zfsimpl.c which includes zfssubr.c both of which need this defined). Also add it to efi/boot1/Makefile since zfs_module.c also includes zfsimple.c. Sponsored by: Netflix Reviewed by: tsoome Differential Revision: https://reviews.freebsd.org/D35887 --- stand/libsa/zfs/Makefile.inc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/stand/libsa/zfs/Makefile.inc b/stand/libsa/zfs/Makefile.inc index 9de1a1f00c24..15a4c8bf3018 100644 --- a/stand/libsa/zfs/Makefile.inc +++ b/stand/libsa/zfs/Makefile.inc @@ -20,13 +20,8 @@ ZSTD_SRC+= zstd_ddict.c zstd_decompress.c zstd_decompress_block.c ZSTD_SRC+= zstd_double_fast.c zstd_fast.c zstd_lazy.c zstd_ldm.c ZSTD_SRC+= zstd_opt.c -CFLAGS+= -DHAS_ZSTD_ZFS SRCS+= ${ZFS_SRC} ${ZSTD_SRC} -CFLAGS+= -I${LDRSRC} -CFLAGS+= -I${SYSDIR}/cddl/boot/zfs -CFLAGS+= -I${SYSDIR}/crypto/skein - # # Any file that needs the FreeBSD overrides that are in # include/os/freebssd/spl/XXX needs to have these added to @@ -63,7 +58,11 @@ CFLAGS_EARLY.nvlist.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, as well as a number of other hacks for pre-openzfs # code still in the tree that needs to be fixed. -CFLAGS.zfs.c+= -I${ZFSOSINC}/spl \ +CFLAGS.zfs.c+= -DHAS_ZSTD_ZFS \ + -I${SYSDIR}/cddl/boot/zfs \ + -I${LDRSRC} \ + -I${SYSDIR}/crypto/skein \ + -I${ZFSOSINC}/spl \ -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/lz4 \ -I${ZFSOSINC}/zfs \ -I${OZFS}/include