From fd502f4f5fe8d2f241102ca9a529aa7f88209c22 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sat, 8 Oct 2016 14:18:33 +0000 Subject: build: Generalize yasm/nasm-related variable names None of them are specific to the YASM assembler. (Cherry-picked from libav commit 39e208f4d4756367c7cd2d581847e0c1b8a429c1) Signed-off-by: James Almer --- tests/checkasm/Makefile | 2 +- tests/checkasm/checkasm.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile index 9cff0d538a..73c2b35da7 100644 --- a/tests/checkasm/Makefile +++ b/tests/checkasm/Makefile @@ -36,7 +36,7 @@ CHECKASMOBJS-$(CONFIG_AVUTIL) += $(AVUTILOBJS) CHECKASMOBJS-$(ARCH_AARCH64) += aarch64/checkasm.o CHECKASMOBJS-$(HAVE_ARMV5TE_EXTERNAL) += arm/checkasm.o -CHECKASMOBJS-$(HAVE_YASM) += x86/checkasm.o +CHECKASMOBJS-$(HAVE_X86ASM) += x86/checkasm.o CHECKASMOBJS += $(CHECKASMOBJS-yes) checkasm.o CHECKASMOBJS := $(sort $(CHECKASMOBJS:%=tests/checkasm/%)) diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h index 4a4099dcb4..2093210b42 100644 --- a/tests/checkasm/checkasm.h +++ b/tests/checkasm/checkasm.h @@ -100,7 +100,7 @@ static av_unused void *func_ref, *func_new; /* Call the reference function */ #define call_ref(...) ((func_type *)func_ref)(__VA_ARGS__) -#if ARCH_X86 && HAVE_YASM +#if ARCH_X86 && HAVE_X86ASM /* Verifies that clobbered callee-saved registers are properly saved and restored * and that either no MMX registers are touched or emms is issued */ void checkasm_checked_call(void *func, ...); -- cgit v1.2.3