merge i386 tree into overall build system