Changeset 101796 in vbox

Timestamp:

Nov 4, 2023 9:43:46 PM (15 months ago)

Author:

vboxsync

Message:

libs/xpcom: Switch to using our own atomics on Solaris like we do on darwin and linux, bugref:10545

Location:

trunk/src/libs/xpcom18a4

Files:

• Makefile.kmk (modified) (2 diffs)
• nsprpub/pr/include/md/_solaris.h (modified) (1 diff)
• nsprpub/pr/include/md/_solaris32.cfg (deleted)
• nsprpub/pr/include/md/_vbox.cfg (modified) (2 diffs)
• nsprpub/pr/src/md/unix/os_SunOS_x86.s (deleted)
• nsprpub/pr/src/md/unix/os_SunOS_x86_64.s (deleted)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -220 +220 @@
         nsprpub/pr/include/md/_netbsd.cfg \
         nsprpub/pr/include/md/_openbsd.cfg \
-        nsprpub/pr/include/md/_solaris32.cfg \
         nsprpub/pr/include/md/_solaris64.cfg
 NSPRPUB-OBS-HEADERS_INST = $(INST_SDK)bindings/xpcom/include/nsprpub/obsolete/
@@ -564 +563 @@
 endif
 
-VBox-xpcom-nspr_SOURCES.darwin = nsprpub/pr/src/md/unix/darwin.c
-
+VBox-xpcom-nspr_SOURCES.darwin  = nsprpub/pr/src/md/unix/darwin.c
 VBox-xpcom-nspr_SOURCES.freebsd = nsprpub/pr/src/md/unix/freebsd.c
-
-VBox-xpcom-nspr_SOURCES.linux = nsprpub/pr/src/md/unix/linux.c
-
+VBox-xpcom-nspr_SOURCES.linux   = nsprpub/pr/src/md/unix/linux.c
 VBox-xpcom-nspr_SOURCES.solaris = nsprpub/pr/src/md/unix/solaris.c
-VBox-xpcom-nspr_SOURCES.solaris.x86 = nsprpub/pr/src/md/unix/os_SunOS_x86.s
-VBox-xpcom-nspr_SOURCES.solaris.amd64 = nsprpub/pr/src/md/unix/os_SunOS_x86_64.s
 
 $(call KB_FN_DO_PASS0_ON_TARGET,VBox-xpcom-nspr)

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

@@ -178 +178 @@
 #define _MD_INTERVAL_PER_SEC              _MD_Solaris_TicksPerSecond
 
-#if defined(_PR_HAVE_ATOMIC_OPS)
-/*
-** Atomic Operations
-*/
-#define _MD_INIT_ATOMIC()
-
-NSPR_API(PRInt32) _MD_AtomicIncrement(PRInt32 *val);
-#define _MD_ATOMIC_INCREMENT _MD_AtomicIncrement
-
-NSPR_API(PRInt32) _MD_AtomicAdd(PRInt32 *ptr, PRInt32 val);
-#define _MD_ATOMIC_ADD _MD_AtomicAdd
-
-NSPR_API(PRInt32) _MD_AtomicDecrement(PRInt32 *val);
-#define _MD_ATOMIC_DECREMENT _MD_AtomicDecrement
-
-NSPR_API(PRInt32) _MD_AtomicSet(PRInt32 *val, PRInt32 newval);
-#define _MD_ATOMIC_SET _MD_AtomicSet
-#endif /* _PR_HAVE_ATOMIC_OPS */
+#include "_iprt_atomic.h"
 
 #if defined(_PR_PTHREADS)

trunk/src/libs/xpcom18a4/nsprpub/pr/include/md/_vbox.cfg

@@ -44 +44 @@
 #elif defined(RT_OS_FREEBSD)
 # include <md/_freebsd.cfg>
-#elif defined(RT_OS_L4)
-# include <md/_l4v2.cfg>
 #elif defined(RT_OS_LINUX)
 # include <md/_linux.cfg>
@@ -53 +51 @@
 # include <md/_openbsd.cfg>
 #elif defined(RT_OS_SOLARIS)
-# if defined(RT_ARCH_X86)
-#  include <md/_solaris32.cfg>
-# else
-#  include <md/_solaris64.cfg>
-# endif
+# include <md/_solaris64.cfg>
 #elif defined(RT_OS_OS2)
 # include <md/_os2.cfg>