From e70fc4b63da1f05c63c7896033e1c7cdc076caee Mon Sep 17 00:00:00 2001 From: Jan Kotas Date: Wed, 26 Jul 2017 00:17:31 +0200 Subject: [PATCH] Revert "Fixes for issue 12982 Android cross-build fails when compiling cee_wks (#12986)" (#13031) This reverts commit 2e7326df470bea696699cc7c812ee56dd0b470b9. --- src/inc/volatile.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/inc/volatile.h b/src/inc/volatile.h index 0f98c3d..5aa0e50 100644 --- a/src/inc/volatile.h +++ b/src/inc/volatile.h @@ -120,15 +120,13 @@ T VolatileLoad(T const * pt) STATIC_CONTRACT_SUPPORTS_DAC_HOST_ONLY; #ifndef DACCESS_COMPILE -#if defined(_ARM64_) && defined(__clang__) +#if defined(_ARM64_) && defined(__GNUC__) T val; static const unsigned lockFreeAtomicSizeMask = (1 << 1) | (1 << 2) | (1 << 4) | (1 << 8); -#if __has_builtin(__atomic_load) if((1 << sizeof(T)) & lockFreeAtomicSizeMask) { __atomic_load((T volatile const *)pt, &val, __ATOMIC_ACQUIRE); } -#endif else { val = *(T volatile const *)pt; -- 2.7.4