Update Clang for merge to r171906.
clang-tblgen-rules.mk - New AttrDump.inc target
lib/AST/Android.mk
lib/Analysis/Android.mk
lib/Basic/Android.mk
lib/Lex/Android.mk
lib/Parse/Android.mk
lib/Sema/Android.mk
lib/StaticAnalyzer/Checkers/Android.mk
Change-Id: If31b4c9123f730ab851f11b00b0688166b14b4b2
diff --git a/clang-tblgen-rules.mk b/clang-tblgen-rules.mk
index d86f1ee..6861d10 100644
--- a/clang-tblgen-rules.mk
+++ b/clang-tblgen-rules.mk
@@ -9,6 +9,13 @@
intermediates := $(call local-intermediates-dir)
+ifneq ($(findstring AttrDump.inc,$(TBLGEN_TABLES)),)
+LOCAL_GENERATED_SOURCES += $(intermediates)/include/clang/AST/AttrDump.inc
+$(intermediates)/include/clang/AST/AttrDump.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
+$(intermediates)/include/clang/AST/AttrDump.inc: $(CLANG_ROOT_PATH)/include/clang/Basic/Attr.td $(CLANG_TBLGEN)
+ $(call transform-host-clang-td-to-out,clang-attr-dump)
+endif
+
ifneq ($(findstring AttrImpl.inc,$(TBLGEN_TABLES)),)
LOCAL_GENERATED_SOURCES += $(intermediates)/include/clang/AST/AttrImpl.inc
$(intermediates)/include/clang/AST/AttrImpl.inc: TBLGEN_LOCAL_MODULE := $(LOCAL_MODULE)
diff --git a/lib/AST/Android.mk b/lib/AST/Android.mk
index 7dd021d..9c7bfb3 100644
--- a/lib/AST/Android.mk
+++ b/lib/AST/Android.mk
@@ -6,6 +6,7 @@
include $(CLEAR_TBLGEN_VARS)
TBLGEN_TABLES := \
+ AttrDump.inc \
AttrImpl.inc \
AttrList.inc \
Attrs.inc \
@@ -25,6 +26,7 @@
ASTConsumer.cpp \
ASTContext.cpp \
ASTDiagnostic.cpp \
+ ASTDumper.cpp \
ASTImporter.cpp \
AttrImpl.cpp \
Comment.cpp \
@@ -65,7 +67,6 @@
RawCommentList.cpp \
SelectorLocationsKind.cpp \
Stmt.cpp \
- StmtDumper.cpp \
StmtIterator.cpp \
StmtPrinter.cpp \
StmtProfile.cpp \
diff --git a/lib/Analysis/Android.mk b/lib/Analysis/Android.mk
index fdf7a4e..8af3726 100644
--- a/lib/Analysis/Android.mk
+++ b/lib/Analysis/Android.mk
@@ -16,6 +16,7 @@
clang_analysis_SRC_FILES := \
AnalysisDeclContext.cpp \
+ BodyFarm.cpp \
CallGraph.cpp \
CFG.cpp \
CFGReachabilityAnalysis.cpp \
@@ -24,6 +25,7 @@
Dominators.cpp \
FormatString.cpp \
LiveVariables.cpp \
+ ObjCNoReturn.cpp \
PostOrderCFGView.cpp \
PrintfFormatString.cpp \
ProgramPoint.cpp \
diff --git a/lib/Basic/Android.mk b/lib/Basic/Android.mk
index 8e50d9c..671a0c2 100644
--- a/lib/Basic/Android.mk
+++ b/lib/Basic/Android.mk
@@ -32,6 +32,7 @@
LangOptions.cpp \
Module.cpp \
ObjCRuntime.cpp \
+ OperatorPrecedence.cpp \
SourceLocation.cpp \
SourceManager.cpp \
TargetInfo.cpp \
diff --git a/lib/Lex/Android.mk b/lib/Lex/Android.mk
index 96909d2..f3e294f 100644
--- a/lib/Lex/Android.mk
+++ b/lib/Lex/Android.mk
@@ -20,6 +20,7 @@
ModuleMap.cpp \
PPCaching.cpp \
PPCallbacks.cpp \
+ PPConditionalDirectiveRecord.cpp \
PPDirectives.cpp \
PPExpressions.cpp \
PPLexerChange.cpp \
diff --git a/lib/Parse/Android.mk b/lib/Parse/Android.mk
index e8fa743..00073f1 100644
--- a/lib/Parse/Android.mk
+++ b/lib/Parse/Android.mk
@@ -14,6 +14,7 @@
DeclNodes.inc \
DiagnosticParseKinds.inc \
DiagnosticCommonKinds.inc \
+ DiagnosticSemaKinds.inc \
StmtNodes.inc
clang_parse_SRC_FILES := \
diff --git a/lib/Sema/Android.mk b/lib/Sema/Android.mk
index c7f0e00..ed7246d 100644
--- a/lib/Sema/Android.mk
+++ b/lib/Sema/Android.mk
@@ -29,7 +29,9 @@
IdentifierResolver.cpp \
DelayedDiagnostic.cpp \
JumpDiagnostics.cpp \
+ MultiplexExternalSemaSource.cpp \
Scope.cpp \
+ ScopeInfo.cpp \
Sema.cpp \
SemaAccess.cpp \
SemaAttr.cpp \
diff --git a/lib/StaticAnalyzer/Checkers/Android.mk b/lib/StaticAnalyzer/Checkers/Android.mk
index b2ad78e..1821920 100644
--- a/lib/StaticAnalyzer/Checkers/Android.mk
+++ b/lib/StaticAnalyzer/Checkers/Android.mk
@@ -50,7 +50,6 @@
NSAutoreleasePoolChecker.cpp \
NSErrorChecker.cpp \
NoReturnFunctionChecker.cpp \
- OSAtomicChecker.cpp \
ObjCAtSyncChecker.cpp \
ObjCContainersASTChecker.cpp \
ObjCContainersChecker.cpp \