1 --- llvm-3.5.0.src/tools/polly/lib/Transform/Pocc.cpp.orig 2014-06-28 10:59:45.000000000 +0200
2 +++ llvm-3.5.0.src/tools/polly/lib/Transform/Pocc.cpp 2014-10-03 22:56:19.591962149 +0200
6 void Pocc::printScop(raw_ostream &OS) const {
7 - std::unique_ptr<MemoryBuffer> stdoutBuffer;
8 - std::unique_ptr<MemoryBuffer> stderrBuffer;
10 OS << "Command line: ";
16 - if (std::error_code ec =
17 - MemoryBuffer::getFile(PlutoStdout.str(), stdoutBuffer))
18 - OS << "Could not open pocc stdout file: " + ec.message() << "\n";
19 + ErrorOr<std::unique_ptr<MemoryBuffer>> stdoutResult = MemoryBuffer::getFile(PlutoStdout.str());
21 + OS << "Could not open pocc stdout file: " + stdoutResult.getError().message() << "\n";
23 - OS << "pocc stdout: " << stdoutBuffer->getBufferIdentifier() << "\n";
24 - OS << stdoutBuffer->getBuffer() << "\n";
25 + OS << "pocc stdout: " << stdoutResult.get()->getBufferIdentifier() << "\n";
26 + OS << stdoutResult.get()->getBuffer() << "\n";
29 - if (std::error_code ec =
30 - MemoryBuffer::getFile(PlutoStderr.str(), stderrBuffer))
31 - OS << "Could not open pocc stderr file: " + ec.message() << "\n";
32 + ErrorOr<std::unique_ptr<MemoryBuffer>> stderrResult = MemoryBuffer::getFile(PlutoStderr.str());
34 + OS << "Could not open pocc stderr file: " + stderrResult.getError().message() << "\n";
36 OS << "pocc stderr: " << PlutoStderr << "\n";
37 - OS << stderrBuffer->getBuffer() << "\n";
38 + OS << stderrResult.get()->getBuffer() << "\n";
42 --- llvm-3.5.0.src/tools/polly/autoconf/configure.ac.orig 2014-04-11 11:47:45.000000000 +0200
43 +++ llvm-3.5.0.src/tools/polly/autoconf/configure.ac 2014-10-06 16:37:55.052037462 +0200
46 dnl Check that we have libpluto.
47 saved_CXXFLAGS=$CXXFLAGS
48 -CXXFLAGS="$CXXFLAGS $gmp_inc $isl_inc"
49 +CXXFLAGS="$CXXFLAGS $gmp_inc $isl_inc -std=c++0x"
50 find_lib_and_headers([pluto], [pluto/libpluto.h], [pluto])
51 CXXFLAGS=$saved_CXXFLAGS
52 AS_IF([test "x$pluto_found" = "xyes"],