wtc's second patch for 158704

1. Link the .so's with -lc only on Solaris.  (SunOS 4.1.3
doesn't need this change.)

2. Add libVersionPoint to NSPR_4.0 in the mapfiles.

3. Try to do ifdef USE_64 in mozilla/nsprpub/pkg/solaris/Makefile
in the way Danek suggested.  I had to use :: (as opposed to :) to
specify PROTO's dependency because :: dependency can be used
multiple times for the same target.

4. Fixed a bug in mozilla/nsprpub/pkg/solaris/Makefile in
the creation of the symlink $(ROOT)/usr/lib/mps/sparcv9.

5. Removed the symbols that shouldn't be exported from nspr.def.
Added PR_StackPop and PR_StackPush (which the 'nm' command
reports as 'N', not 'T').  Added the PRP_* functions.

7 files changed, 19 insertions, 31 deletions

diff --git a/lib/ds/Makefile b/lib/ds/Makefile
index a06dbad4..9acaa324 100644
--- a/lib/ds/Makefile
+++ b/lib/ds/Makefile
@@ -39,10 +39,10 @@ include $(MOD_DEPTH)/config/config.mk
 
 # Disable optimization of the nspr on SunOS4.1.3
 ifeq ($(OS_ARCH),SunOS)
-OS_LIBS += -lc
 ifeq ($(OS_RELEASE),4.1.3_U1)
 OPTIMIZER =
 else
+OS_LIBS += -lc
 MAPFILE = $(OBJDIR)/pldsmap.sun
 ALL_TRASH += $(MAPFILE)
 MKSHLIB += -M $(MAPFILE)
diff --git a/lib/ds/plds.def b/lib/ds/plds.def
index a94f67e6..f062b58b 100644
--- a/lib/ds/plds.def
+++ b/lib/ds/plds.def
@@ -22,6 +22,7 @@ PL_HashTableRawRemove;
 PL_HashTableRemove;
 PL_InitArenaPool;
 PL_NewHashTable;
+libVersionPoint;
     local: *;
 };
 
diff --git a/lib/libc/src/Makefile b/lib/libc/src/Makefile
index e2df99a5..73568748 100644
--- a/lib/libc/src/Makefile
+++ b/lib/libc/src/Makefile
@@ -39,10 +39,10 @@ include $(MOD_DEPTH)/config/config.mk
 
 # Disable optimization of the nspr on SunOS4.1.3
 ifeq ($(OS_ARCH),SunOS)
-OS_LIBS += -lc
 ifeq ($(OS_RELEASE),4.1.3_U1)
 OPTIMIZER =
 else
+OS_LIBS += -lc
 MAPFILE = $(OBJDIR)/plcmap.sun
 ALL_TRASH += $(MAPFILE)
 MKSHLIB += -M $(MAPFILE)
diff --git a/lib/libc/src/plc.def b/lib/libc/src/plc.def
index 42ba61f9..0bb2eaf6 100644
--- a/lib/libc/src/plc.def
+++ b/lib/libc/src/plc.def
@@ -39,5 +39,6 @@ PL_strprbrk;
 PL_strrchr;
 PL_strrstr;
 PL_strstr;
+libVersionPoint;
     local: *;
 };
diff --git a/pkg/solaris/Makefile b/pkg/solaris/Makefile
index 3b95b92f..e9f1f5dd 100644
--- a/pkg/solaris/Makefile
+++ b/pkg/solaris/Makefile
@@ -33,19 +33,14 @@ clean clobber::
 	$(RM) awk_pkginfo bld_awk_pkginfo
 	$(RM) -r $(ROOT)
 
-ifdef USE_64
-PROTO: \
-	$(ROOT) \
-	$(ROOT)/usr \
-	$(ROOT)/usr/lib \
-	$(ROOT)/usr/lib/mps \
-	$(ROOT)/usr/lib/mps/sparcv9
-else
-PROTO: \
+PROTO:: \
 	$(ROOT) \
 	$(ROOT)/usr \
 	$(ROOT)/usr/lib \
 	$(ROOT)/usr/lib/mps
+
+ifdef USE_64
+PROTO:: $(ROOT)/usr/lib/mps/sparcv9
 endif
 
 $(ROOT) $(ROOT)/%:
@@ -53,7 +48,7 @@ $(ROOT) $(ROOT)/%:
 
 ifdef USE_64
 $(ROOT)/usr/lib/mps/sparcv9:
-	$(LN) -sf ../../../$(DIST)/lib $@
+	$(LN) -sf ../../../../$(DIST)/lib $@
 else
 $(ROOT)/usr/lib/mps:
 	$(LN) -sf ../../../$(DIST)/lib $@
diff --git a/pr/src/Makefile b/pr/src/Makefile
index f848ed78..55d5f9e5 100644
--- a/pr/src/Makefile
+++ b/pr/src/Makefile
@@ -65,7 +65,7 @@ ifeq ($(OS_ARCH),SunOS)
 ifeq ($(OS_RELEASE),4.1.3_U1)
 OPTIMIZER =
 export OPTIMIZER
-OS_LIBS			= -lm -lc
+OS_LIBS			= -lm
 else	# 4.1.3_U1
 MAPFILE = $(OBJDIR)/nsprmap.sun
 ALL_TRASH += $(MAPFILE)
diff --git a/pr/src/nspr.def b/pr/src/nspr.def
index 3e1c2f68..c4fbb36c 100644
--- a/pr/src/nspr.def
+++ b/pr/src/nspr.def
@@ -98,7 +98,6 @@ NSPR_4.0 {
 		PR_FD_SET;
 		PR_FD_ZERO;
 		PR_FileDesc2NativeHandle;
-		PR_FindLibrary;
 		PR_FindSymbol;
 		PR_FindSymbolAndLibrary;
 		PR_FloorLog2;
@@ -147,7 +146,6 @@ NSPR_4.0 {
 		PR_GetSocketOption;
 		PR_GetSpecialFD;
 		PR_GetStackSpaceLeft;
-		PR_GetSysfdTableMax;
 		PR_GetSystemInfo;
 		PR_GetTCPMethods;
 		PR_GetThreadAffinityMask;
@@ -251,8 +249,6 @@ NSPR_4.0 {
 		PR_ResetAlarm;
 		PR_ResetProcessAttr;
 		PR_ResumeAll;
-		PR_ResumeSet;
-		PR_ResumeTest;
 		PR_RmDir;
 		PR_ScanStackPointers;
 		PR_SecondsToInterval;
@@ -275,7 +271,6 @@ NSPR_4.0 {
 		PR_SetPollableEvent;
 		PR_SetSocketOption;
 		PR_SetStdioRedirect;
-		PR_SetSysfdTableSize;
 		PR_SetThreadAffinityMask;
 		PR_SetThreadDumpProc;
 		PR_SetThreadGCAble;
@@ -286,10 +281,11 @@ NSPR_4.0 {
 		PR_ShutdownThreadPool;
 		PR_Sleep;
 		PR_Socket;
+		PR_StackPop;
+		PR_StackPush;
 		PR_Stat;
 		PR_StringToNetAddr;
 		PR_SuspendAll;
-		PR_SuspendAllSuspended;
 		PR_Sync;
 		PR_TLockFile;
 		PR_ThreadScanStackPointers;
@@ -311,12 +307,6 @@ NSPR_4.0 {
 		PR_WaitSemaphore;
 		PR_Write;
 		PR_Writev;
-		PR_XIsLocked;
-		PR_XLock;
-		PR_XNotify;
-		PR_XNotifyAll;
-		PR_XUnlock;
-		PR_XWait;
 		PR_Yield;
 		PR_cnvtf;
 		PR_dtoa;
@@ -339,6 +329,13 @@ NSPR_4.0 {
 		PR_vsnprintf;
 		PR_vsprintf_append;
 		PR_vsxprintf;
+		PRP_DestroyNakedCondVar;
+		PRP_NakedBroadcast;
+		PRP_NakedNotify;
+		PRP_NakedWait;
+		PRP_NewNakedCondVar;
+		PRP_TryLock;
+		libVersionPoint;
 	local: *;
 };
 
@@ -355,9 +352,3 @@ NSPR_4.1 {
 		PR_ImportPipe;
 		PR_SetEnv;
 } NSPR_4.0;
-
-NSPRprivate {
-	global:
-		libVersionPoint;
-	local: *;
-};