With the update of config.guess and config.sub the target_cpu will be x86_64 instead of amd64 for autotools scripts, prepare for it.