Sync up the NSPRPUB_PRE_4_2_CLIENT_BRANCH with the trunk.

10 files changed, 121 insertions, 18 deletions

diff --git a/Makefile.in b/Makefile.in
index c1313b86..fd1ca83c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -150,9 +150,9 @@ endif
 	cp -f mdheader.jar $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(RELEASE_OBJDIR_NAME); \
 	chmod 664 $(MDIST)/$(MOD_NAME)/$(BUILD_NUMBER)/$(RELEASE_OBJDIR_NAME)/mdheader.jar
 
-solarispkg:
-	@echo Making Solaris packages.
-	$(MAKE) -C pkg/solaris publish
+package:
+	@echo "cd pkg; $(MAKE) publish"
+	$(MAKE) -C pkg publish
 
 depend:
 	@echo "NSPR20 has no dependencies.  Skipped."
diff --git a/configure b/configure
index a45f300a..0d42989b 100755
--- a/configure
+++ b/configure
@@ -5599,6 +5599,8 @@ lib/libc/Makefile
 lib/libc/include/Makefile 
 lib/libc/src/Makefile 
 lib/tests/Makefile
+pkg/Makefile
+pkg/linux/Makefile
 pkg/solaris/Makefile
 pkg/solaris/SUNWpr/Makefile
 pkg/solaris/SUNWprx/Makefile
@@ -5633,10 +5635,6 @@ if test -n "$USE_CPLUS"; then
     MAKEFILES="$MAKEFILES pr/src/cplus/Makefile pr/src/cplus/tests/Makefile"
 fi
 
-if test ! -d pkg; then
-    mkdir pkg
-fi
-
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
diff --git a/configure.in b/configure.in
index 6d70a277..00605c1d 100644
--- a/configure.in
+++ b/configure.in
@@ -2453,6 +2453,8 @@ lib/libc/Makefile
 lib/libc/include/Makefile 
 lib/libc/src/Makefile 
 lib/tests/Makefile
+pkg/Makefile
+pkg/linux/Makefile
 pkg/solaris/Makefile
 pkg/solaris/SUNWpr/Makefile
 pkg/solaris/SUNWprx/Makefile
@@ -2490,10 +2492,4 @@ if test -n "$USE_CPLUS"; then
     MAKEFILES="$MAKEFILES pr/src/cplus/Makefile pr/src/cplus/tests/Makefile"
 fi
 
-dnl There is no pkg/Makefile.in, so AC_OUTPUT won't create the pkg directory
-dnl for us.
-if test ! -d pkg; then
-    mkdir pkg
-fi
-
 AC_OUTPUT([$MAKEFILES], [chmod +x config/nspr-config])
diff --git a/pkg/solaris/Makefile.com b/pkg/solaris/Makefile.com
index eb2b979f..523460be 100644
--- a/pkg/solaris/Makefile.com
+++ b/pkg/solaris/Makefile.com
@@ -16,11 +16,13 @@ endif
 
 PKGARCHIVE = $(dist_libdir)/pkgarchive
 DATAFILES = copyright
-FILES = $(DATAFILES) pkginfo
+FILES = $(DATAFILES) pkginfo prototype
 
 PACKAGE = $(shell basename `pwd`)
 
-PRODUCT_VERSION = $(MOD_VERSION).$(MOD_MINOR).$(MOD_PATCH)
+PRODUCT_VERSION = $(shell grep PR_VERSION $(dist_includedir)/prinit.h \
+		   | sed -e 's/"$$//' -e 's/.*"//' -e 's/ .*//')
+
 LN = /usr/bin/ln
 
 CLOBBERFILES = $(FILES)
diff --git a/pkg/solaris/Makefile.targ b/pkg/solaris/Makefile.targ
index daf327bd..55ca5238 100644
--- a/pkg/solaris/Makefile.targ
+++ b/pkg/solaris/Makefile.targ
@@ -9,7 +9,14 @@ pkginfo: pkginfo.tmpl ../awk_pkginfo
 	$(RM) $@; nawk -f ../awk_pkginfo $< > $@
 
 # we need to copy prototype_sparc to current too find copyright in current
-pkg: $(PKGARCHIVE)
+prototype:  $(srcdir)/prototype_com $(srcdir)/prototype_$(MACH)
+	cat $(srcdir)/prototype_$(MACH) |  sed -e \
+'/^!include[ 	][ 	]*prototype_com/ r ./prototype_com' \
+-e 's/^!include[ 	][ 	]*prototype_com//g' >prototype
+
+
+
+pkg: $(PKGARCHIVE) prototype
 	cp $(srcdir)/prototype_com .
 	cp $(srcdir)/prototype_$(MACH) .
 	cp $(srcdir)/depend .
diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg
index 301f4590..70f1f9d7 100644
--- a/pr/include/md/_linux.cfg
+++ b/pr/include/md/_linux.cfg
@@ -414,6 +414,97 @@
 #define PR_BYTES_PER_WORD_LOG2   2
 #define PR_BYTES_PER_DWORD_LOG2  3
 
+#elif defined(__s390__)
+
+#define IS_BIG_ENDIAN 1
+#undef  IS_LITTLE_ENDIAN
+
+#define PR_BYTES_PER_BYTE   1
+#define PR_BYTES_PER_SHORT  2
+#define PR_BYTES_PER_INT    4
+#define PR_BYTES_PER_INT64  8
+#define PR_BYTES_PER_LONG   4
+#define PR_BYTES_PER_FLOAT  4
+#define PR_BYTES_PER_DOUBLE 8
+#define PR_BYTES_PER_WORD   4
+#define PR_BYTES_PER_DWORD  8
+
+#define PR_BITS_PER_BYTE    8
+#define PR_BITS_PER_SHORT   16
+#define PR_BITS_PER_INT     32
+#define PR_BITS_PER_INT64   64
+#define PR_BITS_PER_LONG    32
+#define PR_BITS_PER_FLOAT   32
+#define PR_BITS_PER_DOUBLE  64
+#define PR_BITS_PER_WORD    32
+
+#define PR_BITS_PER_BYTE_LOG2   3
+#define PR_BITS_PER_SHORT_LOG2  4
+#define PR_BITS_PER_INT_LOG2    5
+#define PR_BITS_PER_INT64_LOG2  6
+#define PR_BITS_PER_LONG_LOG2   5
+#define PR_BITS_PER_FLOAT_LOG2  5
+#define PR_BITS_PER_DOUBLE_LOG2 6
+#define PR_BITS_PER_WORD_LOG2   5
+
+#define PR_ALIGN_OF_SHORT   2
+#define PR_ALIGN_OF_INT     4
+#define PR_ALIGN_OF_LONG    4
+#define PR_ALIGN_OF_INT64   4
+#define PR_ALIGN_OF_FLOAT   4
+#define PR_ALIGN_OF_DOUBLE  4
+#define PR_ALIGN_OF_POINTER 4
+#define PR_ALIGN_OF_WORD    4
+
+#define PR_BYTES_PER_WORD_LOG2   2
+#define PR_BYTES_PER_DWORD_LOG2  3
+
+#elif defined(__s390x__)
+
+#define IS_BIG_ENDIAN 1
+#undef  IS_LITTLE_ENDIAN
+#define IS_64
+
+#define PR_BYTES_PER_BYTE   1
+#define PR_BYTES_PER_SHORT  2
+#define PR_BYTES_PER_INT    4
+#define PR_BYTES_PER_INT64  8
+#define PR_BYTES_PER_LONG   8
+#define PR_BYTES_PER_FLOAT  4
+#define PR_BYTES_PER_DOUBLE 8
+#define PR_BYTES_PER_WORD   8
+#define PR_BYTES_PER_DWORD  8
+
+#define PR_BITS_PER_BYTE    8
+#define PR_BITS_PER_SHORT   16
+#define PR_BITS_PER_INT     32
+#define PR_BITS_PER_INT64   64
+#define PR_BITS_PER_LONG    64
+#define PR_BITS_PER_FLOAT   32
+#define PR_BITS_PER_DOUBLE  64
+#define PR_BITS_PER_WORD    64
+
+#define PR_BITS_PER_BYTE_LOG2   3
+#define PR_BITS_PER_SHORT_LOG2  4
+#define PR_BITS_PER_INT_LOG2    5
+#define PR_BITS_PER_INT64_LOG2  6
+#define PR_BITS_PER_LONG_LOG2   6
+#define PR_BITS_PER_FLOAT_LOG2  5
+#define PR_BITS_PER_DOUBLE_LOG2 6
+#define PR_BITS_PER_WORD_LOG2   6
+
+#define PR_ALIGN_OF_SHORT   2
+#define PR_ALIGN_OF_INT     4
+#define PR_ALIGN_OF_LONG    8
+#define PR_ALIGN_OF_INT64   8
+#define PR_ALIGN_OF_FLOAT   4
+#define PR_ALIGN_OF_DOUBLE  8
+#define PR_ALIGN_OF_POINTER 8
+#define PR_ALIGN_OF_WORD    8
+
+#define PR_BYTES_PER_WORD_LOG2   3
+#define PR_BYTES_PER_DWORD_LOG2  3
+
 #else
 
 #error "Unknown CPU architecture"
diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h
index 04b2ea74..df2cfd40 100644
--- a/pr/include/md/_linux.h
+++ b/pr/include/md/_linux.h
@@ -59,6 +59,10 @@
 #define _PR_SI_ARCHITECTURE "mips"
 #elif defined(__arm__)
 #define _PR_SI_ARCHITECTURE "arm"
+#elif defined(__s390__)
+#define _PR_SI_ARCHITECTURE "s390"
+#elif defined(__s390x__)
+#define _PR_SI_ARCHITECTURE "s390x"
 #else
 #error "Unknown CPU architecture"
 #endif
diff --git a/pr/src/io/priometh.c b/pr/src/io/priometh.c
index b9279fad..251d46a9 100644
--- a/pr/src/io/priometh.c
+++ b/pr/src/io/priometh.c
@@ -34,6 +34,8 @@
  */
 #include "primpl.h"
 
+#include <string.h>
+
 /*****************************************************************************/
 /************************** Invalid I/O method object ************************/
 /*****************************************************************************/
diff --git a/pr/src/io/prprf.c b/pr/src/io/prprf.c
index 95c165a4..4fa197c1 100644
--- a/pr/src/io/prprf.c
+++ b/pr/src/io/prprf.c
@@ -51,8 +51,10 @@
 ** Note: on some platforms va_list is defined as an array,
 ** and requires array notation.
 */
-#if (defined(LINUX) && defined(__powerpc__)) || defined(WIN16) || \
-    defined(QNX) || \
+#if (defined(LINUX) && defined(__powerpc__)) || \
+    (defined(LINUX) && defined(__s390__)) || \
+    (defined(LINUX) && defined(__s390x__)) || \
+    defined(WIN16) || defined(QNX) || \
     (defined(__NetBSD__) && defined(__powerpc__) && \
     __NetBSD_Version__ < 105000000)
 #define VARARGS_ASSIGN(foo, bar) foo[0] = bar[0]
diff --git a/pr/src/misc/prrng.c b/pr/src/misc/prrng.c
index bc6c0cd8..cb837105 100644
--- a/pr/src/misc/prrng.c
+++ b/pr/src/misc/prrng.c
@@ -34,6 +34,7 @@
 
 #include "primpl.h"
 
+#include <string.h>
 
 PRSize _pr_CopyLowBits( 
     void *dst,