aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2012-10-23 18:53:42 +0800
committerAndrew Hsieh <andrewhsieh@google.com>2012-10-23 18:53:42 +0800
commit106603b925b7f20177c5b7613535d9d43ed35b7d (patch)
tree1c238d4252de0a8c684db0171af3703302489ff4
parent89f41cc2452f2c3ab645a35db0aa5bf6cba0795d (diff)
downloadbuild-106603b925b7f20177c5b7613535d9d43ed35b7d.tar.gz
Options brought in from core combo for IA
Used to be local NDK patch at $NDK/build/tools/toolchain-patches/ build/0001-Options-brought-in-from-core-combo-for-IA.patch Change-Id: I50a6397414a6574c51857dc2c8826ef50f5f4a0c
-rw-r--r--Makefile.in29
1 files changed, 29 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in
index 379929a..482d318 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -441,6 +441,35 @@ GCC_CONFIG_ARGS += $(GCC_CONFIG_LIBSTDCXX_V3) --disable-libssp \
--disable-tls --disable-libitm
CFLAGS_FOR_TARGET += -DTARGET_POSIX_IO -fno-short-enums
+
+ifeq ($(target_cpu),x86)
+# Options brought in from core/combo/* for IA
+CFLAGS_FOR_TARGET += \
+ -DANDROID -D__ANDROID__ -Ulinux \
+ -fPIC -Wa,--noexecstack -m32 -fstack-protector \
+ -W -Wall -Werror=address -Werror=format-security -Werror=non-virtual-dtor -Werror=return-type \
+ -Werror=sequence-point -Winit-self -Wno-multichar -Wno-unused -Wpointer-arith -Wstrict-aliasing=2 \
+ -fexceptions -ffunction-sections -finline-functions \
+ -finline-limit=300 -fmessage-length=0 -fno-inline-functions-called-once \
+ -fno-strict-aliasing -frtti \
+ -fstrict-aliasing -funswitch-loops -funwind-tables \
+ -march=i686 -mtune=atom -mbionic -mfpmath=sse -mstackrealign -DUSE_SSE2
+
+LDFLAGS_FOR_TARGET += \
+ -m32 -O2 -g -fPIC \
+ -nostartfiles \
+ -Wl,-z,noexecstack -Wl,--gc-sections -nostdlib \
+ -fexceptions -frtti -fstrict-aliasing -ffunction-sections -finline-functions \
+ -finline-limit=300 -fno-inline-functions-called-once \
+ -funswitch-loops -funwind-tables -mstackrealign \
+ -ffunction-sections -funwind-tables -fmessage-length=0 \
+ -march=atom -mstackrealign -mfpmath=sse -mbionic \
+ -Wno-multichar -Wl,-z,noexecstack -Werror=format-security -Wstrict-aliasing=2 \
+ -W -Wall -Wno-unused -Winit-self -Wpointer-arith -Werror=return-type -Werror=non-virtual-dtor \
+ -Werror=address -Werror=sequence-point \
+ -Werror=format-security -Wl,--no-undefined
+endif
+
# ARM specific options.
ifeq ($(target_cpu),arm)
GCC_CONFIG_ARGS += --with-float=soft --with-fpu=vfp --with-arch=armv5te \