svn commit: r472282 - in head/benchmarks/fio: . files

[Mark Linimon]

Author: linimon
Date: Wed Jun 13 04:12:58 2018
New Revision: 472282
URL: https://svnweb.freebsd.org/changeset/ports/472282

Log:
  Fix build on armv6, unbreak on aarch64
  
  PR:		228042
  Submitted by:	mikael.urankar
  Approved by:	maintainer timeout

Added:
  head/benchmarks/fio/files/
  head/benchmarks/fio/files/patch-arch_arch-arm.h   (contents, props changed)
Modified:
  head/benchmarks/fio/Makefile

Modified: head/benchmarks/fio/Makefile
==============================================================================
--- head/benchmarks/fio/Makefile	Wed Jun 13 03:24:40 2018	(r472281)
+++ head/benchmarks/fio/Makefile	Wed Jun 13 04:12:58 2018	(r472282)
@@ -11,9 +11,6 @@ COMMENT=	FIO - flexible IO tester
 
 LICENSE=	GPLv2
 
-BROKEN_armv6=		Fails to compile: unsupported ARM architecture
-BROKEN_armv7=		Fails to compile: unsupported ARM architecture
-
 USES=		gmake tar:bzip2
 
 OPTIONS_DEFINE=	GNUPLOT EXAMPLES

Added: head/benchmarks/fio/files/patch-arch_arch-arm.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/benchmarks/fio/files/patch-arch_arch-arm.h	Wed Jun 13 04:12:58 2018	(r472282)
@@ -0,0 +1,16 @@
+--- benchmarks/fio/files/patch-arch_arch-arm.h	(nonexistent)
++++ benchmarks/fio/files/patch-arch_arch-arm.h	(working copy)
+@@ -0,0 +1,12 @@
++--- arch/arch-arm.h.orig	2018-05-07 14:59:32 UTC
+++++ 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")
+