117 lines
4.4 KiB
Diff
117 lines
4.4 KiB
Diff
From b707aea6a4947c3806ced2c23e889943a0f36876 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/arch/powerpc/kernel/vdso32/Makefile b/arch/powerpc/kernel/vdso32/Makefile
|
|
index 9a7946c..28d6765 100644
|
|
--- a/arch/powerpc/kernel/vdso32/Makefile
|
|
+++ b/arch/powerpc/kernel/vdso32/Makefile
|
|
@@ -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 8c500d8..d27737b 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/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
|
|
index fd14be1..1f3eb19 100644
|
|
--- a/arch/x86/entry/vdso/Makefile
|
|
+++ b/arch/x86/entry/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=both) \
|
|
$(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic $(LTO_CFLAGS)
|
|
diff --git a/arch/x86/um/vdso/Makefile b/arch/x86/um/vdso/Makefile
|
|
index fd14be1..1f3eb19 100644
|
|
--- a/arch/x86/um/vdso/Makefile
|
|
+++ b/arch/x86/um/vdso/Makefile
|
|
@@ -71,8 +71,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 cd9c6c6..3edf048 100644
|
|
--- a/scripts/link-vmlinux.sh
|
|
+++ b/scripts/link-vmlinux.sh
|
|
@@ -65,6 +65,10 @@ vmlinux_link()
|
|
-lutil -lrt -lpthread ${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.7.6
|
|
|