| Message ID | 20241113234526.402738-2-masahiroy@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | kbuild: enable objtool for more objects and re-enable KCSAN for *.mod.o | expand |
On Thu, Nov 14, 2024 at 8:45 AM Masahiro Yamada <masahiroy@kernel.org> wrote: > > The cmd_cc_o_c and cmd_as_o_S macros are duplicated in > scripts/Makefile.{build,modfinal,vmlinux}. > > This commit factors them out to scripts/Makefile.lib. > > No functional changes are intended. > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > --- > > scripts/Makefile.build | 8 -------- > scripts/Makefile.lib | 12 ++++++++++++ > scripts/Makefile.modfinal | 6 ++---- > scripts/Makefile.vmlinux | 8 +------- > 4 files changed, 15 insertions(+), 19 deletions(-) > > diff --git a/scripts/Makefile.build b/scripts/Makefile.build > index 1aa928a6fb4f..24e10c821461 100644 > --- a/scripts/Makefile.build > +++ b/scripts/Makefile.build > @@ -141,11 +141,6 @@ ifdef CONFIG_LTO_CLANG > cmd_ld_single_m = $(if $(is-single-obj-m), ; $(LD) $(ld_flags) -r -o $(tmp-target) $@; mv $(tmp-target) $@) > endif > > -quiet_cmd_cc_o_c = CC $(quiet_modtag) $@ > - cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $< \ > - $(cmd_ld_single_m) \ > - $(cmd_objtool) > - > ifdef CONFIG_MODVERSIONS > # When module versioning is enabled the following steps are executed: > # o compile a <file>.o from <file>.c > @@ -336,9 +331,6 @@ cmd_cpp_s_S = $(CPP) $(a_flags) -o $@ $< > $(obj)/%.s: $(obj)/%.S FORCE > $(call if_changed_dep,cpp_s_S) > > -quiet_cmd_as_o_S = AS $(quiet_modtag) $@ > - cmd_as_o_S = $(CC) $(a_flags) -c -o $@ $< $(cmd_objtool) > - > ifdef CONFIG_ASM_MODVERSIONS > > # versioning matches the C process described above, with difference that > diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib > index 5660dfc9ed36..73e385946855 100644 > --- a/scripts/Makefile.lib > +++ b/scripts/Makefile.lib > @@ -298,6 +298,18 @@ $(foreach m, $1, \ > $(addprefix $(obj)/, $(call suffix-search, $(patsubst $(obj)/%,%,$m), $2, $3)))) > endef > > +# Build commads I will fix the typo. s/commads/commands/
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 1aa928a6fb4f..24e10c821461 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -141,11 +141,6 @@ ifdef CONFIG_LTO_CLANG cmd_ld_single_m = $(if $(is-single-obj-m), ; $(LD) $(ld_flags) -r -o $(tmp-target) $@; mv $(tmp-target) $@) endif -quiet_cmd_cc_o_c = CC $(quiet_modtag) $@ - cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $< \ - $(cmd_ld_single_m) \ - $(cmd_objtool) - ifdef CONFIG_MODVERSIONS # When module versioning is enabled the following steps are executed: # o compile a <file>.o from <file>.c @@ -336,9 +331,6 @@ cmd_cpp_s_S = $(CPP) $(a_flags) -o $@ $< $(obj)/%.s: $(obj)/%.S FORCE $(call if_changed_dep,cpp_s_S) -quiet_cmd_as_o_S = AS $(quiet_modtag) $@ - cmd_as_o_S = $(CC) $(a_flags) -c -o $@ $< $(cmd_objtool) - ifdef CONFIG_ASM_MODVERSIONS # versioning matches the C process described above, with difference that diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 5660dfc9ed36..73e385946855 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -298,6 +298,18 @@ $(foreach m, $1, \ $(addprefix $(obj)/, $(call suffix-search, $(patsubst $(obj)/%,%,$m), $2, $3)))) endef +# Build commads +# =========================================================================== +# These are shared by some Makefile.* files. + +quiet_cmd_cc_o_c = CC $(quiet_modtag) $@ + cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $< \ + $(cmd_ld_single_m) \ + $(cmd_objtool) + +quiet_cmd_as_o_S = AS $(quiet_modtag) $@ + cmd_as_o_S = $(CC) $(a_flags) -c -o $@ $< $(cmd_objtool) + # Copy a file # =========================================================================== # 'cp' preserves permissions. If you use it to copy a file in read-only srctree, diff --git a/scripts/Makefile.modfinal b/scripts/Makefile.modfinal index bab53884f7e3..d0153d033bbb 100644 --- a/scripts/Makefile.modfinal +++ b/scripts/Makefile.modfinal @@ -9,7 +9,7 @@ __modfinal: include $(objtree)/include/config/auto.conf include $(srctree)/scripts/Kbuild.include -# for c_flags +# include some build commands include $(srctree)/scripts/Makefile.lib # find all modules listed in modules.order @@ -23,9 +23,7 @@ modname = $(notdir $(@:.mod.o=)) part-of-module = y GCOV_PROFILE := n KCSAN_SANITIZE := n - -quiet_cmd_cc_o_c = CC [M] $@ - cmd_cc_o_c = $(CC) $(filter-out $(CC_FLAGS_CFI), $(c_flags)) -c -o $@ $< +ccflags-remove-y := $(CC_FLAGS_CFI) %.mod.o: %.mod.c FORCE $(call if_changed_dep,cc_o_c) diff --git a/scripts/Makefile.vmlinux b/scripts/Makefile.vmlinux index 9ef0480ed755..1652561896eb 100644 --- a/scripts/Makefile.vmlinux +++ b/scripts/Makefile.vmlinux @@ -6,20 +6,14 @@ __default: vmlinux include include/config/auto.conf include $(srctree)/scripts/Kbuild.include -# for c_flags +# include some build commands include $(srctree)/scripts/Makefile.lib targets := -quiet_cmd_cc_o_c = CC $@ - cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $< - %.o: %.c FORCE $(call if_changed_dep,cc_o_c) -quiet_cmd_as_o_S = AS $@ - cmd_as_o_S = $(CC) $(a_flags) -c -o $@ $< - %.o: %.S FORCE $(call if_changed_dep,as_o_S)
The cmd_cc_o_c and cmd_as_o_S macros are duplicated in scripts/Makefile.{build,modfinal,vmlinux}. This commit factors them out to scripts/Makefile.lib. No functional changes are intended. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> --- scripts/Makefile.build | 8 -------- scripts/Makefile.lib | 12 ++++++++++++ scripts/Makefile.modfinal | 6 ++---- scripts/Makefile.vmlinux | 8 +------- 4 files changed, 15 insertions(+), 19 deletions(-)