summaryrefslogtreecommitdiffstats
path: root/core/combo/TARGET_linux-arm64.mk
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2014-05-30 15:45:24 -0700
committerNick Kralevich <nnk@google.com>2014-05-30 15:46:40 -0700
commit45545761d20e1eab324b8ce302afceb9c440c2a3 (patch)
treeaffa186fcdb455aeb8174dfb5ac2315e81cc67cb /core/combo/TARGET_linux-arm64.mk
parent61cf065ae9247a200208dc7df0234e03caff3605 (diff)
downloadbuild-45545761d20e1eab324b8ce302afceb9c440c2a3.zip
build-45545761d20e1eab324b8ce302afceb9c440c2a3.tar.gz
build-45545761d20e1eab324b8ce302afceb9c440c2a3.tar.bz2
arm64: restore relro/now
The bug which required this option has been fixed. Bug: 11434996 Change-Id: I7ab7e2e8ba7b993281902832d01b3ee3ba9e06ef
Diffstat (limited to 'core/combo/TARGET_linux-arm64.mk')
-rw-r--r--core/combo/TARGET_linux-arm64.mk4
1 files changed, 2 insertions, 2 deletions
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 += -fno-strict-volatile-bitfields
#
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 \