[llvm-commits] CVS: llvm/Makefile.config.in configure.ac configure

[John Criswell]

Changes in directory llvm:

Makefile.config.in updated: 1.5 -> 1.6
configure.ac updated: 1.3 -> 1.4
configure updated: 1.3 -> 1.4

---
Log message:

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).


---
Diffs of the changes:

Index: llvm/Makefile.config.in
diff -u llvm/Makefile.config.in:1.5 llvm/Makefile.config.in:1.6
--- llvm/Makefile.config.in:1.5	Tue Jul  1 10:02:59 2003
+++ llvm/Makefile.config.in	Tue Jul  1 17:07:39 2003
@@ -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.
 #


Index: llvm/configure.ac
diff -u llvm/configure.ac:1.3 llvm/configure.ac:1.4
--- llvm/configure.ac:1.3	Mon Jun 30 17:16:39 2003
+++ llvm/configure.ac	Tue Jul  1 17:07:39 2003
@@ -50,12 +50,24 @@
 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
 


Index: llvm/configure
diff -u llvm/configure:1.3 llvm/configure:1.4
--- llvm/configure:1.3	Mon Jun 30 17:16:39 2003
+++ llvm/configure	Tue Jul  1 17:07:39 2003
@@ -1610,6 +1610,15 @@
 	                  ;;
 esac
 
+case $target in
+	*i*86*)           ARCH=x86
+
+	                  ;;
+	*sparc*solaris*)  ARCH=Sparc
+
+	                  ;;
+esac
+
 
 ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -4296,7 +4305,7 @@
 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 @@
 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 @@
     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 @@
     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, at OS@,$OS,;t t
 s, at DISABLE_LLC_DIFFS@,$DISABLE_LLC_DIFFS,;t t
 s, at LLVMGCCDIR@,$LLVMGCCDIR,;t t
+s, at ARCH@,$ARCH,;t t
 s, at CXX@,$CXX,;t t
 s, at CXXFLAGS@,$CXXFLAGS,;t t
 s, at LDFLAGS@,$LDFLAGS,;t t