From patchwork Wed Aug 14 16:06:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 171309 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp1027105ily; Wed, 14 Aug 2019 09:06:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqz99oZjvzLC3rcYjfopM/ToaqZkgHOgw/LFcsEe1ZROBwm/ErwRuXoANNp/a0p0QD4dRAt2 X-Received: by 2002:a17:90a:1c17:: with SMTP id s23mr481995pjs.108.1565798808545; Wed, 14 Aug 2019 09:06:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565798808; cv=none; d=google.com; s=arc-20160816; b=J7t6o+rYuM4gnTA1jjBvH0B4fL2YHqUmw9UtOJ3bhBVqg4RYDE8uXOha4oEAOqx4iO HpRBL0ua5MucKbw+peGHqgxS0k3Hzy8Hq56RCdcUzL6zyRVREBDfJfDsPUClc2h07U0x 044AfMR7xE4HVg8Q2VkP+visele1hQ0ldWqQmUKBWKgovpM4m3jFk+TTd/dUdQvwnVy6 DS86Vb8ePcQedd3t8/q+Dp8lnZbYo/VMz6tFeKpTMISxj2OdJ+DASyi6ow3AMPFEi4KF tr35tdP4uzjXfnwDcxBGTx4UaDqhV5qpHBB48wCW0XJYT7jLbH5N+reWBAnJeLir5PMn I78Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=gRWmtsYFUwXEvYPaQ9AZkEAa91zIEUkH9nocubkMAYU=; b=M6WsQlwqg7o7blHKsz/9o0dBB4exo3sMjaEhM+eW+ZfZ95hzICTJaetTkP1S9sgC+j 5UDl1BiUMqzCXbB9omc4OlKTdmR+9QoGuxGrd7M5urTCbZU+7voSKzc6hfBCvxaTFHuO NuIGfheixiXX6Yu4y8QRlveo9fhVOn/NIen2P9VeXQciEegWNt6kE2ipt9Rn3D57ItFz LZx3fPFXgqJuRpsfZjIjcLtqsqN3fIWdHoQX/bdLBk0hy/wJPZIEINaypOwxQtlG7qIK JgEm7+PKcp2kS9KqGdqitOkO0wG9tr3wFYen3C6WvOtk5AvQ7GgKnnaJxNgAMSnqmXE2 3w2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=nAJ9ybkg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h186si99655pge.110.2019.08.14.09.06.48; Wed, 14 Aug 2019 09:06:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=nAJ9ybkg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728267AbfHNQGr (ORCPT + 28 others); Wed, 14 Aug 2019 12:06:47 -0400 Received: from conuserg-12.nifty.com ([210.131.2.79]:30776 "EHLO conuserg-12.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726047AbfHNQGq (ORCPT ); Wed, 14 Aug 2019 12:06:46 -0400 Received: from grover.flets-west.jp (softbank126125143222.bbtec.net [126.125.143.222]) (authenticated) by conuserg-12.nifty.com with ESMTP id x7EG6O97024737; Thu, 15 Aug 2019 01:06:27 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com x7EG6O97024737 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1565798787; bh=gRWmtsYFUwXEvYPaQ9AZkEAa91zIEUkH9nocubkMAYU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nAJ9ybkgY+C3zCEzj6r2GGRwDO2LVm4pcNEx8uWfBtie9iRwptgDvbLn6WDk7MfOP uBp89VLOTveKi0MZlr3K9ZFBYlJHlKSma/cX/u3pKqFHnyuS4FE/AHSyYURIesMizt 4Bbj+s9iuu0DN/0roA7X8UaaDW/l2wWRqpk/Wmb2QMjv3Ch+awyI78UzBMW0cQtpoO FsxdHWRXYZOR/zJ/tV+SIiN+bb7kXhVQZfCj8nEkNUM0V4XSqXdcuqlTDe9JwiuKxF YX+hqPcjUySmU3+cbw2jZSqQE+G9aa61rxF2reNil+lVvzw4VYvNyreeQYj+o0baHr yFkgUb4OO6moA== X-Nifty-SrcIP: [126.125.143.222] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH 3/3] kbuild: split final module linking out into Makefile.modfinal Date: Thu, 15 Aug 2019 01:06:23 +0900 Message-Id: <20190814160623.24802-3-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190814160623.24802-1-yamada.masahiro@socionext.com> References: <20190814160623.24802-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org I think splitting the modpost and linking modules into separate Makefiles will be useful especially when more complex build steps come in. The main motivation of this patch is to integrate the proposed klp-convert feature cleanly. I moved the logging 'Building modules, stage 2.' to Makefile.modpost to avoid the code duplication although I do not know whether or not this message is needed in the first place. Signed-off-by: Masahiro Yamada --- Makefile | 2 -- scripts/Makefile.modfinal | 60 +++++++++++++++++++++++++++++++ scripts/Makefile.modpost | 76 +++++---------------------------------- 3 files changed, 69 insertions(+), 69 deletions(-) create mode 100644 scripts/Makefile.modfinal -- 2.17.1 diff --git a/Makefile b/Makefile index af808837a1f2..bc55f366677d 100644 --- a/Makefile +++ b/Makefile @@ -1307,7 +1307,6 @@ all: modules PHONY += modules modules: $(if $(KBUILD_BUILTIN),vmlinux) modules.order modules.builtin - @$(kecho) ' Building modules, stage 2.'; $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost $(Q)$(CONFIG_SHELL) $(srctree)/scripts/modules-check.sh @@ -1627,7 +1626,6 @@ $(objtree)/Module.symvers: build-dirs := $(KBUILD_EXTMOD) PHONY += modules modules: descend $(objtree)/Module.symvers - @$(kecho) ' Building modules, stage 2.'; $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost PHONY += modules_install diff --git a/scripts/Makefile.modfinal b/scripts/Makefile.modfinal new file mode 100644 index 000000000000..2e49d536a9b3 --- /dev/null +++ b/scripts/Makefile.modfinal @@ -0,0 +1,60 @@ +# SPDX-License-Identifier: GPL-2.0-only +# =========================================================================== +# Module final link +# =========================================================================== + +PHONY := __modfinal +__modfinal: + +include scripts/Kbuild.include + +# for c_flags +include scripts/Makefile.lib + +# find all modules listed in modules.order +modules := $(sort $(shell cat $(MODORDER))) + +__modfinal: $(modules) + @: + +# modname is set to make c_flags define KBUILD_MODNAME +modname = $(notdir $(@:.mod.o=)) + +quiet_cmd_cc_o_c = CC [M] $@ + cmd_cc_o_c = $(CC) $(c_flags) $(KBUILD_CFLAGS_MODULE) $(CFLAGS_MODULE) \ + -c -o $@ $< + +%.mod.o: %.mod.c FORCE + $(call if_changed_dep,cc_o_c) + +ARCH_POSTLINK := $(wildcard $(srctree)/arch/$(SRCARCH)/Makefile.postlink) + +quiet_cmd_ld_ko_o = LD [M] $@ + cmd_ld_ko_o = \ + $(LD) -r $(KBUILD_LDFLAGS) \ + $(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE) \ + $(addprefix -T , $(KBUILD_LDS_MODULE)) \ + -o $@ $(filter %.o, $^); \ + $(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true) + +$(modules): %.ko: %.o %.mod.o $(KBUILD_LDS_MODULE) FORCE + +$(call if_changed,ld_ko_o) + +targets += $(modules) $(modules:.ko=.mod.o) + +# Add FORCE to the prequisites of a target to force it to be always rebuilt. +# --------------------------------------------------------------------------- + +PHONY += FORCE +FORCE: + +# Read all saved command lines and dependencies for the $(targets) we +# may be building above, using $(if_changed{,_dep}). As an +# optimization, we don't need to read them if the target does not +# exist, we will rebuild anyway in that case. + +existing-targets := $(wildcard $(sort $(targets))) + +-include $(foreach f,$(existing-targets),$(dir $(f)).$(notdir $(f)).cmd) + +.PHONY: $(PHONY) diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost index 905db30d6622..673f68e5f15d 100644 --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost @@ -15,8 +15,6 @@ # 2) modpost is then used to # 3) create one .mod.c file pr. module # 4) create one Module.symvers file with CRC for all exported symbols -# 5) compile all .mod.c files -# 6) final link of the module to a file # Step 3 is used to place certain information in the module's ELF # section, including information such as: @@ -60,13 +58,10 @@ MODPOST = scripts/mod/modpost \ ifdef MODPOST_VMLINUX -__modpost: vmlinux.o +quiet_cmd_modpost = MODPOST vmlinux.o + cmd_modpost = $(MODPOST) vmlinux.o -quiet_cmd_modpost = MODPOST $@ - cmd_modpost = $(MODPOST) $@ - -PHONY += vmlinux.o -vmlinux.o: +__modpost: $(call cmd,modpost) else @@ -83,74 +78,21 @@ include $(if $(wildcard $(KBUILD_EXTMOD)/Kbuild), \ $(KBUILD_EXTMOD)/Kbuild, $(KBUILD_EXTMOD)/Makefile) endif -include scripts/Makefile.lib +MODPOST += $(subst -i,-n,$(filter -i,$(MAKEFLAGS))) -s -T - $(wildcard vmlinux) # find all modules listed in modules.order modules := $(sort $(shell cat $(MODORDER))) -# Stop after building .o files if NOFINAL is set. Makes compile tests quicker -__modpost: $(if $(KBUILD_MODPOST_NOFINAL), $(modules:.ko:.o),$(modules)) - @: - -MODPOST += $(subst -i,-n,$(filter -i,$(MAKEFLAGS))) -s -T - $(wildcard vmlinux) - # We can go over command line length here, so be careful. quiet_cmd_modpost = MODPOST $(words $(modules)) modules cmd_modpost = sed 's/ko$$/o/' $(MODORDER) | $(MODPOST) -PHONY += modules-modpost -modules-modpost: +__modpost: + @$(kecho) ' Building modules, stage 2.' $(call cmd,modpost) - -# Declare generated files as targets for modpost -$(modules:.ko=.mod.c): modules-modpost - -# Step 5), compile all *.mod.c files - -# modname is set to make c_flags define KBUILD_MODNAME -modname = $(notdir $(@:.mod.o=)) - -quiet_cmd_cc_o_c = CC [M] $@ - cmd_cc_o_c = $(CC) $(c_flags) $(KBUILD_CFLAGS_MODULE) $(CFLAGS_MODULE) \ - -c -o $@ $< - -$(modules:.ko=.mod.o): %.mod.o: %.mod.c FORCE - $(call if_changed_dep,cc_o_c) - -targets += $(modules:.ko=.mod.o) - -ARCH_POSTLINK := $(wildcard $(srctree)/arch/$(SRCARCH)/Makefile.postlink) - -# Step 6), final link of the modules with optional arch pass after final link -quiet_cmd_ld_ko_o = LD [M] $@ - cmd_ld_ko_o = \ - $(LD) -r $(KBUILD_LDFLAGS) \ - $(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE) \ - $(addprefix -T , $(KBUILD_LDS_MODULE)) \ - -o $@ $(filter %.o, $^); \ - $(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true) - -$(modules): %.ko :%.o %.mod.o $(KBUILD_LDS_MODULE) FORCE - +$(call if_changed,ld_ko_o) - -targets += $(modules) - - -# Add FORCE to the prequisites of a target to force it to be always rebuilt. -# --------------------------------------------------------------------------- - -PHONY += FORCE - -FORCE: - -# Read all saved command lines and dependencies for the $(targets) we -# may be building above, using $(if_changed{,_dep}). As an -# optimization, we don't need to read them if the target does not -# exist, we will rebuild anyway in that case. - -existing-targets := $(wildcard $(sort $(targets))) - --include $(foreach f,$(existing-targets),$(dir $(f)).$(notdir $(f)).cmd) +ifneq ($(KBUILD_MODPOST_NOFINAL),1) + $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modfinal +endif endif