From db54406fa346e8a08cb200f490baf2dc6671dcf5 Mon Sep 17 00:00:00 2001
From: Shih-wei Liao <sliao@google.com>
Date: Mon, 12 Jul 2010 21:22:47 -0700
Subject: [PATCH] Add llvm-link for host.

Change-Id: I3ad477cc963c2ae3910b50e272a95f1c4f752306
---
 Android.mk                 |  3 +++
 lib/AsmParser/Android.mk   | 16 ++++++++--------
 lib/Linker/Android.mk      | 21 +++++++++++++++++++++
 tools/llvm-link/Android.mk | 17 +++++++++++++++++
 4 files changed, 49 insertions(+), 8 deletions(-)
 create mode 100644 lib/Linker/Android.mk
 create mode 100644 tools/llvm-link/Android.mk

diff --git a/Android.mk b/Android.mk
index 63fff38203a..c7b82b540f7 100644
--- 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 8458235d886..0f18b4f1cbf 100644
--- 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
index 00000000000..aa8028ef215
--- /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
index 00000000000..4cabcfbd66f
--- /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
-- 
2.11.0