summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2010-08-19 17:39:26 -0700
committerYing Wang <wangying@google.com>2010-08-19 17:39:26 -0700
commit28c238c9ded0b5c91e122c94b5a02d76a5245c11 (patch)
treeb85fb84a4b31993292f3d88b66df518ed5975b3c
parent3e5165a7cc01d28b680a5f409eda72788cb451d3 (diff)
downloadexternal_llvm-28c238c9ded0b5c91e122c94b5a02d76a5245c11.zip
external_llvm-28c238c9ded0b5c91e122c94b5a02d76a5245c11.tar.gz
external_llvm-28c238c9ded0b5c91e122c94b5a02d76a5245c11.tar.bz2
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
-rw-r--r--Android.mk5
-rw-r--r--clear_tblgen_vars.mk5
-rw-r--r--lib/Analysis/Android.mk5
-rw-r--r--lib/Analysis/IPA/Android.mk5
-rw-r--r--lib/AsmParser/Android.mk5
-rw-r--r--lib/Bitcode/Reader/Android.mk5
-rw-r--r--lib/Bitcode/Writer/Android.mk5
-rw-r--r--lib/CodeGen/Android.mk5
-rw-r--r--lib/CodeGen/AsmPrinter/Android.mk5
-rw-r--r--lib/CodeGen/SelectionDAG/Android.mk5
-rw-r--r--lib/ExecutionEngine/JIT/Android.mk5
-rw-r--r--lib/Linker/Android.mk5
-rw-r--r--lib/MC/Android.mk5
-rw-r--r--lib/MC/MCParser/Android.mk5
-rw-r--r--lib/Support/Android.mk5
-rw-r--r--lib/System/Android.mk5
-rw-r--r--lib/Target/ARM/Android.mk5
-rw-r--r--lib/Target/ARM/AsmParser/Android.mk5
-rw-r--r--lib/Target/ARM/AsmPrinter/Android.mk5
-rw-r--r--lib/Target/ARM/Disassembler/Android.mk5
-rw-r--r--lib/Target/ARM/TargetInfo/Android.mk5
-rw-r--r--lib/Target/Android.mk5
-rw-r--r--lib/Target/X86/Android.mk5
-rw-r--r--lib/Target/X86/AsmParser/Android.mk5
-rw-r--r--lib/Target/X86/AsmPrinter/Android.mk5
-rw-r--r--lib/Target/X86/Disassembler/Android.mk5
-rw-r--r--lib/Target/X86/TargetInfo/Android.mk5
-rw-r--r--lib/Transforms/IPO/Android.mk5
-rw-r--r--lib/Transforms/InstCombine/Android.mk5
-rw-r--r--lib/Transforms/Instrumentation/Android.mk4
-rw-r--r--lib/Transforms/Scalar/Android.mk5
-rw-r--r--lib/Transforms/Utils/Android.mk5
-rw-r--r--lib/VMCore/Android.mk5
-rw-r--r--llvm-device-build.mk5
-rw-r--r--llvm-gen-intrinsics.mk5
-rw-r--r--llvm-host-build.mk11
-rw-r--r--llvm-tblgen-rules.mk5
-rw-r--r--llvm.mk5
-rw-r--r--tblgen-rules.mk5
-rw-r--r--utils/TableGen/Android.mk5
40 files changed, 6 insertions, 199 deletions
diff --git a/Android.mk b/Android.mk
index 5565072..ec758b9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
LOCAL_PATH := $(call my-dir)
LLVM_ROOT_PATH := $(LOCAL_PATH)
LLVM_ENABLE_ASSERTION := true
@@ -44,5 +41,3 @@ subdirs := $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, \
include $(LOCAL_PATH)/llvm.mk
include $(subdirs)
-
-endif
diff --git a/clear_tblgen_vars.mk b/clear_tblgen_vars.mk
index 7940b9b..6c9623e 100644
--- a/clear_tblgen_vars.mk
+++ b/clear_tblgen_vars.mk
@@ -1,7 +1,2 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
TBLGEN_TABLES :=
TBLGEN_TD_DIR :=
-
-endif
diff --git a/lib/Analysis/Android.mk b/lib/Analysis/Android.mk
index 06bf0ed..3921860 100644
--- a/lib/Analysis/Android.mk
+++ b/lib/Analysis/Android.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
LOCAL_PATH:= $(call my-dir)
analysis_SRC_FILES := \
@@ -72,5 +69,3 @@ LOCAL_MODULE:= libLLVMAnalysis
include $(LLVM_DEVICE_BUILD_MK)
include $(LLVM_GEN_INTRINSICS_MK)
include $(BUILD_STATIC_LIBRARY)
-
-endif
diff --git a/lib/Analysis/IPA/Android.mk b/lib/Analysis/IPA/Android.mk
index 4408cf4..6d15e52 100644
--- a/lib/Analysis/IPA/Android.mk
+++ b/lib/Analysis/IPA/Android.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
LOCAL_PATH:= $(call my-dir)
analysis_ipa_SRC_FILES := \
@@ -32,5 +29,3 @@ LOCAL_MODULE:= libLLVMipa
include $(LLVM_DEVICE_BUILD_MK)
include $(LLVM_GEN_INTRINSICS_MK)
include $(BUILD_STATIC_LIBRARY)
-
-endif
diff --git a/lib/AsmParser/Android.mk b/lib/AsmParser/Android.mk
index 0f18b4f..c616054 100644
--- a/lib/AsmParser/Android.mk
+++ b/lib/AsmParser/Android.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
LOCAL_PATH:= $(call my-dir)
asm_parser_SRC_FILES := \
@@ -29,5 +26,3 @@ include $(BUILD_HOST_STATIC_LIBRARY)
#
#include $(LOCAL_PATH)/../../llvm-device-build.mk
#include $(BUILD_STATIC_LIBRARY)
-
-endif
diff --git a/lib/Bitcode/Reader/Android.mk b/lib/Bitcode/Reader/Android.mk
index d2d2e87..165b0d0 100644
--- a/lib/Bitcode/Reader/Android.mk
+++ b/lib/Bitcode/Reader/Android.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
LOCAL_PATH:= $(call my-dir)
bitcode_reader_SRC_FILES := \
@@ -30,5 +27,3 @@ LOCAL_MODULE:= libLLVMBitReader
include $(LLVM_DEVICE_BUILD_MK)
include $(LLVM_GEN_INTRINSICS_MK)
include $(BUILD_STATIC_LIBRARY)
-
-endif
diff --git a/lib/Bitcode/Writer/Android.mk b/lib/Bitcode/Writer/Android.mk
index dd57840..5147c46 100644
--- a/lib/Bitcode/Writer/Android.mk
+++ b/lib/Bitcode/Writer/Android.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
LOCAL_PATH:= $(call my-dir)
# For the host only
@@ -18,5 +15,3 @@ LOCAL_MODULE:= libLLVMBitWriter
include $(LLVM_HOST_BUILD_MK)
include $(LLVM_GEN_INTRINSICS_MK)
include $(BUILD_HOST_STATIC_LIBRARY)
-
-endif
diff --git a/lib/CodeGen/Android.mk b/lib/CodeGen/Android.mk
index fa4484c..d232e55 100644
--- a/lib/CodeGen/Android.mk
+++ b/lib/CodeGen/Android.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
LOCAL_PATH:= $(call my-dir)
codegen_SRC_FILES := \
@@ -102,5 +99,3 @@ LOCAL_MODULE:= libLLVMCodeGen
include $(LLVM_DEVICE_BUILD_MK)
include $(LLVM_GEN_INTRINSICS_MK)
include $(BUILD_STATIC_LIBRARY)
-
-endif
diff --git a/lib/CodeGen/AsmPrinter/Android.mk b/lib/CodeGen/AsmPrinter/Android.mk
index d2bbe89..abe5bb6 100644
--- a/lib/CodeGen/AsmPrinter/Android.mk
+++ b/lib/CodeGen/AsmPrinter/Android.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
LOCAL_PATH := $(call my-dir)
codegen_asmprinter_SRC_FILES := \
@@ -36,5 +33,3 @@ LOCAL_MODULE:= libLLVMAsmPrinter
include $(LLVM_DEVICE_BUILD_MK)
include $(BUILD_STATIC_LIBRARY)
-
-endif
diff --git a/lib/CodeGen/SelectionDAG/Android.mk b/lib/CodeGen/SelectionDAG/Android.mk
index ed65340..899123b 100644
--- a/lib/CodeGen/SelectionDAG/Android.mk
+++ b/lib/CodeGen/SelectionDAG/Android.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
LOCAL_PATH:= $(call my-dir)
codegen_selectiondag_SRC_FILES := \
@@ -49,5 +46,3 @@ LOCAL_MODULE:= libLLVMSelectionDAG
include $(LLVM_DEVICE_BUILD_MK)
include $(LLVM_GEN_INTRINSICS_MK)
include $(BUILD_STATIC_LIBRARY)
-
-endif
diff --git a/lib/ExecutionEngine/JIT/Android.mk b/lib/ExecutionEngine/JIT/Android.mk
index 34bdf2c..1c7e27f 100644
--- a/lib/ExecutionEngine/JIT/Android.mk
+++ b/lib/ExecutionEngine/JIT/Android.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
LOCAL_PATH:= $(call my-dir)
# For the host
@@ -33,5 +30,3 @@ LOCAL_MODULE:= libLLVMJIT
include $(LLVM_DEVICE_BUILD_MK)
include $(BUILD_STATIC_LIBRARY)
-
-endif
diff --git a/lib/Linker/Android.mk b/lib/Linker/Android.mk
index aa8028e..e0611ba 100644
--- a/lib/Linker/Android.mk
+++ b/lib/Linker/Android.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
LOCAL_PATH:= $(call my-dir)
# For the host
@@ -17,5 +14,3 @@ LOCAL_MODULE:= libLLVMLinker
include $(LLVM_HOST_BUILD_MK)
include $(BUILD_HOST_STATIC_LIBRARY)
-
-endif
diff --git a/lib/MC/Android.mk b/lib/MC/Android.mk
index 30c491c..a2dc85a 100644
--- a/lib/MC/Android.mk
+++ b/lib/MC/Android.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
LOCAL_PATH:= $(call my-dir)
mc_SRC_FILES := \
@@ -48,5 +45,3 @@ LOCAL_MODULE:= libLLVMMC
include $(LLVM_DEVICE_BUILD_MK)
include $(BUILD_STATIC_LIBRARY)
-
-endif
diff --git a/lib/MC/MCParser/Android.mk b/lib/MC/MCParser/Android.mk
index 0232139..1335362 100644
--- a/lib/MC/MCParser/Android.mk
+++ b/lib/MC/MCParser/Android.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
LOCAL_PATH:= $(call my-dir)
mc_parser_SRC_FILES := \
@@ -31,5 +28,3 @@ LOCAL_MODULE:= libLLVMMCParser
include $(LLVM_DEVICE_BUILD_MK)
include $(BUILD_STATIC_LIBRARY)
-
-endif
diff --git a/lib/Support/Android.mk b/lib/Support/Android.mk
index 4d2b8a8..e972753 100644
--- a/lib/Support/Android.mk
+++ b/lib/Support/Android.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
LOCAL_PATH:= $(call my-dir)
support_SRC_FILES := \
@@ -73,5 +70,3 @@ LOCAL_MODULE:= libLLVMSupport
include $(LLVM_DEVICE_BUILD_MK)
include $(BUILD_STATIC_LIBRARY)
-
-endif
diff --git a/lib/System/Android.mk b/lib/System/Android.mk
index 94eac30..d48bc44 100644
--- a/lib/System/Android.mk
+++ b/lib/System/Android.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
LOCAL_PATH:= $(call my-dir)
system_SRC_FILES := \
@@ -53,5 +50,3 @@ LOCAL_MODULE:= libLLVMSystem
include $(LLVM_DEVICE_BUILD_MK)
include $(BUILD_STATIC_LIBRARY)
-
-endif
diff --git a/lib/Target/ARM/Android.mk b/lib/Target/ARM/Android.mk
index 8d499d6..e4d2f68 100644
--- a/lib/Target/ARM/Android.mk
+++ b/lib/Target/ARM/Android.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
LOCAL_PATH := $(call my-dir)
arm_codegen_TBLGEN_TABLES := \
@@ -71,5 +68,3 @@ include $(LLVM_DEVICE_BUILD_MK)
include $(LLVM_TBLGEN_RULES_MK)
include $(LLVM_GEN_INTRINSICS_MK)
include $(BUILD_STATIC_LIBRARY)
-
-endif
diff --git a/lib/Target/ARM/AsmParser/Android.mk b/lib/Target/ARM/AsmParser/Android.mk
index e0587fd..b862991 100644
--- a/lib/Target/ARM/AsmParser/Android.mk
+++ b/lib/Target/ARM/AsmParser/Android.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
LOCAL_PATH := $(call my-dir)
# For the device only
@@ -28,5 +25,3 @@ LOCAL_MODULE:= libLLVMARMAsmParser
include $(LLVM_DEVICE_BUILD_MK)
include $(LLVM_TBLGEN_RULES_MK)
include $(BUILD_STATIC_LIBRARY)
-
-endif
diff --git a/lib/Target/ARM/AsmPrinter/Android.mk b/lib/Target/ARM/AsmPrinter/Android.mk
index 1a568eb..e233d67 100644
--- a/lib/Target/ARM/AsmPrinter/Android.mk
+++ b/lib/Target/ARM/AsmPrinter/Android.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
LOCAL_PATH := $(call my-dir)
arm_asm_printer_TBLGEN_TABLES := \
@@ -53,5 +50,3 @@ LOCAL_MODULE:= libLLVMARMAsmPrinter
include $(LLVM_DEVICE_BUILD_MK)
include $(LLVM_TBLGEN_RULES_MK)
include $(BUILD_STATIC_LIBRARY)
-
-endif
diff --git a/lib/Target/ARM/Disassembler/Android.mk b/lib/Target/ARM/Disassembler/Android.mk
index ab5800c..9a8f7d8 100644
--- a/lib/Target/ARM/Disassembler/Android.mk
+++ b/lib/Target/ARM/Disassembler/Android.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
LOCAL_PATH := $(call my-dir)
# For the device only
@@ -30,5 +27,3 @@ LOCAL_MODULE:= libLLVMARMDisassembler
include $(LLVM_DEVICE_BUILD_MK)
include $(LLVM_TBLGEN_RULES_MK)
include $(BUILD_STATIC_LIBRARY)
-
-endif
diff --git a/lib/Target/ARM/TargetInfo/Android.mk b/lib/Target/ARM/TargetInfo/Android.mk
index 221af98..8ef7ed9 100644
--- a/lib/Target/ARM/TargetInfo/Android.mk
+++ b/lib/Target/ARM/TargetInfo/Android.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
LOCAL_PATH := $(call my-dir)
arm_target_info_TBLGEN_TABLES := \
@@ -49,5 +46,3 @@ LOCAL_MODULE:= libLLVMARMInfo
include $(LLVM_DEVICE_BUILD_MK)
include $(LLVM_TBLGEN_RULES_MK)
include $(BUILD_STATIC_LIBRARY)
-
-endif
diff --git a/lib/Target/Android.mk b/lib/Target/Android.mk
index 99d013d..8bf4340 100644
--- a/lib/Target/Android.mk
+++ b/lib/Target/Android.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
LOCAL_PATH:= $(call my-dir)
target_SRC_FILES := \
@@ -39,5 +36,3 @@ LOCAL_MODULE:= libLLVMTarget
include $(LLVM_DEVICE_BUILD_MK)
include $(BUILD_STATIC_LIBRARY)
-
-endif
diff --git a/lib/Target/X86/Android.mk b/lib/Target/X86/Android.mk
index 1e9d6cb..701913c 100644
--- a/lib/Target/X86/Android.mk
+++ b/lib/Target/X86/Android.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
LOCAL_PATH := $(call my-dir)
# For the host only
@@ -48,5 +45,3 @@ include $(LLVM_HOST_BUILD_MK)
include $(LLVM_TBLGEN_RULES_MK)
include $(LLVM_GEN_INTRINSICS_MK)
include $(BUILD_HOST_STATIC_LIBRARY)
-
-endif
diff --git a/lib/Target/X86/AsmParser/Android.mk b/lib/Target/X86/AsmParser/Android.mk
index 4b8cd62..0675ad0 100644
--- a/lib/Target/X86/AsmParser/Android.mk
+++ b/lib/Target/X86/AsmParser/Android.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
LOCAL_PATH := $(call my-dir)
# For the device only
@@ -28,5 +25,3 @@ LOCAL_MODULE:= libLLVMX86AsmParser
include $(LLVM_HOST_BUILD_MK)
include $(LLVM_TBLGEN_RULES_MK)
include $(BUILD_HOST_STATIC_LIBRARY)
-
-endif
diff --git a/lib/Target/X86/AsmPrinter/Android.mk b/lib/Target/X86/AsmPrinter/Android.mk
index 1fd9903..055361c 100644
--- a/lib/Target/X86/AsmPrinter/Android.mk
+++ b/lib/Target/X86/AsmPrinter/Android.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
LOCAL_PATH := $(call my-dir)
# For the device only
@@ -31,5 +28,3 @@ LOCAL_MODULE:= libLLVMX86AsmPrinter
include $(LLVM_HOST_BUILD_MK)
include $(LLVM_TBLGEN_RULES_MK)
include $(BUILD_HOST_STATIC_LIBRARY)
-
-endif
diff --git a/lib/Target/X86/Disassembler/Android.mk b/lib/Target/X86/Disassembler/Android.mk
index 8d5b273..045eef8 100644
--- a/lib/Target/X86/Disassembler/Android.mk
+++ b/lib/Target/X86/Disassembler/Android.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
LOCAL_PATH := $(call my-dir)
# For the device only
@@ -28,5 +25,3 @@ LOCAL_MODULE:= libLLVMX86Disassembler
include $(LLVM_HOST_BUILD_MK)
include $(LLVM_TBLGEN_RULES_MK)
include $(BUILD_HOST_STATIC_LIBRARY)
-
-endif
diff --git a/lib/Target/X86/TargetInfo/Android.mk b/lib/Target/X86/TargetInfo/Android.mk
index 9bf109c..53b3a0c 100644
--- a/lib/Target/X86/TargetInfo/Android.mk
+++ b/lib/Target/X86/TargetInfo/Android.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
LOCAL_PATH := $(call my-dir)
# For the device only
@@ -25,5 +22,3 @@ LOCAL_MODULE:= libLLVMX86Info
include $(LLVM_HOST_BUILD_MK)
include $(LLVM_TBLGEN_RULES_MK)
include $(BUILD_HOST_STATIC_LIBRARY)
-
-endif
diff --git a/lib/Transforms/IPO/Android.mk b/lib/Transforms/IPO/Android.mk
index c908a30..c5d4b97 100644
--- a/lib/Transforms/IPO/Android.mk
+++ b/lib/Transforms/IPO/Android.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
LOCAL_PATH:= $(call my-dir)
transforms_ipo_SRC_FILES := \
@@ -49,5 +46,3 @@ LOCAL_MODULE:= libLLVMipo
include $(LLVM_DEVICE_BUILD_MK)
include $(LLVM_GEN_INTRINSICS_MK)
include $(BUILD_STATIC_LIBRARY)
-
-endif
diff --git a/lib/Transforms/InstCombine/Android.mk b/lib/Transforms/InstCombine/Android.mk
index 1894ce7..0782503 100644
--- a/lib/Transforms/InstCombine/Android.mk
+++ b/lib/Transforms/InstCombine/Android.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
LOCAL_PATH:= $(call my-dir)
transforms_inst_combine_SRC_FILES := \
@@ -39,5 +36,3 @@ LOCAL_MODULE:= libLLVMInstCombine
include $(LLVM_DEVICE_BUILD_MK)
include $(LLVM_GEN_INTRINSICS_MK)
include $(BUILD_STATIC_LIBRARY)
-
-endif
diff --git a/lib/Transforms/Instrumentation/Android.mk b/lib/Transforms/Instrumentation/Android.mk
index 6623f9e..0bca17e 100644
--- a/lib/Transforms/Instrumentation/Android.mk
+++ b/lib/Transforms/Instrumentation/Android.mk
@@ -1,5 +1,3 @@
-ifeq ($(TARGET_ARCH),arm)
-
LOCAL_PATH:= $(call my-dir)
# For the host
@@ -15,5 +13,3 @@ LOCAL_MODULE:= libLLVMInstrumentation
include $(LLVM_HOST_BUILD_MK)
include $(BUILD_HOST_STATIC_LIBRARY)
-
-endif
diff --git a/lib/Transforms/Scalar/Android.mk b/lib/Transforms/Scalar/Android.mk
index 656deaf..a86d64f 100644
--- a/lib/Transforms/Scalar/Android.mk
+++ b/lib/Transforms/Scalar/Android.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
LOCAL_PATH:= $(call my-dir)
transforms_scalar_SRC_FILES := \
@@ -55,5 +52,3 @@ LOCAL_MODULE:= libLLVMScalarOpts
include $(LLVM_DEVICE_BUILD_MK)
include $(LLVM_GEN_INTRINSICS_MK)
include $(BUILD_STATIC_LIBRARY)
-
-endif
diff --git a/lib/Transforms/Utils/Android.mk b/lib/Transforms/Utils/Android.mk
index 3f3c6ba..9fba091 100644
--- a/lib/Transforms/Utils/Android.mk
+++ b/lib/Transforms/Utils/Android.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
LOCAL_PATH:= $(call my-dir)
transforms_utils_SRC_FILES := \
@@ -51,5 +48,3 @@ LOCAL_MODULE:= libLLVMTransformUtils
include $(LLVM_DEVICE_BUILD_MK)
include $(LLVM_GEN_INTRINSICS_MK)
include $(BUILD_STATIC_LIBRARY)
-
-endif
diff --git a/lib/VMCore/Android.mk b/lib/VMCore/Android.mk
index 37cb8eb..8d35cc5 100644
--- a/lib/VMCore/Android.mk
+++ b/lib/VMCore/Android.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
LOCAL_PATH:= $(call my-dir)
vmcore_SRC_FILES := \
@@ -64,5 +61,3 @@ LOCAL_MODULE:= libLLVMCore
include $(LLVM_DEVICE_BUILD_MK)
include $(LLVM_GEN_INTRINSICS_MK)
include $(BUILD_STATIC_LIBRARY)
-
-endif
diff --git a/llvm-device-build.mk b/llvm-device-build.mk
index 80d1f61..17532a0 100644
--- a/llvm-device-build.mk
+++ b/llvm-device-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 \
@@ -62,5 +59,3 @@ $(hide) $(TBLGEN) \
-gen-$(strip $(1)) \
-o $@ $<
endef
-
-endif
diff --git a/llvm-gen-intrinsics.mk b/llvm-gen-intrinsics.mk
index d37d2e6..decccdd 100644
--- a/llvm-gen-intrinsics.mk
+++ b/llvm-gen-intrinsics.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
# We treat Intrinsics.td as a very special target just like what lib/VMCore/Makefile does
INTRINSICTD := $(LLVM_ROOT_PATH)/include/llvm/Intrinsics.td
INTRINSICTDS := $(wildcard $(dir $(INTRINSICTD))/Intrinsics*.td)
@@ -19,5 +16,3 @@ ifeq ($(LOCAL_IS_HOST_MODULE),true)
else
$(call transform-device-td-to-out,intrinsic)
endif
-
-endif
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
diff --git a/llvm-tblgen-rules.mk b/llvm-tblgen-rules.mk
index c346825..8ec1705 100644
--- a/llvm-tblgen-rules.mk
+++ b/llvm-tblgen-rules.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
###########################################################
## Commands for running tblgen to compile a td file
##########################################################
@@ -117,5 +114,3 @@ $(intermediates)/ARMGenDecoderTables.inc: $(tblgen_source_dir)/ARM.td $(TBLGEN)
endif
endif
-
-endif
diff --git a/llvm.mk b/llvm.mk
index 10bf06c..b181071 100644
--- a/llvm.mk
+++ b/llvm.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
ifeq ($(LLVM_ROOT_PATH),)
$(error Must set variable LLVM_ROOT_PATH before including this! $(LOCAL_PATH))
endif
@@ -16,5 +13,3 @@ LLVM_TBLGEN_RULES_MK := $(LLVM_ROOT_PATH)/llvm-tblgen-rules.mk
CLANG_ROOT_PATH := $(LLVM_ROOT_PATH)/tools/clang
include $(CLANG_ROOT_PATH)/clang.mk
-
-endif
diff --git a/tblgen-rules.mk b/tblgen-rules.mk
index 7c1e525..6e7bcf1 100644
--- a/tblgen-rules.mk
+++ b/tblgen-rules.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
###########################################################
## Commands for running tblgen to compile a td file
##########################################################
@@ -114,5 +111,3 @@ $(intermediates)/ARMGenDecoderTables.inc: $(tblgen_source_dir)/ARM.td $(TBLGEN)
endif
endif
-
-endif
diff --git a/utils/TableGen/Android.mk b/utils/TableGen/Android.mk
index 8dfa698..8347d5e 100644
--- a/utils/TableGen/Android.mk
+++ b/utils/TableGen/Android.mk
@@ -1,6 +1,3 @@
-# Only use this on the device or emulator.
-ifeq ($(TARGET_ARCH),arm)
-
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
@@ -48,5 +45,3 @@ LOCAL_LDLIBS += -lpthread -lm -ldl
include $(LLVM_HOST_BUILD_MK)
include $(BUILD_HOST_EXECUTABLE)
-
-endif