Merge branch 'master' into nvptx_merge

2014-07-07 16:30:12 +02:00
parent fb581818c5 699674a054
commit 69f3898a61
29 changed files with 397 additions and 231 deletions
--- a/builtins.cpp
+++ b/builtins.cpp
@@ -765,7 +765,7 @@ AddBitcodeToModule(const unsigned char *bitcode, int length,
    llvm::MemoryBuffer *bcBuf = llvm::MemoryBuffer::getMemBuffer(sb);
 #if defined(LLVM_3_5)
    llvm::ErrorOr<llvm::Module *> ModuleOrErr = llvm::parseBitcodeFile(bcBuf, *g->ctx);
-    if (llvm::error_code EC = ModuleOrErr.getError())
+    if (std::error_code EC = ModuleOrErr.getError())
        Error(SourcePos(), "Error parsing stdlib bitcode: %s", EC.message().c_str());
    else {
        llvm::Module *bcModule = ModuleOrErr.get();