Align with the need-builtin implementation. I also added need-modorder=1 to scripts/link-vmlinux.sh to make it more future-proof; currently, we have no module in the init/ directory, but if we had a one, scripts/Makefile.build would show a false positive warning.
Signed-off-by: Masahiro Yamada <[email protected]> --- Changes in v2: - do not show orphan obj-m warning unless you are building modules scripts/Makefile.build | 16 ++++++++-------- scripts/Makefile.lib | 2 ++ scripts/link-vmlinux.sh | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/scripts/Makefile.build b/scripts/Makefile.build index aab9a14fa78d..3b04ff23deb1 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -56,12 +56,10 @@ PHONY += __warn-orphan-obj-y __warn-orphan-obj-y: @echo "warning: $(patsubst %,'%',$(real-obj-y)) will not be linked to vmlinux even though obj-y is specified." >&2 -ifeq ($(need-modorder),) -ifneq ($(obj-m),) -$(warning $(patsubst %.o,'%.ko',$(obj-m)) will not be built even though obj-m is specified.) -$(warning You cannot use subdir-y/m to visit a module Makefile. Use obj-y/m instead.) -endif -endif +PHONY += __warn-orphan-obj-m +__warn-orphan-obj-m: + @echo "warning: $(patsubst %.o,'%.ko',$(obj-m)) will not be built even though obj-m is specified." >&2 + @echo "warning: You cannot use subdir-y/m to visit a module Makefile. Use obj-y/m instead." >&2 # =========================================================================== @@ -78,6 +76,8 @@ endif ifdef need-modorder modorder-target := $(obj)/modules.order +else ifneq ($(obj-m),) +modorder-target := __warn-orphan-obj-m endif mod-targets := $(patsubst %.o, %.mod, $(obj-m)) @@ -406,7 +406,7 @@ targets += $(obj)/built-in.a # # Create commands to either record .ko file or cat modules.order from # a subdirectory -$(modorder-target): $(subdir-ym) FORCE +$(obj)/modules.order: $(subdir-ym) FORCE $(Q){ $(foreach m, $(modorder), \ $(if $(filter %/modules.order, $m), cat $m, echo $m);) :; } \ | $(AWK) '!x[$$0]++' - > $@ @@ -513,7 +513,7 @@ $(subdir-ym): $(Q)$(MAKE) $(build)=$@ \ $(if $(filter $@/, $(KBUILD_SINGLE_TARGETS)),single-build=) \ need-builtin=$(if $(filter $@/built-in.a, $(subdir-obj-y)),1) \ - need-modorder=$(if $(need-modorder),$(if $(filter $@/modules.order, $(modorder)),1)) + need-modorder=$(if $(filter $@/modules.order, $(modorder)),1) # Add FORCE to the prequisites of a target to force it to be always rebuilt. # --------------------------------------------------------------------------- diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 26ac638525cb..23e524027740 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -23,7 +23,9 @@ lib-y := $(filter-out $(obj-y), $(sort $(lib-y) $(lib-m))) # Determine modorder. # Unfortunately, we don't have information about ordering between -y # and -m subdirs. Just put -y's first. +ifdef need-modorder modorder := $(patsubst %/,%/modules.order, $(filter %/, $(obj-y)) $(obj-m:.o=.ko)) +endif # Handle objects in subdirs # --------------------------------------------------------------------------- diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index 8961d999b86b..d9edfba54d84 100755 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh @@ -216,7 +216,7 @@ else fi; # final build of init/ -${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init need-builtin=1 +${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init need-builtin=1 need-modorder=1 #link vmlinux.o info LD vmlinux.o -- 2.17.1
