Bug 1600803 - NSPR_4_25_RTM for Firefox 74. r=kjacobs UPGRADE_NSPR_RE…

…LEASE Differential Revision: https://phabricator.services.mozilla.com/D61379 --HG-- extra : moz-landing-system : lando
dothq · Feb 3, 2020 · 91f084a · 91f084a
1 parent 90759ce
commit 91f084a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/nsprpub/TAG-INFO b/nsprpub/TAG-INFO
@@ -1 +1 @@
-NSPR_4_25_BETA1
+NSPR_4_25_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/pr/include/md/_linux.cfg b/nsprpub/pr/include/md/_linux.cfg
@@ -1157,7 +1157,8 @@
 #define PR_BYTES_PER_WORD_LOG2   2
 #define PR_BYTES_PER_DWORD_LOG2  3
 
-#elif defined(__nios2__) || defined(__microblaze__) || defined(__nds32__)
+#elif defined(__nios2__) || defined(__microblaze__) || defined(__nds32__) || \
+      defined(__xtensa__)
 
 #if defined(__microblaze__) && defined(__BIG_ENDIAN__)
 #define IS_BIG_ENDIAN 1

diff --git a/nsprpub/pr/include/md/_linux.h b/nsprpub/pr/include/md/_linux.h
@@ -69,6 +69,8 @@
 #define _PR_SI_ARCHITECTURE "microblaze"
 #elif defined(__nds32__)
 #define _PR_SI_ARCHITECTURE "nds32"
+#elif defined(__xtensa__)
+#define _PR_SI_ARCHITECTURE "xtensa"
 #else
 #error "Unknown CPU architecture"
 #endif

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.25 Beta"
+#define PR_VERSION  "4.25"
 #define PR_VMAJOR   4
 #define PR_VMINOR   25
 #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."