OSDN Git Service

arm64: restore relro/now
authorNick Kralevich <nnk@google.com>
Fri, 30 May 2014 22:45:24 +0000 (15:45 -0700)
committerNick Kralevich <nnk@google.com>
Fri, 30 May 2014 22:46:40 +0000 (15:46 -0700)
The bug which required this option has been fixed.

Bug: 11434996
Change-Id: I7ab7e2e8ba7b993281902832d01b3ee3ba9e06ef

core/combo/TARGET_linux-arm64.mk

index e6c35a9..c38fb4c 100644 (file)
@@ -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 \