| From cbc8681cbc19ee498b3fbf418a9873f41da02945 Mon Sep 17 00:00:00 2001 |
| From: Vasily Gorbik <gor@linux.ibm.com> |
| Date: Fri, 19 Oct 2018 15:37:01 +0200 |
| Subject: 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: Philipp Rudo <prudo@linux.ibm.com> |
| Signed-off-by: Vasily Gorbik <gor@linux.ibm.com> |
| Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/s390/kernel/vdso32/Makefile | 6 +++--- |
| arch/s390/kernel/vdso64/Makefile | 6 +++--- |
| 2 files changed, 6 insertions(+), 6 deletions(-) |
| |
| diff --git a/arch/s390/kernel/vdso32/Makefile b/arch/s390/kernel/vdso32/Makefile |
| index c5c856f320bc..04dd3e2c3bd9 100644 |
| --- a/arch/s390/kernel/vdso32/Makefile |
| +++ b/arch/s390/kernel/vdso32/Makefile |
| @@ -36,7 +36,7 @@ UBSAN_SANITIZE := 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 |
| @@ -45,12 +45,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 $@ $< |
| |
| diff --git a/arch/s390/kernel/vdso64/Makefile b/arch/s390/kernel/vdso64/Makefile |
| index 15b1ceafc4c1..ddebc26cd949 100644 |
| --- a/arch/s390/kernel/vdso64/Makefile |
| +++ b/arch/s390/kernel/vdso64/Makefile |
| @@ -36,7 +36,7 @@ UBSAN_SANITIZE := 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 |
| @@ -45,12 +45,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 $@ $< |
| |
| -- |
| 2.17.1 |
| |
