summaryrefslogtreecommitdiffstats
path: root/core/combo
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2012-05-10 09:30:54 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-10 09:30:54 -0700
commit0dc038075ca2e5f0b30082e4a78f900febdf5f82 (patch)
treead94f105a5ea07d3236701092ebaf8f7df4e4d30 /core/combo
parent192ed892d57760e94b4f2a6fb4a36cde6b0e6ebe (diff)
parent9d602a7005683965814823feda5aabcce5a92201 (diff)
downloadbuild-0dc038075ca2e5f0b30082e4a78f900febdf5f82.zip
build-0dc038075ca2e5f0b30082e4a78f900febdf5f82.tar.gz
build-0dc038075ca2e5f0b30082e4a78f900febdf5f82.tar.bz2
am 9d602a70: am ecb1a565: x86: compile everything with relro / bind_now
* commit '9d602a7005683965814823feda5aabcce5a92201': x86: compile everything with relro / bind_now
Diffstat (limited to 'core/combo')
-rw-r--r--core/combo/TARGET_linux-x86.mk1
1 files changed, 1 insertions, 0 deletions
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_CFLAGS += -D__ANDROID__
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 := \