Bug 1591887 - NSPR_4_24_BETA1. r=jcj

UPGRADE_NSPR_RELEASE

Differential Revision: https://phabricator.services.mozilla.com/D50794

--HG--
extra : moz-landing-system : lando

nsprpub/TAG-INFO

@@ -1 +1 @@
-NSPR_4_23_RTM
+NSPR_4_24_BETA1

nsprpub/config/prdepend.h

@@ -10,4 +10,3 @@
  */
 
 #error "Do not include this header file."
-

nsprpub/configure

@@ -2486,7 +2486,7 @@ test -n "$target_alias" &&
   program_prefix=${target_alias}-
 
 MOD_MAJOR_VERSION=4
-MOD_MINOR_VERSION=23
+MOD_MINOR_VERSION=24
 MOD_PATCH_VERSION=0
 NSPR_MODNAME=nspr20
 _HAVE_PTHREADS=

nsprpub/configure.in

@@ -15,7 +15,7 @@ dnl ========================================================
 dnl = Defaults
 dnl ========================================================
 MOD_MAJOR_VERSION=4
-MOD_MINOR_VERSION=23
+MOD_MINOR_VERSION=24
 MOD_PATCH_VERSION=0
 NSPR_MODNAME=nspr20
 _HAVE_PTHREADS=

nsprpub/pr/include/md/_linux.cfg

@@ -1157,6 +1157,56 @@
 #define PR_BYTES_PER_WORD_LOG2   2
 #define PR_BYTES_PER_DWORD_LOG2  3
 
+#elif defined(__nios2__) || defined(__microblaze__) || defined(__nds32__)
+
+#if defined(__microblaze__) && defined(__BIG_ENDIAN__)
+#define IS_BIG_ENDIAN 1
+#undef  IS_LITTLE_ENDIAN
+#else
+#define IS_LITTLE_ENDIAN 1
+#undef  IS_BIG_ENDIAN
+#endif
+
+#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
+
 #else
 
 #error "Unknown CPU architecture"

nsprpub/pr/include/md/_linux.h

@@ -63,6 +63,12 @@
 #define _PR_SI_ARCHITECTURE "riscv64"
 #elif defined(__arc__)
 #define _PR_SI_ARCHITECTURE "arc"
+#elif defined(__nios2__)
+#define _PR_SI_ARCHITECTURE "nios2"
+#elif defined(__microblaze__)
+#define _PR_SI_ARCHITECTURE "microblaze"
+#elif defined(__nds32__)
+#define _PR_SI_ARCHITECTURE "nds32"
 #else
 #error "Unknown CPU architecture"
 #endif

nsprpub/pr/include/prinit.h

@@ -31,11 +31,11 @@ PR_BEGIN_EXTERN_C
 ** The format of the version string is
 **     "<major version>.<minor version>[.<patch level>] [<Beta>]"
 */
-#define PR_VERSION  "4.23"
+#define PR_VERSION  "4.24 Beta"
 #define PR_VMAJOR   4
-#define PR_VMINOR   23
+#define PR_VMINOR   24
 #define PR_VPATCH   0
-#define PR_BETA     PR_FALSE
+#define PR_BETA     PR_TRUE
 
 /*
 ** PRVersionCheck

nsprpub/pr/include/prlog.h

@@ -207,12 +207,16 @@ PR_PRETEND_NORETURN;
 #define PR_ASSERT(_expr) \
     ((_expr)?((void)0):PR_Assert(# _expr,__FILE__,__LINE__))
 
+#define PR_ASSERT_ARG(_expr) PR_ASSERT(_expr)
+
 #define PR_NOT_REACHED(_reasonStr) \
     PR_Assert(_reasonStr,__FILE__,__LINE__)
 
 #else
 
 #define PR_ASSERT(expr) ((void) 0)
+/* PR_ASSERT_ARG avoids compiler warning: unused variable */
+#define PR_ASSERT_ARG(expr) ((void)(0 && (expr)))
 #define PR_NOT_REACHED(reasonStr)
 
 #endif /* defined(DEBUG) || defined(FORCE_PR_ASSERT) */

nsprpub/pr/tests/forktest.c

@@ -199,7 +199,6 @@ finish:
 int main(int argc, char **argv)
 {
     pid_t pid;
-    int rv;
 
     /* main test program */
 
@@ -216,7 +215,7 @@ int main(int argc, char **argv)
 
         printf("Fork succeeded.  Parent process continues.\n");
         DoIO();
-        if ((rv = waitpid(pid, &childStatus, 0)) != pid) {
+        if (waitpid(pid, &childStatus, 0) != pid) {
             {
                 fprintf(stderr, "waitpid failed: %d\n", errno);
                 failed_already = 1;

nsprpub/pr/tests/multiwait.c

@@ -706,8 +706,7 @@ static void RunThisOne(
 
 static Verbosity ChangeVerbosity(Verbosity verbosity, PRIntn delta)
 {
-    PRIntn verbage = (PRIntn)verbosity;
-    return (Verbosity)(verbage += delta);
+    return (Verbosity)(((PRIntn)verbosity) + delta);
 }  /* ChangeVerbosity */
 
 int main(int argc, char **argv)

nsprpub/pr/tests/sel_spd.c

@@ -86,7 +86,6 @@ void
 _server_thread(void *arg_id)
 {
     void _client_thread(void *);
-    PRThread *thread;
     int *id =  (int *)arg_id;
     PRFileDesc *sock;
     PRSocketOptionData sockopt;
@@ -142,13 +141,13 @@ _server_thread(void *arg_id)
     }
 
     /* Tell the client to start */
-    if ( (thread = PR_CreateThread(PR_USER_THREAD,
-                                   _client_thread,
-                                   id,
-                                   PR_PRIORITY_NORMAL,
-                                   scope2,
-                                   PR_UNJOINABLE_THREAD,
-                                   0)) == NULL) {
+    if ( PR_CreateThread(PR_USER_THREAD,
+                         _client_thread,
+                         id,
+                         PR_PRIORITY_NORMAL,
+                         scope2,
+                         PR_UNJOINABLE_THREAD,
+                         0) == NULL) {
         fprintf(stderr, "Error creating client thread %d\n", *id);
     }
 
@@ -334,18 +333,17 @@ void do_work(void)
 
     _thread_exit_count = _threads * 2;
     for (index=0; index<_threads; index++) {
-        PRThread *thread;
         int *id = (int *)PR_Malloc(sizeof(int));
 
         *id = index;
 
-        if ( (thread = PR_CreateThread(PR_USER_THREAD,
-                                       _server_thread,
-                                       id,
-                                       PR_PRIORITY_NORMAL,
-                                       scope1,
-                                       PR_UNJOINABLE_THREAD,
-                                       0)) == NULL) {
+        if ( PR_CreateThread(PR_USER_THREAD,
+                             _server_thread,
+                             id,
+                             PR_PRIORITY_NORMAL,
+                             scope1,
+                             PR_UNJOINABLE_THREAD,
+                             0) == NULL) {
             fprintf(stderr, "Error creating server thread %d\n", index);
         }
     }

nsprpub/pr/tests/vercheck.c

@@ -41,6 +41,7 @@ static char *compatible_version[] = {
     "4.10.5", "4.10.6", "4.10.7", "4.10.8", "4.10.9",
     "4.10.10", "4.11", "4.12", "4.13", "4.14", "4.15",
     "4.16", "4.17", "4.18", "4.19", "4.20", "4.21", "4.22",
+    "4.23",
     PR_VERSION
 };
 
@@ -56,8 +57,8 @@ static char *incompatible_version[] = {
     "3.0", "3.0.1",
     "3.1", "3.1.1", "3.1.2", "3.1.3",
     "3.5", "3.5.1",
-    "4.23.1",
-    "4.24", "4.24.1",
+    "4.24.1",
+    "4.25", "4.25.1",
     "10.0", "11.1", "12.14.20"
 };
 

nsprpub/pr/tests/zerolen.c

@@ -72,7 +72,7 @@ static void ClientThread(void *arg)
     /*
      * Then start reading.
      */
-    while ((nbytes = PR_Read(sock, buf, sizeof(buf))) > 0) {
+    while (nbytes = PR_Read(sock, buf, sizeof(buf)) > 0) {
         /* empty loop body */
     }
     if (-1 == nbytes) {
@@ -136,7 +136,7 @@ int main()
         exit(1);
     }
     osfd = PR_FileDesc2NativeHandle(acceptSock);
-    while ((nbytes = write(osfd, buf, sizeof(buf))) != -1) {
+    while (write(osfd, buf, sizeof(buf)) != -1) {
         /* empty loop body */
     }
     if ((errno != EAGAIN) && (errno != EWOULDBLOCK)) {
@@ -177,7 +177,7 @@ int main()
         exit(1);
     }
     osfd = PR_FileDesc2NativeHandle(acceptSock);
-    while ((nbytes = write(osfd, buf, sizeof(buf))) != -1) {
+    while (write(osfd, buf, sizeof(buf)) != -1) {
         /* empty loop body */
     }
     if ((errno != EAGAIN) && (errno != EWOULDBLOCK)) {
@@ -216,7 +216,7 @@ int main()
         exit(1);
     }
     osfd = PR_FileDesc2NativeHandle(acceptSock);
-    while ((nbytes = write(osfd, buf, sizeof(buf))) != -1) {
+    while (write(osfd, buf, sizeof(buf)) != -1) {
         /* empty loop body */
     }
     if ((errno != EAGAIN) && (errno != EWOULDBLOCK)) {