of svr4.h on the i386, and moving all the shared arch neutral bits into the FreeBSD general config header.