aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Meyer <thomas@m3y3r.de>2017-08-20 13:26:04 +0200
committerDaniel Pradilla <dpradilla@google.com>2018-06-04 11:03:06 -0700
commite4d1ce4f4533d105ee47ceeb1564f70da04a6a6a (patch)
tree6a90fb073a9ea9e4f4770ccb14966ca02bb421d7
parent3793df22d4b4ff1e2d174368d98b422b6f3b4ed5 (diff)
downloadv4.4-e4d1ce4f4533d105ee47ceeb1564f70da04a6a6a.tar.gz
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> Bug: 78535461 Test: Verified nettest compile and pass as expected. Change-Id: I769a9026bf1949fea2c31039b8998a099aee8565
-rw-r--r--arch/um/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile
index e3abe6f3156d..9ccf462131c4 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -117,7 +117,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,) \