Bug 1694371 - NSPR_4_30_BETA1. r=bbeurdouche UPGRADE_NSPR_RELEASE

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

nsprpub/TAG-INFO

@@ -1 +1 @@
-NSPR_4_29_RTM
+NSPR_4_30_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=29
+MOD_MINOR_VERSION=30
 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=29
+MOD_MINOR_VERSION=30
 MOD_PATCH_VERSION=0
 NSPR_MODNAME=nspr20
 _HAVE_PTHREADS=

nsprpub/pr/include/md/_openbsd.h

@@ -16,10 +16,12 @@
 #define _PR_SI_ARCHITECTURE "alpha"
 #elif defined(__amd64__)
 #define _PR_SI_ARCHITECTURE "amd64"
-#elif defined(__m68k__)
-#define _PR_SI_ARCHITECTURE "m68k"
+#elif defined(__powerpc64__)
+#define _PR_SI_ARCHITECTURE "powerpc64"
 #elif defined(__powerpc__)
 #define _PR_SI_ARCHITECTURE "powerpc"
+#elif defined(__aarch64__)
+#define _PR_SI_ARCHITECTURE "aarch64"
 #elif defined(__sparc__)
 #define _PR_SI_ARCHITECTURE "sparc"
 #elif defined(__arm__)
@@ -190,6 +192,8 @@ struct _MDCPU {
 
 #endif /* ! _PR_PTHREADS */
 
+extern void _MD_EarlyInit(void);
+
 #define _MD_EARLY_INIT                  _MD_EarlyInit
 #define _MD_FINAL_INIT          _PR_UnixInit
 #define _PR_HAVE_CLOCK_MONOTONIC

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.29"
+#define PR_VERSION  "4.30 Beta"
 #define PR_VMAJOR   4
-#define PR_VMINOR   29
+#define PR_VMINOR   30
 #define PR_VPATCH   0
-#define PR_BETA     PR_FALSE
+#define PR_BETA     PR_TRUE
 
 /*
 ** PRVersionCheck

nsprpub/pr/src/pthreads/ptthread.c

@@ -1694,13 +1694,20 @@ PR_IMPLEMENT(PRStatus) PR_SetCurrentThreadName(const char *name)
         return PR_SUCCESS;
     }
 
+#if defined(DARWIN)
+    /* Mac OS X has a length limit of 63 characters, but there is no API
+     * exposing it.
+     */
+#define SETNAME_LENGTH_CONSTRAINT 63
+#else
     /*
      * The 15-character name length limit is an experimentally determined
-     * length of a null-terminated string that most linux distros and OS X
-     * accept as an argument to pthread_setname_np.  Otherwise the E2BIG
+     * length of a null-terminated string that most linux distros accept
+     * as an argument to pthread_setname_np.  Otherwise the E2BIG
      * error is returned by the function.
      */
 #define SETNAME_LENGTH_CONSTRAINT 15
+#endif
 #define SETNAME_FRAGMENT1_LENGTH (SETNAME_LENGTH_CONSTRAINT >> 1)
 #define SETNAME_FRAGMENT2_LENGTH \
     (SETNAME_LENGTH_CONSTRAINT - SETNAME_FRAGMENT1_LENGTH - 1)

nsprpub/pr/tests/vercheck.c

@@ -41,7 +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", "4.24", "4.25", "4,26", "4.27", "4.28",
+    "4.23", "4.24", "4.25", "4,26", "4.27", "4.28", "4.29",
     PR_VERSION
 };
 
@@ -57,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.29.1",
-    "4.30", "4.30.1",
+    "4.30.1",
+    "4.31", "4.31.1",
     "10.0", "11.1", "12.14.20"
 };