aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-04-23 23:09:30 -0700
committerElliott Hughes <enh@google.com>2014-04-23 23:09:30 -0700
commit2c8e95528c450008c79795b4539f735444264d6e (patch)
tree8902a63bfa21c7470047a297cbc577a15a8f284b
parentdb55f602be5434c0a2b7ffdfe601878d910f0914 (diff)
downloadbuild-2c8e95528c450008c79795b4539f735444264d6e.tar.gz
Leave 'linux' defined on x86/x86-64, like arm.
Change-Id: I53013a45c19a643a985de3f339b8b3f8f4dc39d2
-rw-r--r--core/combo/TARGET_linux-x86.mk1
-rw-r--r--core/combo/TARGET_linux-x86_64.mk1
2 files changed, 0 insertions, 2 deletions
diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk
index 1361be2960..01f8242bd1 100644
--- a/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@ -106,7 +106,6 @@ android_config_h := $(call select-android-config-h,target_linux-x86)
$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \
-O2 \
- -Ulinux \
-Wa,--noexecstack \
-Werror=format-security \
-D_FORTIFY_SOURCE=2 \
diff --git a/core/combo/TARGET_linux-x86_64.mk b/core/combo/TARGET_linux-x86_64.mk
index 2e06263d25..a5a745b4cc 100644
--- a/core/combo/TARGET_linux-x86_64.mk
+++ b/core/combo/TARGET_linux-x86_64.mk
@@ -106,7 +106,6 @@ KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)
TARGET_GLOBAL_CFLAGS += \
-O2 \
- -Ulinux \
-Wa,--noexecstack \
-Werror=format-security \
-D_FORTIFY_SOURCE=2 \