From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.kundenserver.de ([212.227.126.135]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nmhxG-0007yV-62 for linux-um@lists.infradead.org; Thu, 05 May 2022 20:20:14 +0000 Date: Thu, 5 May 2022 22:19:42 +0200 From: Nicolas Schier Subject: Re: [PATCH v3 09/15] kbuild: stop merging *.symversions Message-ID: References: <20220505072244.1155033-1-masahiroy@kernel.org> <20220505072244.1155033-10-masahiroy@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220505072244.1155033-10-masahiroy@kernel.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-um" Errors-To: linux-um-bounces+geert=linux-m68k.org@lists.infradead.org To: Masahiro Yamada Cc: linux-kbuild@vger.kernel.org, clang-built-linux@googlegroups.com, linux-kernel@vger.kernel.org, Ard Biesheuvel , Luis Chamberlain , Peter Zijlstra , linuxppc-dev@lists.ozlabs.org, linux-um@lists.infradead.org, linux-s390@vger.kernel.org, Nick Desaulniers , Sami Tolvanen , Kees Cook On Thu, May 05, 2022 at 04:22:38PM +0900 Masahiro Yamada wrote: > Now modpost reads symbol versions from .*.cmd files. > > These merged *.symversions are not used any more. > > Signed-off-by: Masahiro Yamada > --- > > (no changes since v1) > > scripts/Makefile.build | 21 ++------------------- > scripts/link-vmlinux.sh | 15 --------------- > 2 files changed, 2 insertions(+), 34 deletions(-) > > diff --git a/scripts/Makefile.build b/scripts/Makefile.build > index ddd9080fc028..dff9220135c4 100644 > --- a/scripts/Makefile.build > +++ b/scripts/Makefile.build > @@ -390,17 +390,6 @@ $(obj)/%.asn1.c $(obj)/%.asn1.h: $(src)/%.asn1 $(objtree)/scripts/asn1_compiler > $(subdir-builtin): $(obj)/%/built-in.a: $(obj)/% ; > $(subdir-modorder): $(obj)/%/modules.order: $(obj)/% ; > > -# combine symversions for later processing > -ifeq ($(CONFIG_LTO_CLANG) $(CONFIG_MODVERSIONS),y y) > - cmd_update_lto_symversions = \ > - rm -f $@.symversions \ > - $(foreach n, $(filter-out FORCE,$^), \ > - $(if $(shell test -s $(n).symversions && echo y), \ > - ; cat $(n).symversions >> $@.symversions)) > -else > - cmd_update_lto_symversions = echo >/dev/null > -endif > - > # > # Rule to compile a set of .o files into one .a file (without symbol table) > # > @@ -408,11 +397,8 @@ endif > quiet_cmd_ar_builtin = AR $@ > cmd_ar_builtin = rm -f $@; $(AR) cDPrST $@ $(real-prereqs) > > -quiet_cmd_ar_and_symver = AR $@ > - cmd_ar_and_symver = $(cmd_update_lto_symversions); $(cmd_ar_builtin) > - > $(obj)/built-in.a: $(real-obj-y) FORCE > - $(call if_changed,ar_and_symver) > + $(call if_changed,ar_builtin) > > # > # Rule to create modules.order file > @@ -432,16 +418,13 @@ $(obj)/modules.order: $(obj-m) FORCE > # > # Rule to compile a set of .o files into one .a file (with symbol table) > # > -quiet_cmd_ar_lib = AR $@ > - cmd_ar_lib = $(cmd_update_lto_symversions); $(cmd_ar) > > $(obj)/lib.a: $(lib-y) FORCE > - $(call if_changed,ar_lib) > + $(call if_changed,ar) > > ifneq ($(CONFIG_LTO_CLANG)$(CONFIG_X86_KERNEL_IBT),) > quiet_cmd_link_multi-m = AR [M] $@ > cmd_link_multi-m = \ > - $(cmd_update_lto_symversions); \ > rm -f $@; \ > $(AR) cDPrsT $@ @$(patsubst %.o,%.mod,$@) > else > diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh > index 2742b7dd089a..07333181938b 100755 > --- a/scripts/link-vmlinux.sh > +++ b/scripts/link-vmlinux.sh > @@ -56,20 +56,6 @@ gen_initcalls() > > .tmp_initcalls.lds > } > > -# If CONFIG_LTO_CLANG is selected, collect generated symbol versions into > -# .tmp_symversions.lds > -gen_symversions() > -{ > - info GEN .tmp_symversions.lds > - rm -f .tmp_symversions.lds > - > - for o in ${KBUILD_VMLINUX_OBJS} ${KBUILD_VMLINUX_LIBS}; do > - if [ -f ${o}.symversions ]; then > - cat ${o}.symversions >> .tmp_symversions.lds > - fi > - done > -} > - > # Link of vmlinux.o used for section mismatch analysis > # ${1} output file > modpost_link() > @@ -299,7 +285,6 @@ cleanup() > rm -f .btf.* > rm -f .tmp_System.map > rm -f .tmp_initcalls.lds > - rm -f .tmp_symversions.lds > rm -f .tmp_vmlinux* > rm -f System.map > rm -f vmlinux > -- > 2.32.0 Reviewed-by: Nicolas Schier _______________________________________________ linux-um mailing list linux-um@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-um