Attachment 705475 Details for Bug 918098 – 0001-kbuild-AFTER_LINK.patch

[patch] 0001-kbuild-AFTER_LINK.patch

0001-kbuild-AFTER_LINK.patch (text/plain), 3.95 KB, created by John Kacur on 2013-03-05 14:24:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Kacur

Created: 2013-03-05 14:24:22 UTC

Size: 3.95 KB

patch

obsolete

>From da138051ea54f2bce260a61332ec5cdbe0c67cc2 Mon Sep 17 00:00:00 2001
>From: Roland McGrath <roland@redhat.com>
>Date: Mon, 6 Oct 2008 23:03:03 -0700
>Subject: [PATCH 1/2] 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>
>Signed-off-by: John Kacur <jkacur@redhat.com>
>---
> arch/powerpc/kernel/vdso32/Makefile | 3 ++-
> arch/powerpc/kernel/vdso64/Makefile | 3 ++-
> arch/s390/kernel/vdso32/Makefile    | 3 ++-
> arch/s390/kernel/vdso64/Makefile    | 3 ++-
> arch/x86/vdso/Makefile              | 5 +++--
> scripts/link-vmlinux.sh             | 4 ++++
> 6 files changed, 15 insertions(+), 6 deletions(-)
>
>diff --git a/arch/powerpc/kernel/vdso32/Makefile b/arch/powerpc/kernel/vdso32/Makefile
>index 53e6c9b..e427844 100644
>--- a/arch/powerpc/kernel/vdso32/Makefile
>+++ b/arch/powerpc/kernel/vdso32/Makefile
>@@ -43,7 +43,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 effca94..713891a 100644
>--- a/arch/powerpc/kernel/vdso64/Makefile
>+++ b/arch/powerpc/kernel/vdso64/Makefile
>@@ -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/s390/kernel/vdso32/Makefile b/arch/s390/kernel/vdso32/Makefile
>index 8ad2b34..e153572 100644
>--- a/arch/s390/kernel/vdso32/Makefile
>+++ b/arch/s390/kernel/vdso32/Makefile
>@@ -43,7 +43,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 2a8ddfd..452ca53 100644
>--- a/arch/s390/kernel/vdso64/Makefile
>+++ b/arch/s390/kernel/vdso64/Makefile
>@@ -43,7 +43,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 fd14be1..1f3eb19 100644
>--- a/arch/x86/vdso/Makefile
>+++ b/arch/x86/vdso/Makefile
>@@ -178,8 +178,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/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
>index b3d907e..afe3659 100644
>--- a/scripts/link-vmlinux.sh
>+++ b/scripts/link-vmlinux.sh
>@@ -65,6 +65,10 @@ vmlinux_link()
> 			-lutil ${1}
> 		rm -f linux
> 	fi
>+	if [ -n "${AFTER_LINK}" ]; then
>+		/usr/lib/rpm/debugedit -b ${RPM_BUILD_DIR} -d /usr/src/debug -i ${2} \
>+			> ${2}.id
>+	fi
> }
> 
> 
>-- 
>1.7.11.7
>

Actions: View | Diff

Attachments on bug 918098: 705475 | 705482