Bug 1562330 - Upgrade Firefox 70 to use NSPR 4.22.

UPGRADE_NSPR_RELEASE Differential Revision: https://phabricator.services.mozilla.com/D42512
mozilla-spidermonkey · Aug 19, 2019 · e495fb1 · e495fb1
1 parent 8ad860a
commit e495fb1
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/nsprpub/.arcconfig b/nsprpub/.arcconfig
@@ -0,0 +1,5 @@
+{
+  "phabricator.uri" : "https://phabricator.services.mozilla.com/",
+  "repository.callsign": "NSPR",
+  "history.immutable": false
+}
diff --git a/nsprpub/TAG-INFO b/nsprpub/TAG-INFO
@@ -1 +1 @@
-NSPR_4_22_BETA1
+NSPR_4_22_RTM
diff --git a/nsprpub/config/prdepend.h b/nsprpub/config/prdepend.h
@@ -10,3 +10,4 @@
  */
 
 #error "Do not include this header file."
+
diff --git a/nsprpub/config/rules.mk b/nsprpub/config/rules.mk
@@ -280,10 +280,13 @@ ifdef ENABLE_STRIP
 	$(STRIP) $@
 endif
 
-$(LIBRARY): $(OBJS)
+# Same as OBJS, but without any file that matches p*vrsion.o, since these
+# collide for static libraries, and are not useful for that case anyway.
+STATICLIB_OBJS = $(filter-out $(OBJDIR)/p%vrsion.$(OBJ_SUFFIX),$(OBJS))
+$(LIBRARY): $(STATICLIB_OBJS)
 	@$(MAKE_OBJDIR)
 	rm -f $@
-	$(AR) $(AR_FLAGS) $(OBJS) $(AR_EXTRA_ARGS)
+	$(AR) $(AR_FLAGS) $(STATICLIB_OBJS) $(AR_EXTRA_ARGS)
 	$(RANLIB) $@
 
 ifeq ($(OS_TARGET), OS2)

diff --git a/nsprpub/pr/include/prinit.h b/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.22 Beta"
+#define PR_VERSION  "4.22"
 #define PR_VMAJOR   4
 #define PR_VMINOR   22
 #define PR_VPATCH   0
-#define PR_BETA     PR_TRUE
+#define PR_BETA     PR_FALSE
 
 /*
 ** PRVersionCheck
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,3 +10,4 @@
		*/

		#error "Do not include this header file."