commit 847fd0311f6c82b8ac90d970cfc68aafd9913471
author Elliott Hughes <enh@google.com> Thu Apr 24 16:19:17 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 24 16:19:17 2014 +0000
tree 03ebfe7311263b7a4d37278f70dab780a73d39ec
parent 1076c5685b1f1dd0f8b691466f6e16259722ca56
parent 2c8e95528c450008c79795b4539f735444264d6e

Merge "Leave 'linux' defined on x86/x86-64, like arm."

core/combo/TARGET_linux-x86.mk

diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk
index 1361be2..01f8242 100644
--- a/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@ -106,7 +106,6 @@
 
 $(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \
 			-O2 \
-			-Ulinux \
 			-Wa,--noexecstack \
 			-Werror=format-security \
 			-D_FORTIFY_SOURCE=2 \

core/combo/TARGET_linux-x86_64.mk

diff --git a/core/combo/TARGET_linux-x86_64.mk b/core/combo/TARGET_linux-x86_64.mk
index 2e06263..a5a745b 100644
--- a/core/combo/TARGET_linux-x86_64.mk
+++ b/core/combo/TARGET_linux-x86_64.mk
@@ -106,7 +106,6 @@
 
 TARGET_GLOBAL_CFLAGS += \
 			-O2 \
-			-Ulinux \
 			-Wa,--noexecstack \
 			-Werror=format-security \
 			-D_FORTIFY_SOURCE=2 \