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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « nspr/pr/src/threads/prmon.c ('k') | scripts/nspr-checkout.sh » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
1 Index: nspr/pr/include/md/_darwin.cfg
2 ===================================================================
3 --- nspr/pr/include/md/_darwin.cfg (revision 246067)
4 +++ nspr/pr/include/md/_darwin.cfg (working copy)
5 @@ -20,7 +20,7 @@
6 #define IS_BIG_ENDIAN 1
7 #endif
8
9 -#ifdef __x86_64__
10 +#ifdef __LP64__
11 #define IS_64
12 #endif
13
14 Index: nspr/pr/include/md/_darwin.h
15 ===================================================================
16 --- nspr/pr/include/md/_darwin.h (revision 246067)
17 +++ nspr/pr/include/md/_darwin.h (working copy)
18 @@ -26,6 +26,8 @@
19 #define _PR_SI_ARCHITECTURE "ppc"
20 #elif defined(__arm__)
21 #define _PR_SI_ARCHITECTURE "arm"
22 +#elif defined(__aarch64__)
23 +#define _PR_SI_ARCHITECTURE "aarch64"
24 #else
25 #error "Unknown CPU architecture"
26 #endif
27 @@ -122,7 +124,7 @@ extern PRInt32 _PR_Darwin_x86_64_AtomicAdd(PRInt32 *ptr, PRI nt32 val);
28 #define _MD_ATOMIC_ADD(ptr, val) _PR_Darwin_x86_64_AtomicAdd(ptr, val)
29 #endif /* __x86_64__ */
30
31 -#ifdef __arm__
32 +#if defined(__arm__) || defined(__aarch64__)
33 #define _PR_HAVE_ATOMIC_OPS
34 #define _MD_INIT_ATOMIC()
35 #define _MD_ATOMIC_INCREMENT(val) OSAtomicIncrement32(val)
36 @@ -136,7 +138,7 @@ static inline PRInt32 _MD_ATOMIC_SET(PRInt32 *val, PRInt32 n ewval)
37 return oldval;
38 }
39 #define _MD_ATOMIC_ADD(ptr, val) OSAtomicAdd32(val, ptr)
40 -#endif /* __arm__ */
41 +#endif /* __arm__ || __aarch64__ */
42
43 #define USE_SETJMP
44
OLDNEW
« 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