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

kbuild: add real-prereqs shorthand for $(filter-out FORCE,$^) 



In Kbuild, if_changed and friends must have FORCE as a prerequisite.

Hence, $(filter-out FORCE,$^) or $(filter-out $(PHONY),$^) is a common
idiom to get the names of all the prerequisites except phony targets.

Add real-prereqs as a shorthand.

Note:
We cannot replace $(filter %.o,$^) in cmd_link_multi-m because $^ may
include auto-generated dependencies from the .*.cmd file when a single
object module is changed into a multi object module. Refer to commit
69ea912f ("kbuild: remove unneeded link_multi_deps"). I added some
comment to avoid accidental breakage.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: default avatarRob Herring <robh@kernel.org>
parent 5d680056

Documentation/devicetree/bindings/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ DT_TMP_SCHEMA := processed-schema.yaml 
extra-y += $(DT_TMP_SCHEMA)



quiet_cmd_mk_schema = SCHEMA  $@

      cmd_mk_schema = $(DT_MK_SCHEMA) $(DT_MK_SCHEMA_FLAGS) -o $@ $(filter-out FORCE, $^)

      cmd_mk_schema = $(DT_MK_SCHEMA) $(DT_MK_SCHEMA_FLAGS) -o $@ $(real-prereqs)



DT_DOCS = $(shell cd $(srctree)/$(src) && find * -name '*.yaml')

DT_SCHEMA_FILES ?= $(addprefix $(src)/,$(DT_DOCS))

arch/mips/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ endif 
targets += vmlinux.its.S



quiet_cmd_its_cat = CAT     $@

      cmd_its_cat = cat $(filter-out $(PHONY), $^) >$@

      cmd_its_cat = cat $(real-prereqs) >$@



$(obj)/vmlinux.its.S: $(addprefix $(srctree)/arch/mips/$(PLATFORM)/,$(ITS_INPUTS)) FORCE

	$(call if_changed,its_cat)

arch/powerpc/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ quiet_cmd_bootas = BOOTAS $@ 
      cmd_bootas = $(BOOTCC) -Wp,-MD,$(depfile) $(BOOTAFLAGS) -c -o $@ $<



quiet_cmd_bootar = BOOTAR  $@

      cmd_bootar = $(BOOTAR) $(BOOTARFLAGS) $@.$$$$ $(filter-out FORCE,$^); mv $@.$$$$ $@

      cmd_bootar = $(BOOTAR) $(BOOTARFLAGS) $@.$$$$ $(real-prereqs); mv $@.$$$$ $@



$(obj-libfdt): $(obj)/%.o: $(srctree)/scripts/dtc/libfdt/%.c FORCE

	$(call if_changed_dep,bootcc)

arch/s390/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ $(obj)/compressed/vmlinux: $(obj)/startup.a FORCE 
	$(Q)$(MAKE) $(build)=$(obj)/compressed $@



quiet_cmd_ar = AR      $@

      cmd_ar = rm -f $@; $(AR) rcsTP$(KBUILD_ARFLAGS) $@ $(filter $(OBJECTS), $^)

      cmd_ar = rm -f $@; $(AR) rcsTP$(KBUILD_ARFLAGS) $@ $(real-prereqs)



$(obj)/startup.a: $(OBJECTS) FORCE

	$(call if_changed,ar)

arch/x86/realmode/rm/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -37,8 +37,7 @@ REALMODE_OBJS = $(addprefix $(obj)/,$(realmode-y)) 
sed-pasyms := -n -r -e 's/^([0-9a-fA-F]+) [ABCDGRSTVW] (.+)$$/pa_\2 = \2;/p'



quiet_cmd_pasyms = PASYMS  $@

      cmd_pasyms = $(NM) $(filter-out FORCE,$^) | \

		   sed $(sed-pasyms) | sort | uniq > $@

      cmd_pasyms = $(NM) $(real-prereqs) | sed $(sed-pasyms) | sort | uniq > $@



targets += pasyms.h

$(obj)/pasyms.h: $(REALMODE_OBJS) FORCE

CRA Git | Maintained and supported by SUSTech CRA and CCSE