From 411754f7922a21229f9d3d4349cfb766900228ec Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Wed, 7 Jun 2017 14:57:45 +0200 Subject: llvm4: handle different header names LLVM 4 renamed and splitted some headers. Take this into account in includes. Signed-off-by: Jiri Slaby --- lib/Module/KModule.cpp | 4 ++++ lib/Module/ModuleUtil.cpp | 9 ++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/Module/KModule.cpp b/lib/Module/KModule.cpp index 49a1ba69..7b02c856 100644 --- a/lib/Module/KModule.cpp +++ b/lib/Module/KModule.cpp @@ -21,7 +21,11 @@ #include "klee/Internal/Support/Debug.h" #include "klee/Internal/Support/ModuleUtil.h" +#if LLVM_VERSION_CODE >= LLVM_VERSION(4, 0) +#include "llvm/Bitcode/BitcodeWriter.h" +#else #include "llvm/Bitcode/ReaderWriter.h" +#endif #include "llvm/IR/DataLayout.h" #include "llvm/IR/IRBuilder.h" #include "llvm/IR/Instructions.h" diff --git a/lib/Module/ModuleUtil.cpp b/lib/Module/ModuleUtil.cpp index 79395da6..e2da9e51 100644 --- a/lib/Module/ModuleUtil.cpp +++ b/lib/Module/ModuleUtil.cpp @@ -24,7 +24,9 @@ #include "llvm/Object/Archive.h" #include "llvm/Object/Error.h" #include "llvm/Object/ObjectFile.h" +#if LLVM_VERSION_CODE < LLVM_VERSION(4, 0) #include "llvm/Support/DataStream.h" +#endif #include "llvm/Support/FileSystem.h" #include "llvm/Support/SourceMgr.h" @@ -43,8 +45,13 @@ #include "llvm/IR/DiagnosticPrinter.h" #endif +#if LLVM_VERSION_CODE >= LLVM_VERSION(4, 0) +#include +#else +#include +#endif + #include "llvm/Analysis/ValueTracking.h" -#include "llvm/Bitcode/ReaderWriter.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Support/Path.h" -- cgit 1.4.1