From 2274132a180b4d45b13800d10b00e3409ce47ccf Mon Sep 17 00:00:00 2001
From: Kai Engert <kaie@kuix.de>
Date: Tue, 20 Oct 2015 12:34:15 +0200
Subject: [PATCH] Bug 1215200, NSPR_4_10_10_RTM and NSS 3_20_1_RTM, bump
 version requirements, r=keeler

---
 configure.in                       |  4 ++--
 nsprpub/TAG-INFO                   |  2 +-
 nsprpub/config/prdepend.h          |  1 +
 nsprpub/pr/include/md/_linux.h     | 10 ----------
 nsprpub/pr/include/pratom.h        |  4 +---
 security/nss/TAG-INFO              |  2 +-
 security/nss/coreconf/coreconf.dep |  1 -
 7 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/configure.in b/configure.in
index 6eb81033b3b..c994885cfce 100644
--- a/configure.in
+++ b/configure.in
@@ -53,7 +53,7 @@ dnl ========================================================
 MOZJPEG=62
 MOZPNG=10617
 NSPR_VERSION=4
-NSPR_MINVER=4.10.8
+NSPR_MINVER=4.10.10
 NSS_VERSION=3
 
 dnl Set the minimum version of toolkit libs used by mozilla
@@ -3427,7 +3427,7 @@ MOZ_ARG_WITH_BOOL(system-nss,
     _USE_SYSTEM_NSS=1 )
 
 if test -n "$_USE_SYSTEM_NSS"; then
-    AM_PATH_NSS(3.19.2, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
+    AM_PATH_NSS(3.20.1, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
 fi
 
 if test -n "$MOZ_NATIVE_NSS"; then
diff --git a/nsprpub/TAG-INFO b/nsprpub/TAG-INFO
index 67e03969811..95780389356 100644
--- a/nsprpub/TAG-INFO
+++ b/nsprpub/TAG-INFO
@@ -1 +1 @@
-NSPR_4_10_10_RC1
+NSPR_4_10_10_RTM
diff --git a/nsprpub/config/prdepend.h b/nsprpub/config/prdepend.h
index e49e92677e3..6c66b37ca0f 100644
--- 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.h b/nsprpub/pr/include/md/_linux.h
index c29ba5ce3ad..2a2ad53da0d 100644
--- a/nsprpub/pr/include/md/_linux.h
+++ b/nsprpub/pr/include/md/_linux.h
@@ -162,16 +162,6 @@ extern PRInt32 _PR_ppc_AtomicSet(PRInt32 *val, PRInt32 newval);
 #endif
 #endif
 
-#if defined(__mips__) && defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)
-/* Use GCC built-in functions */
-#define _PR_HAVE_ATOMIC_OPS
-#define _MD_INIT_ATOMIC()
-#define _MD_ATOMIC_INCREMENT(ptr) __sync_add_and_fetch(ptr, 1)
-#define _MD_ATOMIC_DECREMENT(ptr) __sync_sub_and_fetch(ptr, 1)
-#define _MD_ATOMIC_ADD(ptr, i) __sync_add_and_fetch(ptr, i)
-#define _MD_ATOMIC_SET(ptr, nv) __sync_lock_test_and_set(ptr, nv)
-#endif
-
 #if defined(__alpha)
 #define _PR_HAVE_ATOMIC_OPS
 #define _MD_INIT_ATOMIC()
diff --git a/nsprpub/pr/include/pratom.h b/nsprpub/pr/include/pratom.h
index dff9d6c09ab..9dbe0fad339 100644
--- a/nsprpub/pr/include/pratom.h
+++ b/nsprpub/pr/include/pratom.h
@@ -107,9 +107,7 @@ NSPR_API(PRInt32)	PR_AtomicAdd(PRInt32 *ptr, PRInt32 val);
            defined(__powerpc__) || \
            (defined(__arm__) && \
            defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)) || \
-           defined(__aarch64__) || defined(__alpha) || \
-           (defined(__mips__) && \
-           defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)))))
+           defined(__aarch64__) || defined(__alpha))))
 
 /*
  * Because the GCC manual warns that some processors may support
diff --git a/security/nss/TAG-INFO b/security/nss/TAG-INFO
index e6e301a526e..0cea637f8b3 100644
--- a/security/nss/TAG-INFO
+++ b/security/nss/TAG-INFO
@@ -1 +1 @@
-NSS_3_20_1_RC0
+NSS_3_20_1_RTM
diff --git a/security/nss/coreconf/coreconf.dep b/security/nss/coreconf/coreconf.dep
index 590d1bfaeee..5182f75552c 100644
--- a/security/nss/coreconf/coreconf.dep
+++ b/security/nss/coreconf/coreconf.dep
@@ -10,4 +10,3 @@
  */
 
 #error "Do not include this header file."
-