Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2017)

Unified Diff: patches/nspr-darwin.patch

Issue 200653003: Update to NSPR 4.10.4. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « nspr/pr/src/threads/prmon.c ('k') | scripts/nspr-checkout.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: patches/nspr-darwin.patch
===================================================================
--- patches/nspr-darwin.patch (revision 257452)
+++ patches/nspr-darwin.patch (working copy)
@@ -1,44 +0,0 @@
-Index: nspr/pr/include/md/_darwin.cfg
-===================================================================
---- nspr/pr/include/md/_darwin.cfg (revision 246067)
-+++ nspr/pr/include/md/_darwin.cfg (working copy)
-@@ -20,7 +20,7 @@
- #define IS_BIG_ENDIAN 1
- #endif
-
--#ifdef __x86_64__
-+#ifdef __LP64__
- #define IS_64
- #endif
-
-Index: nspr/pr/include/md/_darwin.h
-===================================================================
---- nspr/pr/include/md/_darwin.h (revision 246067)
-+++ nspr/pr/include/md/_darwin.h (working copy)
-@@ -26,6 +26,8 @@
- #define _PR_SI_ARCHITECTURE "ppc"
- #elif defined(__arm__)
- #define _PR_SI_ARCHITECTURE "arm"
-+#elif defined(__aarch64__)
-+#define _PR_SI_ARCHITECTURE "aarch64"
- #else
- #error "Unknown CPU architecture"
- #endif
-@@ -122,7 +124,7 @@ extern PRInt32 _PR_Darwin_x86_64_AtomicAdd(PRInt32 *ptr, PRInt32 val);
- #define _MD_ATOMIC_ADD(ptr, val) _PR_Darwin_x86_64_AtomicAdd(ptr, val)
- #endif /* __x86_64__ */
-
--#ifdef __arm__
-+#if defined(__arm__) || defined(__aarch64__)
- #define _PR_HAVE_ATOMIC_OPS
- #define _MD_INIT_ATOMIC()
- #define _MD_ATOMIC_INCREMENT(val) OSAtomicIncrement32(val)
-@@ -136,7 +138,7 @@ static inline PRInt32 _MD_ATOMIC_SET(PRInt32 *val, PRInt32 newval)
- return oldval;
- }
- #define _MD_ATOMIC_ADD(ptr, val) OSAtomicAdd32(val, ptr)
--#endif /* __arm__ */
-+#endif /* __arm__ || __aarch64__ */
-
- #define USE_SETJMP
-
« no previous file with comments | « nspr/pr/src/threads/prmon.c ('k') | scripts/nspr-checkout.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698