linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Masahiro Yamada <masahiroy@kernel.org>
To: linux-kbuild@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
	Nathan Chancellor <nathan@kernel.org>,
	Nick Desaulniers <ndesaulniers@google.com>,
	Nicolas Schier <nicolas@fjasle.eu>,
	Peter Zijlstra <peterz@infradead.org>,
	linux-modules@vger.kernel.org, llvm@lists.linux.dev,
	Ard Biesheuvel <ardb@kernel.org>,
	Sami Tolvanen <samitolvanen@google.com>,
	Masahiro Yamada <masahiroy@kernel.org>
Subject: [PATCH v5 06/12] genksyms: adjust the output format to modpost
Date: Thu, 12 May 2022 01:45:08 +0900	[thread overview]
Message-ID: <20220511164514.2741934-7-masahiroy@kernel.org> (raw)
In-Reply-To: <20220511164514.2741934-1-masahiroy@kernel.org>

Make genksyms output symbol versions in the format modpost expects,
so the 'sed' is unneeded.

This commit makes *.symversions completely unneeded.

I will keep *.symversions in .gitignore and 'make clean' for a while.
Otherwise, 'git status' might be surprising.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
Tested-by: Nathan Chancellor <nathan@kernel.org>
---

(no changes since v2)

Changes in v2:
  - New patch

 scripts/Makefile.build      | 6 ------
 scripts/genksyms/genksyms.c | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index dff9220135c4..461998a2ad2b 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -165,16 +165,10 @@ ifdef CONFIG_MODVERSIONS
 # o modpost will extract versions from that file and create *.c files that will
 #   be compiled and linked to the kernel and/or modules.
 
-genksyms_format := __crc_\(.*\) = \(.*\);
-
 gen_symversions =								\
 	if $(NM) $@ 2>/dev/null | grep -q __ksymtab; then			\
 		$(call cmd_gensymtypes_$(1),$(KBUILD_SYMTYPES),$(@:.o=.symtypes)) \
-		    > $@.symversions;						\
-		sed -n 's/$(genksyms_format)/$(pound)SYMVER \1 \2/p' $@.symversions \
 			>> $(dot-target).cmd;					\
-	else									\
-		rm -f $@.symversions;						\
 	fi
 
 cmd_gen_symversions_c =	$(call gen_symversions,c)
diff --git a/scripts/genksyms/genksyms.c b/scripts/genksyms/genksyms.c
index 67b23cc0df0f..f5dfdb9d80e9 100644
--- a/scripts/genksyms/genksyms.c
+++ b/scripts/genksyms/genksyms.c
@@ -680,7 +680,7 @@ void export_symbol(const char *name)
 		if (flag_dump_defs)
 			fputs(">\n", debugfile);
 
-		printf("__crc_%s = 0x%08lx;\n", name, crc);
+		printf("#SYMVER %s 0x%08lx\n", name, crc);
 	}
 }
 
-- 
2.32.0


  parent reply	other threads:[~2022-05-11 16:49 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-11 16:45 [PATCH v5 00/12] kbuild: yet another series of cleanups (modpost, LTO, MODULE_REL_CRCS, export.h) Masahiro Yamada
2022-05-11 16:45 ` [PATCH v5 01/12] modpost: split the section mismatch checks into section-check.c Masahiro Yamada
2022-05-11 22:28   ` Nick Desaulniers
2022-05-12  3:32     ` Masahiro Yamada
2022-05-11 22:31   ` Nick Desaulniers
2022-05-12  3:35     ` Masahiro Yamada
2022-05-11 16:45 ` [PATCH v5 02/12] modpost: add sym_find_with_module() helper Masahiro Yamada
2022-05-11 16:45 ` [PATCH v5 03/12] modpost: extract symbol versions from *.cmd files Masahiro Yamada
2022-05-12 16:28   ` Masahiro Yamada
2022-05-11 16:45 ` [PATCH v5 04/12] kbuild: link symbol CRCs at final link, removing CONFIG_MODULE_REL_CRCS Masahiro Yamada
2022-05-11 19:57   ` Nicolas Schier
2022-05-11 16:45 ` [PATCH v5 05/12] kbuild: stop merging *.symversions Masahiro Yamada
2022-05-11 16:45 ` Masahiro Yamada [this message]
2022-05-11 16:45 ` [PATCH v5 07/12] kbuild: do not create *.prelink.o for Clang LTO or IBT Masahiro Yamada
2022-05-11 16:45 ` [PATCH v5 08/12] kbuild: check static EXPORT_SYMBOL* by script instead of modpost Masahiro Yamada
2022-05-11 16:45 ` [PATCH v5 09/12] kbuild: make built-in.a rule robust against too long argument error Masahiro Yamada
2022-05-11 16:45 ` [PATCH v5 10/12] kbuild: make *.mod " Masahiro Yamada
2022-05-11 16:45 ` [PATCH v5 11/12] kbuild: add cmd_and_savecmd macro Masahiro Yamada
2022-05-13 11:40   ` Nicolas Schier
2022-05-11 16:45 ` [PATCH v5 12/12] kbuild: rebuild multi-object modules when objtool is updated Masahiro Yamada
2022-05-13 11:40   ` Nicolas Schier
2022-05-11 20:04 ` [PATCH v5 00/12] kbuild: yet another series of cleanups (modpost, LTO, MODULE_REL_CRCS, export.h) Nathan Chancellor
2022-05-13 11:18   ` Masahiro Yamada
2022-05-13 11:19     ` Masahiro Yamada

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220511164514.2741934-7-masahiroy@kernel.org \
    --to=masahiroy@kernel.org \
    --cc=ardb@kernel.org \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-modules@vger.kernel.org \
    --cc=llvm@lists.linux.dev \
    --cc=nathan@kernel.org \
    --cc=ndesaulniers@google.com \
    --cc=nicolas@fjasle.eu \
    --cc=peterz@infradead.org \
    --cc=samitolvanen@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).