diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-03-19 12:01:27 +0300 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-03-25 20:01:26 +0300 |
| commit | c0152e9a6b4484b44e77e0cc49c6c3b2e3417782 (patch) | |
| tree | 4cee7172a5395528a132df32a04a6abacf4a002e /scripts | |
| parent | fe852ac200311bcbbb0a8c84096e4cd44ea623d9 (diff) | |
| download | linux-c0152e9a6b4484b44e77e0cc49c6c3b2e3417782.tar.xz | |
kbuild: move modname and modname-multi close to modname_flags
Just a cosmetic change to put related code close together.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Cao jin <caoj.fnst@cn.fujitsu.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.build | 2 | ||||
| -rw-r--r-- | scripts/Makefile.lib | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index f5858f609210..93d05e30bdb1 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -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 $@ $< diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index b5fa80a07c26..1e35c8bb11e0 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -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) |