Bugzilla bug 233048: 1. Support doing 64-bit Solaris SPARC builds using

gcc.  2. Enable all.sh to work with gcc-compiled NSS tests which require
setting LD_LIBRARY_PATH to point to the directory where libgcc.so resides.
The patch is contributed by Vladim¡r Marek <Vladimir.Marek@printsoft.cz>.
r=wtc,nelsonb.
Modified Files: coreconf/SunOS5.mk nss/tests/common/init.sh


git-svn-id: svn://10.0.0.236/trunk@152744 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/security/coreconf/SunOS5.mk

@@ -53,7 +53,7 @@ endif
 
 ifeq ($(USE_64), 1)
   ifdef NS_USE_GCC
-      ARCHFLAG= UNKNOWN 
+      ARCHFLAG=-m64
   else
       ARCHFLAG=-xarch=v9
   endif
@@ -99,11 +99,10 @@ ifdef NS_USE_GCC
 	CCC        = g++
 	CCC       += -Wall -Wno-format
 	ASFLAGS	  += -x assembler-with-cpp
-	OS_CFLAGS += $(NOMD_OS_CFLAGS)
+	OS_CFLAGS += $(NOMD_OS_CFLAGS) $(ARCHFLAG)
 	ifdef USE_MDUPDATE
 		OS_CFLAGS += -MDupdate $(DEPENDENCIES)
 	endif
-	OS_CFLAGS += $(ARCHFLAG)
 else
 	CC         = cc
 	CCC        = CC
@@ -157,6 +156,9 @@ PROCESS_MAP_FILE = grep -v ';-' $(LIBRARY_NAME).def | \
 # -G: produce a shared object
 # -z defs: no unresolved symbols allowed
 ifdef NS_USE_GCC
+ifeq ($(USE_64), 1)
+	DSO_LDOPTS += -m64
+endif
 	DSO_LDOPTS += -shared -h $(notdir $@)
 else
 ifeq ($(USE_64), 1)

mozilla/security/nss/tests/common/init.sh

@@ -169,10 +169,10 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then
             PATH=`perl ../path_uniq -d ':' "$PATH"`
         fi
 
-        LD_LIBRARY_PATH=${DIST}/${OBJDIR}/lib
-        SHLIB_PATH=${DIST}/${OBJDIR}/lib
-        LIBPATH=${DIST}/${OBJDIR}/lib
-        DYLD_LIBRARY_PATH=${DIST}/${OBJDIR}/lib
+        LD_LIBRARY_PATH=${DIST}/${OBJDIR}/lib:$LD_LIBRARY_PATH
+        SHLIB_PATH=${DIST}/${OBJDIR}/lib:$SHLIB_PATH
+        LIBPATH=${DIST}/${OBJDIR}/lib:$LIBPATH
+        DYLD_LIBRARY_PATH=${DIST}/${OBJDIR}/lib:$DYLD_LIBRARY_PATH
     fi
 
     if [ ! -d "${TESTDIR}" ]; then