Update the amd64 target detection checks.

Patch contributed by Markus F.X.J. Oberhumer.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@19118 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index 6129bb449b8868155f5373712be46577e6b5192e..a9df9a74f98171c9ee228142070501ad33b590ae 100644 (file)
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -139,11 +139,11 @@ dnl This will allow Makefiles to make a distinction between the hardware and
 dnl the OS.
 AC_CACHE_CHECK([target architecture],[llvm_cv_target_arch],
 [case $target in
-  i?86-*)      llvm_cv_target_arch="x86" ;;
-  amd64-*)     llvm_cv_target_arch="amd64" ;;
-  sparc*-*)    llvm_cv_target_arch="Sparc" ;;
-  powerpc*-*)  llvm_cv_target_arch="PowerPC" ;;
-  *)           llvm_cv_target_arch="Unknown" ;;
+  i?86-*)                 llvm_cv_target_arch="x86" ;;
+  amd64-* | x86_64-*)     llvm_cv_target_arch="AMD64" ;;
+  sparc*-*)               llvm_cv_target_arch="Sparc" ;;
+  powerpc*-*)             llvm_cv_target_arch="PowerPC" ;;
+  *)                      llvm_cv_target_arch="Unknown" ;;
 esac])
 
 if test "$llvm_cv_target_arch" = "Unknown" ; then
@@ -184,7 +184,7 @@ else
     x86)     AC_SUBST(JIT,[[TARGET_HAS_JIT=1]]) ;;
     Sparc)   AC_SUBST(JIT,[[TARGET_HAS_JIT=1]]) ;;
     PowerPC) AC_SUBST(JIT,[[TARGET_HAS_JIT=1]]) ;;
-    amd64)   AC_SUBST(JIT,[[]]) ;;
+    AMD64)   AC_SUBST(JIT,[[]]) ;;
     *)       AC_SUBST(JIT,[[]]) ;;
   esac
 fi

diff --git a/configure b/configure
index b335be56f8498f8a2530dc94c74844ca3445d169..85256d7cf61f6d72bf2332e04d2a281d44bffafb 100755 (executable)
--- a/configure
+++ b/configure
@@ -1742,11 +1742,11 @@ if test "${llvm_cv_target_arch+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case $target in
-  i?86-*)      llvm_cv_target_arch="x86" ;;
-  amd64-*)     llvm_cv_target_arch="amd64" ;;
-  sparc*-*)    llvm_cv_target_arch="Sparc" ;;
-  powerpc*-*)  llvm_cv_target_arch="PowerPC" ;;
-  *)           llvm_cv_target_arch="Unknown" ;;
+  i?86-*)                 llvm_cv_target_arch="x86" ;;
+  amd64-* | x86_64-*)     llvm_cv_target_arch="AMD64" ;;
+  sparc*-*)               llvm_cv_target_arch="Sparc" ;;
+  powerpc*-*)             llvm_cv_target_arch="PowerPC" ;;
+  *)                      llvm_cv_target_arch="Unknown" ;;
 esac
 fi
 echo "$as_me:$LINENO: result: $llvm_cv_target_arch" >&5
@@ -2955,7 +2955,7 @@ else
  ;;
     PowerPC) JIT=TARGET_HAS_JIT=1
  ;;
-    amd64)   JIT=
+    AMD64)   JIT=
  ;;
     *)       JIT=
  ;;