summaryrefslogtreecommitdiff
path: root/arch/ia64
diff options
context:
space:
mode:
authorNicholas Piggin <npiggin@gmail.com>2017-06-23 16:44:15 +0300
committerMasahiro Yamada <yamada.masahiro@socionext.com>2017-06-30 03:03:04 +0300
commit26160371359ea91d8e2bdad6245f39e7ed0c17a3 (patch)
treefdb8b303a4f3a78b7dcfa6030d995e864486a618 /arch/ia64
parent8f5ef7c74ac778a16a89bc054e316dcade304784 (diff)
downloadlinux-26160371359ea91d8e2bdad6245f39e7ed0c17a3.tar.xz
ia64: thin archives fix linking
The VDSO symbols can't be linked into built-in.o when building with thin archives, so change this to linking a new object file that is included into the built-in.o. Cc: Tony Luck <tony.luck@intel.com> Cc: Fenghua Yu <fenghua.yu@intel.com> Cc: linux-ia64@vger.kernel.org Signed-off-by: Nicholas Piggin <npiggin@gmail.com> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/kernel/Makefile.gate15
1 files changed, 9 insertions, 6 deletions
diff --git a/arch/ia64/kernel/Makefile.gate b/arch/ia64/kernel/Makefile.gate
index 92693c1d65f4..7da7c65a9bb1 100644
--- a/arch/ia64/kernel/Makefile.gate
+++ b/arch/ia64/kernel/Makefile.gate
@@ -1,6 +1,8 @@
# The gate DSO image is built using a special linker script.
-targets += gate.so gate-syms.o gate.lds gate.o
+targets += gate.so gate.lds gate.o gate-dummy.o
+
+obj-y += gate-syms.o
CPPFLAGS_gate.lds := -P -C -U$(ARCH)
@@ -12,13 +14,14 @@ GATECFLAGS_gate.so = -shared -s -Wl,-soname=linux-gate.so.1 \
$(obj)/gate.so: $(obj)/gate.lds $(obj)/gate.o FORCE
$(call if_changed,gate)
-$(obj)/built-in.o: $(obj)/gate-syms.o
-$(obj)/built-in.o: ld_flags += -R $(obj)/gate-syms.o
-
-GATECFLAGS_gate-syms.o = -r
-$(obj)/gate-syms.o: $(obj)/gate.lds $(obj)/gate.o FORCE
+GATECFLAGS_gate-dummy.o = -r
+$(obj)/gate-dummy.o: $(obj)/gate.lds $(obj)/gate.o FORCE
$(call if_changed,gate)
+LDFLAGS_gate-syms.o := -r -R
+$(obj)/gate-syms.o: $(obj)/gate-dummy.o FORCE
+ $(call if_changed,ld)
+
# gate-data.o contains the gate DSO image as data in section .data..gate.
# We must build gate.so before we can assemble it.
# Note: kbuild does not track this dependency due to usage of .incbin