summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2012-10-04 17:12:46 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-04 17:12:46 -0700
commitf3b02739a7abba7c8f4884d49553f8a9f3fcfaf8 (patch)
tree9439622c0c0dede6fde538fe43eeea4e27411349 /core
parent2cb0549a18232b262b5c01b86319cbc6fece252e (diff)
parent7653519f4e9efaaef906d2e5d3b109909b6d45c7 (diff)
downloadbuild-f3b02739a7abba7c8f4884d49553f8a9f3fcfaf8.zip
build-f3b02739a7abba7c8f4884d49553f8a9f3fcfaf8.tar.gz
build-f3b02739a7abba7c8f4884d49553f8a9f3fcfaf8.tar.bz2
am 7653519f: Merge "[MIPS] Makes a build system use PIE flag"
* commit '7653519f4e9efaaef906d2e5d3b109909b6d45c7': [MIPS] Makes a build system use PIE flag
Diffstat (limited to 'core')
-rw-r--r--core/combo/TARGET_linux-mips.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/combo/TARGET_linux-mips.mk b/core/combo/TARGET_linux-mips.mk
index 0a7e20f..1e649ec 100644
--- a/core/combo/TARGET_linux-mips.mk
+++ b/core/combo/TARGET_linux-mips.mk
@@ -84,7 +84,7 @@ arch_include_dir := $(dir $(android_config_h))
TARGET_GLOBAL_CFLAGS += \
$(TARGET_mips_CFLAGS) \
-Ulinux -U__unix -U__unix__ -Umips \
- -fpic \
+ -fpic -fPIE\
-ffunction-sections \
-fdata-sections \
-funwind-tables \
@@ -244,7 +244,7 @@ $(hide) $(PRIVATE_CXX) \
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 \