Commit 9697d84c authored by Oliver Upton's avatar Oliver Upton
Browse files

KVM: selftests: Generate sysreg-defs.h and add to include path 



Start generating sysreg-defs.h for arm64 builds in anticipation of
updating sysreg.h to a version that depends on it.

Reviewed-by: default avatarMark Brown <broonie@kernel.org>
Reviewed-by: default avatarEric Auger <eric.auger@redhat.com>
Tested-by: default avatarEric Auger <eric.auger@redhat.com>
Acked-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20231011195740.3349631-4-oliver.upton@linux.dev


Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
parent e2bdd172

tools/testing/selftests/kvm/Makefile

+20 −3
Original line number Diff line number Diff line
@@ -17,6 +17,17 @@ else 
	ARCH_DIR := $(ARCH)

endif



ifeq ($(ARCH),arm64)

arm64_tools_dir := $(top_srcdir)/tools/arch/arm64/tools/

GEN_HDRS := $(top_srcdir)/tools/arch/arm64/include/generated/

CFLAGS += -I$(GEN_HDRS)



prepare:

	$(MAKE) -C $(arm64_tools_dir)

else

prepare:

endif



LIBKVM += lib/assert.c

LIBKVM += lib/elf.c

LIBKVM += lib/guest_modes.c
@@ -256,13 +267,18 @@ $(TEST_GEN_OBJ): $(OUTPUT)/%.o: %.c 
$(SPLIT_TESTS_TARGETS): %: %.o $(SPLIT_TESTS_OBJS)

	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@



EXTRA_CLEAN += $(LIBKVM_OBJS) $(TEST_DEP_FILES) $(TEST_GEN_OBJ) $(SPLIT_TESTS_OBJS) cscope.*

EXTRA_CLEAN += $(GEN_HDRS) \

	       $(LIBKVM_OBJS) \

	       $(SPLIT_TESTS_OBJS) \

	       $(TEST_DEP_FILES) \

	       $(TEST_GEN_OBJ) \

	       cscope.*



x := $(shell mkdir -p $(sort $(dir $(LIBKVM_C_OBJ) $(LIBKVM_S_OBJ))))

$(LIBKVM_C_OBJ): $(OUTPUT)/%.o: %.c

$(LIBKVM_C_OBJ): $(OUTPUT)/%.o: %.c prepare

	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@



$(LIBKVM_S_OBJ): $(OUTPUT)/%.o: %.S

$(LIBKVM_S_OBJ): $(OUTPUT)/%.o: %.S prepare

	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@



# Compile the string overrides as freestanding to prevent the compiler from
@@ -274,6 +290,7 @@ $(LIBKVM_STRING_OBJ): $(OUTPUT)/%.o: %.c 
x := $(shell mkdir -p $(sort $(dir $(TEST_GEN_PROGS))))

$(TEST_GEN_PROGS): $(LIBKVM_OBJS)

$(TEST_GEN_PROGS_EXTENDED): $(LIBKVM_OBJS)

$(TEST_GEN_OBJ): prepare



cscope: include_paths = $(LINUX_TOOL_INCLUDE) $(LINUX_HDR_PATH) include lib ..

cscope: