[openwrt/openwrt] target.mk: change i386 CPU type to pentium-mmx

LEDE Commits lede-commits at lists.infradead.org
Wed Jul 8 16:55:19 EDT 2020


ynezz pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/691bf54369fbccf9c27a14231a14dcdf07acaf36

commit 691bf54369fbccf9c27a14231a14dcdf07acaf36
Author: Rosen Penev <rosenp at gmail.com>
AuthorDate: Sat Jan 11 20:44:34 2020 -0800

    target.mk: change i386 CPU type to pentium-mmx
    
    f4f8f4a180366ee90fd8e153213db2cb746ca361 broke ffmpeg compilation with x86
    
    The reason is that ffmpeg's x86 assembly requires at least MMX, which the
    pentium CPU_TYPE was preventing.
    
    Fixes ffmpeg compilation on x86_legacy and x86_geode.
    
    Ref: https://github.com/openwrt/openwrt/pull/3061
    Signed-off-by: Rosen Penev <rosenp at gmail.com>
---
 include/target.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/target.mk b/include/target.mk
index 64292138b7..aba477e83b 100644
--- a/include/target.mk
+++ b/include/target.mk
@@ -174,8 +174,8 @@ ifeq ($(DUMP),1)
     CPU_CFLAGS_octeonplus = -march=octeon+ -mabi=64
   endif
   ifeq ($(ARCH),i386)
-    CPU_TYPE ?= pentium
-    CPU_CFLAGS_pentium = -march=pentium-mmx
+    CPU_TYPE ?= pentium-mmx
+    CPU_CFLAGS_pentium-mmx = -march=pentium-mmx
     CPU_CFLAGS_pentium4 = -march=pentium4
   endif
   ifneq ($(findstring arm,$(ARCH)),)



More information about the lede-commits mailing list