From a595928db48ffc5bb51b1da537b70a2399b8e7a0 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 31 Mar 2019 21:22:58 -0700 Subject: [PATCH] fio: Fix compilation under mpcore. Signed-off-by: Rosen Penev --- utils/fio/Makefile | 2 +- utils/fio/patches/010-mpcore.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 utils/fio/patches/010-mpcore.patch diff --git a/utils/fio/Makefile b/utils/fio/Makefile index d46215645..5d8bdf2b2 100644 --- a/utils/fio/Makefile +++ b/utils/fio/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fio PKG_VERSION:=3.13 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://brick.kernel.dk/snaps PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 diff --git a/utils/fio/patches/010-mpcore.patch b/utils/fio/patches/010-mpcore.patch new file mode 100644 index 000000000..bc46d56f7 --- /dev/null +++ b/utils/fio/patches/010-mpcore.patch @@ -0,0 +1,28 @@ +From ec4b65d9c9180101807f598c9edecb462f54261a Mon Sep 17 00:00:00 2001 +From: Rosen Penev +Date: Sun, 31 Mar 2019 21:19:03 -0700 +Subject: [PATCH] arch: fix build breakage on armv6 again + +6K was missing from the defines. + +Signed-off-by: Rosen Penev +--- + arch/arch-arm.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arch-arm.h b/arch/arch-arm.h +index fc1c4844..78cb2ebe 100644 +--- a/arch/arch-arm.h ++++ b/arch/arch-arm.h +@@ -7,7 +7,7 @@ + || 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_6KZ__) ++ || defined(__ARM_ARCH_6KZ__) || defined(__ARM_ARCH_6K__) + #define nop __asm__ __volatile__("mov\tr0,r0\t@ nop\n\t") + #define read_barrier() __asm__ __volatile__ ("" : : : "memory") + #define write_barrier() __asm__ __volatile__ ("" : : : "memory") +-- +2.17.1 +