Browse Source

Merge pull request #8555 from neheb/fio

fio: Fix compilation under mpcore.
lilik-openwrt-22.03
Rosen Penev 6 years ago
committed by GitHub
parent
commit
5a70835cc9
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 1 deletions
  1. +1
    -1
      utils/fio/Makefile
  2. +28
    -0
      utils/fio/patches/010-mpcore.patch

+ 1
- 1
utils/fio/Makefile View File

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


+ 28
- 0
utils/fio/patches/010-mpcore.patch View File

@ -0,0 +1,28 @@
From ec4b65d9c9180101807f598c9edecb462f54261a Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
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 <rosenp@gmail.com>
---
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

Loading…
Cancel
Save