From 33dde9da38322ebc65c821a378d4debd6a200312 Mon Sep 17 00:00:00 2001
From: hobbs <hobbs>
Date: Sat, 7 May 2005 00:05:54 +0000
Subject: 	* unix/tcl.m4, unix/configure: correct Solaris 10 (5.10) check
 and 	add support for x86_64 Solaris cc builds.

---
 ChangeLog      |  5 +++++
 unix/configure | 17 +++++++++++++----
 unix/tcl.m4    | 14 +++++++++++---
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2c02d31..8635f6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-06  Jeff Hobbs  <jeffh@ActiveState.com>
+
+	* unix/tcl.m4, unix/configure: correct Solaris 10 (5.10) check and
+	add support for x86_64 Solaris cc builds.
+
 2005-05-05  Kevin B. Kenny  <kennykb@acm.org>
 
 	* win/tclWinThrd.c:  Corrected a compilation error on the
diff --git a/unix/configure b/unix/configure
index 1ccbc15..3496807 100755
--- a/unix/configure
+++ b/unix/configure
@@ -8094,7 +8094,8 @@ _ACEOF
 	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 	    TCL_LIB_VERSIONS_OK=nodots
 	    ;;
-	SunOS-5.[0-6]*)
+	SunOS-5.[0-6])
+	    # Careful to not let 5.10+ fall into this case
 
 	    # Note: If _REENTRANT isn't defined, then Solaris
 	    # won't define thread-safe library routines.
@@ -8130,7 +8131,6 @@ _ACEOF
 	    fi
 	    ;;
 	SunOS-5*)
-
 	    # Note: If _REENTRANT isn't defined, then Solaris
 	    # won't define thread-safe library routines.
 
@@ -8171,9 +8171,18 @@ echo "$as_me: WARNING: 64bit mode not supported with GCC < 3.2 on $system" >&2;}
 			    	LDFLAGS_ARCH="-xarch=v9"
 			    fi
 			fi
+		elif test "$arch" = "amd64 i386" ; then
+		    if test "$GCC" = "yes" ; then
+			{ echo "$as_me:$LINENO: WARNING: 64bit mode not supported with GCC on $system" >&5
+echo "$as_me: WARNING: 64bit mode not supported with GCC on $system" >&2;}
+		    else
+			do64bit_ok=yes
+			CFLAGS="$CFLAGS -xarch=amd64"
+			LDFLAGS="$LDFLAGS -xarch=amd64"
+		    fi
 		else
-		    { echo "$as_me:$LINENO: WARNING: 64bit mode only supported sparcv9 system" >&5
-echo "$as_me: WARNING: 64bit mode only supported sparcv9 system" >&2;}
+		    { echo "$as_me:$LINENO: WARNING: 64bit mode not supported for $arch" >&5
+echo "$as_me: WARNING: 64bit mode not supported for $arch" >&2;}
 		fi
 	    fi
 
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 778beee..bbed997 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1565,7 +1565,8 @@ dnl AC_CHECK_TOOL(AR, ar)
 	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 	    TCL_LIB_VERSIONS_OK=nodots
 	    ;;
-	SunOS-5.[[0-6]]*)
+	SunOS-5.[[0-6]])
+	    # Careful to not let 5.10+ fall into this case
 
 	    # Note: If _REENTRANT isn't defined, then Solaris
 	    # won't define thread-safe library routines.
@@ -1594,7 +1595,6 @@ dnl AC_CHECK_TOOL(AR, ar)
 	    fi
 	    ;;
 	SunOS-5*)
-
 	    # Note: If _REENTRANT isn't defined, then Solaris
 	    # won't define thread-safe library routines.
 
@@ -1627,8 +1627,16 @@ dnl AC_CHECK_TOOL(AR, ar)
 			    	LDFLAGS_ARCH="-xarch=v9"
 			    fi
 			fi
+		elif test "$arch" = "amd64 i386" ; then
+		    if test "$GCC" = "yes" ; then
+			AC_MSG_WARN([64bit mode not supported with GCC on $system])
+		    else
+			do64bit_ok=yes
+			CFLAGS="$CFLAGS -xarch=amd64"
+			LDFLAGS="$LDFLAGS -xarch=amd64"
+		    fi
 		else
-		    AC_MSG_WARN([64bit mode only supported sparcv9 system])
+		    AC_MSG_WARN([64bit mode not supported for $arch])
 		fi
 	    fi
 	    
-- 
cgit v0.12