From 7fbf8315fb7fc7321919e6c880d70077aded515e Mon Sep 17 00:00:00 2001 From: Hendrik Brueckner Date: Thu, 11 Jan 2018 12:13:18 +0100 Subject: s390/tools: generate header files in arch/s390/include/generated/ Previously, the generated dis.h and facilities.h header files have been stored in include/generated. Because they are s390 specific, store them in the arch/s390/include/generated/asm/ directory. Also update references to the header files respectively. To prevent name collisions with those header files in asm/ that include the generated ones, rename the generated headers files and add an -defs suffix. Also update the generators to create the ifdef guards respectively. Signed-off-by: Hendrik Brueckner Acked-by: Heiko Carstens Signed-off-by: Martin Schwidefsky --- arch/s390/tools/Makefile | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'arch/s390/tools/Makefile') diff --git a/arch/s390/tools/Makefile b/arch/s390/tools/Makefile index 2e70e25de07a..48cdac1143a9 100644 --- a/arch/s390/tools/Makefile +++ b/arch/s390/tools/Makefile @@ -3,22 +3,33 @@ # Makefile for s390 specific build tools # +kapi := arch/$(ARCH)/include/generated/asm +kapi-hdrs-y := $(kapi)/facility-defs.h $(kapi)/dis-defs.h + +targets += $(addprefix ../../../,$(kapi-hdrs-y)) +PHONY += kapi + +kapi: $(kapi-hdrs-y) + hostprogs-y += gen_facilities hostprogs-y += gen_opcode_table HOSTCFLAGS_gen_facilities.o += -Wall $(LINUXINCLUDE) HOSTCFLAGS_gen_opcode_table.o += -Wall $(LINUXINCLUDE) -define filechk_facilities.h +# Ensure output directory exists +_dummy := $(shell [ -d '$(kapi)' ] || mkdir -p '$(kapi)') + +define filechk_facility-defs.h $(obj)/gen_facilities endef -define filechk_dis.h +define filechk_dis-defs.h ( $(obj)/gen_opcode_table < $(srctree)/arch/$(ARCH)/tools/opcodes.txt ) endef -include/generated/facilities.h: $(obj)/gen_facilities FORCE - $(call filechk,facilities.h) +$(kapi)/facility-defs.h: $(obj)/gen_facilities FORCE + $(call filechk,facility-defs.h) -include/generated/dis.h: $(obj)/gen_opcode_table FORCE - $(call filechk,dis.h) +$(kapi)/dis-defs.h: $(obj)/gen_opcode_table FORCE + $(call filechk,dis-defs.h) -- cgit v1.2.3