From: Rosen Penev <rosenp@gmail.com>
Date: Tue, 12 Nov 2019 21:56:53 +0000 (-0800)
Subject: Only yield under ARMv7 and above (#1176)
X-Git-Tag: archive/raspbian/16.2.7+ds-4+rpi1~2^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8fb0a103b0c1e4486b4ae403ac70fb96be6295f9;p=ceph.git

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
---

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");