From 78f458bce9998570544356ed5b41afb0a8625cee Mon Sep 17 00:00:00 2001
From: Shih-wei Liao <sliao@google.com>
Date: Fri, 3 Aug 2012 02:01:27 -0700
Subject: Apply changes to migrate to CLANG-160673-20120724.

Change-Id: Iaae5454643a2871fbfa01bcbe52924891c4357d7
---
 Android.mk   | 2 ++
 Compiler.cpp | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Android.mk b/Android.mk
index 0e28e75..c7be789 100644
--- a/Android.mk
+++ b/Android.mk
@@ -59,6 +59,7 @@ endif
 TBLGEN_TABLES :=    \
 	AttrList.inc	\
 	Attrs.inc	\
+	CommentNodes.inc \
 	DeclNodes.inc	\
 	DiagnosticCommonKinds.inc	\
 	DiagnosticFrontendKinds.inc	\
@@ -96,6 +97,7 @@ endif
 TBLGEN_TABLES :=    \
 	AttrList.inc    \
 	Attrs.inc    \
+	CommentNodes.inc \
 	DeclNodes.inc    \
 	DiagnosticCommonKinds.inc   \
 	DiagnosticDriverKinds.inc \
diff --git a/Compiler.cpp b/Compiler.cpp
index f8bc250..6b5e0c8 100644
--- a/Compiler.cpp
+++ b/Compiler.cpp
@@ -117,7 +117,7 @@ void Compiler::createPreprocessor() {
 						    mTarget.get());
 
   llvm::OwningPtr<clang::CompilerInstance> Clang(new clang::CompilerInstance());
-   
+
   mPP.reset(new clang::Preprocessor(*mDiagnostics,
                                     mLangOpts,
                                     mTarget.get(),
@@ -185,7 +185,6 @@ void Compiler::injectPreDefined() {
 void Compiler::init(const std::string &Triple, const std::string &CPU,
                     const std::vector<std::string> &Features, bool isCXX) {
   mLangOpts.RTTI = 0;  // Turn off the RTTI information support
-  mLangOpts.NeXTRuntime = 0;   // Turn off the NeXT runtime uses
   mLangOpts.C99 = 1;
   if (isCXX) {
     mLangOpts.CPlusPlus = 1;
-- 
cgit v1.2.3