From 28c238c9ded0b5c91e122c94b5a02d76a5245c11 Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Thu, 19 Aug 2010 17:39:26 -0700
Subject: Fix sim build.

Note that this only makes the sim build green, but the built images won't work for sure:
No libbcc.so, which depends on something else that can not build in sim mode.
No x86 bitcode is generated as well, I believe.

Change-Id: Idca8378427196622ac77cd56a38c6a160f03ba22
---
 llvm-host-build.mk | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'llvm-host-build.mk')

diff --git a/llvm-host-build.mk b/llvm-host-build.mk
index ca2f258..7160b52 100644
--- a/llvm-host-build.mk
+++ b/llvm-host-build.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
 LOCAL_CFLAGS :=	\
 	-D_GNU_SOURCE	\
 	-D__STDC_LIMIT_MACROS	\
@@ -20,6 +17,12 @@ LOCAL_CFLAGS :=	\
 	$(LOCAL_CFLAGS)
 endif
 
+# force 32 bit code for sim build
+ifeq ($(TARGET_SIMULATOR),true)
+LOCAL_CFLAGS += -m32
+LOCAL_LDFLAGS += -m32
+endif
+
 ifneq ($(REQUIRES_EH),1)
 LOCAL_CFLAGS += -fno-exceptions
 else
@@ -60,5 +63,3 @@ $(hide) $(TBLGEN) \
     -gen-$(strip $(1)) \
     -o $@ $<
 endef
-
-endif
-- 
cgit v1.1