Commit 037fc336 authored Mar 17, 2019 by Masahiro Yamada

kbuild: force all architectures except um to include mandatory-y



Currently, every arch/*/include/uapi/asm/Kbuild explicitly includes
the common Kbuild.asm file. Factor out the duplicated include directives
to scripts/Makefile.asm-generic so that no architecture would opt out
of the mandatory-y mechanism.

um is not forced to include mandatory-y since it is a very exceptional
case which does not support UAPI.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

parent 7cbbbb8b

Documentation/kbuild/makefiles.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1274,7 +1274,7 @@ See subsequent chapter for the syntax of the Kbuild file.

	--- 7.4 mandatory-y		--- 7.4 mandatory-y

	mandatory-y is essentially used by include/(uapi/)asm-generic/Kbuild.asm		mandatory-y is essentially used by include/(uapi/)asm-generic/Kbuild
	to define the minimum set of ASM headers that all architectures must have.		to define the minimum set of ASM headers that all architectures must have.

	This works like optional generic-y. If a mandatory header is missing		This works like optional generic-y. If a mandatory header is missing

Makefile

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1098,9 +1098,11 @@ asm-generic := -f $(srctree)/scripts/Makefile.asm-generic obj

	PHONY += asm-generic uapi-asm-generic		PHONY += asm-generic uapi-asm-generic
	asm-generic: uapi-asm-generic		asm-generic: uapi-asm-generic
	$(Q)$(MAKE) $(asm-generic)=arch/$(SRCARCH)/include/generated/asm		$(Q)$(MAKE) $(asm-generic)=arch/$(SRCARCH)/include/generated/asm \
			generic=include/asm-generic
	uapi-asm-generic:		uapi-asm-generic:
	$(Q)$(MAKE) $(asm-generic)=arch/$(SRCARCH)/include/generated/uapi/asm		$(Q)$(MAKE) $(asm-generic)=arch/$(SRCARCH)/include/generated/uapi/asm \
			generic=include/uapi/asm-generic

	PHONY += prepare-objtool		PHONY += prepare-objtool
	prepare-objtool: $(objtool_target)		prepare-objtool: $(objtool_target)

arch/alpha/include/uapi/asm/Kbuild

+0 −2

Original line number	Original line	Diff line number	Diff line
	include include/uapi/asm-generic/Kbuild.asm

	generated-y += unistd_32.h		generated-y += unistd_32.h

arch/arc/include/uapi/asm/Kbuild

+0 −2

Original line number	Original line	Diff line number	Diff line
	include include/uapi/asm-generic/Kbuild.asm

	generic-y += kvm_para.h		generic-y += kvm_para.h
	generic-y += ucontext.h		generic-y += ucontext.h

arch/arm/include/uapi/asm/Kbuild

+0 −1

Original line number	Original line	Diff line number	Diff line
	# SPDX-License-Identifier: GPL-2.0		# SPDX-License-Identifier: GPL-2.0
	include include/uapi/asm-generic/Kbuild.asm

	generated-y += unistd-common.h		generated-y += unistd-common.h
	generated-y += unistd-oabi.h		generated-y += unistd-oabi.h