aboutsummaryrefslogtreecommitdiff
path: root/cddl
diff options
context:
space:
mode:
Diffstat (limited to 'cddl')
-rw-r--r--cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c9
-rw-r--r--cddl/lib/libavl/Makefile4
-rw-r--r--cddl/lib/libctf/Makefile2
-rw-r--r--cddl/lib/libdtrace/psinfo.d2
-rw-r--r--cddl/lib/libicp/Makefile4
-rw-r--r--cddl/lib/libicp_rescue/Makefile2
-rw-r--r--cddl/lib/libnvpair/Makefile4
-rw-r--r--cddl/lib/libspl/Makefile4
-rw-r--r--cddl/lib/libtpool/Makefile7
-rw-r--r--cddl/lib/libumem/Makefile4
-rw-r--r--cddl/lib/libuutil/Makefile4
-rw-r--r--cddl/lib/libzdb/Makefile4
-rw-r--r--cddl/lib/libzfs/Makefile4
-rw-r--r--cddl/lib/libzfs_core/Makefile3
-rw-r--r--cddl/lib/libzfsbootenv/Makefile2
-rw-r--r--cddl/lib/libzpool/Makefile2
-rw-r--r--cddl/lib/libzutil/Makefile4
-rw-r--r--cddl/share/zfs/compatibility.d/Makefile5
-rw-r--r--cddl/usr.bin/ctfconvert/Makefile2
-rw-r--r--cddl/usr.bin/ctfdump/Makefile2
-rw-r--r--cddl/usr.bin/ctfmerge/Makefile2
21 files changed, 54 insertions, 22 deletions
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c
index 385c9d78bdfc..b311b5425587 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c
@@ -2242,11 +2242,10 @@ dt_format_bytes_get(dtrace_hdl_t *dtp, caddr_t addr, size_t nbytes)
static int
dt_format_memory(dtrace_hdl_t *dtp, caddr_t addr)
{
-
- size_t nbytes = *((uintptr_t *) addr);
+ size_t nbytes = *((size_t *) addr);
char *s;
- s = dt_format_bytes_get(dtp, addr + sizeof(uintptr_t), nbytes);
+ s = dt_format_bytes_get(dtp, addr + sizeof(size_t), nbytes);
if (s == NULL)
return (-1);
@@ -2260,9 +2259,9 @@ static int
dt_print_memory(dtrace_hdl_t *dtp, FILE *fp, caddr_t addr)
{
int quiet = (dtp->dt_options[DTRACEOPT_QUIET] != DTRACEOPT_UNSET);
- size_t nbytes = *((uintptr_t *) addr);
+ size_t nbytes = *((size_t *) addr);
- return (dt_print_bytes(dtp, fp, addr + sizeof(uintptr_t),
+ return (dt_print_bytes(dtp, fp, addr + sizeof(size_t),
nbytes, 50, quiet, 1));
}
diff --git a/cddl/lib/libavl/Makefile b/cddl/lib/libavl/Makefile
index ce77012def9f..4ce1de20a3d9 100644
--- a/cddl/lib/libavl/Makefile
+++ b/cddl/lib/libavl/Makefile
@@ -1,6 +1,8 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/avl
-PACKAGE= libzfs
+PACKAGE= zfs
+LIB_PACKAGE=
+
LIB= avl
LIBADD= spl
SRCS= avl.c
diff --git a/cddl/lib/libctf/Makefile b/cddl/lib/libctf/Makefile
index 10854482cd21..1c605182bc1d 100644
--- a/cddl/lib/libctf/Makefile
+++ b/cddl/lib/libctf/Makefile
@@ -2,6 +2,8 @@
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libctf/common
.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/ctf
+PACKAGE= ctf
+LIB_PACKAGE=
LIB= ctf
SRCS= ctf_create.c \
ctf_decl.c \
diff --git a/cddl/lib/libdtrace/psinfo.d b/cddl/lib/libdtrace/psinfo.d
index c0cd5b121064..8dc27e812965 100644
--- a/cddl/lib/libdtrace/psinfo.d
+++ b/cddl/lib/libdtrace/psinfo.d
@@ -55,7 +55,7 @@ translator psinfo_t < struct proc *T > {
pr_uid = T->p_ucred->cr_ruid;
pr_euid = T->p_ucred->cr_uid;
pr_gid = T->p_ucred->cr_rgid;
- pr_egid = T->p_ucred->cr_groups[0];
+ pr_egid = T->p_ucred->cr_gid;
pr_addr = 0;
pr_psargs = (T->p_args == 0) ? "" :
memstr(T->p_args->ar_args, ' ', T->p_args->ar_length);
diff --git a/cddl/lib/libicp/Makefile b/cddl/lib/libicp/Makefile
index f097e7e6ff58..1a9a79103b50 100644
--- a/cddl/lib/libicp/Makefile
+++ b/cddl/lib/libicp/Makefile
@@ -1,6 +1,8 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp
PACKAGE= zfs
+LIB_PACKAGE=
+
LIB= icp
LIBADD=
@@ -11,6 +13,7 @@ ASM_SOURCES_AS = \
asm-x86_64/aes/aes_aesni.S \
asm-x86_64/modes/gcm_pclmulqdq.S \
asm-x86_64/modes/aesni-gcm-x86_64.S \
+ asm-x86_64/modes/aesni-gcm-avx2-vaes.S \
asm-x86_64/modes/ghash-x86_64.S \
asm-x86_64/sha2/sha256-x86_64.S \
asm-x86_64/sha2/sha512-x86_64.S \
@@ -112,6 +115,7 @@ CFLAGS.aes_amd64.S+= -DLOCORE
CFLAGS.aes_aesni.S+= -DLOCORE
CFLAGS.gcm_pclmulqdq.S+= -DLOCORE
CFLAGS.aesni-gcm-x86_64.S+= -DLOCORE
+CFLAGS.aesni-gcm-avx2-vaes.S+= -DLOCORE
CFLAGS.ghash-x86_64.S+= -DLOCORE
CFLAGS.sha256-x86_64.S+= -DLOCORE
CFLAGS.sha512-x86_64.S+= -DLOCORE
diff --git a/cddl/lib/libicp_rescue/Makefile b/cddl/lib/libicp_rescue/Makefile
index 3a8b6746fe61..0a5a81f4ab7f 100644
--- a/cddl/lib/libicp_rescue/Makefile
+++ b/cddl/lib/libicp_rescue/Makefile
@@ -11,6 +11,7 @@ ASM_SOURCES_AS = \
asm-x86_64/aes/aes_aesni.S \
asm-x86_64/modes/gcm_pclmulqdq.S \
asm-x86_64/modes/aesni-gcm-x86_64.S \
+ asm-x86_64/modes/aesni-gcm-avx2-vaes.S \
asm-x86_64/sha2/sha256-x86_64.S \
asm-x86_64/sha2/sha512-x86_64.S \
asm-x86_64/blake3/blake3_avx2.S \
@@ -109,6 +110,7 @@ CFLAGS.aes_amd64.S+= -DLOCORE
CFLAGS.aes_aesni.S+= -DLOCORE
CFLAGS.gcm_pclmulqdq.S+= -DLOCORE
CFLAGS.aesni-gcm-x86_64.S+= -DLOCORE
+CFLAGS.aesni-gcm-avx2-vaes.S+= -DLOCORE
CFLAGS.ghash-x86_64.S+= -DLOCORE
CFLAGS.sha256-x86_64.S+= -DLOCORE
CFLAGS.sha512-x86_64.S+= -DLOCORE
diff --git a/cddl/lib/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile
index 2d9ef1c7af1e..8245b324688b 100644
--- a/cddl/lib/libnvpair/Makefile
+++ b/cddl/lib/libnvpair/Makefile
@@ -2,10 +2,12 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libnvpair
.PATH: ${SRCTOP}/sys/contrib/openzfs/include
+PACKAGE= zfs
+LIB_PACKAGE=
+
LIB= nvpair
LIBADD= spl
-PACKAGE= libzfs
# user
INCS= libnvpair.h
SRCS= libnvpair.c \
diff --git a/cddl/lib/libspl/Makefile b/cddl/lib/libspl/Makefile
index d8d997c6f377..26e14ea72b8a 100644
--- a/cddl/lib/libspl/Makefile
+++ b/cddl/lib/libspl/Makefile
@@ -4,9 +4,11 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libspl
.PATH: ${SRCTOP}/sys/contrib/openzfs/include
+PACKAGE= zfs
+LIB_PACKAGE=
+
LIB= spl
LIBADD=
-PACKAGE= libzfs
SRCS = \
assert.c \
diff --git a/cddl/lib/libtpool/Makefile b/cddl/lib/libtpool/Makefile
index 7acf34219a47..3a50a21bf62c 100644
--- a/cddl/lib/libtpool/Makefile
+++ b/cddl/lib/libtpool/Makefile
@@ -1,11 +1,12 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libtpool
.PATH: ${SRCTOP}/sys/contrib/openzfs/include
+PACKAGE= zfs
+LIB_PACKAGE=
-LIB= tpool
+LIB= tpool
SHLIBDIR?= /lib
-LIBADD= spl
-PACKAGE= libzfs
+LIBADD= spl
INCS= thread_pool_impl.h
SRCS= thread_pool.c
diff --git a/cddl/lib/libumem/Makefile b/cddl/lib/libumem/Makefile
index 9164ba771fe6..512332275fec 100644
--- a/cddl/lib/libumem/Makefile
+++ b/cddl/lib/libumem/Makefile
@@ -1,6 +1,8 @@
.PATH: ${SRCTOP}/cddl/compat/opensolaris/lib/libumem
-PACKAGE= libzfs
+PACKAGE= zfs
+LIB_PACKAGE=
+
LIB= umem
SRCS= umem.c
WARNS?= 3
diff --git a/cddl/lib/libuutil/Makefile b/cddl/lib/libuutil/Makefile
index 8c8a786ee039..947e755d4aae 100644
--- a/cddl/lib/libuutil/Makefile
+++ b/cddl/lib/libuutil/Makefile
@@ -1,6 +1,8 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libuutil
-PACKAGE= libzfs
+PACKAGE= zfs
+LIB_PACKAGE=
+
LIB= uutil
SRCS=\
uu_alloc.c \
diff --git a/cddl/lib/libzdb/Makefile b/cddl/lib/libzdb/Makefile
index 0eb30c55d107..040d7d2c63f9 100644
--- a/cddl/lib/libzdb/Makefile
+++ b/cddl/lib/libzdb/Makefile
@@ -1,8 +1,10 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzdb
.PATH: ${SRCTOP}/sys/contrib/openzfs/include
-LIB= zdb
PACKAGE= zfs
+LIB_PACKAGE=
+
+LIB= zdb
INCS = libzdb.h
diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
index 40553aa68719..376e32fb893f 100644
--- a/cddl/lib/libzfs/Makefile
+++ b/cddl/lib/libzfs/Makefile
@@ -7,7 +7,9 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd/lib
-PACKAGE= libzfs
+PACKAGE= zfs
+LIB_PACKAGE=
+
LIB= zfs
LIBADD= \
avl \
diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile
index bac81ca73497..10533c5de05b 100644
--- a/cddl/lib/libzfs_core/Makefile
+++ b/cddl/lib/libzfs_core/Makefile
@@ -3,10 +3,11 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs
+PACKAGE= zfs
+LIB_PACKAGE=
LIB= zfs_core
LIBADD= nvpair spl zutil
-PACKAGE= libzfs
INCS= libzfs_core.h
SRCS= libzfs_core.c \
diff --git a/cddl/lib/libzfsbootenv/Makefile b/cddl/lib/libzfsbootenv/Makefile
index 15ee5bfaeaa4..22f5da1ee5b1 100644
--- a/cddl/lib/libzfsbootenv/Makefile
+++ b/cddl/lib/libzfsbootenv/Makefile
@@ -2,6 +2,8 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/include
PACKAGE= zfs
+LIB_PACKAGE=
+
LIB= zfsbootenv
SHLIB_MAJOR= 1
diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
index 4da3840e59f0..82ec0e890d56 100644
--- a/cddl/lib/libzpool/Makefile
+++ b/cddl/lib/libzpool/Makefile
@@ -29,6 +29,8 @@ PICFLAG= -fPIC
.endif
PACKAGE= zfs
+LIB_PACKAGE=
+
LIB= zpool
USER_C = \
diff --git a/cddl/lib/libzutil/Makefile b/cddl/lib/libzutil/Makefile
index 07ca3b9bc156..37e9e8dd5e63 100644
--- a/cddl/lib/libzutil/Makefile
+++ b/cddl/lib/libzutil/Makefile
@@ -2,9 +2,11 @@
.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzutil/os/freebsd
.PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs
+PACKAGE= zfs
+LIB_PACKAGE=
+
LIB= zutil
LIBADD= avl geom m tpool
-PACKAGE= libzfs
INCS = zutil_import.h
diff --git a/cddl/share/zfs/compatibility.d/Makefile b/cddl/share/zfs/compatibility.d/Makefile
index 6cdb64b0fccb..6d3663081ae6 100644
--- a/cddl/share/zfs/compatibility.d/Makefile
+++ b/cddl/share/zfs/compatibility.d/Makefile
@@ -24,6 +24,7 @@ FILES= \
openzfs-2.1-linux \
openzfs-2.2 \
openzfs-2.3 \
+ openzfs-2.4 \
zol-0.6.1 \
zol-0.6.4 \
zol-0.6.5 \
@@ -60,7 +61,9 @@ LINKS= \
${FILESDIR}/openzfs-2.2 ${FILESDIR}/openzfs-2.2-linux \
${FILESDIR}/openzfs-2.2 ${FILESDIR}/openzfs-2.2-freebsd \
${FILESDIR}/openzfs-2.3 ${FILESDIR}/openzfs-2.3-linux \
- ${FILESDIR}/openzfs-2.3 ${FILESDIR}/openzfs-2.3-freebsd
+ ${FILESDIR}/openzfs-2.3 ${FILESDIR}/openzfs-2.3-freebsd \
+ ${FILESDIR}/openzfs-2.4 ${FILESDIR}/openzfs-2.4-linux \
+ ${FILESDIR}/openzfs-2.4 ${FILESDIR}/openzfs-2.4-freebsd
LINKMODE= ${NOBINMODE}
diff --git a/cddl/usr.bin/ctfconvert/Makefile b/cddl/usr.bin/ctfconvert/Makefile
index cd9f850f480c..df53c46b7246 100644
--- a/cddl/usr.bin/ctfconvert/Makefile
+++ b/cddl/usr.bin/ctfconvert/Makefile
@@ -3,7 +3,7 @@
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/cvt
-PACKAGE= ctf-tools
+PACKAGE= ctf
PROG= ctfconvert
SRCS= alist.c \
ctf.c \
diff --git a/cddl/usr.bin/ctfdump/Makefile b/cddl/usr.bin/ctfdump/Makefile
index 23ded7458bed..357598583ae7 100644
--- a/cddl/usr.bin/ctfdump/Makefile
+++ b/cddl/usr.bin/ctfdump/Makefile
@@ -1,7 +1,7 @@
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/dump
-PACKAGE= ctf-tools
+PACKAGE= ctf
PROG= ctfdump
SRCS= dump.c \
symbol.c \
diff --git a/cddl/usr.bin/ctfmerge/Makefile b/cddl/usr.bin/ctfmerge/Makefile
index 4cd9511f911c..81bccc047a25 100644
--- a/cddl/usr.bin/ctfmerge/Makefile
+++ b/cddl/usr.bin/ctfmerge/Makefile
@@ -1,7 +1,7 @@
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/cvt
-PACKAGE= ctf-tools
+PACKAGE= ctf
PROG= ctfmerge
SRCS= alist.c \
barrier.c \
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-15 07:01:19 +0000