Mesa (master): Revert "Prefer intrinsics to handrolled atomic ops."

Thomas Fogal tfogal at kemper.freedesktop.org
Thu Sep 30 20:43:32 UTC 2010


Module: Mesa
Branch: master
Commit: 3661f757ee7e75348f0df834ecf1febb211ddf66
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3661f757ee7e75348f0df834ecf1febb211ddf66

Author: Tom Fogal <tfogal at alumni.unh.edu>
Date:   Thu Sep 30 14:39:14 2010 -0600

Revert "Prefer intrinsics to handrolled atomic ops."

This reverts commit 5f66b340aa49c6bc8d0acb2d1a6f8e9a7ef2cb2e, quickly
fixing 30514.

---

 src/gallium/auxiliary/util/u_atomic.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_atomic.h b/src/gallium/auxiliary/util/u_atomic.h
index 4ae6def..8434491 100644
--- a/src/gallium/auxiliary/util/u_atomic.h
+++ b/src/gallium/auxiliary/util/u_atomic.h
@@ -27,12 +27,12 @@
 #define PIPE_ATOMIC_MSVC_INTRINSIC
 #elif (defined(PIPE_CC_MSVC) && defined(PIPE_ARCH_X86))
 #define PIPE_ATOMIC_ASM_MSVC_X86                
-#elif defined(PIPE_CC_GCC) && (PIPE_CC_GCC_VERSION >= 401)
-#define PIPE_ATOMIC_GCC_INTRINSIC
 #elif (defined(PIPE_CC_GCC) && defined(PIPE_ARCH_X86))
 #define PIPE_ATOMIC_ASM_GCC_X86
 #elif (defined(PIPE_CC_GCC) && defined(PIPE_ARCH_X86_64))
 #define PIPE_ATOMIC_ASM_GCC_X86_64
+#elif defined(PIPE_CC_GCC) && (PIPE_CC_GCC_VERSION >= 401)
+#define PIPE_ATOMIC_GCC_INTRINSIC
 #else
 #error "Unsupported platform"
 #endif




More information about the mesa-commit mailing list