From: Masahiro Yamada <masahiroy@kernel.org>
To: linux-kbuild@vger.kernel.org
Cc: Masahiro Yamada <masahiroy@kernel.org>,
Kees Cook <keescook@chromium.org>,
Michal Marek <michal.lkml@markovi.net>,
Nathan Chancellor <nathan@kernel.org>,
Nick Desaulniers <ndesaulniers@google.com>,
clang-built-linux@googlegroups.com, linux-kernel@vger.kernel.org
Subject: [PATCH v2 12/13] kbuild: merge cmd_modversions_c and cmd_modversions_S
Date: Tue, 31 Aug 2021 16:40:03 +0900 [thread overview]
Message-ID: <20210831074004.3195284-13-masahiroy@kernel.org> (raw)
In-Reply-To: <20210831074004.3195284-1-masahiroy@kernel.org>
Now cmd_modversions_c and cmd_modversions_S are similar.
The latter uses $(OBJDUMP) -h, but it can be replaced with $(NM).
$(NM) works for both ELF and LLVM bitcode (if $(NM) is llvm-nm).
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
---
scripts/Makefile.build | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 50a6765c9a14..4d12f83389ce 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -166,13 +166,16 @@ ifdef CONFIG_MODVERSIONS
# Generate .o.symversions files for each .o with exported symbols, and link these
# to the kernel and/or modules at the end.
-cmd_modversions_c = \
+cmd_modversions = \
if $(NM) $@ 2>/dev/null | grep -q __ksymtab; then \
- $(call cmd_gensymtypes_c,$(KBUILD_SYMTYPES),$(@:.o=.symtypes)) \
+ $(call cmd_gensymtypes_$(1),$(KBUILD_SYMTYPES),$(@:.o=.symtypes)) \
> $@.symversions; \
else \
rm -f $@.symversions; \
fi;
+
+cmd_modversions_c = $(call cmd_modversions,c)
+
endif
ifdef CONFIG_FTRACE_MCOUNT_USE_RECORDMCOUNT
@@ -337,14 +340,8 @@ ifdef CONFIG_ASM_MODVERSIONS
# versioning matches the C process described above, with difference that
# we parse asm-prototypes.h C header to get function definitions.
+cmd_modversions_S = $(call cmd_modversions,S)
-cmd_modversions_S = \
- if $(OBJDUMP) -h $@ | grep -q __ksymtab; then \
- $(call cmd_gensymtypes_S,$(KBUILD_SYMTYPES),$(@:.o=.symtypes)) \
- > $@.symversions; \
- else \
- rm -rf $@.symversions; \
- fi
endif
$(obj)/%.o: $(src)/%.S FORCE
--
2.30.2
next prev parent reply other threads:[~2021-08-31 7:41 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-31 7:39 [PATCH v2 00/13] kbuild: second round of Clang LTO refactoring Masahiro Yamada
2021-08-31 7:39 ` [PATCH v2 01/13] kbuild: move objtool_args back to scripts/Makefile.build Masahiro Yamada
2021-09-04 18:18 ` Josh Poimboeuf
2021-08-31 7:39 ` [PATCH v2 02/13] kbuild: rename __objtool_obj to objtool Masahiro Yamada
2021-08-31 17:16 ` Nick Desaulniers
2021-08-31 17:29 ` Kees Cook
2021-09-04 18:19 ` Josh Poimboeuf
2021-08-31 7:39 ` [PATCH v2 03/13] kbuild: store the objtool command in *.cmd files Masahiro Yamada
2021-08-31 17:23 ` Nick Desaulniers
2021-08-31 17:30 ` Kees Cook
2021-09-04 18:04 ` Josh Poimboeuf
2021-09-04 18:45 ` Josh Poimboeuf
2021-09-08 16:12 ` Masahiro Yamada
2021-08-31 7:39 ` [PATCH v2 04/13] kbuild: factor out OBJECT_FILES_NON_STANDARD check into a macro Masahiro Yamada
2021-08-31 17:25 ` Nick Desaulniers
2021-08-31 17:31 ` Kees Cook
2021-09-04 18:59 ` Josh Poimboeuf
2021-08-31 7:39 ` [PATCH v2 05/13] kbuild: detect objtool update without using .SECONDEXPANSION Masahiro Yamada
2021-08-31 17:32 ` Kees Cook
2021-09-03 0:43 ` Masahiro Yamada
2021-08-31 17:33 ` Nick Desaulniers
2021-09-02 23:42 ` Masahiro Yamada
2021-09-04 19:04 ` Josh Poimboeuf
2021-08-31 7:39 ` [PATCH v2 06/13] kbuild: reuse $(cmd_objtool) for cmd_cc_lto_link_modules Masahiro Yamada
2021-08-31 17:35 ` Kees Cook
2021-09-03 0:39 ` Masahiro Yamada
2021-09-03 1:49 ` Kees Cook
2021-09-04 19:11 ` Josh Poimboeuf
2021-08-31 7:39 ` [PATCH v2 07/13] kbuild: do not create built-in.a.symversions or lib.a.symversions Masahiro Yamada
2021-08-31 17:36 ` Kees Cook
2021-08-31 7:39 ` [PATCH v2 08/13] kbuild: build modules in the same way with/without Clang LTO Masahiro Yamada
2021-08-31 17:39 ` Kees Cook
2021-08-31 17:46 ` Nick Desaulniers
2021-08-31 7:40 ` [PATCH v2 09/13] kbuild: add cmd_and_savecmd macro Masahiro Yamada
2021-08-31 17:39 ` Kees Cook
2021-08-31 7:40 ` [PATCH v2 10/13] kbuild: rebuild modules when objtool is updated for CONFIG_LTO_CLANG Masahiro Yamada
2021-08-31 17:40 ` Kees Cook
2021-09-04 19:13 ` Josh Poimboeuf
2021-08-31 7:40 ` [PATCH v2 11/13] kbuild: always postpone CRC links for module versioning Masahiro Yamada
2021-08-31 7:40 ` Masahiro Yamada [this message]
2021-08-31 7:40 ` [PATCH v2 13/13] kbuild: merge cmd_ar_builtin and cmd_ar_module 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=20210831074004.3195284-13-masahiroy@kernel.org \
--to=masahiroy@kernel.org \
--cc=clang-built-linux@googlegroups.com \
--cc=keescook@chromium.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.lkml@markovi.net \
--cc=nathan@kernel.org \
--cc=ndesaulniers@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).