@@ -28,12 +28,12 @@
 # elif defined(__ppc__)
 #  include "apple-forwarding-ppc.S"
 # endif
 #else
 # if defined(__ELF__)
-#  if defined(__amd64__) || defined(__x86_64__)
-#   include "forwarding-amd64-elf.S"
+#  if defined(__x86_64__) || defined(__amd64__)
+#   include "forwarding-x86_64-elf.S"
 #  elif defined(__i386__)
 #   include "forwarding-x86-elf.S"
 #  elif defined(__arm__) || defined(__ARM__)
 #   include "forwarding-arm-elf.S"
 #  elif defined(__ppc__) || defined(__PPC__)
@@ -42,11 +42,11 @@
 	(defined(__mips_eabi) && _MIPS_SZPTR == 32)
 #   include "forwarding-mips-elf.S"
 #  endif
 # elif defined(_WIN32)
 #  if defined(__x86_64__)
-#   include "forwarding-amd64-win64.S"
+#   include "forwarding-x86_64-win64.S"
 #  elif defined(__i386__)
 #   include "forwarding-x86-win32.S"
 #  endif
 # endif
 #endif