svn commit: r466922 - in head/multimedia/libvpx: . files

[Jan Beich]

Author: jbeich
Date: Tue Apr 10 00:13:43 2018
New Revision: 466922
URL: https://svnweb.freebsd.org/changeset/ports/466922

Log:
  multimedia/libvpx: enable NEON on armv6 with more CPUTYPE values
  
  PR:		224107
  Submitted by:	Mikaël Urankar

Modified:
  head/multimedia/libvpx/Makefile   (contents, props changed)
  head/multimedia/libvpx/files/patch-build_make_configure.sh   (contents, props changed)
  head/multimedia/libvpx/files/patch-configure   (contents, props changed)

Modified: head/multimedia/libvpx/Makefile
==============================================================================
--- head/multimedia/libvpx/Makefile	Tue Apr 10 00:13:23 2018	(r466921)
+++ head/multimedia/libvpx/Makefile	Tue Apr 10 00:13:43 2018	(r466922)
@@ -35,11 +35,6 @@ ASFLAGS+=	${ASFLAGS_${MACHINE}}
 ASFLAGS_arm=	-meabi=5
 ALL_TARGET=	# empty
 
-# armv7 is actually armv6 target before FreeBSD 12.0
-.if ${CFLAGS:M-march=armv7*}
-CONFIGURE_ARGS+=	--target=armv7-linux-gcc
-.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

Modified: head/multimedia/libvpx/files/patch-build_make_configure.sh
==============================================================================
--- head/multimedia/libvpx/files/patch-build_make_configure.sh	Tue Apr 10 00:13:23 2018	(r466921)
+++ head/multimedia/libvpx/files/patch-build_make_configure.sh	Tue Apr 10 00:13:43 2018	(r466922)
@@ -1,7 +1,23 @@
+- Add armv6 targets where NEON depends on CFLAGS
 - Recognize DragonFly as x86_64-linux-gcc target by default
 
 --- build/make/configure.sh.orig	2018-01-24 22:25:44 UTC
 +++ build/make/configure.sh
+@@ -696,6 +696,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
 @@ -767,7 +767,7 @@ process_common_toolchain() {
          [ -z "$tgt_isa" ] && tgt_isa=x86
          tgt_os=win32

Modified: head/multimedia/libvpx/files/patch-configure
==============================================================================
--- head/multimedia/libvpx/files/patch-configure	Tue Apr 10 00:13:23 2018	(r466921)
+++ head/multimedia/libvpx/files/patch-configure	Tue Apr 10 00:13:43 2018	(r466922)
@@ -3,6 +3,14 @@
 
 --- configure.orig	2018-01-24 22:25:44 UTC
 +++ configure
+@@ -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"
+ 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
 @@ -116,6 +117,7 @@ all_platforms="${all_platforms} mips32-linux-gcc"
  all_platforms="${all_platforms} mips64-linux-gcc"
  all_platforms="${all_platforms} ppc64-linux-gcc"