kbuild: move cmd_cc_o_c and cmd_as_o_S to scripts/Malefile.lib

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>

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 15a88f4d6ef694d138a1b7fce6259dc4c33e325e..c0b61ae71e3e0b903034e21988eb6950f97c6e5f 100644 (file)
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -135,11 +135,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
@@ -322,9 +317,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 5660dfc9ed36c21ccf1aa659dd9805ad32cad39c..c0b485ab029a440933de88d7833ad6237089d759 100644 (file)
--- 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 commands
+# ===========================================================================
+# 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 bab53884f7e3102c9a8e879cf58e3dcce9170278..f63410ba5c2c8e88162f93e66e14936bc76c1c03 100644 (file)
--- a/scripts/Makefile.modfinal
+++ b/scripts/Makefile.modfinal
@@ -8,8 +8,6 @@ __modfinal:
 
 include $(objtree)/include/config/auto.conf
 include $(srctree)/scripts/Kbuild.include
-
-# for c_flags
 include $(srctree)/scripts/Makefile.lib
 
 # find all modules listed in modules.order
@@ -23,9 +21,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 9ef0480ed755a4e0102d5efb06eee3498b26e388..2ce61f6c79c697ebbf06d0c83ea8e379aabc5d4c 100644 (file)
--- a/scripts/Makefile.vmlinux
+++ b/scripts/Makefile.vmlinux
@@ -5,21 +5,13 @@ __default: vmlinux
 
 include include/config/auto.conf
 include $(srctree)/scripts/Kbuild.include
-
-# for c_flags
 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)