Commit 454753d9 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: make modules.order rule consistent with built-in.a 



built-in.a contains the built-in object paths from the current and sub
directories.

module.order collects the module paths from the current and sub
directories.

Make their build rules look more symmetrical.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent aaa385ba

scripts/Makefile.build

+6 −4
Original line number Diff line number Diff line
@@ -69,8 +69,9 @@ endif 


# ===========================================================================



# subdir-builtin may contain duplications. Use $(sort ...)

# subdir-builtin and subdir-modorder may contain duplications. Use $(sort ...)

subdir-builtin := $(sort $(filter %/built-in.a, $(real-obj-y)))

subdir-modorder := $(sort $(filter %/modules.order, $(modorder)))



ifneq ($(strip $(lib-y) $(lib-m) $(lib-)),)

lib-target := $(obj)/lib.a
@@ -383,6 +384,7 @@ $(obj)/%.asn1.c $(obj)/%.asn1.h: $(src)/%.asn1 $(objtree)/scripts/asn1_compiler 


# To build objects in subdirs, we need to descend into the directories

$(subdir-builtin): $(obj)/%/built-in.a: $(obj)/% ;

$(subdir-modorder): $(obj)/%/modules.order: $(obj)/% ;



#

# Rule to compile a set of .o files into one .a file (without symbol table)
@@ -401,9 +403,9 @@ targets += $(builtin-target) 
#

# Create commands to either record .ko file or cat modules.order from

# a subdirectory

$(modorder-target): $(subdir-ym) FORCE

$(obj)/modules.order: $(subdir-modorder) FORCE

	$(Q){ $(foreach m, $(modorder), \

	$(if $(filter %/modules.order, $m), cat $m, echo $m);) :; } \

	$(if $(filter $^, $m), cat $m, echo $m);) :; } \

	| $(AWK) '!x[$$0]++' - > $@



#
@@ -491,7 +493,7 @@ $(subdir-ym): 
	$(Q)$(MAKE) $(build)=$@ \

	$(if $(filter $@/, $(KBUILD_SINGLE_TARGETS)),single-build=) \

	need-builtin=$(if $(filter $@/built-in.a, $(subdir-builtin)),1) \

	need-modorder=$(if $(need-modorder),$(if $(filter $@/modules.order, $(modorder)),1))

	need-modorder=$(if $(filter $@/modules.order, $(subdir-modorder)),1)



# Add FORCE to the prequisites of a target to force it to be always rebuilt.

# ---------------------------------------------------------------------------

scripts/Makefile.lib

+2 −0
Original line number Diff line number Diff line
@@ -35,7 +35,9 @@ lib-y := $(filter-out $(obj-y), $(sort $(lib-y) $(lib-m))) 
# Determine modorder.

# Unfortunately, we don't have information about ordering between -y

# and -m subdirs.  Just put -y's first.

ifdef need-modorder

modorder	:= $(patsubst %/,%/modules.order, $(filter %/, $(obj-y)) $(obj-m:.o=.ko))

endif



# Handle objects in subdirs

# ---------------------------------------------------------------------------