diff --git a/oshmem/mca/spml/base/spml_base.c b/oshmem/mca/spml/base/spml_base.c
index 75ccda7393..c7b1f83381 100644
--- a/oshmem/mca/spml/base/spml_base.c
+++ b/oshmem/mca/spml/base/spml_base.c
@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2013      Mellanox Technologies, Inc.
  *                         All rights reserved.
+ * Copyright (c) 2017      ARM, Inc. All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -20,33 +21,35 @@
 #include "oshmem/mca/spml/yoda/spml_yoda_getreq.h"
 #include "opal/mca/btl/btl.h"
 
-#define SPML_BASE_DO_CMP(res, addr, op, val) \
-    switch((op)) { \
+#define SPML_BASE_DO_CMP(_res, _addr, _op, _val) \
+    switch((_op)) { \
         case SHMEM_CMP_EQ: \
-            res = *(addr) == (val) ? 1 : 0; \
+            _res = *(_addr) == (_val) ? 1 : 0; \
             break; \
         case SHMEM_CMP_NE: \
-            res = *(addr) != (val) ? 1 : 0; \
+            _res = *(_addr) != (_val) ? 1 : 0; \
             break; \
         case SHMEM_CMP_GT: \
-            res =  *(addr) > (val) ? 1 : 0; \
+            _res =  *(_addr) > (_val) ? 1 : 0; \
             break; \
         case SHMEM_CMP_LE: \
-            res = *(addr) <= (val) ? 1 : 0; \
+            _res = *(_addr) <= (_val) ? 1 : 0; \
             break; \
         case SHMEM_CMP_LT: \
-            res = *(addr) < (val) ? 1: 0; \
+            _res = *(_addr) < (_val) ?  1 : 0; \
             break; \
         case SHMEM_CMP_GE: \
-            res = *(addr) >= (val) ? 1 : 0; \
+            _res = *(_addr) >= (_val) ? 1 : 0; \
             break; \
     }
 
-#define SPML_BASE_DO_WAIT(cond, val, addr, op) \
-    do { \
-        SPML_BASE_DO_CMP(cond, val,addr,op); \
-        opal_progress(); \
-    } while (cond == 0) ;
+#define SPML_BASE_DO_WAIT(_res, _addr, _op, _val)  \
+    do {                                           \
+        SPML_BASE_DO_CMP(_res, _addr, _op, _val);  \
+        if (_res == 0) {                           \
+            opal_progress();                       \
+        }                                          \
+    } while (_res == 0);
 
 /**
  * Wait for data delivery.
@@ -54,15 +57,24 @@
  */
 int mca_spml_base_wait(void* addr, int cmp, void* value, int datatype)
 {
-    int *int_addr, int_value;
-    long *long_addr, long_value;
-    short *short_addr, short_value;
-    long long *longlong_addr, longlong_value;
-    int32_t *int32_addr, int32_value;
-    int64_t *int64_addr, int64_value;
+    volatile int *int_addr;
+    volatile long *long_addr;
+    volatile short *short_addr;
+    volatile long long *longlong_addr;
+    volatile int32_t *int32_addr;
+    volatile int64_t *int64_addr;
+
+    int int_value;
+    long long_value;
+    short short_value;
+    long long longlong_value;
+    int32_t int32_value;
+    int64_t int64_value;
+
     ompi_fortran_integer_t *fint_addr, fint_value;
     ompi_fortran_integer4_t *fint4_addr, fint4_value;
     ompi_fortran_integer8_t *fint8_addr, fint8_value;
+
     int res = 0;
 
     switch (datatype) {