From: Rosen Penev <rosenp@gmail.com>
Date: Sun, 12 Jan 2020 04:44:34 +0000 (-0800)
Subject: target.mk: change i386 CPU type to pentium-mmx
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=691bf54369fbccf9c27a14231a14dcdf07acaf36;p=openwrt%2Fstaging%2Flinusw.git

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@gmail.com>
---

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)),)