From ee93c874aa6018e0189df0a8d5b10197c6085d93 Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Thu, 23 Dec 2004 21:08:52 +0000 Subject: [PATCH] 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 --- autoconf/configure.ac | 12 ++++++------ configure | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/autoconf/configure.ac b/autoconf/configure.ac index 6129bb449b8..a9df9a74f98 100644 --- 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 b335be56f84..85256d7cf61 100755 --- 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= ;; -- 2.34.1