summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorShih-wei Liao <sliao@google.com>2010-07-12 21:22:47 -0700
committerShih-wei Liao <sliao@google.com>2010-07-12 21:22:47 -0700
commitdb54406fa346e8a08cb200f490baf2dc6671dcf5 (patch)
tree019c14359842c67ca5ec355d9b794b23c412c528 /lib
parent512d7ab8a03215be54f1f48f10fd1b9059c32949 (diff)
downloadexternal_llvm-db54406fa346e8a08cb200f490baf2dc6671dcf5.zip
external_llvm-db54406fa346e8a08cb200f490baf2dc6671dcf5.tar.gz
external_llvm-db54406fa346e8a08cb200f490baf2dc6671dcf5.tar.bz2
Add llvm-link for host.
Change-Id: I3ad477cc963c2ae3910b50e272a95f1c4f752306
Diffstat (limited to 'lib')
-rw-r--r--lib/AsmParser/Android.mk16
-rw-r--r--lib/Linker/Android.mk21
2 files changed, 29 insertions, 8 deletions
diff --git a/lib/AsmParser/Android.mk b/lib/AsmParser/Android.mk
index 8458235..0f18b4f 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 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