ck_pr: Fallback to RMO for PSO for this release.

Barriers can be rejiggered next release.

include/gcc/ppc/ck_pr.h

@@ -55,7 +55,7 @@ ck_pr_stall(void)
 	return;
 }
 
-#ifdef CK_MD_RMO
+#if defined(CK_MD_RMO) || defined(CK_MD_PSO)
 #define CK_PR_FENCE(T, I)                               \
         CK_CC_INLINE static void                        \
         ck_pr_fence_strict_##T(void)                    \
@@ -77,7 +77,7 @@ ck_pr_stall(void)
         {                                               \
                 __asm__ __volatile__("" ::: "memory");  \
         }
-#endif /* !CK_MD_RMO */
+#endif /* !CK_MD_RMO && !CK_MD_PSO */
 
 CK_PR_FENCE(load_depends, "")
 CK_PR_FENCE(store, "eieio")

include/gcc/ppc64/ck_pr.h

@@ -54,7 +54,7 @@ ck_pr_stall(void)
 	return;
 }
 
-#if defined(CK_MD_RMO)
+#if defined(CK_MD_RMO) || defined(CK_MD_PSO)
 #define CK_PR_FENCE(T, I)                               \
         CK_CC_INLINE static void                        \
         ck_pr_fence_strict_##T(void)                    \
@@ -76,7 +76,7 @@ ck_pr_stall(void)
         {                                               \
                 __asm__ __volatile__("" ::: "memory");  \
         }
-#endif /* !CK_MD_RMO */
+#endif /* !CK_MD_RMO && !CK_MD_PSO */
 
 CK_PR_FENCE(load_depends, "")
 CK_PR_FENCE(store, "eieio")

include/gcc/sparcv9/ck_pr.h

@@ -51,10 +51,10 @@ ck_pr_stall(void)
 	return;
 }
 
-#ifndef CK_MD_RMO
+#if defined(CK_MD_RMO) || defined(CK_MD_PSO)
-	/*
+/*
-	 * By default, we will assume TSO model is used on SPARCv9.
+ * If RMO is forced, then do not assume TSO model.
-	 */
+ */
 #define CK_PR_FENCE(T, I)                               \
         CK_CC_INLINE static void                        \
         ck_pr_fence_strict_##T(void)                    \
@@ -63,12 +63,12 @@ ck_pr_stall(void)
         }                                               \
         CK_CC_INLINE static void ck_pr_fence_##T(void)  \
         {                                               \
-                __asm__ __volatile__("" ::: "memory");  \
+                __asm__ __volatile__(I ::: "memory");   \
         }
 #else
-	/*
+/*
-	 * If RMO is forced, then do not assume TSO model.
+ * By default, we will assume TSO model is used on SPARCv9.
-	 */
+ */
 #define CK_PR_FENCE(T, I)                               \
         CK_CC_INLINE static void                        \
         ck_pr_fence_strict_##T(void)                    \
@@ -77,9 +77,9 @@ ck_pr_stall(void)
         }                                               \
         CK_CC_INLINE static void ck_pr_fence_##T(void)  \
         {                                               \
-                __asm__ __volatile__(I ::: "memory");   \
+                __asm__ __volatile__("" ::: "memory");  \
         }
-#endif /* CK_MD_RMO */
+#endif /* !CK_MD_RMO && !CK_MD_PSO */
 
 CK_PR_FENCE(load_depends, "")
 CK_PR_FENCE(store, "membar #StoreStore")

include/gcc/x86/ck_pr.h

@@ -63,7 +63,7 @@ ck_pr_stall(void)
 	return;
 }
 
-#ifdef CK_MD_RMO
+#if defined(CK_MD_RMO) || defined(CK_MD_PSO)
 #define CK_PR_FENCE(T, I)				\
 	CK_CC_INLINE static void			\
 	ck_pr_fence_strict_##T(void)			\
@@ -92,7 +92,7 @@ ck_pr_stall(void)
 	{						\
 		__asm__ __volatile__("" ::: "memory");	\
 	}
-#endif /* !CK_MD_RMO */
+#endif /* !CK_MD_RMO && !CK_MD_PSO */
 
 CK_PR_FENCE(load, "lfence")
 CK_PR_FENCE(load_depends, "")

include/gcc/x86_64/ck_pr.h

@@ -62,7 +62,7 @@ ck_pr_stall(void)
 	return;
 }
 
-#ifdef CK_MD_RMO
+#if defined(CK_MD_RMO) || defined(CK_MD_PSO)
 #define CK_PR_FENCE(T, I)				\
 	CK_CC_INLINE static void			\
 	ck_pr_fence_strict_##T(void)			\
@@ -91,7 +91,7 @@ ck_pr_stall(void)
 	{						\
 		__asm__ __volatile__("" ::: "memory");	\
 	}
-#endif /* !CK_MD_RMO */
+#endif /* !CK_MD_RMO && !CK_MD_PSO */
 
 CK_PR_FENCE(load, "lfence")
 CK_PR_FENCE(load_depends, "")