Changeset 16391 in vbox for trunk/src/libs/xpcom18a4

Timestamp:

Jan 29, 2009 10:50:11 PM (16 years ago)

Author:

vboxsync

Message:

XPCOM-darwin/amd64: brushed up the _darwin.h for AMD64 support, using IPRT for the atomic assembly bits.

Location:

trunk/src/libs/xpcom18a4

Files:

• Makefile.kmk (modified) (1 diff)
• nsprpub/pr/include/md/_darwin.h (modified) (4 diffs)
• nsprpub/pr/include/md/_iprt_atomic.h (added)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -412 +412 @@
 NSPRPUB-MD-HEADERS_IFFLAGS = -m 644
 NSPRPUB-MD-HEADERS_SOURCES = \
+        nsprpub/pr/include/md/_iprt_atomic.h \
         nsprpub/pr/include/md/_darwin.h \
         nsprpub/pr/include/md/_freebsd.h \

trunk/src/libs/xpcom18a4/nsprpub/pr/include/md/_darwin.h

@@ -53 +53 @@
 #elif defined(__ppc__)
 #define _PR_SI_ARCHITECTURE "ppc"
+#elif defined(__amd64__)
+#define _PR_SI_ARCHITECTURE "amd64"
+#else
+#error "unknown architecture."
 #endif
 #define PR_DLL_SUFFIX           ".dylib"
@@ -64 +68 @@
 #define HAVE_DLL
 #define USE_MACH_DYLD
-#define _PR_HAVE_SOCKADDR_LEN  
+#define _PR_HAVE_SOCKADDR_LEN
 #define _PR_STAT_HAS_ST_ATIMESPEC
 #define _PR_HAVE_LARGE_OFF_T
@@ -103 +107 @@
 #endif
 
+#ifdef VBOX_USE_MORE_IPRT_IN_NSPR
+# include "_iprt_atomic.h"
+#else  /* !VBOX_USE_MORE_IPRT_IN_NSPR */
 #if defined(__ppc__)
 #define _PR_HAVE_ATOMIC_OPS
@@ -126 +133 @@
 #define _MD_ATOMIC_ADD(ptr, val)    _PR_Darwin_x86_AtomicAdd(ptr, val)
 #endif /* __i386__ */
+#endif /* !VBOX_USE_MORE_IPRT_IN_NSPR */
 
 #define USE_SETJMP