Merge pull request #4225 from ffainelli/x264

libx264: Blacklist all MIPS CPUs for assembly optimizations

diff --git a/libs/libx264/Makefile b/libs/libx264/Makefile
index dbb7543b8d39983d07beb21f4b6fa4e466fe30f3..8aebb85f3a9b5535fb94b22a4e76b330595eabcd 100644 (file)
--- a/libs/libx264/Makefile
+++ b/libs/libx264/Makefile
@@ -29,7 +29,8 @@ MAKE_FLAGS+= LD="$(TARGET_CC) -o"
 
 # ARM ASM depends on ARM1156 or later, blacklist earlier or incompatible cores
 # AMD Geode LX and i486 do not have SSE
-CPU_ASM_BLACKLIST:=geode i486 arm920t arm926ej-s arm1136j-s arm1176jzf-s fa526 mpcore xscale
+CPU_ASM_BLACKLIST:=geode i486 arm920t arm926ej-s arm1136j-s arm1176jzf-s fa526 mpcore xscale \
+                  mips32 24kc 34kc 74kc octeon mips64
 
 ifneq ($(CONFIG_SOFT_FLOAT)$(findstring $(call qstrip,$(CONFIG_CPU_TYPE)),$(CPU_ASM_BLACKLIST)),)
   CONFIGURE_VARS+= AS=