Commit 7fbf8315 authored by Hendrik Brueckner's avatar Hendrik Brueckner Committed by Martin Schwidefsky
Browse files

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: default avatarHendrik Brueckner <brueckner@linux.vnet.ibm.com>
Acked-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 4381f9f1

arch/s390/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -138,8 +138,7 @@ archheaders: 


archprepare:

	$(Q)$(MAKE) $(build)=$(syscalls) kapi

	$(Q)$(MAKE) $(build)=$(tools) include/generated/facilities.h

	$(Q)$(MAKE) $(build)=$(tools) include/generated/dis.h

	$(Q)$(MAKE) $(build)=$(tools) kapi



# Don't use tabs in echo arguments

define archhelp

arch/s390/include/asm/Kbuild

+2 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

generated-y += dis-defs.h

generated-y += facility-defs.h

generated-y += syscall_table.h

generated-y += unistd_nr.h

arch/s390/include/asm/dis.h

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#ifndef __ASM_S390_DIS_H__

#define __ASM_S390_DIS_H__



#include <generated/dis.h>

#include <asm/dis-defs.h>



static inline int insn_length(unsigned char code)

{

arch/s390/include/asm/facility.h

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#ifndef __ASM_FACILITY_H

#define __ASM_FACILITY_H



#include <generated/facilities.h>

#include <asm/facility-defs.h>

#include <linux/string.h>

#include <linux/preempt.h>

#include <asm/lowcore.h>

arch/s390/tools/Makefile

+17 −6
Original line number Diff line number Diff line
@@ -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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE