aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-04-24 16:16:06 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-04-24 16:16:06 +0000
commit1076c5685b1f1dd0f8b691466f6e16259722ca56 (patch)
tree6649aa8a7a3419e168deddb7b628cae506116cd9
parent3467048f3f5a483ca2fff529ebd4c8d3b7827143 (diff)
parent1acd8b0552e94f46b985b0ecdc878ab61cc894d2 (diff)
downloadbuild-1076c5685b1f1dd0f8b691466f6e16259722ca56.tar.gz
Merge "Leave 'linux' defined on mips/mips64, like arm."
-rw-r--r--core/combo/TARGET_linux-mips.mk2
-rw-r--r--core/combo/TARGET_linux-mips64.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/combo/TARGET_linux-mips.mk b/core/combo/TARGET_linux-mips.mk
index 27304eebcb..ba03b5df35 100644
--- a/core/combo/TARGET_linux-mips.mk
+++ b/core/combo/TARGET_linux-mips.mk
@@ -82,7 +82,7 @@ android_config_h := $(call select-android-config-h,linux-mips)
$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \
$(TARGET_mips_CFLAGS) \
- -Ulinux -U__unix -U__unix__ -Umips \
+ -U__unix -U__unix__ -Umips \
-fpic -fPIE\
-ffunction-sections \
-fdata-sections \
diff --git a/core/combo/TARGET_linux-mips64.mk b/core/combo/TARGET_linux-mips64.mk
index 36b70ada34..969ba10a09 100644
--- a/core/combo/TARGET_linux-mips64.mk
+++ b/core/combo/TARGET_linux-mips64.mk
@@ -87,7 +87,7 @@ android_config_h := $(call select-android-config-h,linux-mips64)
TARGET_GLOBAL_CFLAGS += \
$(TARGET_mips_CFLAGS) \
- -Ulinux -U__unix -U__unix__ -Umips \
+ -U__unix -U__unix__ -Umips \
-fpic -fPIE\
-ffunction-sections \
-fdata-sections \