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

Commit 4a3ce6f9 authored by Vasily Gorbik's avatar Vasily Gorbik Committed by Greg Kroah-Hartman
Browse files

s390/vdso: add missing FORCE to build targets 



[ Upstream commit b44b136a3773d8a9c7853f8df716bd1483613cbb ]

According to Documentation/kbuild/makefiles.txt all build targets using
if_changed should use FORCE as well. Add missing FORCE to make sure
vdso targets are rebuild properly when not just immediate prerequisites
have changed but also when build command differs.

Reviewed-by: default avatarPhilipp Rudo <prudo@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 92972124

arch/s390/kernel/vdso32/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ GCOV_PROFILE := n 
$(obj)/vdso32_wrapper.o : $(obj)/vdso32.so



# link rule for the .so file, .lds has to be first

$(obj)/vdso32.so.dbg: $(src)/vdso32.lds $(obj-vdso32)

$(obj)/vdso32.so.dbg: $(src)/vdso32.lds $(obj-vdso32) FORCE

	$(call if_changed,vdso32ld)



# strip rule for the .so file
@@ -38,12 +38,12 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE 
	$(call if_changed,objcopy)



# assembly rules for the .S files

$(obj-vdso32): %.o: %.S

$(obj-vdso32): %.o: %.S FORCE

	$(call if_changed_dep,vdso32as)



# actual build commands

quiet_cmd_vdso32ld = VDSO32L $@

      cmd_vdso32ld = $(CC) $(c_flags) -Wl,-T $^ -o $@

      cmd_vdso32ld = $(CC) $(c_flags) -Wl,-T $(filter %.lds %.o,$^) -o $@

quiet_cmd_vdso32as = VDSO32A $@

      cmd_vdso32as = $(CC) $(a_flags) -c -o $@ $<

arch/s390/kernel/vdso64/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ GCOV_PROFILE := n 
$(obj)/vdso64_wrapper.o : $(obj)/vdso64.so



# link rule for the .so file, .lds has to be first

$(obj)/vdso64.so.dbg: $(src)/vdso64.lds $(obj-vdso64)

$(obj)/vdso64.so.dbg: $(src)/vdso64.lds $(obj-vdso64) FORCE

	$(call if_changed,vdso64ld)



# strip rule for the .so file
@@ -38,12 +38,12 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE 
	$(call if_changed,objcopy)



# assembly rules for the .S files

$(obj-vdso64): %.o: %.S

$(obj-vdso64): %.o: %.S FORCE

	$(call if_changed_dep,vdso64as)



# actual build commands

quiet_cmd_vdso64ld = VDSO64L $@

      cmd_vdso64ld = $(CC) $(c_flags) -Wl,-T $^ -o $@

      cmd_vdso64ld = $(CC) $(c_flags) -Wl,-T $(filter %.lds %.o,$^) -o $@

quiet_cmd_vdso64as = VDSO64A $@

      cmd_vdso64as = $(CC) $(a_flags) -c -o $@ $<