From nobody Mon May 1 21:04:25 2023 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 4Q9G163MzJz491dX; Mon, 1 May 2023 21:04:26 +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 4Q9G1615bXz3JSd; Mon, 1 May 2023 21:04:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682975066; 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=nR0TKkdWk92IJd+DUctzVzk6Sj8accfeDlWD8wwZ/DY=; b=FlPqm+HVD9Wzo5u7ayh2JeYinQdFRCYqVIH/zAkcavWcqP9qJAOJ1/5VZXmnpp/5FDb2mW WdLVrpBpbxww2jXSIDXyyRTpt5rs9tBla/UpKCSSCKwuGIK9P5GhYj4Y4c7TPHNtPCBoDf I4zgDJCJzECsny9WB7+dBIz5WNbeaVgWKdce+Z9LP/nUdk9v0XqLiXwWBFYp0IHBjxX9Fb 5lxcYKG5NsL8XfaQMVZAMfB4lsMkBEEPEX/mf7knj3Of6Gx2ramRpVZ+t7GHt4IPpJGkCh Gg/ccJlVy6yXXcYLhvor6b+61rra+lPIVfPEYFMkEpxxuAx4todAIXuS46SzqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682975066; 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=nR0TKkdWk92IJd+DUctzVzk6Sj8accfeDlWD8wwZ/DY=; b=ANc+SS5jQEtrpC9M7wT0WLjI5Gw+F62cSpyCTaZdvDGLPdA/j/N0zYRAjkrsw1l6kUUjTD 5X3Eab0CvDO8IK2B5N/mBHW9Bik8LO6cGCXF3HBfzv/SmM8tivZ1RdCA6TSbIvQ6hbFZ8s jiww3K0Pacjxx0QIq+i0d6evA1I3gFKn8UyRWM2gSy0LXt9FNpg1g8G7YDO3ijGsBkneqS fANeVIatLiU8Vbr7SQjSxHrk4oXvIeim+ORlNHt7rAv+K3PASiDLslOG9fyj5SPfVX6BFN TMLqrZHsfqoQaovzbhZ/q5Arn7KEbDHC3exXzTaV+ae/YrEIFcI0luuBSH3g6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682975066; a=rsa-sha256; cv=none; b=Goo1FCChQ5QS4DDyF0V3PeF8Mm5d5LDbuTXDuZyQ+BPfuaszQtZOUwiDdtU3qvvvil6nto ok7ANp8VupUrqq+gc2EIxdTIXEg2JgGsGTRBCwFQD6QtxwdfUeUd4u2648zdSzJ3ZjT+f9 ve1c2IePWv1xOi6ewysLpbZDJgjpDn/raZskya62md839I80mcziEDwSzdpWHIL3YgGW4e TfBkJRNt2WbMmXNh37mCKa1yeY1/dWZ6hXWdcvxqHsATDMRAymVdxuTUuA3kjhHDkwJtgn RBtCJuSjY5cgJjR6oEYCB8i02LPzZmH09L8HIKlEBbBzqPBpqc2pg32f91Ph7g== 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 4Q9G155qhMzLM9; Mon, 1 May 2023 21:04:25 +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 341L4Pxd052011; Mon, 1 May 2023 21:04:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 341L4PxL052007; Mon, 1 May 2023 21:04:25 GMT (envelope-from git) Date: Mon, 1 May 2023 21:04:25 GMT Message-Id: <202305012104.341L4PxL052007@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: b53ec4e44f6f - main - stand: Add isspace to FreeBSD ctypes.h 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: b53ec4e44f6f66f2235a96f7c0508a586b1275f1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b53ec4e44f6f66f2235a96f7c0508a586b1275f1 commit b53ec4e44f6f66f2235a96f7c0508a586b1275f1 Author: Warner Losh AuthorDate: 2023-05-01 17:50:21 +0000 Commit: Warner Losh CommitDate: 2023-05-01 21:02:54 +0000 stand: Add isspace to FreeBSD ctypes.h And eliminate blake3_impl_hack.c since it's no longer needed. Sponsored by: Netflix Reviewed by: delphij Differential Revision: https://reviews.freebsd.org/D39899 --- stand/libsa/zfs/Makefile.inc | 6 +++--- stand/libsa/zfs/blake3_impl_hack.c | 18 ------------------ sys/contrib/openzfs/include/os/freebsd/spl/sys/ctype.h | 1 + 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/stand/libsa/zfs/Makefile.inc b/stand/libsa/zfs/Makefile.inc index 6eded5659602..8bf430a8e4bf 100644 --- a/stand/libsa/zfs/Makefile.inc +++ b/stand/libsa/zfs/Makefile.inc @@ -11,7 +11,7 @@ .PATH: ${OZFS}/module/icp/algs/blake3 ZFS_SRC= zfs.c nvlist.c skein.c skein_block.c list.c ZFS_SRC+= zfs_zstd.c -ZFS_SRC+= blake3.c blake3_generic.c blake3_impl_hack.c +ZFS_SRC+= blake3.c blake3_generic.c blake3_impl.c ZSTD_SRC+= entropy_common.c error_private.c ZSTD_SRC+= fse_decompress.c hist.c ZSTD_SRC+= huf_decompress.c pool.c xxhash.c @@ -49,7 +49,7 @@ CFLAGS.$i+= -include ${ZFSOSINC}/spl/sys/ccompile.h -Wformat -Wall -I${OZFS}/inc CFLAGS_EARLY.blake3.c+= ${ZFS_EARLY} -DOMIT_SIMD CFLAGS_EARLY.blake3_generic.c+= ${ZFS_EARLY} -DOMIT_SIMD -CFLAGS_EARLY.blake3_impl_hack.c+= ${ZFS_EARLY} -DOMIT_SIMD +CFLAGS_EARLY.blake3_impl.c+= ${ZFS_EARLY} -DOMIT_SIMD CFLAGS_EARLY.list.c+= ${ZFS_EARLY} CFLAGS_EARLY.zfs_zstd.c+= ${ZFS_EARLY} CFLAGS_EARLY.nvlist.c+= ${ZFS_EARLY} @@ -78,7 +78,7 @@ CFLAGS.$i+= -U__BMI__ ${NO_WBITWISE_INSTEAD_OF_LOGICAL} CFLAGS.zfs_zstd.c+= -DIN_BASE -DIN_LIBSA -CFLAGS.blake3_impl_hack.c+= -I${OZFS}/module/icp/algs/blake3 -I${OZFS}/module/icp/include +CFLAGS.blake3_impl.c+= -I${OZFS}/module/icp/algs/blake3 -I${OZFS}/module/icp/include # Do not unroll skein loops, reduce code size CFLAGS.skein_block.c+= -DSKEIN_LOOP=111 diff --git a/stand/libsa/zfs/blake3_impl_hack.c b/stand/libsa/zfs/blake3_impl_hack.c deleted file mode 100644 index 789807714e2c..000000000000 --- a/stand/libsa/zfs/blake3_impl_hack.c +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright 2022, Netflix, Inc - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -/* - * Hack for aarch64... Not sure why isspace isn't defined, but it sure doesn't - * belong here. - */ -#ifndef isspace -static __inline int isspace(int c) -{ - return c == ' ' || (c >= 0x9 && c <= 0xd); -} -#endif - -#include "blake3_impl.c" diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/ctype.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/ctype.h index 53afd8b8bd42..201fa95550e3 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/ctype.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/ctype.h @@ -39,5 +39,6 @@ ((C) >= 0x3A && (C) <= 0x40) || \ ((C) >= 0x5B && (C) <= 0x60) || \ ((C) >= 0x7B && (C) <= 0x7E)) +#define isspace(C) ((C) == 0x20 || ((C) >= 0x9 && (C) <= 0xD)) #endif