commit 33a4e7e4cfa81dc21d37091515891859ef3ab934
author Andrew Hsieh <andrewhsieh@google.com> Fri Aug 16 01:08:00 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 16 01:08:01 2013 +0000
tree 6236832141d53f5836cf72403653eecc8cfa289d
parent 5c3bee7defca81362e98cf8fbd6c20cf47dff00b
parent 1516181dc31d12c9470b846a5d94d46e04341d15

Merge "Add explicit LOCAL_ASFLAGS=-m32 for x86 target"

Android.mk

diff --git a/Android.mk b/Android.mk
index ae94276..123e082 100644
--- a/Android.mk
+++ b/Android.mk
@@ -31,6 +31,7 @@
         -Wpointer-arith -falign-jumps=1 -falign-loops=1 \
         -falign-functions=1 -Wundef
 LOCAL_CFLAGS += -m32 -O2 -fno-builtin -nostdinc -fno-reorder-functions -fno-stack-protector
+LOCAL_ASFLAGS += -m32
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/stage1
 
@@ -88,6 +89,7 @@
 	-falign-functions=1 -Wundef
 
 LOCAL_CFLAGS += -m32 -Os -fno-builtin -nostdinc -fno-reorder-functions -fno-stack-protector
+LOCAL_ASFLAGS += -m32
 
 LOCAL_CFLAGS += -DHAVE_CONFIG_H -DFSYS_EXT2FS=1 -DSUPPORT_SERIAL=1
 
@@ -125,6 +127,7 @@
 	-falign-functions=1 -Wundef
 
 LOCAL_CFLAGS += -m32 -Os -fno-builtin -nostdinc -fno-reorder-functions -fno-stack-protector
+LOCAL_ASFLAGS += -m32
 
 LOCAL_CFLAGS += -DHAVE_CONFIG_H -DFSYS_EXT2FS=1 -DSUPPORT_SERIAL=1