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

Commit 46d7d734 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Mark Salyzyn
Browse files

UPSTREAM: kbuild: drop FORCE from PHONY targets 



(cherry pick from commit 2e8d696b79e9c68d3005a9b09a8c72625d141ea6)

These targets are marked as PHONY.  No need to add FORCE to their
dependency.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarMichal Marek <mmarek@suse.com>
Bug: 20045882
Bug: 19198045
Change-Id: I718d46c339c99418d543cc64cabc851307e5abb7
parent eb3f1cee

Makefile

+4 −4
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ PHONY += $(MAKECMDGOALS) sub-make 
$(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make

	@:



sub-make: FORCE

sub-make:

	$(Q)$(MAKE) -C $(KBUILD_OUTPUT) KBUILD_SRC=$(CURDIR) \

	-f $(CURDIR)/Makefile $(filter-out _all sub-make,$(MAKECMDGOALS))
@@ -985,7 +985,7 @@ prepare1: prepare2 $(version_h) include/generated/utsrelease.h \ 


archprepare: archheaders archscripts prepare1 scripts_basic



prepare0: archprepare FORCE

prepare0: archprepare

	$(Q)$(MAKE) $(build)=.



# All the preparing..
@@ -1035,7 +1035,7 @@ INSTALL_FW_PATH=$(INSTALL_MOD_PATH)/lib/firmware 
export INSTALL_FW_PATH



PHONY += firmware_install

firmware_install: FORCE

firmware_install:

	@mkdir -p $(objtree)/firmware

	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_install
@@ -1057,7 +1057,7 @@ PHONY += archscripts 
archscripts:



PHONY += __headers

__headers: $(version_h) scripts_basic asm-generic archheaders archscripts FORCE

__headers: $(version_h) scripts_basic asm-generic archheaders archscripts

	$(Q)$(MAKE) $(build)=scripts build_unifdef



PHONY += headers_install_all

arch/arm/vdso/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -74,5 +74,5 @@ $(MODLIB)/vdso: FORCE 
	@mkdir -p $(MODLIB)/vdso



PHONY += vdso_install

vdso_install: $(obj)/vdso.so.dbg $(MODLIB)/vdso FORCE

vdso_install: $(obj)/vdso.so.dbg $(MODLIB)/vdso

	$(call cmd,vdso_install)

arch/ia64/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -96,8 +96,8 @@ define archhelp 
  echo '* unwcheck	- Check vmlinux for invalid unwind info'

endef



archprepare: make_nr_irqs_h FORCE

archprepare: make_nr_irqs_h

PHONY += make_nr_irqs_h FORCE



make_nr_irqs_h: FORCE

make_nr_irqs_h:

	$(Q)$(MAKE) $(build)=arch/ia64/kernel include/generated/nr-irqs.h

arch/x86/vdso/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -199,10 +199,10 @@ vdso_img_insttargets := $(vdso_img_sodbg:%.dbg=install_%) 
$(MODLIB)/vdso: FORCE

	@mkdir -p $(MODLIB)/vdso



$(vdso_img_insttargets): install_%: $(obj)/%.dbg $(MODLIB)/vdso FORCE

$(vdso_img_insttargets): install_%: $(obj)/%.dbg $(MODLIB)/vdso

	$(call cmd,vdso_install)



PHONY += vdso_install $(vdso_img_insttargets)

vdso_install: $(vdso_img_insttargets) FORCE

vdso_install: $(vdso_img_insttargets)



clean-files := vdso32-syscall* vdso32-sysenter* vdso32-int80*