Update clang for merge to r183849.
Add missing libLLVMObject to clang dependencies.
Add AttrExprArgs.inc build rule to clang-tblgen-rules.mk
Add AttrExprArgs.inc to Parse dependencies
Add DiagnosticSemaKinds.inc to CodeGen dependencies.
Android.mk updates:
Add TypeLocBuilder.cpp
Change-Id: I034b209e82e02062860752f17b2eb0dd1081f6b0
diff --git a/README.android b/README.android
index 01f0d81..37d59b6 100644
--- a/README.android
+++ b/README.android
@@ -21,8 +21,9 @@
* For Jellybean: Synced to upstream r155088
* For Jellybean MR1: Synced to upstream r162325
* For Jellybean MR2: Synced to upstream r177345
-* For Key Lime Pie: Synced to upstream r180944
+* For Key Lime Pie: Synced to upstream r183849
+* Recent downstreaming on 2013/6/13: Synced to r183849 (Contact srhines for merge questions.)
* Recent downstreaming on 2013/5/3: Synced to r180944 (Contact srhines for merge questions.)
* Recent downstreaming on 2013/3/18: Synced to r177345 (Contact srhines for merge questions.)
* Recent downstreaming on 2013/3/5: Synced to r176138 (Contact srhines for merge questions.)
diff --git a/clang-tblgen-rules.mk b/clang-tblgen-rules.mk
index 82d079b..26fc293 100644
--- a/clang-tblgen-rules.mk
+++ b/clang-tblgen-rules.mk
@@ -58,6 +58,13 @@
$(call transform-host-clang-td-to-out,clang-attr-pch-write)
endif
+ifneq ($(findstring AttrExprArgs.inc,$(TBLGEN_TABLES)),)
+LOCAL_GENERATED_SOURCES += $(intermediates)/include/clang/Parse/AttrExprArgs.inc
+$(intermediates)/include/clang/Parse/AttrExprArgs.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
+$(intermediates)/include/clang/Parse/AttrExprArgs.inc: $(CLANG_ROOT_PATH)/include/clang/Basic/Attr.td | $(CLANG_TBLGEN)
+ $(call transform-host-clang-td-to-out,clang-attr-expr-args-list)
+endif
+
ifneq ($(findstring AttrLateParsed.inc,$(TBLGEN_TABLES)),)
LOCAL_GENERATED_SOURCES += $(intermediates)/include/clang/Parse/AttrLateParsed.inc
$(intermediates)/include/clang/Parse/AttrLateParsed.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
diff --git a/lib/CodeGen/Android.mk b/lib/CodeGen/Android.mk
index dc11b8b..5bfdea3 100644
--- a/lib/CodeGen/Android.mk
+++ b/lib/CodeGen/Android.mk
@@ -8,6 +8,7 @@
DeclNodes.inc \
DiagnosticCommonKinds.inc \
DiagnosticFrontendKinds.inc \
+ DiagnosticSemaKinds.inc \
StmtNodes.inc \
arm_neon.inc
diff --git a/lib/Parse/Android.mk b/lib/Parse/Android.mk
index 488d86a..b22294a 100644
--- a/lib/Parse/Android.mk
+++ b/lib/Parse/Android.mk
@@ -6,6 +6,7 @@
include $(CLEAR_TBLGEN_VARS)
TBLGEN_TABLES := \
+ AttrExprArgs.inc \
AttrList.inc \
AttrLateParsed.inc \
AttrParsedAttrList.inc \
diff --git a/lib/Sema/Android.mk b/lib/Sema/Android.mk
index 9494f5b..f18ce98 100644
--- a/lib/Sema/Android.mk
+++ b/lib/Sema/Android.mk
@@ -68,7 +68,8 @@
SemaTemplateInstantiateDecl.cpp \
SemaTemplateVariadic.cpp \
SemaType.cpp \
- TargetAttributesSema.cpp
+ TargetAttributesSema.cpp \
+ TypeLocBuilder.cpp
LOCAL_SRC_FILES := $(clang_sema_SRC_FILES)
diff --git a/tools/driver/Android.mk b/tools/driver/Android.mk
index 642fe38..6635801 100644
--- a/tools/driver/Android.mk
+++ b/tools/driver/Android.mk
@@ -72,6 +72,7 @@
libLLVMInstCombine \
libLLVMInstrumentation \
libLLVMCodeGen \
+ libLLVMObject \
libLLVMLinker \
libLLVMMC \
libLLVMMCParser \