diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2016-10-28 23:39:12 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2016-10-28 23:39:12 +0000 |
| commit | 1feedf04f01eae58a193fcdc3d4c9f96d0737343 (patch) | |
| tree | 217e8423440010cb960f29741790ef946dfdd95e /multimedia/x264/files/patch-configure | |
| parent | multimedia/libx264: unbreak ASM on armv6 after r422672 (diff) | |
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
Notes
Notes:
svn path=/head/; revision=424888
Diffstat (limited to 'multimedia/x264/files/patch-configure')
| -rw-r--r-- | multimedia/x264/files/patch-configure | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/multimedia/x264/files/patch-configure b/multimedia/x264/files/patch-configure index 6ca2a5b9487a..f73c49ce56ee 100644 --- a/multimedia/x264/files/patch-configure +++ b/multimedia/x264/files/patch-configure @@ -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 |