From: Nicholas Piggin <npiggin@gmail.com>
To: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Nicholas Piggin <npiggin@gmail.com>,
linux-kbuild@vger.kernel.org, Tony Luck <tony.luck@intel.com>,
Fenghua Yu <fenghua.yu@intel.com>,
linux-ia64@vger.kernel.org
Subject: [PATCH 1/2] ia64: thin archives fix linking
Date: Wed, 21 Jun 2017 17:56:37 +1000 [thread overview]
Message-ID: <20170621075638.19251-2-npiggin@gmail.com> (raw)
In-Reply-To: <20170621075638.19251-1-npiggin@gmail.com>
The VDSO symbols can't be linked into built-in.o when building with
thin archives, so change this to linking them into the final link.
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>
---
arch/ia64/Makefile | 1 +
arch/ia64/kernel/Makefile.gate | 3 ---
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
index c100d780f1eb..302f7edbcfd1 100644
--- a/arch/ia64/Makefile
+++ b/arch/ia64/Makefile
@@ -22,6 +22,7 @@ CHECKFLAGS += -m64 -D__ia64=1 -D__ia64__=1 -D_LP64 -D__LP64__
OBJCOPYFLAGS := --strip-all
LDFLAGS_vmlinux := -static
+LDFLAGS_vmlinux += -R arch/ia64/kernel/gate-syms.o
KBUILD_LDFLAGS_MODULE += -T $(srctree)/arch/ia64/module.lds
KBUILD_AFLAGS_KERNEL := -mconstant-gp
EXTRA :=
diff --git a/arch/ia64/kernel/Makefile.gate b/arch/ia64/kernel/Makefile.gate
index a32903ada016..9d9c69100d35 100644
--- a/arch/ia64/kernel/Makefile.gate
+++ b/arch/ia64/kernel/Makefile.gate
@@ -14,9 +14,6 @@ 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
$(call if_changed,gate)
--
2.11.0
next prev parent reply other threads:[~2017-06-21 7:56 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-21 7:56 [PATCH 0/2] fix ia64 and tile for thin archives Nicholas Piggin
2017-06-21 7:56 ` Nicholas Piggin [this message]
2017-06-21 7:56 ` [PATCH 2/2] tile: thin archives fix linking Nicholas Piggin
2017-06-21 23:33 ` [PATCH 0/2] fix ia64 and tile for thin archives Masahiro Yamada
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170621075638.19251-2-npiggin@gmail.com \
--to=npiggin@gmail.com \
--cc=fenghua.yu@intel.com \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=tony.luck@intel.com \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox