Skip to content

Commit

Permalink
zfs: Detect purecap kernels via MACHINE_ABI not a list of MACHINE_ARCH
Browse files Browse the repository at this point in the history
The current list is missing aarch64cb, so zfs for purecap benchmark
kernels is built with subobject bounds and thus panics with a bounds
fault early in boot if used. Instead of updating the list to include
aarch64cb, just check MACHINE_ABI, which is available here.
  • Loading branch information
jrtc27 authored and bsdjhb committed Aug 19, 2024
1 parent 8c2a10c commit f3680ba
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sys/modules/zfs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,6 @@ zfs-sha512-x86_64.o: sha512-x86_64.S
${CTFCONVERT_CMD}
.endif

.if ${MACHINE_ARCH} == "aarch64c" || ${MACHINE_ARCH} == "riscv64c"
.if ${MACHINE_ABI:Mpurecap}
CFLAGS+=-Xclang -cheri-bounds=conservative
.endif

0 comments on commit f3680ba

Please sign in to comment.