PR #22461 opened by Ramiro Polla (ramiro) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/22461 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/22461.patch
It had been added in bc8e044d (2015), and broken in 3ddae9ee (2017). Nobody has complained since, so it's safe to assume that it is not being used. >From 8f54e4a5d0c848e30e10722a4422cda1b9f88cae Mon Sep 17 00:00:00 2001 From: Ramiro Polla <[email protected]> Date: Fri, 30 May 2025 01:03:14 +0200 Subject: [PATCH] ffbuild/common: remove DBG=1 to preprocess external asm It had been added in bc8e044d (2015), and broken in 3ddae9ee (2017). Nobody has complained since, so it's safe to assume that it is not being used. --- doc/build_system.txt | 5 ----- doc/optimization.txt | 5 ----- ffbuild/common.mak | 16 ++-------------- 3 files changed, 2 insertions(+), 24 deletions(-) diff --git a/doc/build_system.txt b/doc/build_system.txt index 77841b77ad..e9efed6bf5 100644 --- a/doc/build_system.txt +++ b/doc/build_system.txt @@ -7,11 +7,6 @@ V Disable the default terse mode, the full command issued by make and its output will be shown on the screen. -DBG - Preprocess x86 external assembler files to a .dbg.asm file in the object - directory, which then gets compiled. Helps in developing those assembler - files. - DESTDIR Destination directory for the install targets, useful to prepare packages or install FFmpeg in cross-environments. diff --git a/doc/optimization.txt b/doc/optimization.txt index 06ad3ab880..eaa3d1964b 100644 --- a/doc/optimization.txt +++ b/doc/optimization.txt @@ -191,11 +191,6 @@ __asm__() block. Use external asm (nasm) or inline asm (__asm__()), do not use intrinsics. The latter requires a good optimizing compiler which gcc is not. -When debugging a x86 external asm compilation issue, if lost in the macro -expansions, add DBG=1 to your make command-line: the input file will be -preprocessed, stripped of the debug/empty lines, then compiled, showing the -actual lines causing issues. - Inline asm vs. external asm --------------------------- Both inline asm (__asm__("..") in a .c file, handled by a compiler such as gcc) diff --git a/ffbuild/common.mak b/ffbuild/common.mak index 06d6f39715..762a0fb89e 100644 --- a/ffbuild/common.mak +++ b/ffbuild/common.mak @@ -2,14 +2,6 @@ # common bits used by all libraries # -DEFAULT_X86ASMD=.dbg - -ifeq ($(DBG),1) -X86ASMD=$(DEFAULT_X86ASMD) -else -X86ASMD= -endif - ifndef SUBDIR LINK = $(LD) $(1) @@ -105,10 +97,6 @@ COMPILE_LASX = $(call COMPILE,CC,LASXFLAGS) %_host.o: %.c $(COMPILE_HOSTC) -%$(DEFAULT_X86ASMD).asm: %.asm - $(DEPX86ASM) $(X86ASMFLAGS) -M -o $@ $< > $(@:.asm=.d) - $(X86ASM) $(X86ASMFLAGS) -e $< | sed '/^%/d;/^$$/d;' > $@ - %.o: %.asm $(COMPILE_X86ASM) -$(if $(ASMSTRIPFLAGS), $(STRIP) $(ASMSTRIPFLAGS) $@) @@ -266,7 +254,7 @@ $(TOOLOBJS): | tools OUTDIRS := $(OUTDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(SHLIBOBJS) $(STLIBOBJS) $(TESTOBJS)) -CLEANSUFFIXES = *.d *.gcda *.gcno *.h.c *.ho *.map *.o *.objs *.pc *.ptx *.ptx.gz *.ptx.c *.spv *.spv.gz *.spv.c *.ver *.version *.html.gz *.html.c *.css.min.gz *.css.min *.css.c *$(DEFAULT_X86ASMD).asm *~ *.ilk *.pdb +CLEANSUFFIXES = *.d *.gcda *.gcno *.h.c *.ho *.map *.o *.objs *.pc *.ptx *.ptx.gz *.ptx.c *.spv *.spv.gz *.spv.c *.ver *.version *.html.gz *.html.c *.css.min.gz *.css.min *.css.c *~ *.ilk *.pdb LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a define RULES @@ -276,4 +264,4 @@ endef $(eval $(RULES)) --include $(wildcard $(OBJS:.o=.d) $(HOSTOBJS:.o=.d) $(TESTOBJS:.o=.d) $(HOBJS:.o=.d) $(SHLIBOBJS:.o=.d) $(STLIBOBJS:.o=.d) $(SPVOBJS:.spv.o=.d)) $(OBJS:.o=$(DEFAULT_X86ASMD).d) +-include $(wildcard $(OBJS:.o=.d) $(HOSTOBJS:.o=.d) $(TESTOBJS:.o=.d) $(HOBJS:.o=.d) $(SHLIBOBJS:.o=.d) $(STLIBOBJS:.o=.d) $(SPVOBJS:.spv.o=.d)) -- 2.52.0 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
