Okay, with the prior patch I have a -current GENERIC kernel.
The system is stock 1.5 installed so that I have a
basis to upgrade to -current.

I've already built all the needed bin's as per UPGRADING.

When I try to upgrade lib/libc though in the next step, I get:

# make MKSHARE=no dependall
creating LintSysNormal.c
syscall utrace not found!
*** Error code 1

Stop.