Sent from my iPhone
> On Feb 22, 2020, at 6:13 AM, Hauke Mehrtens <[email protected]> wrote: > > On 1/12/20 5:44 AM, Rosen Penev wrote: >> 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. > > As far as I understand it MMX is already needed and you just want to > rename the toolchain from pentium to pentium_mmx, is this correct? Yeah. Changing the CPU_TYPE to pentium-mmx fixes NASM. > >> >> Fixes ffmpeg compilation on x86_legacy and x86_geode. >> >> Signed-off-by: Rosen Penev <[email protected]> >> --- >> include/target.mk | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/include/target.mk b/include/target.mk >> index a813ba2d2d..a30400c5bc 100644 >> --- a/include/target.mk >> +++ b/include/target.mk >> @@ -177,8 +177,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)),) >> > > _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
