aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Murray <timmurray@google.com>2014-04-30 15:12:24 -0700
committerTim Murray <timmurray@google.com>2014-04-30 15:12:24 -0700
commit1cd6a8b6c8ab7b4c54ce06a9cac50300ec562e8e (patch)
tree3a1500d4333eeaa4acf2d4681f47b4e249f8da72
parent3878b1bfaa285b099422daca1a13e62ca3f8debb (diff)
downloadllvm_35a-master.tar.gz
Fix build system for rebase.HEADmastermain
Change-Id: I3536efafeefdae9c2f669b1245fa38df4bd01590
-rw-r--r--lib/Object/Android.mk1
-rw-r--r--tools/llc/Android.mk3
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/Object/Android.mk b/lib/Object/Android.mk
index 7dfa44fda9..bd9659cbac 100644
--- a/lib/Object/Android.mk
+++ b/lib/Object/Android.mk
@@ -12,6 +12,7 @@ object_SRC_FILES := \
MachOUniversal.cpp \
Object.cpp \
ObjectFile.cpp \
+ StringTableBuilder.cpp \
SymbolicFile.cpp
diff --git a/tools/llc/Android.mk b/tools/llc/Android.mk
index 2167fe3e00..9ddd5f9e90 100644
--- a/tools/llc/Android.mk
+++ b/tools/llc/Android.mk
@@ -56,7 +56,8 @@ llvm_llc_STATIC_LIBRARIES := \
libLLVMAnalysis \
libLLVMTarget \
libLLVMCore \
- libLLVMSupport
+ libLLVMSupport \
+ libLLVMObject
llvm_llc_arm64_STATIC_LIBRARIES := \
libLLVMARM64Info \