--- Makefile	(revision 455567)
+++ Makefile	(working copy)
@@ -31,6 +31,7 @@ 
 # Only explicitly list ARCHs with SIMD optimizations
 CONFIGURE_ARGS_aarch64=	--target=arm64-linux-gcc
 CONFIGURE_ARGS_amd64=	--target=x86_64-linux-gcc
+CONFIGURE_ARGS_armv6=	--target=armv6-linux-gcc
 CONFIGURE_ARGS_armv7=	--target=armv7-linux-gcc
 CONFIGURE_ARGS_i386=	--target=x86-linux-gcc
 CONFIGURE_ARGS+=${CONFIGURE_ARGS_${ARCH}} \
@@ -42,15 +43,10 @@ 
 		--enable-vp9
 MAKE_ARGS+=	verbose=yes
 ASFLAGS+=	${ASFLAGS_${ARCH}}
+ASFLAGS_armv6=	-meabi=5
 ASFLAGS_armv7=	-meabi=5
 ALL_TARGET=	# empty
 
-# armv7 is actually armv6 target before FreeBSD 12.0
-.if ${CFLAGS:M-march=armv7*}
-CONFIGURE_ARGS+=	${CONFIGURE_ARGS_armv7}
-ASFLAGS+=		${ASFLAGS_armv7}
-.endif
-
 OPTIONS_DEFINE=	DEBUG MULTIRES POSTPROC RTCPU SHARED SIZE_LIMIT TEST THREADS
 OPTIONS_DEFAULT=MULTIRES POSTPROC RTCPU SHARED SIZE_LIMIT THREADS
 OPTIONS_EXCLUDE_aarch64=RTCPU
--- files/patch-build_make_configure.sh	(nonexistent)
+++ files/patch-build_make_configure.sh	(working copy)
@@ -0,0 +1,17 @@ 
+--- build/make/configure.sh.orig	2017-12-05 12:21:54 UTC
++++ build/make/configure.sh
+@@ -680,6 +680,14 @@ process_common_toolchain() {
+       aarch64*)
+         tgt_isa=arm64
+         ;;
++      armv6*-gnueabihf)
++        tgt_isa=armv6
++        float_abi=hard
++        ;;
++      armv6*-gnueabi)
++        tgt_isa=armv6
++        float_abi=softfp
++        ;;
+       armv7*-hardfloat* | armv7*-gnueabihf | arm-*-gnueabihf)
+         tgt_isa=armv7
+         float_abi=hard
--- files/patch-configure	(nonexistent)
+++ files/patch-configure	(working copy)
@@ -0,0 +1,10 @@ 
+--- configure.orig	2017-12-05 11:21:00.447522000 +0100
++++ configure	2017-12-05 11:20:52.815463000 +0100
+@@ -101,6 +101,7 @@ EOF
+ all_platforms="${all_platforms} arm64-android-gcc"
+ all_platforms="${all_platforms} arm64-darwin-gcc"
+ all_platforms="${all_platforms} arm64-linux-gcc"
++all_platforms="${all_platforms} armv6-linux-gcc"     #armv6
+ all_platforms="${all_platforms} armv7-android-gcc"   #neon Cortex-A8
+ all_platforms="${all_platforms} armv7-darwin-gcc"    #neon Cortex-A8
+ all_platforms="${all_platforms} armv7-linux-rvct"    #neon Cortex-A8