iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kbuild: refactor Makefile.asm-generic

Browse Source 
- Use conventional $(MAKE) $(asm-generic)=<dir> style
   for directory descending

 - Remove unneeded FORCE since "all" is a phony target

 - Remove unneeded "_dummy :=" assignment

 - Skip $(shell mkdir ...) when headers exist in the directory

 - Misc cleanups

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
This commit is contained in:
Masahiro Yamada 2018-12-05 20:28:04 +09:00
parent c7fe060885
commit 7d0e5c2056
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -1119,13 +1119,13 @@ prepare0: archprepare
prepare: prepare0 prepare-objtool prepare: prepare0 prepare-objtool
# Support for using generic headers in asm-generic # Support for using generic headers in asm-generic
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) -f $(srctree)/scripts/Makefile.asm-generic \ $(Q)$(MAKE) $(asm-generic)=arch/$(SRCARCH)/include/generated/asm
src=asm obj=arch/$(SRCARCH)/include/generated/asm
uapi-asm-generic: uapi-asm-generic:
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \ $(Q)$(MAKE) $(asm-generic)=arch/$(SRCARCH)/include/generated/uapi/asm
src=uapi/asm obj=arch/$(SRCARCH)/include/generated/uapi/asm
PHONY += prepare-objtool PHONY += prepare-objtool
prepare-objtool: $(objtool_target) prepare-objtool: $(objtool_target)

35
scripts/Makefile.asm-generic
View File

@ -2,41 +2,42 @@
# include/asm-generic contains a lot of files that are used # include/asm-generic contains a lot of files that are used
# verbatim by several architectures. # verbatim by several architectures.
# #
# This Makefile reads the file arch/$(SRCARCH)/include/$(src)/Kbuild # This Makefile reads the file arch/$(SRCARCH)/include/(uapi/)/asm/Kbuild
# and for each file listed in this file with generic-y creates # and for each file listed in this file with generic-y creates
# a small wrapper file in $(obj) (arch/$(SRCARCH)/include/generated/$(src)) # a small wrapper file in arch/$(SRCARCH)/include/generated/(uapi/)/asm.
PHONY := all PHONY := all
all: all:
kbuild-file := $(srctree)/arch/$(SRCARCH)/include/$(src)/Kbuild src := $(subst /generated,,$(obj))
-include $(kbuild-file) -include $(src)/Kbuild
include scripts/Kbuild.include include scripts/Kbuild.include
# Create output directory if not already present generic-y := $(addprefix $(obj)/, $(generic-y))
_dummy := $(shell [ -d $(obj) ] || mkdir -p $(obj)) generated-y := $(addprefix $(obj)/, $(generated-y))
# Stale wrappers when the corresponding files are removed from generic-y # Remove stale wrappers when the corresponding files are removed from generic-y
# need removing.
generated-y := $(generic-y) $(generated-y)
all-files := $(patsubst %, $(obj)/%, $(generated-y))
old-headers := $(wildcard $(obj)/*.h) old-headers := $(wildcard $(obj)/*.h)
unwanted := $(filter-out $(all-files),$(old-headers)) unwanted := $(filter-out $(generic-y) $(generated-y),$(old-headers))
quiet_cmd_wrap = WRAP $@ quiet_cmd_wrap = WRAP $@
cmd_wrap = echo "\#include <asm-generic/$*.h>" >$@ cmd_wrap = echo "\#include <asm-generic/$*.h>" > $@
quiet_cmd_remove = REMOVE $(unwanted) quiet_cmd_remove = REMOVE $(unwanted)
cmd_remove = rm -f $(unwanted) cmd_remove = rm -f $(unwanted)
all: $(patsubst %, $(obj)/%, $(generic-y)) FORCE all: $(generic-y)
$(if $(unwanted),$(call cmd,remove),) $(if $(unwanted),$(call cmd,remove))
@: @:
$(obj)/%.h: $(obj)/%.h:
$(call cmd,wrap) $(call cmd,wrap)
PHONY += FORCE # Create output directory. Skip it if at least one old header exists
# since we know the output directory already exists.
ifeq ($(old-headers),)
$(shell mkdir -p $(obj))
endif
.PHONY: $(PHONY) .PHONY: $(PHONY)
FORCE: ;