Index: apr/atomic/unix/solaris.c
===================================================================
--- apr.orig/atomic/unix/solaris.c
+++ apr/atomic/unix/solaris.c
@@ -25,48 +25,52 @@ APR_DECLARE(apr_status_t) apr_atomic_ini
     return APR_SUCCESS;
 }
 
-APR_DECLARE(apr_uint32_t) apr_atomic_read32(volatile apr_uint32_t *mem)
+APR_DECLARE(apr_uint32_t) apr_atomic_read32(apr_uint32_t *mem)
 {
+    membar_consumer();
+
     return *mem;
 }
 
-APR_DECLARE(void) apr_atomic_set32(volatile apr_uint32_t *mem, apr_uint32_t val)
+APR_DECLARE(void) apr_atomic_set32(apr_uint32_t *mem, apr_uint32_t val)
 {
     *mem = val;
+
+    membar_producer();
 }
 
-APR_DECLARE(apr_uint32_t) apr_atomic_add32(volatile apr_uint32_t *mem, apr_uint32_t val)
+APR_DECLARE(apr_uint32_t) apr_atomic_add32(apr_uint32_t *mem, apr_uint32_t val)
 {
     return atomic_add_32_nv(mem, val) - val;
 }
 
-APR_DECLARE(void) apr_atomic_sub32(volatile apr_uint32_t *mem, apr_uint32_t val)
+APR_DECLARE(void) apr_atomic_sub32(apr_uint32_t *mem, apr_uint32_t val)
 {
     atomic_add_32(mem, -val);
 }
 
-APR_DECLARE(apr_uint32_t) apr_atomic_inc32(volatile apr_uint32_t *mem)
+APR_DECLARE(apr_uint32_t) apr_atomic_inc32(apr_uint32_t *mem)
 {
     return atomic_inc_32_nv(mem) - 1;
 }
 
-APR_DECLARE(int) apr_atomic_dec32(volatile apr_uint32_t *mem)
+APR_DECLARE(int) apr_atomic_dec32(apr_uint32_t *mem)
 {
     return atomic_dec_32_nv(mem);
 }
 
-APR_DECLARE(apr_uint32_t) apr_atomic_cas32(volatile apr_uint32_t *mem, apr_uint32_t with,
+APR_DECLARE(apr_uint32_t) apr_atomic_cas32(apr_uint32_t *mem, apr_uint32_t with,
                                            apr_uint32_t cmp)
 {
     return atomic_cas_32(mem, cmp, with);
 }
 
-APR_DECLARE(apr_uint32_t) apr_atomic_xchg32(volatile apr_uint32_t *mem, apr_uint32_t val)
+APR_DECLARE(apr_uint32_t) apr_atomic_xchg32(apr_uint32_t *mem, apr_uint32_t val)
 {
     return atomic_swap_32(mem, val);
 }
 
-APR_DECLARE(void*) apr_atomic_casptr(volatile void **mem, void *with, const void *cmp)
+APR_DECLARE(void*) apr_atomic_casptr(void **mem, void *with, void *cmp)
 {
     return atomic_cas_ptr(mem, cmp, with);
 }