commit 9d602a7005683965814823feda5aabcce5a92201
author Nick Kralevich <nnk@google.com> Thu May 10 09:24:10 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu May 10 09:24:10 2012 -0700
tree c602c8ae2cc0ccc0360be7d129bf77187f8aeba7
parent 25ceb29e001e61189590e97442f3f149b5ee3731
parent ecb1a565849b40ab7aa45b7fe71e24e29a059376

am ecb1a565: x86: compile everything with relro / bind_now

* commit 'ecb1a565849b40ab7aa45b7fe71e24e29a059376':
  x86: compile everything with relro / bind_now

core/combo/TARGET_linux-x86.mk

diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk
index 9e1d4bd..dc4afb8 100644
--- a/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@ -139,6 +139,7 @@
 TARGET_GLOBAL_LDFLAGS += -m32
 
 TARGET_GLOBAL_LDFLAGS += -Wl,-z,noexecstack
+TARGET_GLOBAL_LDFLAGS += -Wl,-z,relro -Wl,-z,now
 TARGET_GLOBAL_LDFLAGS += -Wl,--gc-sections
 
 TARGET_C_INCLUDES := \