Commit 000e22a8 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

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: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent 91ca8be3

scripts/Makefile.build

+0 −8
Original line number Diff line number Diff line
@@ -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

scripts/Makefile.lib

+12 −0
Original line number Diff line number Diff line
@@ -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,

scripts/Makefile.modfinal

+1 −5
Original line number Diff line number Diff line
@@ -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)

scripts/Makefile.vmlinux

+0 −8
Original line number Diff line number Diff line
@@ -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)