Index: common/lib/libc/atomic/atomic_c11_compare_exchange_cas_16.c
===================================================================
RCS file: /cvsroot/src/common/lib/libc/atomic/atomic_c11_compare_exchange_cas_16.c,v
retrieving revision 1.2
diff -p -u -r1.2 atomic_c11_compare_exchange_cas_16.c
--- common/lib/libc/atomic/atomic_c11_compare_exchange_cas_16.c	4 Nov 2014 19:56:44 -0000	1.2
+++ common/lib/libc/atomic/atomic_c11_compare_exchange_cas_16.c	6 Sep 2020 08:11:38 -0000
@@ -36,15 +36,15 @@
 #endif
 #include <sys/atomic.h>
 
-bool __atomic_compare_exchange_2(volatile uint16_t *, uint16_t *, uint16_t,
+bool __atomic_compare_exchange_2(volatile void *, void *, uint16_t,
     bool, int, int);
 
 bool
-__atomic_compare_exchange_2(volatile uint16_t *mem,
-    uint16_t *expected, uint16_t desired,
+__atomic_compare_exchange_2(volatile void *mem,
+    void *expected, uint16_t desired,
     bool weak, int success, int failure)
 {
-	uint16_t old = *expected;
+	uint16_t old = *(uint16_t *)expected;
 
 	/*
 	 * Ignore the details (weak, memory model on success and failure)
Index: common/lib/libc/atomic/atomic_c11_compare_exchange_cas_32.c
===================================================================
RCS file: /cvsroot/src/common/lib/libc/atomic/atomic_c11_compare_exchange_cas_32.c,v
retrieving revision 1.2
diff -p -u -r1.2 atomic_c11_compare_exchange_cas_32.c
--- common/lib/libc/atomic/atomic_c11_compare_exchange_cas_32.c	4 Nov 2014 19:56:44 -0000	1.2
+++ common/lib/libc/atomic/atomic_c11_compare_exchange_cas_32.c	6 Sep 2020 08:11:38 -0000
@@ -36,15 +36,15 @@
 #endif
 #include <sys/atomic.h>
 
-bool __atomic_compare_exchange_4(volatile uint32_t *, uint32_t *, uint32_t,
+bool __atomic_compare_exchange_4(volatile void *, void *, uint32_t,
     bool, int, int);
 
 bool
-__atomic_compare_exchange_4(volatile uint32_t *mem,
-    uint32_t *expected, uint32_t desired,
+__atomic_compare_exchange_4(volatile void *mem,
+    void *expected, uint32_t desired,
     bool weak, int success, int failure)
 {
-	uint32_t old = *expected;
+	uint32_t old = *(uint32_t *)expected;
 
 	/*
 	 * Ignore the details (weak, memory model on success and failure)
Index: common/lib/libc/atomic/atomic_c11_compare_exchange_cas_8.c
===================================================================
RCS file: /cvsroot/src/common/lib/libc/atomic/atomic_c11_compare_exchange_cas_8.c,v
retrieving revision 1.2
diff -p -u -r1.2 atomic_c11_compare_exchange_cas_8.c
--- common/lib/libc/atomic/atomic_c11_compare_exchange_cas_8.c	4 Nov 2014 19:56:44 -0000	1.2
+++ common/lib/libc/atomic/atomic_c11_compare_exchange_cas_8.c	6 Sep 2020 08:11:38 -0000
@@ -36,15 +36,15 @@
 #endif
 #include <sys/atomic.h>
 
-bool __atomic_compare_exchange_1(volatile uint8_t *, uint8_t *, uint8_t,
+bool __atomic_compare_exchange_1(volatile void *, void *, uint8_t,
     bool, int, int);
 
 bool
-__atomic_compare_exchange_1(volatile uint8_t *mem,
-    uint8_t *expected, uint8_t desired,
+__atomic_compare_exchange_1(volatile void *mem,
+    void *expected, uint8_t desired,
     bool weak, int success, int failure)
 {
-	uint8_t old = *expected;
+	uint8_t old = *(uint8_t *)expected;
 
 	/*
 	 * Ignore the details (weak, memory model on success and failure)
Index: common/lib/libc/atomic/atomic_load.c
===================================================================
RCS file: /cvsroot/src/common/lib/libc/atomic/atomic_load.c,v
retrieving revision 1.2
diff -p -u -r1.2 atomic_load.c
--- common/lib/libc/atomic/atomic_load.c	6 Jul 2014 01:19:45 -0000	1.2
+++ common/lib/libc/atomic/atomic_load.c	6 Sep 2020 08:11:38 -0000
@@ -35,13 +35,13 @@ __RCSID("$NetBSD: atomic_load.c,v 1.2 20
 #include <sys/atomic.h>
 
 #define atomic_load_n(n,b) \
-uint ## b ## _t __atomic_load_ ## n(volatile uint ## b ## _t *, int); \
+uint ## b ## _t __atomic_load_ ## n(volatile void *, int); \
 uint ## b ## _t \
-__atomic_load_ ## n(volatile uint ## b ## _t *ptr, int memmodel) \
+__atomic_load_ ## n(volatile void *ptr, int memmodel) \
 { \
 	uint## b ##_t val; \
 	membar_enter(); \
-	val = *ptr; \
+	val = *(volatile uint ## b ## _t *)ptr; \
 	membar_exit(); \
 	return val; \
 }
Index: common/lib/libc/atomic/atomic_store.c
===================================================================
RCS file: /cvsroot/src/common/lib/libc/atomic/atomic_store.c,v
retrieving revision 1.2
diff -p -u -r1.2 atomic_store.c
--- common/lib/libc/atomic/atomic_store.c	6 Jul 2014 01:19:45 -0000	1.2
+++ common/lib/libc/atomic/atomic_store.c	6 Sep 2020 08:11:38 -0000
@@ -35,9 +35,9 @@ __RCSID("$NetBSD: atomic_store.c,v 1.2 2
 #include <sys/atomic.h>
 
 #define atomic_store_n(n,b) \
-void __atomic_store_ ## n(volatile uint ## b ## _t *, uint ## b ## _t, int); \
+void __atomic_store_ ## n(volatile void ## b ## _t *, uint ## b ## _t, int); \
 void \
-__atomic_store_ ## n(volatile uint ## b ## _t *ptr, uint ## b ## _t val, \
+__atomic_store_ ## n(volatile void ## b ## _t *ptr, uint ## b ## _t val, \
                      int memmodel) \
 { \
 	membar_enter(); \