commit a42e0f50162721bc54c113ef1ed3058cfb38ae67
author Nick Kralevich <nnk@google.com> Fri May 30 22:52:34 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 30 22:52:35 2014 +0000
tree affa186fcdb455aeb8174dfb5ac2315e81cc67cb
parent 61cf065ae9247a200208dc7df0234e03caff3605
parent 45545761d20e1eab324b8ce302afceb9c440c2a3

Merge "arm64: restore relro/now"

core/combo/TARGET_linux-arm64.mk

diff --git a/core/combo/TARGET_linux-arm64.mk b/core/combo/TARGET_linux-arm64.mk
index e6c35a9..c38fb4c 100644
--- a/core/combo/TARGET_linux-arm64.mk
+++ b/core/combo/TARGET_linux-arm64.mk
@@ -106,10 +106,10 @@
 #
 TARGET_GLOBAL_CFLAGS += -Wno-psabi
 
-# TODO - temporarily remove "-Wl,-z,relro -Wl,-z,now" as they cause segmentation fault on the
-# v8 foundation model.
 TARGET_GLOBAL_LDFLAGS += \
 			-Wl,-z,noexecstack \
+			-Wl,-z,relro \
+			-Wl,-z,now \
 			-Wl,--warn-shared-textrel \
 			-Wl,--fatal-warnings \
 			-Wl,-maarch64linux \