am 329988c2: am a42e0f50: Merge "arm64: restore relro/now"

* commit '329988c277553621c40bbfff85e9848783992040':
  arm64: restore relro/now
This commit is contained in:
Nick Kralevich
2014-05-30 22:59:28 +00:00
committed by Android Git Automerger

View 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 \