commit 23025ecdc0890e9262951627defda77e621fd9e8
author Nick Kralevich <nnk@google.com> Thu Oct 04 17:14:17 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 04 17:14:17 2012 -0700
tree c6b6c1199c7eaf5c1bfa0ac72edee4a69b4a126f
parent 195b0653a23545c22bf506ab67bc0674e885b936
parent f3b02739a7abba7c8f4884d49553f8a9f3fcfaf8

am f3b02739: am 7653519f: Merge "[MIPS] Makes a build system use PIE flag"

* commit 'f3b02739a7abba7c8f4884d49553f8a9f3fcfaf8':
  [MIPS] Makes a build system use PIE flag

core/combo/TARGET_linux-mips.mk

diff --git a/core/combo/TARGET_linux-mips.mk b/core/combo/TARGET_linux-mips.mk
index 60d7e5b..9c9fe2a 100644
--- a/core/combo/TARGET_linux-mips.mk
+++ b/core/combo/TARGET_linux-mips.mk
@@ -81,7 +81,7 @@
 TARGET_GLOBAL_CFLAGS += \
 			$(TARGET_mips_CFLAGS) \
 			-Ulinux -U__unix -U__unix__ -Umips \
-			-fpic \
+			-fpic -fPIE\
 			-ffunction-sections \
 			-fdata-sections \
 			-funwind-tables \
@@ -243,7 +243,7 @@
 endef
 
 define transform-o-to-executable-inner
-$(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic \
+$(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \
 	-Wl,-dynamic-linker,/system/bin/linker \
 	-Wl,--gc-sections \
 	-Wl,-z,nocopyreloc \