Merge branch 'master' into nvptx_clean

2014-02-21 12:45:01 +01:00
parent 739e4e73ef 1f2541fbec
commit 42c4d3246c
48 changed files with 1492 additions and 27 deletions
--- a/module.cpp
+++ b/module.cpp
@@ -2048,9 +2048,6 @@ void
 Module::execPreprocessor(const char *infilename, llvm::raw_string_ostream *ostream) const
 {
    clang::CompilerInstance inst;
-#if defined(LLVM_3_5)
-    inst.createVirtualFileSystem();
-#endif
    inst.createFileManager();

    llvm::raw_fd_ostream stderrRaw(2, false);