From: Laura Abbott <labbott@redhat.com>
To: Andy Lutomirski <luto@kernel.org>,
mjw@fedoraproject.org, "H . J . Lu" <hjl.tools@gmail.com>,
Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Laura Abbott <labbott@redhat.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
X86 ML <x86@kernel.org>,
linux-kernel@vger.kernel.org, Nick Clifton <nickc@redhat.com>,
Cary Coutant <ccoutant@gmail.com>,
linux-kbuild@vger.kernel.org
Subject: [PATCHv3 2/2] x86/vdso: Add build salt to the vDSO
Date: Tue, 22 May 2018 17:19:39 -0700 [thread overview]
Message-ID: <20180523001939.9431-3-labbott@redhat.com> (raw)
In-Reply-To: <20180523001939.9431-1-labbott@redhat.com>
The vDSO is linked separately from the kernel and modules. Ensure it picks
up the comment section, if available.
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
v3: Invoke the generated linker script. The ".." nightmare is pretty
ugly but I didn't see an easier way to pick up the generated file.
That was actually part of my motivation for using an #include since
paths for those are standardized.
---
arch/x86/entry/vdso/Makefile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
index d998a487c9b1..f54aa97dc9f0 100644
--- a/arch/x86/entry/vdso/Makefile
+++ b/arch/x86/entry/vdso/Makefile
@@ -162,7 +162,9 @@ $(obj)/vdso32.so.dbg: FORCE \
quiet_cmd_vdso = VDSO $@
cmd_vdso = $(CC) -nostdlib -o $@ \
$(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
- -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
+ -Wl,-T,$(filter %.lds,$^) \
+ -Wl,-T$(obj)/../../../../scripts/build-salt.lds \
+ $(filter %.o,$^) && \
sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=both) \
--
2.17.0
next prev parent reply other threads:[~2018-05-23 0:20 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-23 0:19 [PATCHv3 0/2] Salted build ids via linker sections Laura Abbott
2018-05-23 0:19 ` [PATCHv3 1/2] kbuild: Introduce build-salt linker script Laura Abbott
2018-05-23 0:19 ` Laura Abbott [this message]
2018-05-23 0:33 ` [PATCHv3 2/2] x86/vdso: Add build salt to the vDSO Andy Lutomirski
2018-05-23 1:23 ` Laura Abbott
2018-05-23 22:53 ` Laura Abbott
2018-05-23 23:55 ` Linus Torvalds
2018-05-24 0:01 ` Andy Lutomirski
[not found] ` <CA+55aFxXCWc5qCAsuRmrCGqL7ws4f6B_zy1WR98kHgr_XZs3fw@mail.gmail.com>
2018-05-24 1:36 ` Laura Abbott
2018-05-24 0:11 ` Masahiro Yamada
2018-05-24 1:43 ` Masahiro Yamada
2018-05-24 2:16 ` Laura Abbott
2018-05-24 1:55 ` 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=20180523001939.9431-3-labbott@redhat.com \
--to=labbott@redhat.com \
--cc=ccoutant@gmail.com \
--cc=hjl.tools@gmail.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mjw@fedoraproject.org \
--cc=nickc@redhat.com \
--cc=torvalds@linux-foundation.org \
--cc=x86@kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).