commit e6f47ace30855ea7dca94256fad9983d1e916732
author Nick Kralevich <nnk@google.com> Wed May 05 12:52:15 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed May 05 12:52:15 2010 -0700
tree 23e70b0a70769cab01834167df709d4dc082403c
parent c621843d823509051a22748f763aee6e1d2f305c
parent 8084f8c123006226767e0c37547412e8b7dd3238

am 8084f8c1: am 2915cc3e: Enable NX protections

core/combo/TARGET_linux-arm.mk

diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk
index 27e04ce..2bc91c9 100644
--- a/core/combo/TARGET_linux-arm.mk
+++ b/core/combo/TARGET_linux-arm.mk
@@ -97,12 +97,14 @@
 			-ffunction-sections \
 			-funwind-tables \
 			-fstack-protector \
+			-Wa,--noexecstack \
 			-fno-short-enums \
 			$(arch_variant_cflags) \
 			-include $(android_config_h) \
 			-I $(arch_include_dir)
 
 TARGET_GLOBAL_LDFLAGS += \
+			-Wl,-z,noexecstack \
 			$(arch_variant_ldflags)
 
 # We only need thumb interworking in cases where thumb support