diff options
| author | Todd Fiala <tfiala@google.com> | 2013-10-18 15:22:40 -0700 |
|---|---|---|
| committer | Todd Fiala <tfiala@google.com> | 2013-10-22 15:28:11 -0700 |
| commit | ba309b04ea5c66df1bc1c27849642d2602ab869d (patch) | |
| tree | 87474c3f45809ca4575b2cda4bcd9eab943a9518 | |
| parent | 1255ecdd03f25d397c6871c18a6be6ba8f1142e7 (diff) | |
| download | external_llvm-ba309b04ea5c66df1bc1c27849642d2602ab869d.zip external_llvm-ba309b04ea5c66df1bc1c27849642d2602ab869d.tar.gz external_llvm-ba309b04ea5c66df1bc1c27849642d2602ab869d.tar.bz2 | |
Added libs to the host's libLLVM.so.
Added Android.mk build rules for:
* lib/ExecutionEngine
* lib/ExecutionEngine/RuntimeDyld
* lib/ExecutionEngine/MCJIT
* lib/MC/MCDisassembler
Added all of the static libraries above to the host build of libLLVM.so.
In addition, the following existing static library was added to
the host build of libLLVM.so:
* lib/ExecutionEngine/JIT
Change-Id: I0e6cfac607e02b4ae77ee46df33eca2f96dac8e1
| -rw-r--r-- | Android.mk | 6 | ||||
| -rw-r--r-- | lib/ExecutionEngine/Android.mk | 18 | ||||
| -rw-r--r-- | lib/ExecutionEngine/MCJIT/Android.mk | 16 | ||||
| -rw-r--r-- | lib/ExecutionEngine/RuntimeDyld/Android.mk | 18 | ||||
| -rw-r--r-- | lib/MC/MCDisassembler/Android.mk | 15 | ||||
| -rw-r--r-- | shared_llvm.mk | 8 |
6 files changed, 80 insertions, 1 deletions
@@ -11,7 +11,10 @@ subdirs := \ lib/AsmParser \ lib/Bitcode/Reader \ lib/Bitcode/Writer \ + lib/ExecutionEngine \ + lib/ExecutionEngine/RuntimeDyld \ lib/ExecutionEngine/JIT \ + lib/ExecutionEngine/MCJIT \ lib/CodeGen \ lib/CodeGen/AsmPrinter \ lib/CodeGen/SelectionDAG \ @@ -19,6 +22,7 @@ subdirs := \ lib/IRReader \ lib/Linker \ lib/MC \ + lib/MC/MCDisassembler \ lib/MC/MCParser \ lib/Object \ lib/Option \ @@ -70,7 +74,7 @@ subdirs += tools/llvm-dis subdirs += tools/llvm-link #subdirs += tools/opt - include $(LOCAL_PATH)/llvm.mk include $(LOCAL_PATH)/shared_llvm.mk + include $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, $(subdirs))) diff --git a/lib/ExecutionEngine/Android.mk b/lib/ExecutionEngine/Android.mk new file mode 100644 index 0000000..9f1befd --- /dev/null +++ b/lib/ExecutionEngine/Android.mk @@ -0,0 +1,18 @@ +LOCAL_PATH:= $(call my-dir) + +# For the host +# ===================================================== +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := \ + ExecutionEngineBindings.cpp \ + ExecutionEngine.cpp \ + RTDyldMemoryManager.cpp \ + TargetSelect.cpp + +LOCAL_MODULE:= libLLVMExecutionEngine + +LOCAL_MODULE_TAGS := optional + +include $(LLVM_HOST_BUILD_MK) +include $(BUILD_HOST_STATIC_LIBRARY) diff --git a/lib/ExecutionEngine/MCJIT/Android.mk b/lib/ExecutionEngine/MCJIT/Android.mk new file mode 100644 index 0000000..0314958 --- /dev/null +++ b/lib/ExecutionEngine/MCJIT/Android.mk @@ -0,0 +1,16 @@ +LOCAL_PATH:= $(call my-dir) + +# For the host +# ===================================================== +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := \ + MCJIT.cpp \ + SectionMemoryManager.cpp + +LOCAL_MODULE:= libLLVMMCJIT + +LOCAL_MODULE_TAGS := optional + +include $(LLVM_HOST_BUILD_MK) +include $(BUILD_HOST_STATIC_LIBRARY) diff --git a/lib/ExecutionEngine/RuntimeDyld/Android.mk b/lib/ExecutionEngine/RuntimeDyld/Android.mk new file mode 100644 index 0000000..e98e80a --- /dev/null +++ b/lib/ExecutionEngine/RuntimeDyld/Android.mk @@ -0,0 +1,18 @@ +LOCAL_PATH:= $(call my-dir) + +# For the host +# ===================================================== +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := \ + GDBRegistrar.cpp \ + RuntimeDyld.cpp \ + RuntimeDyldELF.cpp \ + RuntimeDyldMachO.cpp + +LOCAL_MODULE:= libLLVMRuntimeDyld + +LOCAL_MODULE_TAGS := optional + +include $(LLVM_HOST_BUILD_MK) +include $(BUILD_HOST_STATIC_LIBRARY) diff --git a/lib/MC/MCDisassembler/Android.mk b/lib/MC/MCDisassembler/Android.mk new file mode 100644 index 0000000..7f73df3 --- /dev/null +++ b/lib/MC/MCDisassembler/Android.mk @@ -0,0 +1,15 @@ +LOCAL_PATH:= $(call my-dir) + +# For the host +# ===================================================== +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := \ + Disassembler.cpp + +LOCAL_MODULE:= libLLVMMCDisassembler + +LOCAL_MODULE_TAGS := optional + +include $(LLVM_HOST_BUILD_MK) +include $(BUILD_HOST_STATIC_LIBRARY) diff --git a/shared_llvm.mk b/shared_llvm.mk index 3945dd7..8e20092 100644 --- a/shared_llvm.mk +++ b/shared_llvm.mk @@ -56,6 +56,13 @@ llvm_post_static_libraries := \ libLLVMSupport \ libLLVMVectorize +llvm_host_static_libraries := \ + libLLVMExecutionEngine \ + libLLVMMCDisassembler \ + libLLVMRuntimeDyld \ + libLLVMJIT \ + libLLVMMCJIT + ifeq (true,$(FORCE_BUILD_LLVM_COMPONENTS)) # HOST LLVM shared library build include $(CLEAR_VARS) @@ -71,6 +78,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ $(llvm_arm_static_libraries) \ $(llvm_x86_static_libraries) \ $(llvm_mips_static_libraries) \ + $(llvm_host_static_libraries) \ $(llvm_post_static_libraries) ifeq ($(HOST_OS),windows) |