[pkg-boost-devel] Bug#866761: boost1.63: Patch for the armel FTBFS

[Adrian Bunk]

Source: boost1.63
Version: 1.63.0+dfsg-1
Severity: important
Tags: patch

Attached is the upstream fix for the armel FTBFS.
-------------- next part --------------
>From 6f152b6e00d107e0abde22954d1da271cb98a18d Mon Sep 17 00:00:00 2001
From: Oliver Kowalke <oliver.kowalke at gmail.com>
Date: Sun, 2 Apr 2017 09:05:21 +0200
Subject: use mnemonic 'yield' only for some ARM variants

- fix #110
---
 include/boost/fiber/detail/cpu_relax.hpp | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

--- a/boost/fiber/detail/cpu_relax.hpp
+++ b/boost/fiber/detail/cpu_relax.hpp
@@ -29,8 +30,20 @@ namespace detail {
 #if BOOST_ARCH_ARM
 # if BOOST_COMP_MSVC
 #  define cpu_relax() YieldProcessor();
-# else
+# elif (defined(__ARM_ARCH_6K__) || \
+        defined(__ARM_ARCH_6Z__) || \
+        defined(__ARM_ARCH_6ZK__) || \
+        defined(__ARM_ARCH_6T2__) || \
+        defined(__ARM_ARCH_7__) || \
+        defined(__ARM_ARCH_7A__) || \
+        defined(__ARM_ARCH_7R__) || \
+        defined(__ARM_ARCH_7M__) || \
+        defined(__ARM_ARCH_7S__) || \
+        defined(__ARM_ARCH_8A__) || \
+        defined(__aarch64__))
 #  define cpu_relax() asm volatile ("yield" ::: "memory");
+# else
+#  define cpu_relax() asm volatile ("nop" ::: "memory");
 # endif
 #elif BOOST_ARCH_MIPS
 # define cpu_relax() asm volatile ("pause" ::: "memory");