Build more device libraries

The libraries are used by Mesa llvm support.

diff --git a/Android.mk b/Android.mk
index 21fe737..2db62da 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -7,16 +7,23 @@ include $(CLEAR_VARS)
 subdirs := $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, \
   lib/Analysis \
   lib/Analysis/IPA \
+  lib/Archive \
   lib/AsmParser \
   lib/Bitcode/Reader \
   lib/Bitcode/Writer \
+  lib/ExecutionEngine \
+  lib/ExecutionEngine/Interpreter \
   lib/ExecutionEngine/JIT \
+  lib/ExecutionEngine/MCJIT \
+  lib/ExecutionEngine/RuntimeDyld \
   lib/CodeGen \
   lib/CodeGen/AsmPrinter \
   lib/CodeGen/SelectionDAG \
   lib/Linker \
   lib/MC \
+  lib/MC/MCDisassembler \
   lib/MC/MCParser \
+  lib/Object \
   lib/Support \
   lib/TableGen \
   lib/Target \

diff --git a/lib/Archive/Android.mk b/lib/Archive/Android.mk
new file mode 100644 (file)
index 0000000..f64867a
--- /dev/null
+++ b/lib/Archive/Android.mk
@@ -0,0 +1,19 @@
+LOCAL_PATH:= $(call my-dir)
+
+archive_SRC_FILES := \
+  Archive.cpp \
+  ArchiveReader.cpp \
+  ArchiveWriter.cpp
+
+# For the device
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(archive_SRC_FILES)
+
+LOCAL_MODULE := libLLVMArchive
+
+LOCAL_MODULE_TAGS := optional
+
+include $(LLVM_DEVICE_BUILD_MK)
+include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/ExecutionEngine/Android.mk b/lib/ExecutionEngine/Android.mk
new file mode 100644 (file)
index 0000000..bea1243
--- /dev/null
+++ b/lib/ExecutionEngine/Android.mk
@@ -0,0 +1,19 @@
+LOCAL_PATH:= $(call my-dir)
+
+executionengine_SRC_FILES := \
+  ExecutionEngine.cpp \
+  ExecutionEngineBindings.cpp \
+  TargetSelect.cpp
+
+# For the device
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(executionengine_SRC_FILES)
+
+LOCAL_MODULE := libLLVMExecutionEngine
+
+LOCAL_MODULE_TAGS := optional
+
+include $(LLVM_DEVICE_BUILD_MK)
+include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/ExecutionEngine/Interpreter/Android.mk b/lib/ExecutionEngine/Interpreter/Android.mk
new file mode 100644 (file)
index 0000000..3e3c98f
--- /dev/null
+++ b/lib/ExecutionEngine/Interpreter/Android.mk
@@ -0,0 +1,17 @@
+LOCAL_PATH:= $(call my-dir)
+
+interpreter_SRC_FILES := \
+  ExternalFunctions.cpp \
+
+# For the device
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(interpreter_SRC_FILES)
+
+LOCAL_MODULE := libLLVMInterpreter
+
+LOCAL_MODULE_TAGS := optional
+
+include $(LLVM_DEVICE_BUILD_MK)
+include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/ExecutionEngine/JIT/Android.mk b/lib/ExecutionEngine/JIT/Android.mk
index 7c1cfdd..ab3c266 100644 (file)
--- a/lib/ExecutionEngine/JIT/Android.mk
+++ b/lib/ExecutionEngine/JIT/Android.mk
@@ -1,17 +1,19 @@
 LOCAL_PATH:= $(call my-dir)
 
+jit_SRC_FILES := \
+  Intercept.cpp \
+  JIT.cpp \
+  JITDebugRegisterer.cpp \
+  JITDwarfEmitter.cpp \
+  JITEmitter.cpp \
+  JITMemoryManager.cpp \
+  OProfileJITEventListener.cpp
+
 # For the host
 # =====================================================
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES :=     \
-       Intercept.cpp   \
-       JIT.cpp \
-       JITDebugRegisterer.cpp  \
-       JITDwarfEmitter.cpp     \
-       JITEmitter.cpp  \
-       JITMemoryManager.cpp    \
-       OProfileJITEventListener.cpp
+LOCAL_SRC_FILES := $(jit_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMJIT
 
@@ -24,8 +26,7 @@ include $(BUILD_HOST_STATIC_LIBRARY)
 # =====================================================
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES :=     \
-       JITMemoryManager.cpp
+LOCAL_SRC_FILES := $(jit_SRC_FILES)
 
 LOCAL_MODULE:= libLLVMJIT
 

diff --git a/lib/ExecutionEngine/MCJIT/Android.mk b/lib/ExecutionEngine/MCJIT/Android.mk
new file mode 100644 (file)
index 0000000..3f0dcfc
--- /dev/null
+++ b/lib/ExecutionEngine/MCJIT/Android.mk
@@ -0,0 +1,18 @@
+LOCAL_PATH:= $(call my-dir)
+
+mcjit_SRC_FILES := \
+  Intercept.cpp \
+  MCJIT.cpp
+
+# For the device
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(mcjit_SRC_FILES)
+
+LOCAL_MODULE := libLLVMMCJIT
+
+LOCAL_MODULE_TAGS := optional
+
+include $(LLVM_DEVICE_BUILD_MK)
+include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/ExecutionEngine/RuntimeDyld/Android.mk b/lib/ExecutionEngine/RuntimeDyld/Android.mk
new file mode 100644 (file)
index 0000000..fccf544
--- /dev/null
+++ b/lib/ExecutionEngine/RuntimeDyld/Android.mk
@@ -0,0 +1,18 @@
+LOCAL_PATH:= $(call my-dir)
+
+runtimedyld_SRC_FILES := \
+  RuntimeDyld.cpp \
+  RuntimeDyldMachO.cpp
+
+# For the device
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(runtimedyld_SRC_FILES)
+
+LOCAL_MODULE := libLLVMRuntimeDyld
+
+LOCAL_MODULE_TAGS := optional
+
+include $(LLVM_DEVICE_BUILD_MK)
+include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/MC/MCDisassembler/Android.mk b/lib/MC/MCDisassembler/Android.mk
new file mode 100644 (file)
index 0000000..7a21070
--- /dev/null
+++ b/lib/MC/MCDisassembler/Android.mk
@@ -0,0 +1,21 @@
+LOCAL_PATH:= $(call my-dir)
+
+mc_mcdisassembler_SRC_FILES := \
+  Disassembler.cpp \
+  EDDisassembler.cpp \
+  EDInst.cpp \
+  EDOperand.cpp \
+  EDToken.cpp
+
+# For the device
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(mc_mcdisassembler_SRC_FILES)
+
+LOCAL_MODULE := libLLVMMCDisassembler
+
+LOCAL_MODULE_TAGS := optional
+
+include $(LLVM_DEVICE_BUILD_MK)
+include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/Object/Android.mk b/lib/Object/Android.mk
new file mode 100644 (file)
index 0000000..b84fd35
--- /dev/null
+++ b/lib/Object/Android.mk
@@ -0,0 +1,24 @@
+LOCAL_PATH:= $(call my-dir)
+
+object_SRC_FILES := \
+  Binary.cpp \
+  COFFObjectFile.cpp \
+  ELFObjectFile.cpp \
+  Error.cpp \
+  MachOObject.cpp \
+  MachOObjectFile.cpp \
+  Object.cpp \
+  ObjectFile.cpp
+
+# For the device
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(object_SRC_FILES)
+
+LOCAL_MODULE := libLLVMObject
+
+LOCAL_MODULE_TAGS := optional
+
+include $(LLVM_DEVICE_BUILD_MK)
+include $(BUILD_STATIC_LIBRARY)

diff --git a/lib/Object/COFFObjectFile.cpp b/lib/Object/COFFObjectFile.cpp
index a048cf5..ed07c13 100644 (file)
--- a/lib/Object/COFFObjectFile.cpp
+++ b/lib/Object/COFFObjectFile.cpp
@@ -15,6 +15,7 @@
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/ADT/Triple.h"
+#include <cctype>
 
 using namespace llvm;
 using namespace object;

diff --git a/lib/Object/ELFObjectFile.cpp b/lib/Object/ELFObjectFile.cpp
index 97ba916..4f6c27e 100644 (file)
--- a/lib/Object/ELFObjectFile.cpp
+++ b/lib/Object/ELFObjectFile.cpp
@@ -24,6 +24,7 @@
 #include <algorithm>
 #include <limits>
 #include <utility>
+#include <cctype>
 
 using namespace llvm;
 using namespace object;

diff --git a/lib/Target/X86/AsmParser/Android.mk b/lib/Target/X86/AsmParser/Android.mk
index fc501ec..65333f8 100644 (file)
--- a/lib/Target/X86/AsmParser/Android.mk
+++ b/lib/Target/X86/AsmParser/Android.mk
@@ -1,22 +1,25 @@
 LOCAL_PATH := $(call my-dir)
 
+asmparser_TBLGEN_TABLES :=     \
+       X86GenAsmMatcher.inc    \
+       X86GenInstrInfo.inc     \
+       X86GenRegisterInfo.inc  \
+       X86GenSubtargetInfo.inc
+
+asmparser_SRC_FILES := \
+       X86AsmLexer.cpp \
+       X86AsmParser.cpp
+
 # For the device only
 # =====================================================
 include $(CLEAR_VARS)
 include $(CLEAR_TBLGEN_VARS)
 
-TBLGEN_TABLES :=       \
-       X86GenAsmMatcher.inc    \
-       X86GenInstrInfo.inc     \
-       X86GenRegisterInfo.inc \
-       X86GenSubtargetInfo.inc
-
+TBLGEN_TABLES := $(asmparser_TBLGEN_TABLES)
 
 TBLGEN_TD_DIR := $(LOCAL_PATH)/..
 
-LOCAL_SRC_FILES :=     \
-       X86AsmLexer.cpp \
-       X86AsmParser.cpp
+LOCAL_SRC_FILES := $(asmparser_SRC_FILES)
 
 LOCAL_C_INCLUDES +=    \
        $(LOCAL_PATH)/..
@@ -28,3 +31,24 @@ LOCAL_MODULE_TAGS := optional
 include $(LLVM_HOST_BUILD_MK)
 include $(LLVM_TBLGEN_RULES_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
+
+
+include $(CLEAR_VARS)
+include $(CLEAR_TBLGEN_VARS)
+
+TBLGEN_TABLES := $(asmparser_TBLGEN_TABLES)
+
+TBLGEN_TD_DIR := $(LOCAL_PATH)/..
+
+LOCAL_SRC_FILES := $(asmparser_SRC_FILES)
+
+LOCAL_C_INCLUDES +=    \
+       $(LOCAL_PATH)/..
+
+LOCAL_MODULE:= libLLVMX86AsmParser
+
+LOCAL_MODULE_TAGS := optional
+
+include $(LLVM_DEVICE_BUILD_MK)
+include $(LLVM_TBLGEN_RULES_MK)
+include $(BUILD_STATIC_LIBRARY)