Other than the Sun 3 version, are these significantly different?  I'd
really like to seem them merged.  Also perhaps sys_machdep.c, trap.c,
and vm_machdep.c.  Some of this is contingent on the ports all
implementing the '040 stuff the same way, which should have been fixed
a long time ago.