Move all of the XSAVE support under #ifdef I686_CPU and fix the build
without I686_CPU.