diff options
| author | Shih-wei Liao <sliao@google.com> | 2010-07-12 21:22:47 -0700 |
|---|---|---|
| committer | Shih-wei Liao <sliao@google.com> | 2010-07-12 21:22:47 -0700 |
| commit | db54406fa346e8a08cb200f490baf2dc6671dcf5 (patch) | |
| tree | 019c14359842c67ca5ec355d9b794b23c412c528 | |
| parent | 512d7ab8a03215be54f1f48f10fd1b9059c32949 (diff) | |
| download | external_llvm-db54406fa346e8a08cb200f490baf2dc6671dcf5.tar.gz external_llvm-db54406fa346e8a08cb200f490baf2dc6671dcf5.tar.bz2 external_llvm-db54406fa346e8a08cb200f490baf2dc6671dcf5.zip | |
Add llvm-link for host.
Change-Id: I3ad477cc963c2ae3910b50e272a95f1c4f752306
| -rw-r--r-- | Android.mk | 3 | ||||
| -rw-r--r-- | lib/AsmParser/Android.mk | 16 | ||||
| -rw-r--r-- | lib/Linker/Android.mk | 21 | ||||
| -rw-r--r-- | tools/llvm-link/Android.mk | 17 |
4 files changed, 49 insertions, 8 deletions
diff --git a/Android.mk b/Android.mk index 63fff38203..c7b82b540f 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 8458235d88..0f18b4f1cb 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 0000000000..aa8028ef21 --- /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 0000000000..4cabcfbd66 --- /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 |