Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80f09cf5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 build updates from Ingo Molnar:
 "A build system fix and a cleanup"

* 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  kbuild: Remove stale asm-generic wrappers
  kbuild, x86: Track generated headers with generated-y
parents 77cd3d0c cda2c65f

Documentation/kbuild/makefiles.txt

+14 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ This document describes the Linux kernel Makefiles. 
		--- 7.2 genhdr-y

		--- 7.3 destination-y

		--- 7.4 generic-y

		--- 7.5 generated-y



	=== 8 Kbuild Variables

	=== 9 Makefile language
@@ -1319,6 +1320,19 @@ See subsequent chapter for the syntax of the Kbuild file. 
		Example: termios.h

			#include <asm-generic/termios.h>



	--- 7.5 generated-y



	If an architecture generates other header files alongside generic-y

	wrappers, and not included in genhdr-y, then generated-y specifies

	them.



	This prevents them being treated as stale asm-generic wrappers and

	removed.



		Example:

			#arch/x86/include/asm/Kbuild

			generated-y += syscalls_32.h



=== 8 Kbuild Variables



The top Makefile exports the following variables:

arch/x86/include/asm/Kbuild

+6 −0
Original line number Diff line number Diff line 




generated-y += syscalls_32.h

generated-y += syscalls_64.h

generated-y += unistd_32_ia32.h

generated-y += unistd_64_x32.h

generated-y += xen-hypercalls.h



genhdr-y += unistd_32.h

genhdr-y += unistd_64.h

genhdr-y += unistd_x32.h

scripts/Makefile.asm-generic

+16 −1
Original line number Diff line number Diff line
@@ -13,11 +13,26 @@ include scripts/Kbuild.include 
# Create output directory if not already present

_dummy := $(shell [ -d $(obj) ] || mkdir -p $(obj))



# Stale wrappers when the corresponding files are removed from generic-y

# need removing.

generated-y   := $(generic-y) $(genhdr-y) $(generated-y)

all-files     := $(patsubst %, $(obj)/%, $(generated-y))

old-headers   := $(wildcard $(obj)/*.h)

unwanted      := $(filter-out $(all-files),$(old-headers))



quiet_cmd_wrap = WRAP    $@

cmd_wrap = echo "\#include <asm-generic/$*.h>" >$@



all: $(patsubst %, $(obj)/%, $(generic-y))

quiet_cmd_remove = REMOVE  $(unwanted)

cmd_remove = rm -f $(unwanted)



all: $(patsubst %, $(obj)/%, $(generic-y)) FORCE

	$(if $(unwanted),$(call cmd,remove),)

	@:



$(obj)/%.h:

	$(call cmd,wrap)



PHONY += FORCE

.PHONY: $(PHONY)

FORCE: ;