From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5C662C433E0 for ; Sun, 17 May 2020 09:51:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 36DC320671 for ; Sun, 17 May 2020 09:51:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589709073; bh=RF+hFuL3YwXZLBLPwtTxnHK/TvfkxaKkPpgx3op/R7M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=r6c6oKZ7fEyMltAbqG3pDsBMoQO7iCdwSLeFlFYhywgpHl8J4LZR/sgA8Tra/RfGo xKr+K+hwa1tK36x9wE3I+0tA27QTNTaXUW/qN4B+PHPqlkyjxgE7T+iBj09h+VdGUq jnNzPkUyEkI6NV3nW+3IhbbTyVV4IckJRRfoFFAU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728296AbgEQJvM (ORCPT ); Sun, 17 May 2020 05:51:12 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:38298 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727113AbgEQJtf (ORCPT ); Sun, 17 May 2020 05:49:35 -0400 Received: from oscar.flets-west.jp (softbank126090202047.bbtec.net [126.90.202.47]) (authenticated) by conuserg-08.nifty.com with ESMTP id 04H9n4L9018560; Sun, 17 May 2020 18:49:12 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com 04H9n4L9018560 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1589708952; bh=fKQ2suNbonPmMpy+xo1CkibGOmskSnkybnUC1ujH2W0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OHlez3+wyMKPlWr+X8K+9UOvN4ATUr1THtxYvbI9jU3dZO8plShQFKy9Onx5uvBJj vKA2YbzH7iPwEZrs5hjG/WQHOgAOL5yS++JNk1KKRaezmtffCJZqAumw3H6wSeEKby 2Sfqr/DG5vRgNJSDKPauYNXttGjQbUOxFZU1ZUFwu+iy8xmNJuoPpTuVGa2LF4DDhL y5zizcg8aTTJitesUGn4O5gl5RnHnwtV41y3d/qylfwiLdIp2fKKYvAdO+qThe4vG5 tktYnGiH+IDZmCPNtwDE4+4XZLp3Exrlhujr5+JA5R5k4DAIt0GZbXg426pdMHbxRL Yxd/isp9zdDIg== X-Nifty-SrcIP: [126.90.202.47] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Jessica Yu , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH 12/29] modpost: move external module options Date: Sun, 17 May 2020 18:48:42 +0900 Message-Id: <20200517094859.2376211-13-masahiroy@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200517094859.2376211-1-masahiroy@kernel.org> References: <20200517094859.2376211-1-masahiroy@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Separate out the external-only code for readability. Signed-off-by: Masahiro Yamada --- scripts/Makefile.modpost | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost index bc5561aedb24..8321068abb31 100644 --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost @@ -44,14 +44,11 @@ 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),$(addprefix -e ,$(KBUILD_EXTRA_SYMBOLS))) \ - $(if $(KBUILD_EXTMOD),-o $(modulesymfile)) \ + $(if $(KBUILD_EXTMOD),,-o $(kernelsymfile)) \ $(if $(CONFIG_SECTION_MISMATCH_WARN_ONLY),,-E) \ $(if $(KBUILD_MODPOST_WARN),-w) @@ -81,6 +78,13 @@ src := $(obj) # Include the module's Makefile to find KBUILD_EXTRA_SYMBOLS include $(if $(wildcard $(KBUILD_EXTMOD)/Kbuild), \ $(KBUILD_EXTMOD)/Kbuild, $(KBUILD_EXTMOD)/Makefile) + +# modpost options for external modules +MODPOST += \ + -i Module.symvers \ + $(addprefix -e ,$(KBUILD_EXTRA_SYMBOLS)) \ + -o $(KBUILD_EXTMOD)/Module.symvers + endif # find all modules listed in modules.order -- 2.25.1