From eccf130fdbcf719566d3ffb5e780d89776b77c23 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Thu, 27 Nov 2025 19:50:15 +0100 Subject: [PATCH] {lib{avcodec,swscale}/x86/,}Makefile: Kill MMX-OBJS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Kacper Michajłow Signed-off-by: Andreas Rheinhardt --- Makefile | 2 +- ffbuild/arch.mak | 1 - libavcodec/x86/Makefile | 7 ++----- libswscale/x86/Makefile | 2 +- libswscale/x86/hscale_fast_bilinear_simd.c | 2 -- 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 2f78db02a5..4fc0aebd33 100644 --- a/Makefile +++ b/Makefile @@ -107,7 +107,7 @@ ffbuild/.config: $(CONFIGURABLE_COMPONENTS) SUBDIR_VARS := CLEANFILES FFLIBS HOSTPROGS TESTPROGS TOOLS \ HEADERS ARCH_HEADERS BUILT_HEADERS SKIPHEADERS \ ARMV5TE-OBJS ARMV6-OBJS ARMV8-OBJS VFP-OBJS NEON-OBJS \ - ALTIVEC-OBJS VSX-OBJS MMX-OBJS X86ASM-OBJS \ + ALTIVEC-OBJS VSX-OBJS X86ASM-OBJS \ MIPSFPU-OBJS MIPSDSPR2-OBJS MIPSDSP-OBJS MSA-OBJS \ MMI-OBJS LSX-OBJS LASX-OBJS RV-OBJS RVV-OBJS RVVB-OBJS \ OBJS SHLIBOBJS STLIBOBJS HOSTOBJS TESTOBJS SIMD128-OBJS diff --git a/ffbuild/arch.mak b/ffbuild/arch.mak index 197e30bb89..ec79ae7866 100644 --- a/ffbuild/arch.mak +++ b/ffbuild/arch.mak @@ -23,5 +23,4 @@ OBJS-$(HAVE_RV_ZVBB) += $(RVVB-OBJS) $(RVVB-OBJS-yes) OBJS-$(HAVE_SIMD128) += $(SIMD128-OBJS) $(SIMD128-OBJS-yes) -OBJS-$(HAVE_MMX) += $(MMX-OBJS) $(MMX-OBJS-yes) OBJS-$(HAVE_X86ASM) += $(X86ASM-OBJS) $(X86ASM-OBJS-yes) diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 63b16f24c8..bf723ed1a6 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -65,6 +65,8 @@ X86ASM-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp_init.o X86ASM-OBJS-$(CONFIG_PRORES_RAW_DECODER) += x86/proresdsp_init.o X86ASM-OBJS-$(CONFIG_RV40_DECODER) += x86/rv40dsp_init.o X86ASM-OBJS-$(CONFIG_SBC_ENCODER) += x86/sbcdsp_init.o +OBJS-$(CONFIG_SNOW_DECODER) += x86/snowdsp.o +OBJS-$(CONFIG_SNOW_ENCODER) += x86/snowdsp.o X86ASM-OBJS-$(CONFIG_SVQ1_ENCODER) += x86/svq1enc_init.o X86ASM-OBJS-$(CONFIG_TAK_DECODER) += x86/takdsp_init.o OBJS-$(CONFIG_TRUEHD_DECODER) += x86/mlpdsp_init.o @@ -81,11 +83,6 @@ X86ASM-OBJS-$(CONFIG_VP9_DECODER) += x86/vp9dsp_init.o \ x86/vp9dsp_init_16bpp.o -# GCC inline assembly optimizations -# decoders/encoders -MMX-OBJS-$(CONFIG_SNOW_DECODER) += x86/snowdsp.o -MMX-OBJS-$(CONFIG_SNOW_ENCODER) += x86/snowdsp.o - # subsystems X86ASM-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp.o \ x86/ac3dsp_downmix.o diff --git a/libswscale/x86/Makefile b/libswscale/x86/Makefile index f82b411fb1..9c9d286600 100644 --- a/libswscale/x86/Makefile +++ b/libswscale/x86/Makefile @@ -4,7 +4,7 @@ OBJS += x86/rgb2rgb.o \ x86/swscale.o \ x86/yuv2rgb.o \ -MMX-OBJS += x86/hscale_fast_bilinear_simd.o \ +OBJS-$(HAVE_MMXEXT_INLINE) += x86/hscale_fast_bilinear_simd.o \ OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o diff --git a/libswscale/x86/hscale_fast_bilinear_simd.c b/libswscale/x86/hscale_fast_bilinear_simd.c index 47ca020004..d8a4e444b4 100644 --- a/libswscale/x86/hscale_fast_bilinear_simd.c +++ b/libswscale/x86/hscale_fast_bilinear_simd.c @@ -27,7 +27,6 @@ #define RET 0xC3 // near return opcode for x86 #define PREFETCH "prefetchnta" -#if HAVE_INLINE_ASM av_cold int ff_init_hscaler_mmxext(int dstW, int xInc, uint8_t *filterCode, int16_t *filter, int32_t *filterPos, int numSplits) @@ -358,4 +357,3 @@ void ff_hcscale_fast_mmxext(SwsInternal *c, int16_t *dst1, int16_t *dst2, dst2[i] = src2[srcW-1]*128; } } -#endif //HAVE_INLINE_ASM