Date: Fri, 28 Oct 2016 23:39:12 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424888 - head/multimedia/x264/files Message-ID: <201610282339.u9SNdCgJ086839@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Fri Oct 28 23:39:12 2016 New Revision: 424888 URL: https://svnweb.freebsd.org/changeset/ports/424888 Log: multimedia/{lib,}x264: unbreak ASM on mips* after r422672 ASM=on is nop on many Tier2 and Tier3 architectures: arm + armeb, mips + mipsel, ia64, sparc64. mips64 may be able to use MSA optimizations but the ancient GCC in base doesn't support -msa flag and lang/gcc* are broken. arm (aka armv4t) failed as: You specified a pre-ARMv6 or Thumb-1 CPU in your CFLAGS. If you really want to run on such a CPU, configure with --disable-asm. mips (o32) failed as: [1] You specified a pre-MSA CPU in your CFLAGS. If you really want to run on such a CPU, configure with --disable-asm. PR: 213443 Reported by: pkg-fallout [1] Obtained from: PkgSrc Approved by: portmgr blanket Modified: head/multimedia/x264/files/patch-configure (contents, props changed) Modified: head/multimedia/x264/files/patch-configure ============================================================================== --- head/multimedia/x264/files/patch-configure Fri Oct 28 23:39:01 2016 (r424887) +++ head/multimedia/x264/files/patch-configure Fri Oct 28 23:39:12 2016 (r424888) @@ -31,7 +31,31 @@ ARCH="AARCH64" stack_alignment=16 if [ "$SYS" = MACOSX ] ; then -@@ -1225,10 +1219,6 @@ if cc_check '' -Wshadow ; then +@@ -882,9 +876,8 @@ if [ $asm = auto -a $ARCH = ARM ] ; then + cc_check '' '' '__asm__("vadd.i16 q0, q0, q0");' && define HAVE_NEON + ASFLAGS="$ASFLAGS -c" + else +- echo "You specified a pre-ARMv6 or Thumb-1 CPU in your CFLAGS." +- echo "If you really want to run on such a CPU, configure with --disable-asm." +- exit 1 ++ echo "No usable SIMD found, adding --disable-asm." ++ asm="no" + fi + fi + +@@ -911,9 +904,8 @@ if [ $asm = auto -a $ARCH = MIPS ] ; the + if cc_check '' '' '__asm__("addvi.b $w0, $w1, 1");' ; then + define HAVE_MSA + else +- echo "You specified a pre-MSA CPU in your CFLAGS." +- echo "If you really want to run on such a CPU, configure with --disable-asm." +- exit 1 ++ echo "No usable SIMD found, adding --disable-asm." ++ asm="no" + fi + fi + +@@ -1225,10 +1217,6 @@ if cc_check '' -Wshadow ; then CFLAGS="-Wshadow $CFLAGS" fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610282339.u9SNdCgJ086839>