From 29eafac9ff37eb93b7dc98298fe78ba6a53c77bc Mon Sep 17 00:00:00 2001
From: John Criswell <criswell@uiuc.edu>
Date: Tue, 1 Jul 2003 22:07:39 +0000
Subject: [PATCH] Added the ARCH variable so that some of the Makefiles can
 perform actions based upon the target hardware architecture (as opposed to
 always checking the OS).

llvm-svn: 7050
---
 llvm/Makefile.config.in |  5 +++++
 llvm/configure          | 18 ++++++++++++++----
 llvm/configure.ac       | 18 +++++++++++++++---
 3 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/llvm/Makefile.config.in b/llvm/Makefile.config.in
index 9480219db8e9..e3fe5218b485 100644
--- a/llvm/Makefile.config.in
+++ b/llvm/Makefile.config.in
@@ -9,6 +9,11 @@
 #
 OS=@OS@
 
+#
+# Target hardware architecture
+#
+ARCH=@ARCH@
+
 # Path to the C++ compiler to use.  This is an optional setting, which defaults
 # to whatever your gmake defaults to.
 #
diff --git a/llvm/configure b/llvm/configure
index 335912483f4a..3fdc25ea81ff 100755
--- a/llvm/configure
+++ b/llvm/configure
@@ -1610,6 +1610,15 @@ case $target in
 	                  ;;
 esac
 
+case $target in
+	*i*86*)           ARCH=x86
+
+	                  ;;
+	*sparc*solaris*)  ARCH=Sparc
+
+	                  ;;
+esac
+
 
 ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -4296,7 +4305,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4299 "configure"' > conftest.$ac_ext
+  echo '#line 4308 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -4846,7 +4855,7 @@ chmod -w .
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:4849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:4858: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
   # The compiler can only warn and ignore the option if not recognized
   # So say no if there are warnings
   if test -s out/conftest.err; then
@@ -6677,7 +6686,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6680 "configure"
+#line 6689 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -6775,7 +6784,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6778 "configure"
+#line 6787 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12126,6 +12135,7 @@ s,@target_os@,$target_os,;t t
 s,@OS@,$OS,;t t
 s,@DISABLE_LLC_DIFFS@,$DISABLE_LLC_DIFFS,;t t
 s,@LLVMGCCDIR@,$LLVMGCCDIR,;t t
+s,@ARCH@,$ARCH,;t t
 s,@CXX@,$CXX,;t t
 s,@CXXFLAGS@,$CXXFLAGS,;t t
 s,@LDFLAGS@,$LDFLAGS,;t t
diff --git a/llvm/configure.ac b/llvm/configure.ac
index 609b66fa3fd7..e82780ccf307 100644
--- a/llvm/configure.ac
+++ b/llvm/configure.ac
@@ -50,15 +50,27 @@ case $build in
 esac
 
 dnl
-dnl If we are on a Solaris machine, pretend that it is V9, since that is all
-dnl that we support at the moment, and autoconf will only tell us we're a
-dnl sparc.
+dnl If we are targetting a Sparc machine running Solaris, pretend that it is
+dnl V9, since that is all that we support at the moment, and autoconf will only
+dnl tell us we're a sparc.
 dnl
 case $target in
 	*sparc*solaris*)  AC_SUBST(target,[[sparcv9-sun-solaris2.8]])
 	                  ;;
 esac
 
+dnl
+dnl Determine what our target architecture is and configure accordingly.
+dnl This will allow Makefiles to make a distinction between the hardware and
+dnl the OS.
+dnl
+case $target in
+	*i*86*)           AC_SUBST(ARCH,[x86])
+	                  ;;
+	*sparc*solaris*)  AC_SUBST(ARCH,[Sparc])
+	                  ;;
+esac
+
 dnl **************************************************************************
 dnl * Check for programs.
 dnl **************************************************************************