summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2020-06-01 08:57:09 +0300
committerMasahiro Yamada <masahiroy@kernel.org>2020-06-06 17:38:12 +0300
commitbcfedae7d92886597e581ec32dfbf698cbccb4a1 (patch)
treece60c4e9f31f75147a65736e4b397c60b2ef335b
parente3fb4df7fe4e8636de32a1e4ff5ebc75257f5570 (diff)
downloadlinux-bcfedae7d92886597e581ec32dfbf698cbccb4a1.tar.xz
modpost: print symbol dump file as the build target in short log
The symbol dump *.symvers is the output of modpost. Print it in the short log. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
-rw-r--r--scripts/Makefile.modpost33
1 files changed, 20 insertions, 13 deletions
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index 4d79afe997ad..e766e134b0f3 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -44,25 +44,26 @@ include include/config/auto.conf
include scripts/Kbuild.include
kernelsymfile := $(objtree)/Module.symvers
-modulesymfile := $(KBUILD_EXTMOD)/Module.symvers
MODPOST = scripts/mod/modpost \
$(if $(CONFIG_MODVERSIONS),-m) \
$(if $(CONFIG_MODULE_SRCVERSION_ALL),-a) \
- $(if $(KBUILD_EXTMOD),-i,-o) $(kernelsymfile) \
+ $(if $(KBUILD_EXTMOD),-i $(kernelsymfile)) \
$(if $(KBUILD_EXTMOD),$(addprefix -i ,$(KBUILD_EXTRA_SYMBOLS))) \
- $(if $(KBUILD_EXTMOD),-o $(modulesymfile)) \
$(if $(CONFIG_SECTION_MISMATCH_WARN_ONLY),,-E) \
- $(if $(KBUILD_MODPOST_WARN),-w)
+ $(if $(KBUILD_MODPOST_WARN),-w) \
+ -o $@
ifdef MODPOST_VMLINUX
-quiet_cmd_modpost = MODPOST vmlinux.o
- cmd_modpost = $(MODPOST) vmlinux.o
+quiet_cmd_modpost = MODPOST $@
+ cmd_modpost = $(MODPOST) $<
-__modpost:
+Module.symvers: vmlinux.o
$(call cmd,modpost)
+__modpost: Module.symvers
+
else
MODPOST += -s \
@@ -70,6 +71,8 @@ MODPOST += -s \
ifeq ($(KBUILD_EXTMOD),)
MODPOST += $(wildcard vmlinux)
+output-symdump := Module.symvers
+
else
# set src + obj - they may be used in the modules's Makefile
@@ -83,6 +86,8 @@ include $(if $(wildcard $(KBUILD_EXTMOD)/Kbuild), \
# modpost option for external modules
MODPOST += -e
+output-symdump := $(KBUILD_EXTMOD)/Module.symvers
+
endif
# modpost options for modules (both in-kernel and external)
@@ -94,20 +99,22 @@ ifneq ($(findstring i,$(filter-out --%,$(MAKEFLAGS))),)
MODPOST += -n
endif
-# find all modules listed in modules.order
-modules := $(sort $(shell cat $(MODORDER)))
-
-# Read out modules.order instead of expanding $(modules) to pass in modpost.
+# Read out modules.order to pass in modpost.
# Otherwise, allmodconfig would fail with "Argument list too long".
-quiet_cmd_modpost = MODPOST $(words $(modules)) modules
+quiet_cmd_modpost = MODPOST $@
cmd_modpost = sed 's/ko$$/o/' $(MODORDER) | $(MODPOST) -T -
-__modpost:
+$(output-symdump): FORCE
$(call cmd,modpost)
+
+__modpost: $(output-symdump)
ifneq ($(KBUILD_MODPOST_NOFINAL),1)
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modfinal
endif
+PHONY += FORCE
+FORCE:
+
endif
.PHONY: $(PHONY)