[coreboot-gerrit] Patch merged into coreboot/master: x86: Port x86 over to compile cleanly with x86-64