summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Fogal <tfogal@alumni.unh.edu>2010-09-30 14:39:14 -0600
committerTom Fogal <tfogal@alumni.unh.edu>2010-09-30 14:43:20 -0600
commit3af43c0b4c29f7cb82df72d0b65bcd190053f57c (patch)
treef6456330452b8b08d03da609456dd037c0917844
parent337dace22dc2b0eab2372375f1574d94b894ef84 (diff)
Revert "Prefer intrinsics to handrolled atomic ops."7.8
This reverts commit 5f66b340aa49c6bc8d0acb2d1a6f8e9a7ef2cb2e, quickly fixing 30514.
-rw-r--r--src/gallium/auxiliary/util/u_atomic.h4
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 4ae6def495a..8434491a421 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