am 5023bb57: am 31570961: am c5e3539b: am 5859f105: Merge "Enable NX protections"

* commit '5023bb574f5e0e29a8434734ca1db52b6a35bf6a':
  Enable NX protections
This commit is contained in:
Ying Wang 2013-12-13 00:17:27 +00:00 committed by Android Git Automerger
commit a27fd616c0
1 changed files with 4 additions and 4 deletions

View File

@ -39,12 +39,12 @@ ifneq ($(strip $(BUILD_HOST_64bit)),)
# more consistency between the host tools and the target.
# BUILD_HOST_64bit=1 overrides it for tool like emulator
# which can benefit from 64-bit host arch.
HOST_GLOBAL_CFLAGS += -m64
HOST_GLOBAL_LDFLAGS += -m64
HOST_GLOBAL_CFLAGS += -m64 -Wa,--noexecstack
HOST_GLOBAL_LDFLAGS += -m64 -Wl,-z,noexecstack
else
# We expect SSE3 floating point math.
HOST_GLOBAL_CFLAGS += -mstackrealign -msse3 -mfpmath=sse -m32
HOST_GLOBAL_LDFLAGS += -m32
HOST_GLOBAL_CFLAGS += -mstackrealign -msse3 -mfpmath=sse -m32 -Wa,--noexecstack
HOST_GLOBAL_LDFLAGS += -m32 -Wl,-z,noexecstack
endif # BUILD_HOST_64bit
ifneq ($(strip $(BUILD_HOST_static)),)