git: 822366134658 - main - Revert "zstd: disable weak-symbol tracing hooks in the kernel"

The branch main has been updated by delphij:

URL: https://cgit.FreeBSD.org/src/commit/?id=822366134658ee59922d7f3e37db7bbb8956aaaf

commit 822366134658ee59922d7f3e37db7bbb8956aaaf
Author:     Xin LI <delphij@FreeBSD.org>
AuthorDate: 2026-05-06 08:27:55 +0000
Commit:     Xin LI <delphij@FreeBSD.org>
CommitDate: 2026-05-06 08:27:55 +0000

    Revert "zstd: disable weak-symbol tracing hooks in the kernel"
    
    This reverts commit de2ea5423cc63b62e7e42d11b667aa634109fc28 which is
    no longer needed after 1dddb580f950 .
    
    Tested by:      mmel
---
 sys/conf/kern.pre.mk | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index a5b21cdbe843..d1556660094a 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -157,11 +157,9 @@ NORMAL_FWO= ${CC:N${CCACHE_BIN}} -c ${ASM_CFLAGS} ${WERROR} -o ${.TARGET} \
 NOSAN_C= ${NORMAL_C:N-fsanitize*:N-fno-sanitize*:N-fasan-shadow-offset*}
 
 # for ZSTD in the kernel (include zstd/lib/freebsd before other CFLAGS)
-ZSTD_C= ${CC} -c -I$S/contrib/zstd/lib/freebsd ${CFLAGS} \
+ZSTD_C= ${CC} -c -DZSTD_HEAPMODE=1 -I$S/contrib/zstd/lib/freebsd ${CFLAGS} \
 	-I$S/contrib/zstd/lib -I$S/contrib/zstd/lib/common ${WERROR} \
-	-Wno-missing-prototypes -U__BMI__ \
-	-DZSTD_HEAPMODE=1 -DZSTD_NO_INTRINSICS -DZSTD_NO_TRACE \
-	${.IMPSRC}
+	-Wno-missing-prototypes -U__BMI__ -DZSTD_NO_INTRINSICS ${.IMPSRC}
 # https://github.com/facebook/zstd/commit/812e8f2a [zstd 1.4.1]
 # "Note that [GCC] autovectorization still does not do a good job on the
 # optimized version, so it's turned off via attribute and flag.  I found