From 13a9f2055a7576ecf25f2c6e821216c4b12ca5b8 Mon Sep 17 00:00:00 2001
From: "richm%stanfordalumni.org" <richm%stanfordalumni.org>
Date: Tue, 10 May 2005 20:08:39 +0000
Subject: [PATCH] fix for 293042: enable Solaris builds with gcc and enable 64
 bit builds as well

---
 directory/c-sdk/config/SunOS5.mk | 15 +++++++++------
 directory/c-sdk/configure        |  7 ++++++-
 directory/c-sdk/configure.in     |  7 ++++++-
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/directory/c-sdk/config/SunOS5.mk b/directory/c-sdk/config/SunOS5.mk
index 78c3165d12b1..dfa51875c3d2 100644
--- a/directory/c-sdk/config/SunOS5.mk
+++ b/directory/c-sdk/config/SunOS5.mk
@@ -108,16 +108,19 @@ ifndef INTERNAL_TOOLS
 ifneq ($(NS_USE_GCC), 1)
 CC			+= -xarch=v9
 CCC			+= -xarch=v9
-endif
-endif
-COMPILER_TAG		= _64
 else
+CC			+= -m64
+CCC			+= -m64
+endif # NS_USE_GCC
+endif # INTERNAL_TOOLS
+COMPILER_TAG		+= _64
+else # USE_64
 ifeq ($(HAVE_CCONF), 1)
 COMPILER_TAG		=
 else
-COMPILER_TAG		= _32
-endif
-endif
+COMPILER_TAG		+= _32
+endif # HAVE_CCONF
+endif # USE_64
 
 RANLIB			= echo
 
diff --git a/directory/c-sdk/configure b/directory/c-sdk/configure
index 9d70e0965104..60b4fc36c2b2 100755
--- a/directory/c-sdk/configure
+++ b/directory/c-sdk/configure
@@ -4701,6 +4701,7 @@ EOF
             CFLAGS="$CFLAGS -MDupdate \$(DEPENDENCIES)"
             CXXFLAGS="$CXXFLAGS -MDupdate \$(DEPENDENCIES)"
         fi
+	COMPILER_TAG=_gcc
     else
         CC="$CC -xstrconst"
         CXX="$CXX -Qoption cg -xstrconst"
@@ -4713,6 +4714,10 @@ EOF
         CC="$CC -xarch=v9"
         CXX="$CXX -xarch=v9"
     fi
+    if test -n "$USE_64" && test "$GNU_CC"; then
+        CC="$CC -m64"
+        CXX="$CXX -m64"
+    fi
     if test "$OS_TEST" = "i86pc"; then
         cat >> confdefs.h <<\EOF
 #define i386 1
@@ -5539,7 +5544,7 @@ else
 fi
 
 if test -n "$USE_64"; then
-    COMPILER_TAG=_64
+    COMPILER_TAG=${COMPILER_TAG}_64
 fi
 
 RELEASE_OBJDIR_NAME="${OS_CONFIG}${CPU_ARCH_TAG}${COMPILER_TAG}${IMPL_STRATEGY}${OBJDIR_TAG}.${OBJDIR_SUFFIX}"
diff --git a/directory/c-sdk/configure.in b/directory/c-sdk/configure.in
index 938579bb2874..40296b54574c 100644
--- a/directory/c-sdk/configure.in
+++ b/directory/c-sdk/configure.in
@@ -1706,6 +1706,7 @@ mips-sony-newsos*)
             CFLAGS="$CFLAGS -MDupdate \$(DEPENDENCIES)"
             CXXFLAGS="$CXXFLAGS -MDupdate \$(DEPENDENCIES)"
         fi
+	COMPILER_TAG=_gcc
     else
         CC="$CC -xstrconst"
         CXX="$CXX -Qoption cg -xstrconst"
@@ -1718,6 +1719,10 @@ mips-sony-newsos*)
         CC="$CC -xarch=v9"
         CXX="$CXX -xarch=v9"
     fi
+    if test -n "$USE_64" && test -n "$GNU_CC"; then
+        CC="$CC -m64"
+        CXX="$CXX -m64"
+    fi
     if test "$OS_TEST" = "i86pc"; then
         AC_DEFINE(i386)
         CPU_ARCH_TAG=_$OS_TEST
@@ -2216,7 +2221,7 @@ else
 fi
 
 if test -n "$USE_64"; then
-    COMPILER_TAG=_64
+    COMPILER_TAG=${COMPILER_TAG}_64
 fi
 
 RELEASE_OBJDIR_NAME="${OS_CONFIG}${CPU_ARCH_TAG}${COMPILER_TAG}${IMPL_STRATEGY}${OBJDIR_TAG}.${OBJDIR_SUFFIX}"