* config/linux/sparc/futex.h (cpu_relax): Read from CC register.

From-SVN: r184672

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index c0d578f3e9e4dc8694bb5df38faeadb6e78e1948..44fabda7b360b770783fc09c5aab1211d0f1ab07 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-29  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * config/linux/sparc/futex.h (cpu_relax): Read from CC register.
+
 2012-02-27  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
        PR libstdc++/52188

diff --git a/libgomp/config/linux/sparc/futex.h b/libgomp/config/linux/sparc/futex.h
index 6c600446eb9c2af38053b7d52141b5005df66b88..96e37b820c5ed35e6dc3a821d09622cdca7ff4e8 100644 (file)
--- a/libgomp/config/linux/sparc/futex.h
+++ b/libgomp/config/linux/sparc/futex.h
@@ -90,9 +90,5 @@ futex_wake (int *addr, int count)
 static inline void
 cpu_relax (void)
 {
-#if defined __arch64__ || defined  __sparc_v9__
-  __asm volatile ("membar #LoadLoad" : : : "memory");
-#else
-  __asm volatile ("" : : : "memory");
-#endif
+  __asm volatile ("rd %%ccr, %%g0" : : : "memory");
 }