aboutsummaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorTed Hess <thess@kitschensync.net>2017-04-02 07:08:37 -0400
committerGitHub <noreply@github.com>2017-04-02 07:08:37 -0400
commitb7dae3c92163e51414c87dd9bab3aebe5ca4dc6d (patch)
tree0998dee48d6aad867c28892b72a8bce09488f5c6 /libs
parentf67f7085607ff1b4919e43027a80ae591fed3469 (diff)
parent39b2c6f2f5b5d4400a06df48e907d66163a9a1d3 (diff)
Merge pull request #4225 from ffainelli/x264
libx264: Blacklist all MIPS CPUs for assembly optimizations
Diffstat (limited to 'libs')
-rw-r--r--libs/libx264/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/libx264/Makefile b/libs/libx264/Makefile
index dbb7543b8..8aebb85f3 100644
--- 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=