summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Meyer <thomas@m3y3r.de>2017-08-20 13:26:04 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-02-07 11:07:53 -0800
commitf79ad9c84ff551ae15bb85374e554659c263bb31 (patch)
treed056f59b023314f1a67e788d6bf79e23bf2ad0ed
parent33fd368597ad615f9f7232ca9daa3ed3fdba1516 (diff)
downloadlinux-stable-f79ad9c84ff551ae15bb85374e554659c263bb31.tar.gz
linux-stable-f79ad9c84ff551ae15bb85374e554659c263bb31.tar.bz2
linux-stable-f79ad9c84ff551ae15bb85374e554659c263bb31.zip
um: link vmlinux with -no-pie
commit 883354afbc109c57f925ccc19840055193da0cc0 upstream. Debian's gcc defaults to pie. The global Makefile already defines the -fno-pie option. Link UML dynamic kernel image also with -no-pie to fix the build. Signed-off-by: Thomas Meyer <thomas@m3y3r.de> Signed-off-by: Richard Weinberger <richard@nod.at> Cc: Bernie Innocenti <codewiz@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/um/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile
index e4b1a9639c4d..4e161398af93 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -116,7 +116,7 @@ archheaders:
archprepare: include/generated/user_constants.h
LINK-$(CONFIG_LD_SCRIPT_STATIC) += -static
-LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib
+LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib $(call cc-option, -no-pie)
CFLAGS_NO_HARDENING := $(call cc-option, -fno-PIC,) $(call cc-option, -fno-pic,) \
$(call cc-option, -fno-stack-protector,) \