diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-07-31 15:55:45 +0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-07-31 15:55:45 +0300 |
| commit | c2586cfbb905939b79b49a9121fb0a59a5668fd6 (patch) | |
| tree | 42bf9a711c59549294b2f2125978f5a7095e16c2 /arch/x86/boot/compressed/Makefile | |
| parent | 25a00ac7dc92912f0b1e5e533bf077255c828b02 (diff) | |
| parent | ce03b6d2b610b70bb527d14d82c2394adb235e5d (diff) | |
| download | linux-c2586cfbb905939b79b49a9121fb0a59a5668fd6.tar.xz | |
Merge remote-tracking branch 'tip/perf/urgent' into perf/core
To pick up fixes.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'arch/x86/boot/compressed/Makefile')
| -rw-r--r-- | arch/x86/boot/compressed/Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile index fa42f895fdde..169c2feda14a 100644 --- a/arch/x86/boot/compressed/Makefile +++ b/arch/x86/boot/compressed/Makefile @@ -106,9 +106,13 @@ define cmd_check_data_rel done endef +# We need to run two commands under "if_changed", so merge them into a +# single invocation. +quiet_cmd_check-and-link-vmlinux = LD $@ + cmd_check-and-link-vmlinux = $(cmd_check_data_rel); $(cmd_ld) + $(obj)/vmlinux: $(vmlinux-objs-y) FORCE - $(call if_changed,check_data_rel) - $(call if_changed,ld) + $(call if_changed,check-and-link-vmlinux) OBJCOPYFLAGS_vmlinux.bin := -R .comment -S $(obj)/vmlinux.bin: vmlinux FORCE |