sysutils/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-10-24 02:09:03 +03:00
Code Activity

checkasm: Fix building for macos/aarch64

Browse Source 
Commit 74705b3970 changed to only
compile some of the checkasm source files when they are expected
to be non-empty, but the condition for when perf/macos_kperf.c
is needed is wrong, breaking building checkasm in default macos
aarch64 configurations.

Checkasm decides whether to enable the macos kperf codepaths on
its own, irrespective of ffmpeg's configure's --enable-macos-kperf
(which defaults to disabled) - see the end of checkasm's
src/perf_internal.h for the condition:

    #if defined(__APPLE__) && ARCH_AARCH64
      /* This only depends on <dlfcn.h>, and isn't needed on other architectures. */
      #define HAVE_MACOS_KPERF 1
    #else
      #define HAVE_MACOS_KPERF 0
    #endif

To approximate this, build macos_kperf.c for any aarch64 target.
For non-macOS cases, perf_internal.h defines inline functions in
most aarch64 build configurations, so we don't end up with an
empty translation unit in any case.
This commit is contained in:
Martin Storsjö
2026-08-25 10:01:31 +02:00
parent 007cd1fd43
commit 3d5534d271
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/checkasm/Makefile
View File

@@ -115,7 +115,7 @@ EXT_CHECKASMOBJS-$(ARCH_ARM) += ext/src/arm/checkasm_32.o \
ext/src/arm/cpu.o ext/src/perf/arm.o
EXT_CHECKASMOBJS-$(ARCH_LOONGARCH) += ext/src/loongarch/checkasm.o
EXT_CHECKASMOBJS-$(CONFIG_LINUX_PERF) += ext/src/perf/linux.o
EXT_CHECKASMOBJS-$(CONFIG_MACOS_KPERF) += ext/src/perf/macos_kperf.o
EXT_CHECKASMOBJS-$(ARCH_AARCH64) += ext/src/perf/macos_kperf.o
EXT_CHECKASMOBJS-$(HAVE_RV) += ext/src/riscv/callcheck.o
EXT_CHECKASMOBJS-$(ARCH_RISCV) += ext/src/riscv/cpu.o
EXT_CHECKASMOBJS-$(HAVE_X86ASM) += ext/src/x86/checkasm.o