diff options
author | Jonathan Gray <jsg@cvs.openbsd.org> | 2016-12-31 08:21:40 +0000 |
---|---|---|
committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2016-12-31 08:21:40 +0000 |
commit | 36fe995dbb0193705bec5d90f06120615c131418 (patch) | |
tree | a051aa4a9d7b70601e4641da95e1d3fac436aa8d | |
parent | 2ca3b8c8a4d765087f11b53431a2d2b9fe3a2e02 (diff) |
Use the unlocked atomic path in Mesa when just __arm__ is defined and
don't assume the builtin atomics are present with __ARM_ARCH_6__ and later
as base gcc with -march=armv6 doesn't have them.
-rw-r--r-- | lib/mesa/src/util/u_atomic.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/mesa/src/util/u_atomic.h b/lib/mesa/src/util/u_atomic.h index 5710ab6da..e873a21b0 100644 --- a/lib/mesa/src/util/u_atomic.h +++ b/lib/mesa/src/util/u_atomic.h @@ -23,10 +23,7 @@ #define PIPE_ATOMIC_OS_SOLARIS #elif defined(_MSC_VER) #define PIPE_ATOMIC_MSVC_INTRINSIC -#elif defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__) || \ - defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) || \ - defined(__ARM_ARCH_5TE__) || defined(__ARM_ARCH_5E__) || \ - defined(__hppa__) || defined(__sparc__) || defined(__sh__) +#elif defined(__arm__) || defined(__hppa__) || defined(__sh__) #define PIPE_ATOMIC_UNLOCKED #elif defined(__GNUC__) #define PIPE_ATOMIC_GCC_INTRINSIC |