Map amd64 -> x86_64 in Make.inc