From 3730a8739b3dc1e35deaa6a9501c65cc9c6bf1c8 Mon Sep 17 00:00:00 2001 From: Sitsofe Wheeler Date: Sun, 12 Aug 2018 09:42:03 +0100 Subject: [PATCH] arch: fix build breakage on armv6 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The FreeBSD folks found fio didn't build on their armv6 systems (https://svnweb.freebsd.org/ports/head/benchmarks/fio/Makefile?revision=432897&view=markup ) but Mikaël Urankar fixed the issue in https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=228042 so copy the fix to mainline. Signed-off-by: Sitsofe Wheeler --- arch/arch-arm.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arch-arm.h b/arch/arch-arm.h index dd286d04..fc1c4844 100644 --- a/arch/arch-arm.h +++ b/arch/arch-arm.h @@ -6,7 +6,8 @@ #if defined (__ARM_ARCH_4__) || defined (__ARM_ARCH_4T__) \ || defined (__ARM_ARCH_5__) || defined (__ARM_ARCH_5T__) || defined (__ARM_ARCH_5E__)\ || defined (__ARM_ARCH_5TE__) || defined (__ARM_ARCH_5TEJ__) \ - || defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) + || defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) \ + || defined(__ARM_ARCH_6KZ__) #define nop __asm__ __volatile__("mov\tr0,r0\t@ nop\n\t") #define read_barrier() __asm__ __volatile__ ("" : : : "memory") #define write_barrier() __asm__ __volatile__ ("" : : : "memory") -- 2.25.1