[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20180523001939.9431-3-labbott@redhat.com>
Date: Tue, 22 May 2018 17:19:39 -0700
From: Laura Abbott <labbott@...hat.com>
To: Andy Lutomirski <luto@...nel.org>, mjw@...oraproject.org,
"H . J . Lu" <hjl.tools@...il.com>,
Masahiro Yamada <yamada.masahiro@...ionext.com>
Cc: Laura Abbott <labbott@...hat.com>,
Linus Torvalds <torvalds@...ux-foundation.org>,
X86 ML <x86@...nel.org>, linux-kernel@...r.kernel.org,
Nick Clifton <nickc@...hat.com>,
Cary Coutant <ccoutant@...il.com>, linux-kbuild@...r.kernel.org
Subject: [PATCHv3 2/2] x86/vdso: Add build salt to the vDSO
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@...hat.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
Powered by blists - more mailing lists