From 0ac58cdacfb6fc02780b3d98faae0feafc534ba8 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 12 Nov 2019 13:56:53 -0800 Subject: [PATCH] Only yield under ARMv7 and above (#1176) Origin: upstream, https://github.com/facebook/folly/commit/62d8e6e0b91ebd6f878f3066cd9b6e5f3c18a97b.patch Last-Update: 2021-11-24 Gbp-Pq: Name only-yied-under-armv7-and-above.patch --- src/rocksdb/third-party/folly/folly/portability/Asm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rocksdb/third-party/folly/folly/portability/Asm.h b/src/rocksdb/third-party/folly/folly/portability/Asm.h index cca168586..9225f05e1 100644 --- a/src/rocksdb/third-party/folly/folly/portability/Asm.h +++ b/src/rocksdb/third-party/folly/folly/portability/Asm.h @@ -19,7 +19,7 @@ inline void asm_volatile_pause() { ::_mm_pause(); #elif defined(__i386__) || FOLLY_X64 asm volatile("pause"); -#elif FOLLY_AARCH64 || defined(__arm__) +#elif FOLLY_AARCH64 || (defined(__arm__) && !(__ARM_ARCH < 7)) asm volatile("yield"); #elif FOLLY_PPC64 asm volatile("or 27,27,27"); -- 2.30.2