Add llvm-link for host.

Change-Id: I3ad477cc963c2ae3910b50e272a95f1c4f752306

diff --git a/Android.mk b/Android.mk
index 63fff38..c7b82b5 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -36,6 +36,9 @@ subdirs := $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, \
                lib/MC  \
                lib/MC/MCParser \
                 tools/clang     \
+                lib/Linker      \
+                lib/AsmParser \
+                tools/llvm-link \
        ))
 
 include $(LOCAL_PATH)/llvm.mk

diff --git a/lib/AsmParser/Android.mk b/lib/AsmParser/Android.mk
index 8458235..0f18b4f 100644 (file)
--- a/lib/AsmParser/Android.mk
+++ b/lib/AsmParser/Android.mk
@@ -21,13 +21,13 @@ include $(BUILD_HOST_STATIC_LIBRARY)
 
 # For the device
 # =====================================================
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(asm_parser_SRC_FILES)
-
-LOCAL_MODULE:= libLLVMAsmParser
-
-include $(LOCAL_PATH)/../../llvm-device-build.mk
-include $(BUILD_STATIC_LIBRARY)
+#include $(CLEAR_VARS)
+#
+#LOCAL_SRC_FILES := $(asm_parser_SRC_FILES)
+#
+#LOCAL_MODULE:= libLLVMAsmParser
+#
+#include $(LOCAL_PATH)/../../llvm-device-build.mk
+#include $(BUILD_STATIC_LIBRARY)
 
 endif

diff --git a/lib/Linker/Android.mk b/lib/Linker/Android.mk
new file mode 100644 (file)
index 0000000..aa8028e
--- /dev/null
+++ b/lib/Linker/Android.mk
@@ -0,0 +1,21 @@
+# Only use this on the device or emulator.
+ifeq ($(TARGET_ARCH),arm)
+
+LOCAL_PATH:= $(call my-dir)
+
+# For the host
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES :=      \
+     LinkArchives.cpp   \
+     LinkItems.cpp      \
+     LinkModules.cpp    \
+     Linker.cpp
+
+LOCAL_MODULE:= libLLVMLinker
+
+include $(LLVM_HOST_BUILD_MK)
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+endif

diff --git a/tools/llvm-link/Android.mk b/tools/llvm-link/Android.mk
new file mode 100644 (file)
index 0000000..4cabcfb
--- /dev/null
+++ b/tools/llvm-link/Android.mk
@@ -0,0 +1,17 @@
+# Only use this on the device or emulator.
+ifeq ($(TARGET_ARCH),arm)
+
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES :=     \
+       llvm-link.cpp
+
+LOCAL_STATIC_LIBRARIES := libLLVMLinker libLLVMBitReader libLLVMBitWriter libLLVMCore libLLVMSupport libLLVMSystem libLLVMAsmParser
+LOCAL_MODULE := llvm-link
+LOCAL_LDLIBS += -lpthread -lm -ldl
+
+include $(LLVM_HOST_BUILD_MK)
+include $(BUILD_HOST_EXECUTABLE)
+
+endif