summaryrefslogtreecommitdiffstats
path: root/src/gallium/auxiliary
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2010-04-04 16:54:00 -0700
committerIan Romanick <[email protected]>2010-04-04 16:54:00 -0700
commit4fb2daf42c8171579cdc18605c5ceeb1963f8b31 (patch)
treeda534f83de94161df440986ad5e36df245291552 /src/gallium/auxiliary
parentad3575e2dd81252e9ea341d1a7355e0bfd1cccee (diff)
parentf66733e0773b4ec794438dd2422aeb28a791adda (diff)
Merge branch '7.8'
Diffstat (limited to 'src/gallium/auxiliary')
-rw-r--r--src/gallium/auxiliary/util/u_atomic.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/util/u_atomic.h b/src/gallium/auxiliary/util/u_atomic.h
index 3c42477ad4f..a1568233906 100644
--- a/src/gallium/auxiliary/util/u_atomic.h
+++ b/src/gallium/auxiliary/util/u_atomic.h
@@ -29,7 +29,7 @@
#define PIPE_ATOMIC_ASM_MSVC_X86
#elif (defined(PIPE_CC_GCC) && defined(PIPE_ARCH_X86))
#define PIPE_ATOMIC_ASM_GCC_X86
-#elif defined(PIPE_CC_GCC)
+#elif defined(PIPE_CC_GCC) && (PIPE_CC_GCC_VERSION >= 401)
#define PIPE_ATOMIC_GCC_INTRINSIC
#else
#error "Unsupported platform"