diff options
| author | Shih-wei Liao <sliao@google.com> | 2012-08-03 02:01:27 -0700 |
|---|---|---|
| committer | Shih-wei Liao <sliao@google.com> | 2012-08-03 02:01:27 -0700 |
| commit | 78f458bce9998570544356ed5b41afb0a8625cee (patch) | |
| tree | 02ea1d8f7862b1823115b4a6fd33471ae3db857c | |
| parent | 42552ec6168d994991696a04c1626ac91218a720 (diff) | |
| download | llvm-ndk-cc-78f458bce9998570544356ed5b41afb0a8625cee.tar.gz | |
Apply changes to migrate to CLANG-160673-20120724.
Change-Id: Iaae5454643a2871fbfa01bcbe52924891c4357d7
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | Compiler.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
@@ -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; |