diff --git a/libs/libfolly/Makefile b/libs/libfolly/Makefile index 8f4cc9dc6..b731a7d69 100644 --- a/libs/libfolly/Makefile +++ b/libs/libfolly/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libfolly PKG_VERSION:=2019.06.10.00 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/facebook/folly/tar.gz/v$(PKG_VERSION)? diff --git a/libs/libfolly/patches/103-arm-yield.patch b/libs/libfolly/patches/103-arm-yield.patch new file mode 100644 index 000000000..f8695261f --- /dev/null +++ b/libs/libfolly/patches/103-arm-yield.patch @@ -0,0 +1,11 @@ +--- a/folly/portability/Asm.h ++++ b/folly/portability/Asm.h +@@ -38,7 +38,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");