| From f072f7db2194c8255c003d985b61ad2f97ebbee0 Mon Sep 17 00:00:00 2001 |
| From: Roland McGrath <roland@redhat.com> |
| Date: Mon, 6 Oct 2008 23:03:03 -0700 |
| Subject: [PATCH] kbuild: AFTER_LINK |
| |
| If the make variable AFTER_LINK is set, it is a command line to run |
| after each final link. This includes vmlinux itself and vDSO images. |
| |
| Signed-off-by: Roland McGrath <roland@redhat.com> |
| |
| diff --git a/Makefile b/Makefile |
| index f908acc..960ff6f 100644 |
| |
| |
| @@ -746,6 +746,10 @@ quiet_cmd_vmlinux__ ?= LD $@ |
| --start-group $(vmlinux-main) --end-group \ |
| $(filter-out $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) vmlinux.o FORCE ,$^) |
| |
| +ifdef AFTER_LINK |
| +cmd_vmlinux__ += ; $(AFTER_LINK) |
| +endif |
| + |
| # Generate new vmlinux version |
| quiet_cmd_vmlinux_version = GEN .version |
| cmd_vmlinux_version = set -e; \ |
| diff --git a/arch/powerpc/kernel/vdso32/Makefile b/arch/powerpc/kernel/vdso32/Makefile |
| index 51ead52..ad21273 100644 |
| |
| |
| @@ -41,7 +41,8 @@ $(obj-vdso32): %.o: %.S |
| |
| # actual build commands |
| quiet_cmd_vdso32ld = VDSO32L $@ |
| - cmd_vdso32ld = $(CROSS32CC) $(c_flags) -Wl,-T $^ -o $@ |
| + cmd_vdso32ld = $(CROSS32CC) $(c_flags) -Wl,-T $^ -o $@ \ |
| + $(if $(AFTER_LINK),; $(AFTER_LINK)) |
| quiet_cmd_vdso32as = VDSO32A $@ |
| cmd_vdso32as = $(CROSS32CC) $(a_flags) -c -o $@ $< |
| |
| diff --git a/arch/powerpc/kernel/vdso64/Makefile b/arch/powerpc/kernel/vdso64/Makefile |
| index 79da65d..f11c21b 100644 |
| |
| |
| @@ -36,7 +36,8 @@ $(obj-vdso64): %.o: %.S |
| |
| # actual build commands |
| quiet_cmd_vdso64ld = VDSO64L $@ |
| - cmd_vdso64ld = $(CC) $(c_flags) -Wl,-T $^ -o $@ |
| + cmd_vdso64ld = $(CC) $(c_flags) -Wl,-T $^ -o $@ \ |
| + $(if $(AFTER_LINK),; $(AFTER_LINK)) |
| quiet_cmd_vdso64as = VDSO64A $@ |
| cmd_vdso64as = $(CC) $(a_flags) -c -o $@ $< |
| |
| diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile |
| index 4a2afa1..12ad9f7 100644 |
| |
| |
| @@ -120,8 +120,9 @@ $(obj)/vdso32-syms.lds: $(vdso32.so-y:%=$(obj)/vdso32-%-syms.lds) FORCE |
| quiet_cmd_vdso = VDSO $@ |
| cmd_vdso = $(CC) -nostdlib -o $@ \ |
| $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \ |
| - -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \ |
| - sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@' |
| + -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) \ |
| + $(if $(AFTER_LINK),; $(AFTER_LINK)) && \ |
| + sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@' |
| |
| VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) |
| GCOV_PROFILE := n |
| |
| diff --git a/arch/s390/kernel/vdso32/Makefile b/arch/s390/kernel/vdso32/Makefile |
| index d13e875..28a3e1ad 100644 |
| |
| |
| @@ -40,7 +40,8 @@ $(obj-vdso32): %.o: %.S |
| |
| # actual build commands |
| quiet_cmd_vdso32ld = VDSO32L $@ |
| - cmd_vdso32ld = $(CC) $(c_flags) -Wl,-T $^ -o $@ |
| + cmd_vdso32ld = $(CC) $(c_flags) -Wl,-T $^ -o $@ \ |
| + $(if $(AFTER_LINK),; $(AFTER_LINK)) |
| 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 449352d..e90e656 100644 |
| |
| |
| @@ -40,7 +40,8 @@ $(obj-vdso64): %.o: %.S |
| |
| # actual build commands |
| quiet_cmd_vdso64ld = VDSO64L $@ |
| - cmd_vdso64ld = $(CC) $(c_flags) -Wl,-T $^ -o $@ |
| + cmd_vdso64ld = $(CC) $(c_flags) -Wl,-T $^ -o $@ \ |
| + $(if $(AFTER_LINK),; $(AFTER_LINK)) |
| quiet_cmd_vdso64as = VDSO64A $@ |
| cmd_vdso64as = $(CC) $(a_flags) -c -o $@ $< |
| |