Something omitted in an MFC?
- Reply: David Wolfskill : "Re: Something omitted in an MFC?"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 10 Feb 2025 12:14:45 UTC
TL;DR: I thought it was just that stable/14's sys/sys/libkern.h had
grown a need for an
#include <kassert.h>
but merely adding that just generated another error, so I thought I
should leave that part to folks who actually have more clue about
this stuff than I do. :-}
Daily update of stable/14 failed today; this was from:
freebeast(14.2-S)[5] uname -aUK
FreeBSD freebeast.catwhisker.org 14.2-STABLE FreeBSD 14.2-STABLE #102 stable/14-n270345-9938f6408934: Sat Feb 8 11:53:14 UTC 2025 root@freebeast.catwhisker.org:/common/S1/obj/usr/src/amd64.amd64/sys/GENERIC amd64 1402501 1402501
after updating sources to stable/14-n270354-16b7da6f7abe.
...
make[4]: stopped in /usr/src/stand/libsa32
.ERROR_TARGET='zfs_zstd.o'
.ERROR_META_FILE='/common/S1/obj/usr/src/amd64.amd64/stand/libsa32/zfs_zstd.o.meta'
.MAKE.LEVEL='4'
....
Checking the meta file, I see:
...
TARGET zfs_zstd.o
-- command output --
In file included from /usr/src/sys/contrib/openzfs/module/zstd/zfs_zstd.c:43:
In file included from /usr/src/sys/contrib/openzfs/include/os/freebsd/spl/sys/sysmacros.h:34:
In file included from /usr/src/sys/contrib/openzfs/include/os/freebsd/spl/sys/systm.h:35:
In file included from /usr/src/sys/contrib/openzfs/include/os/freebsd/spl/sys/string.h:32:
/usr/src/sys/sys/libkern.h:196:2: error: call to undeclared function 'MPASS'; ISO C99 and later do not support implicit function declarations [-Werror,-Wimplicit-function-declaration]
196 | MPASS(n != 0);
| ^
/usr/src/sys/sys/libkern.h:204:2: error: call to undeclared function 'MPASS'; ISO C99 and later do not support implicit function declarations [-Werror,-Wimplicit-function-declaration]
204 | MPASS(n != 0);
| ^
/usr/src/sys/sys/libkern.h:212:2: error: call to undeclared function 'MPASS'; ISO C99 and later do not support implicit function declarations [-Werror,-Wimplicit-function-declaration]
212 | MPASS(n != 0);
| ^
3 errors generated.
*** Error code 1
....
Checking a git diff, MPASS is now in some new code added to
sys/sys/libkern.h in stable/14-n270350-4ed1837853b1, which MFCs
main-n270548-b0056b31e900. And that's about as far as I got before
inserting that '#include <kassert.h' in sys/sys/libkern.h.
Peace,
david
--
David H. Wolfskill david@catwhisker.org
"A man reaps what he sows."
See https://www.catwhisker.org/~david/publickey.gpg for my public key.