summaryrefslogtreecommitdiffstats
path: root/makefile-after_link.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-02-08 03:24:55 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2014-02-08 03:24:55 -0500
commit28a80a313cb4ddf896143d6260a2efee9e9bfb1e (patch)
tree517881067caf7e71759d8512440a81d01a95b2bd /makefile-after_link.patch
parent58fa16ea43056ac79a692f2ae38a9ff737787096 (diff)
downloadkernel-28a80a313cb4ddf896143d6260a2efee9e9bfb1e.tar.gz
kernel-28a80a313cb4ddf896143d6260a2efee9e9bfb1e.tar.xz
kernel-28a80a313cb4ddf896143d6260a2efee9e9bfb1e.zip
Linux v3.14-rc1-150-g34a9bff
Diffstat (limited to 'makefile-after_link.patch')
-rw-r--r--makefile-after_link.patch11
1 files changed, 6 insertions, 5 deletions
diff --git a/makefile-after_link.patch b/makefile-after_link.patch
index 4c96701d6..23406fc95 100644
--- a/makefile-after_link.patch
+++ b/makefile-after_link.patch
@@ -11,17 +11,18 @@ after each final link. This includes vmlinux itself and vDSO images.
Signed-off-by: Roland McGrath <roland@redhat.com>
+
diff --git a/arch/arm64/kernel/vdso/Makefile b/arch/arm64/kernel/vdso/Makefile
-index d8064af..04dcfe1 100644
+index 6d20b7d..863a01b 100644
--- a/arch/arm64/kernel/vdso/Makefile
+++ b/arch/arm64/kernel/vdso/Makefile
@@ -48,7 +48,8 @@ $(obj-vdso): %.o: %.S
# Actual build commands
quiet_cmd_vdsold = VDSOL $@
-- cmd_vdsold = $(CC) $(c_flags) -Wl,-T $^ -o $@
-+ cmd_vdsold = $(CC) $(c_flags) -Wl,-T $^ -o $@ \
-+ $(if $(AFTER_LINK),; $(AFTER_LINK))
+- cmd_vdsold = $(CC) $(c_flags) -Wl,-n -Wl,-T $^ -o $@
++ cmd_vdsold = $(CC) $(c_flags) -Wl,-n -Wl,-T $^ -o $@ \
++ $(if $(AFTER_LINK),;$(AFTER_LINK))
quiet_cmd_vdsoas = VDSOA $@
cmd_vdsoas = $(CC) $(a_flags) -c -o $@ $<
@@ -98,7 +99,7 @@ index fd14be1..1f3eb19 100644
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 0149949..e307cda 100644
+index 2dcb377..25e170e 100644
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -65,6 +65,10 @@ vmlinux_link()