aboutsummaryrefslogtreecommitdiffstats
path: root/lib/Option
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2013-08-07 19:25:16 -0700
committerStephen Hines <srhines@google.com>2013-08-09 17:11:14 -0700
commitead8d02a509cd69a74e01e4af90d8b237f30ed1c (patch)
tree654c9742f1bd3cda576befe15f7600a9a62f3495 /lib/Option
parentfab2daa4a1127ecb217abe2b07c1769122b6fee1 (diff)
downloadexternal_llvm-ead8d02a509cd69a74e01e4af90d8b237f30ed1c.zip
external_llvm-ead8d02a509cd69a74e01e4af90d8b237f30ed1c.tar.gz
external_llvm-ead8d02a509cd69a74e01e4af90d8b237f30ed1c.tar.bz2
Update LLVM for merge to r187913.
Add HAVE_FUTIMENS to */include/llvm/Config/config.h Update version number to 3.3 (even though this is tracking 3.4) Removed lib/Archive Added lib/Option Android.mk changes: - PathV2.cpp - SimplifyLibCalls.cpp - BlackList.cpp - VecUtils.cpp + MD5.cpp + CFG.cpp + SpecialCaseList.cpp + MachOUniversal.cpp + StructurizeCFG.cpp Change-Id: I8ee072cd0d4210a6a5492c0e6663f8464ff21386
Diffstat (limited to 'lib/Option')
-rw-r--r--lib/Option/Android.mk40
1 files changed, 40 insertions, 0 deletions
diff --git a/lib/Option/Android.mk b/lib/Option/Android.mk
new file mode 100644
index 0000000..a90af3c
--- /dev/null
+++ b/lib/Option/Android.mk
@@ -0,0 +1,40 @@
+LOCAL_PATH:= $(call my-dir)
+
+option_SRC_FILES := \
+ Arg.cpp \
+ ArgList.cpp \
+ Option.cpp \
+ OptTable.cpp
+
+# For the host
+# =====================================================
+include $(CLEAR_VARS)
+
+# FIXME: This only requires RTTI because tblgen uses it. Fix that.
+REQUIRES_RTTI := 1
+
+LOCAL_SRC_FILES := $(option_SRC_FILES)
+
+LOCAL_MODULE:= libLLVMOption
+
+LOCAL_CFLAGS := -D__android__
+
+LOCAL_MODULE_TAGS := optional
+
+include $(LLVM_HOST_BUILD_MK)
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+# For the device
+# =====================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(option_SRC_FILES)
+
+LOCAL_MODULE:= libLLVMOption
+
+LOCAL_CFLAGS := -D__android__
+
+LOCAL_MODULE_TAGS := optional
+
+include $(LLVM_DEVICE_BUILD_MK)
+include $(BUILD_STATIC_LIBRARY)