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

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

kbuild: rename real-objs-y/m to real-obj-y/m 



When I was refactoring Makefiles, I stupidly mistook 'real-obj-y' for
'real-objs-y' over and over again.  Finally, I decide to rename it to
'real-obj-y'.  This is consistent with 'obj-y', 'subdir-obj-y'.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent c0152e9a

scripts/Makefile.build

+12 −12
Original line number Diff line number Diff line
@@ -119,15 +119,15 @@ modkern_cflags = \ 
		$(KBUILD_CFLAGS_KERNEL) $(CFLAGS_KERNEL))

quiet_modtag := $(empty)   $(empty)



$(real-objs-m)        : part-of-module := y

$(real-objs-m:.o=.i)  : part-of-module := y

$(real-objs-m:.o=.s)  : part-of-module := y

$(real-objs-m:.o=.lst): part-of-module := y

$(real-obj-m)        : part-of-module := y

$(real-obj-m:.o=.i)  : part-of-module := y

$(real-obj-m:.o=.s)  : part-of-module := y

$(real-obj-m:.o=.lst): part-of-module := y



$(real-objs-m)        : quiet_modtag := [M]

$(real-objs-m:.o=.i)  : quiet_modtag := [M]

$(real-objs-m:.o=.s)  : quiet_modtag := [M]

$(real-objs-m:.o=.lst): quiet_modtag := [M]

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

$(real-obj-m:.o=.i)  : quiet_modtag := [M]

$(real-obj-m:.o=.s)  : quiet_modtag := [M]

$(real-obj-m:.o=.lst): quiet_modtag := [M]



$(obj-m)             : quiet_modtag := [M]
@@ -333,8 +333,8 @@ $(obj)/%.lst: $(src)/%.c FORCE 


modkern_aflags := $(KBUILD_AFLAGS_KERNEL) $(AFLAGS_KERNEL)



$(real-objs-m)      : modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE)

$(real-objs-m:.o=.s): modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE)

$(real-obj-m)      : modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE)

$(real-obj-m:.o=.s): modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE)



# .S file exports must have their C prototypes defined in asm/asm-prototypes.h

# or a file that it includes, in order to get versioned symbols. We build a
@@ -412,7 +412,7 @@ endif 
$(obj)/%.o: $(src)/%.S $(objtool_dep) FORCE

	$(call if_changed_rule,as_o_S)



targets += $(real-objs-y) $(real-objs-m) $(lib-y)

targets += $(real-obj-y) $(real-obj-m) $(lib-y)

targets += $(extra-y) $(MAKECMDGOALS) $(always)



# Linker scripts preprocessor (.lds.S -> .lds)

scripts/Makefile.lib

+4 −4
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ single-used-m := $(sort $(filter-out $(multi-used-m),$(obj-m))) 
subdir-obj-y := $(filter %/built-in.a, $(obj-y))



# Replace multi-part objects by their individual parts, look at local dir only

real-objs-y := $(foreach m, $(filter-out $(subdir-obj-y), $(obj-y)), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))),$($(m:.o=-objs)) $($(m:.o=-y)),$(m)))

real-objs-m := $(foreach m, $(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y)) $($(m:.o=-m))),$($(m:.o=-objs)) $($(m:.o=-y)) $($(m:.o=-m)),$(m)))

real-obj-y := $(foreach m, $(filter-out $(subdir-obj-y), $(obj-y)), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))),$($(m:.o=-objs)) $($(m:.o=-y)),$(m)))

real-obj-m := $(foreach m, $(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y)) $($(m:.o=-m))),$($(m:.o=-objs)) $($(m:.o=-y)) $($(m:.o=-m)),$(m)))



# DTB

# If CONFIG_OF_ALL_DTBS is enabled, all DT blobs are built
@@ -70,8 +70,8 @@ obj-y := $(addprefix $(obj)/,$(obj-y)) 
obj-m		:= $(addprefix $(obj)/,$(obj-m))

lib-y		:= $(addprefix $(obj)/,$(lib-y))

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

real-objs-y	:= $(addprefix $(obj)/,$(real-objs-y))

real-objs-m	:= $(addprefix $(obj)/,$(real-objs-m))

real-obj-y	:= $(addprefix $(obj)/,$(real-obj-y))

real-obj-m	:= $(addprefix $(obj)/,$(real-obj-m))

single-used-m	:= $(addprefix $(obj)/,$(single-used-m))

multi-used-y	:= $(addprefix $(obj)/,$(multi-used-y))

multi-used-m	:= $(addprefix $(obj)/,$(multi-used-m))