diff -r 367e5999a90e make/defines_COMMON.mk
--- a/make/defines_COMMON.mk	Thu May 07 03:20:10 2009 -0700
+++ b/make/defines_COMMON.mk	Mon Sep 14 04:13:29 2009 -0700
@@ -140,6 +140,9 @@
 
 ifdef USE_ZLIB
 SYSTEM_INC+=$(ZLIB_INC)
+ifdef BUILD64
+LIBDIRS+=$(ZLIB_LIBDIR_64)
+endif
 LIBDIRS+=$(ZLIB_LIBDIR)
 SYSTEM_LIB+=$(ZLIB_LIB)
 endif
@@ -169,6 +172,9 @@
 ifdef USE_CLIENTLIBS
 # unlike other USE_X USE_CLIENTLIBS does not actually link any libraries.
 CLIENTLIBS=$(SECURITY_COMMON_LIBS) 
+ifdef BUILD64
+LIBDIRS+=$(NSS_LIBDIR_64)
+endif
 LIBDIRS+=$(NSS_LIBDIR)
 INCLUDES+=$(NSS_INC)
 endif
@@ -178,27 +184,42 @@
 
 ifdef USE_LDAPSDK
 INCLUDES+=$(LDAPSDK_INC)
+ifdef BUILD64
+LIBDIRS+=$(LDAPSDK_LIBDIR_64)
+endif
 LIBDIRS+=$(LDAPSDK_LIBDIR)
 SYSTEM_LIB+=$(LDAP_LIBS)
 INCLUDES+=-I$(SASL_INC)
+ifdef BUILD64
+LIBDIRS+=$(SASL_LIBDIR_64)
+endif
 LIBDIRS+=$(SASL_LIBDIR)
 SYSTEM_LIB+=$(SASL_LIBS)
 endif
 
 ifdef USE_XERCESC
 INCLUDES+=$(XERCESC_INC)
+ifdef BUILD64
+LIBDIRS+=$(XERCESC_LIBDIR_64)
+endif
 LIBDIRS+=$(XERCESC_LIBDIR)
 SYSTEM_LIB+=$(XERCESC_LIBS)
 endif
 
 ifdef USE_XALANC
 INCLUDES+=$(XALANC_INC)
+ifdef BUILD64
+LIBDIRS+=$(XALANC_LIBDIR_64)
+endif
 LIBDIRS+=$(XALANC_LIBDIR)
 SYSTEM_LIB+=$(XALANC_LIBS)
 endif
 
 ifdef USE_PCRE
 INCLUDES+=$(PCRE_INC)
+ifdef BUILD64
+LIBDIRS+=$(PCRE_LIBDIR_64)
+endif
 LIBDIRS+=$(PCRE_LIBDIR)
 SYSTEM_LIB+=$(PCRE_LIBS)
 endif
@@ -206,6 +227,9 @@
 LIBICU_SUFFIX=3
 ifdef USE_LIBICU
 SYSTEM_INC+=$(ICU_INC)
+ifdef BUILD64
+LIBDIRS+=$(ICU_LIBDIR_64)
+endif
 LIBDIRS+=$(ICU_LIBDIR)
 SYSTEM_LIB+=$(ICU_LIBS)
 endif
@@ -221,6 +245,9 @@
 endif
 
 ifdef USE_NSPR
+ifdef BUILD64
+LIBDIRS+=$(NSPR_LIBDIR_64)
+endif
 LIBDIRS+=$(NSPR_LIBDIR)
 SYSTEM_INC+=$(NSPR_INC)
 SYSTEM_LIB+=$(NSPR_LIB)
diff -r 367e5999a90e make/defines_SPARCV9_SOLARIS_2.8.mk
--- a/make/defines_SPARCV9_SOLARIS_2.8.mk	Thu May 07 03:20:10 2009 -0700
+++ b/make/defines_SPARCV9_SOLARIS_2.8.mk	Mon Sep 14 04:13:29 2009 -0700
@@ -50,3 +50,14 @@
 
 # Add platform specific NSS modules
 SECURITY_MODULE_LIBS += freebl_64fpu_3 freebl_64int_3
+
+NSPR_LIBDIR_64=/usr/lib/mps/64
+NSS_LIBDIR_64=/usr/lib/mps/64
+LDAPSDK_LIBDIR_64=/usr/local/lib/mozldap/64
+ZLIB_LIBDIR_64=/usr/lib/64
+XERCESC_LIBDIR_64=/usr/local/lib/64
+XALANC_LIBDIR_64=/usr/local/lib/64
+PCRE_LIBDIR_64=/usr/lib/64
+ICU_LIBDIR_64=/usr/lib/64
+SASL_LIBDIR_64=/usr/lib/64
+PLATFORM_LIBPATH_64=$(NSS_LIBDIR_64):$(LDAPSDK_LIBDIR_64):$(XERCESC_LIBDIR_64):$(XALANC_LIBDIR_64):$(PCRE_LIBDIR_64)
diff -r 367e5999a90e make/defines_SPARC_SOLARIS_2.8.mk
--- a/make/defines_SPARC_SOLARIS_2.8.mk	Thu May 07 03:20:10 2009 -0700
+++ b/make/defines_SPARC_SOLARIS_2.8.mk	Mon Sep 14 04:13:29 2009 -0700
@@ -36,7 +36,7 @@
 
 LOCAL_COPY=0
 
-SUNWSPRO_DIR = /usr/dist/share/sunstudio_sparc,v11.0/SUNWspro
+SUNWSPRO_DIR = /opt/SunstudioExpress/
 
 # Tool locations
 C++C		=$(PRE_CC) $(SUNWSPRO_DIR)/bin/CC
@@ -126,3 +126,35 @@
 
 # Add platform specific JES patch dependencies
 REQUIRE_LIST = ""
+
+# Tool locations
+PERL5		=/usr/bin/perl
+ZIP		=/usr/bin/zip
+UNZIP		=/usr/bin/unzip
+
+NO_LIBXML2=1
+
+IDS_NSPR_DIR    =$(NSPR_DIR)
+IDS_LDAPSDK_DIR =$(LDAPSDK_DIR)
+
+SASL_LIBS  = sasl
+
+NSPR_INC=-I/usr/include/mps
+NSPR_LIBDIR=/usr/lib/mps
+NSS_INC=-I/usr/include/mps
+NSS_LIBDIR=/usr/lib/mps
+LDAPSDK_INC=-I/usr/local/include/mozldap
+LDAPSDK_LIBDIR=/usr/local/lib/mozldap
+ZLIB_INC=
+ZLIB_LIBDIR=
+XERCESC_INC=-I/usr/local/include/
+XERCESC_LIBDIR=/usr/local/lib/
+XALANC_INC=-I/usr/local/include/
+XALANC_LIBDIR=/usr/local/lib/
+PCRE_INC=-I/usr/include/pcre/
+PCRE_LIBDIR=
+ICU_INC=
+ICU_LIBDIR=
+SASL_INC=
+SASL_LIBDIR=
+PLATFORM_LIBPATH=$(NSS_LIBDIR):$(LDAPSDK_LIBDIR):$(XERCESC_LIBDIR):$(XALANC_LIBDIR):$(PCRE_LIBDIR)
diff -r 367e5999a90e src/server/extras/binlog/Makefile
--- a/src/server/extras/binlog/Makefile	Thu May 07 03:20:10 2009 -0700
+++ b/src/server/extras/binlog/Makefile	Mon Sep 14 04:13:29 2009 -0700
@@ -60,8 +60,16 @@
 LOCAL_LIBDIRS+=../../../support/libxsd2cpp/$(OBJDIR)/
 LOCAL_LIBDIRS+=../../../support/libdbm/$(OBJDIR)/
 LOCAL_LIBDIRS+=../../libsi18n/$(OBJDIR)/
+ifdef BUILD64
+LOCAL_LIBDIRS+=$(LDAPSDK_LIBDIR_64)
+LOCAL_LIBDIRS+=$(NSS_LIBDIR_64)
+LOCAL_LIBDIRS+=$(XERCESC_LIBDIR_64)
+LOCAL_LIBDIRS+=$(XALANC_LIBDIR_64)
+endif
 LOCAL_LIBDIRS+=$(LDAPSDK_LIBDIR)
 LOCAL_LIBDIRS+=$(NSS_LIBDIR)
+LOCAL_LIBDIRS+=$(XERCESC_LIBDIR)
+LOCAL_LIBDIRS+=$(XALANC_LIBDIR)
 
 EXE_TARGET=binlog
 EXE_OBJS=binlog
diff -r 367e5999a90e src/server/libsi18n/makefile.step2
--- a/src/server/libsi18n/makefile.step2	Thu May 07 03:20:10 2009 -0700
+++ b/src/server/libsi18n/makefile.step2	Mon Sep 14 04:13:29 2009 -0700
@@ -39,6 +39,9 @@
 MODULE=libsi18n
 include ${BUILD_ROOT}/make/defines.mk
 
+ifdef BUILD64
+LD_LIB_PATH=../../support/libdbm/$(OBJDIR):$(NSPR_LIBDIR_64)
+endif
 LD_LIB_PATH=../../support/libdbm/$(OBJDIR):$(NSPR_LIBDIR)
 
 LOCAL_DEF+= -DBUILD_DLL
diff -r 367e5999a90e src/server/plugins/fastcgi/util.cpp
--- a/src/server/plugins/fastcgi/util.cpp	Thu May 07 03:20:10 2009 -0700
+++ b/src/server/plugins/fastcgi/util.cpp	Mon Sep 14 04:13:29 2009 -0700
@@ -32,6 +32,7 @@
  */
 
 #ifndef XP_WIN32
+  #include <sys/types.h>
   #include <sys/un.h>
 #endif  // XP_WIN32
 
diff -r 367e5999a90e src/support/xp/sparc/atomic.S
--- a/src/support/xp/sparc/atomic.S	Thu May 07 03:20:10 2009 -0700
+++ b/src/support/xp/sparc/atomic.S	Mon Sep 14 04:13:29 2009 -0700
@@ -75,8 +75,10 @@
 	/*
 	 * Include the definitions for the libc weak aliases.
 	 */
+#ifndef NO_INC_ATOMIC_ASM_WEAK
 #include "../atomic_asm_weak.h"
 #endif
+#endif
 
 	ENTRY(atomic_inc_8)
 	ALTENTRY(atomic_inc_8_nv)
diff -r 367e5999a90e src/support/xp/sparcv9/atomic.S
--- a/src/support/xp/sparcv9/atomic.S	Thu May 07 03:20:10 2009 -0700
+++ b/src/support/xp/sparcv9/atomic.S	Mon Sep 14 04:13:29 2009 -0700
@@ -75,8 +75,10 @@
 	/*
 	 * Include the definitions for the libc weak aliases.
 	 */
+#ifndef NO_INC_ATOMIC_ASM_WEAK
 #include "../atomic_asm_weak.h"
 #endif
+#endif
 
 	ENTRY(atomic_inc_8)
 	ALTENTRY(atomic_inc_8_nv)
diff -r 367e5999a90e templates/Makefile
--- a/templates/Makefile	Thu May 07 03:20:10 2009 -0700
+++ b/templates/Makefile	Mon Sep 14 04:13:29 2009 -0700
@@ -78,6 +78,9 @@
 WS_VARS+=WS_CONFIG_NAME=$(WS_CONFIG_NAME) WS_INSTANCE_NAME=$(WS_INSTANCE_NAME)
 WS_VARS+=WS_SERVER_USER=$(WS_SERVER_USER) WS_HTTP_PORT=$(WS_HTTP_PORT)
 WS_VARS+=WS_SERVER_NAME=$(WS_SERVER_NAME) WS_SERVER_TEMPDIR=$(WS_SERVER_TEMPDIR)
+ifdef BUILD64
+WS_VARS+=WS_EXTRA_LIBPATH_64=$(PLATFORM_LIBPATH_64)
+endif
 WS_VARS+=WS_EXTRA_LIBPATH=$(PLATFORM_LIBPATH)
 
 install:: bin lib-dtds lib-icons instance includes lib
diff -r 367e5999a90e templates/bin/startserv.template
--- a/templates/bin/startserv.template	Thu May 07 03:20:10 2009 -0700
+++ b/templates/bin/startserv.template	Mon Sep 14 04:13:29 2009 -0700
@@ -69,7 +69,7 @@
 if [ -n "${SERVER_PLATFORM_SUBDIR}" ] ; then
     PATH="${SERVER_BIN_DIR}/${SERVER_PLATFORM_SUBDIR}:${SERVER_LIB_DIR}/${SERVER_PLATFORM_SUBDIR}:${PATH}"; export PATH
     SERVER_LIB_DIR_64="${SERVER_LIB_DIR}/${SERVER_PLATFORM_SUBDIR}"
-    SERVER_LIB_PATH_64="${SERVER_LIB_DIR_64}"
+    SERVER_LIB_PATH_64="${SERVER_LIB_DIR_64}:%%%WS_EXTRA_LIBPATH_64%%%"
 fi
 
 # Add instance-specific information to LD_LIBRARY_PATH for Solaris and Linux