diff --git a/contrib/libcxxrt/atomic.h b/contrib/libcxxrt/atomic.h
index bcd8a47ac89d..53aa26faa3fb 100644
--- a/contrib/libcxxrt/atomic.h
+++ b/contrib/libcxxrt/atomic.h
@@ -11,7 +11,7 @@
  */
 #if __has_feature(cxx_atomic)
 #define ATOMIC_SWAP(addr, val)\
-	__atomic_exchange(addr, val, __ATOMIC_ACQ_REL)
+	__c11_atomic_exchange((_Atomic(__typeof__(val))*)addr, val, __ATOMIC_ACQ_REL)
 #elif __has_builtin(__sync_swap)
 #define ATOMIC_SWAP(addr, val)\
 	__sync_swap(addr, val)
@@ -22,7 +22,7 @@
 
 #if __has_feature(cxx_atomic)
 #define ATOMIC_LOAD(addr)\
-	__atomic_load(addr, __ATOMIC_ACQUIRE)
+	__c11_atomic_load((_Atomic(__typeof__(*addr))*)addr, __ATOMIC_ACQUIRE)
 #else
 #define ATOMIC_LOAD(addr)\
 	(__sync_synchronize(), *addr)