diff options
| -rw-r--r-- | include/klee/Internal/Module/KInstruction.h | 2 | ||||
| -rw-r--r-- | include/klee/Statistic.h | 2 | ||||
| -rw-r--r-- | include/klee/util/Bits.h | 2 | ||||
| -rw-r--r-- | tools/klee/main.cpp | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/include/klee/Internal/Module/KInstruction.h b/include/klee/Internal/Module/KInstruction.h index c96d103b..20db560d 100644 --- a/include/klee/Internal/Module/KInstruction.h +++ b/include/klee/Internal/Module/KInstruction.h @@ -11,7 +11,7 @@ #define KLEE_KINSTRUCTION_H #include "klee/Config/Version.h" -#if LLVM_VERSION_CODE < LLVM_VERSION(2, 9) +#if LLVM_VERSION_CODE < LLVM_VERSION(2, 9) && LLVM_VERSION_CODE >= LLVM_VERSION(2, 7) #include "llvm/System/DataTypes.h" #else #include "llvm/Support/DataTypes.h" diff --git a/include/klee/Statistic.h b/include/klee/Statistic.h index f567f680..1e5b1c92 100644 --- a/include/klee/Statistic.h +++ b/include/klee/Statistic.h @@ -11,7 +11,7 @@ #define KLEE_STATISTIC_H #include "klee/Config/Version.h" -#if LLVM_VERSION_CODE < LLVM_VERSION(2, 9) +#if LLVM_VERSION_CODE < LLVM_VERSION(2, 9) && LLVM_VERSION_CODE >= LLVM_VERSION(2, 7) #include "llvm/System/DataTypes.h" #else #include "llvm/Support/DataTypes.h" diff --git a/include/klee/util/Bits.h b/include/klee/util/Bits.h index f2bb7692..aa78e534 100644 --- a/include/klee/util/Bits.h +++ b/include/klee/util/Bits.h @@ -11,7 +11,7 @@ #define KLEE_UTIL_BITS_H #include "klee/Config/Version.h" -#if LLVM_VERSION_CODE < LLVM_VERSION(2, 9) +#if LLVM_VERSION_CODE < LLVM_VERSION(2, 9) && LLVM_VERSION_CODE >= LLVM_VERSION(2, 7) #include "llvm/System/DataTypes.h" #else #include "llvm/Support/DataTypes.h" diff --git a/tools/klee/main.cpp b/tools/klee/main.cpp index 68ef98d4..2046be05 100644 --- a/tools/klee/main.cpp +++ b/tools/klee/main.cpp @@ -1158,8 +1158,8 @@ int main(int argc, char **argv, char **envp) { sys::SetInterruptFunction(interrupt_handle); // Load the bytecode... -#if LLVM_VERSION_CODE < LLVM_VERSION(2, 7) std::string ErrorMsg; +#if LLVM_VERSION_CODE < LLVM_VERSION(2, 7) ModuleProvider *MP = 0; if (MemoryBuffer *Buffer = MemoryBuffer::getFileOrSTDIN(InputFile, &ErrorMsg)) { MP = getBitcodeModuleProvider(Buffer, getGlobalContext(), &ErrorMsg); @@ -1172,8 +1172,7 @@ int main(int argc, char **argv, char **envp) { Module *mainModule = MP->materializeModule(); MP->releaseModule(); delete MP; -#endif - std::string ErrorMsg; +#else Module *mainModule = 0; #if LLVM_VERSION_CODE < LLVM_VERSION(2, 9) MemoryBuffer *Buffer = MemoryBuffer::getFileOrSTDIN(InputFile, &ErrorMsg); @@ -1200,6 +1199,7 @@ int main(int argc, char **argv, char **envp) { if (!mainModule) klee_error("error loading program '%s': %s", InputFile.c_str(), ErrorMsg.c_str()); +#endif if (WithPOSIXRuntime) { int r = initEnv(mainModule); |