Merge branch 'rickard/atomic-type/OTP-8974' into dev

* rickard/atomic-type/OTP-8974:
  Use 32-bit atomics for system block
  Use 32-bit atomics for misc scheduling specific information
  Use 32-bit atomic for uaflgs in thread specific events
  Use 32-bit atomics for process lock flags
  Add 32-bit atomics to emulator APIs
  Use new atomic types in emulator
  Use 32-bit atomics for ethr_thr_create
  Use 32-bit atomics for mutex and rwmutex flags
  Use 32-bit atomics for events
  Add support for 32-bit atomics
  Move atomic API into own files
  Add support for 64-bit atomics on Windows
  Remove unused ethread time functionality
  Introduce ethr_sint_t and use it for atomics

1 files changed, 5 insertions, 2 deletions

diff --git a/erts/lib_src/win/ethr_event.c b/erts/lib_src/win/ethr_event.c
index ddb4780ff1..68f093f49c 100644
--- a/erts/lib_src/win/ethr_event.c
+++ b/erts/lib_src/win/ethr_event.c
@@ -28,6 +28,9 @@
 
 /* --- Windows implementation of thread events ------------------------------ */
 
+#pragma intrinsic(_InterlockedExchangeAdd)
+#pragma intrinsic(_InterlockedCompareExchange)
+
 int
 ethr_event_init(ethr_event *e)
 {
@@ -72,10 +75,10 @@ wait(ethr_event *e, int spincount)
     while (1) {
 	long on;
 	while (1) {
-#if ETHR_IMMED_ATOMIC_SET_GET_SAFE__
+#if ETHR_READ_AND_SET_WITHOUT_INTERLOCKED_OP__
 	    state = e->state;
 #else
-	    state = InterlockedExchangeAdd(&e->state, (LONG) 0);
+	    state = _InterlockedExchangeAdd(&e->state, (LONG) 0);
 #endif
 	    if (state == ETHR_EVENT_ON__)
 		return 0;