You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
67 lines
2.2 KiB
67 lines
2.2 KiB
From f06e0fe77c3518568bcf4755981acd24c1a993c2 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.
|
|
|
|
Bugzilla: N/A
|
|
Upstream-status: ??
|
|
|
|
Signed-off-by: Roland McGrath <roland@redhat.com>
|
|
---
|
|
arch/arm64/kernel/vdso/Makefile | 3 ++-
|
|
arch/x86/entry/vdso/Makefile | 5 +++--
|
|
scripts/link-vmlinux.sh | 4 ++++
|
|
3 files changed, 9 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/arch/arm64/kernel/vdso/Makefile b/arch/arm64/kernel/vdso/Makefile
|
|
index fa230ff09aa1..ab668b5e07cd 100644
|
|
--- a/arch/arm64/kernel/vdso/Makefile
|
|
+++ b/arch/arm64/kernel/vdso/Makefile
|
|
@@ -48,7 +48,8 @@ $(obj-vdso): %.o: %.S FORCE
|
|
|
|
# Actual build commands
|
|
quiet_cmd_vdsoas = VDSOA $@
|
|
- cmd_vdsoas = $(CC) $(a_flags) -c -o $@ $<
|
|
+ cmd_vdsoas = $(CC) $(a_flags) -c -o $@ $< \
|
|
+ $(if $(AFTER_LINK),;$(AFTER_LINK))
|
|
|
|
# Install commands for the unstripped file
|
|
quiet_cmd_vdso_install = INSTALL $@
|
|
diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
|
|
index 42fe42e82baf..c38a827a7c90 100644
|
|
--- a/arch/x86/entry/vdso/Makefile
|
|
+++ b/arch/x86/entry/vdso/Makefile
|
|
@@ -167,8 +167,9 @@ $(obj)/vdso32.so.dbg: FORCE \
|
|
quiet_cmd_vdso = VDSO $@
|
|
cmd_vdso = $(LD) -nostdlib -o $@ \
|
|
$(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
|
|
- -T $(filter %.lds,$^) $(filter %.o,$^) && \
|
|
- sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
|
|
+ -T $(filter %.lds,$^) $(filter %.o,$^) \
|
|
+ $(if $(AFTER_LINK),; $(AFTER_LINK)) && \
|
|
+ sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
|
|
|
|
VDSO_LDFLAGS = -shared $(call ld-option, --hash-style=both) \
|
|
$(call ld-option, --build-id) $(call ld-option, --eh-frame-hdr) \
|
|
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
|
|
index a7124f895b24..8a3f116a7d86 100755
|
|
--- a/scripts/link-vmlinux.sh
|
|
+++ b/scripts/link-vmlinux.sh
|
|
@@ -89,6 +89,10 @@ vmlinux_link()
|
|
-lutil -lrt -lpthread
|
|
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
|
|
}
|
|
|
|
# generate .BTF typeinfo from DWARF debuginfo
|
|
--
|
|
2.20.1
|
|
|