Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0152e9a authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: move modname and modname-multi close to modname_flags 



Just a cosmetic change to put related code close together.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: default avatarCao jin <caoj.fnst@cn.fujitsu.com>
parent fe852ac2

scripts/Makefile.build

+0 −2
Original line number Diff line number Diff line
@@ -131,8 +131,6 @@ $(real-objs-m:.o=.lst): quiet_modtag := [M] 


$(obj-m)              : quiet_modtag := [M]



modname = $(if $(modname-multi),$(modname-multi),$(basetarget))



quiet_cmd_cc_s_c = CC $(quiet_modtag)  $@

cmd_cc_s_c       = $(CC) $(c_flags) $(DISABLE_LTO) -fverbose-asm -S -o $@ $<

scripts/Makefile.lib

+8 −6
Original line number Diff line number Diff line
@@ -77,6 +77,14 @@ multi-used-y := $(addprefix $(obj)/,$(multi-used-y)) 
multi-used-m	:= $(addprefix $(obj)/,$(multi-used-m))

subdir-ym	:= $(addprefix $(obj)/,$(subdir-ym))



# Finds the multi-part object the current object will be linked into.

# If the object belongs to two or more multi-part objects, all of them are

# concatenated with a colon separator.

modname-multi = $(subst $(space),:,$(sort $(foreach m,$(multi-used),\

		$(if $(filter $*.o, $($(m:.o=-objs)) $($(m:.o=-y)) $($(m:.o=-m))),$(m:.o=)))))



modname = $(if $(modname-multi),$(modname-multi),$(basetarget))



# These flags are needed for modversions and compiling, so we define them here

# $(modname_flags) defines KBUILD_MODNAME as the name of the module it will

# end up in (or would, if it gets compiled in)
@@ -162,12 +170,6 @@ dtc_cpp_flags = -Wp,-MD,$(depfile).pre.tmp -nostdinc \ 
		 $(addprefix -I,$(DTC_INCLUDE))                          \

		 -undef -D__DTS__



# Finds the multi-part object the current object will be linked into

# If the object belongs to two or more multi-part objects, all of them are

# concatenated with a colon separator.

modname-multi = $(subst $(space),:,$(sort $(foreach m,$(multi-used),\

		$(if $(filter $*.o, $($(m:.o=-objs)) $($(m:.o=-y)) $($(m:.o=-m))),$(m:.o=)))))



# Useful for describing the dependency of composite objects

# Usage:

#   $(call multi_depend, multi_used_targets, suffix_to_remove, suffix_to_add)