diff options
| author | Cristian Cadar <cristic@cs.stanford.edu> | 2011-04-23 19:22:22 +0000 |
|---|---|---|
| committer | Cristian Cadar <cristic@cs.stanford.edu> | 2011-04-23 19:22:22 +0000 |
| commit | 930ae7d06fc1d8cc3117397cb3fd168a0a1090b7 (patch) | |
| tree | ac1ff2162b5ea6d51bbf6a1ac35f350a297234ac /include | |
| parent | 2ec715a7e08724e54cd8c14904446d1b91b42121 (diff) | |
| download | klee-930ae7d06fc1d8cc3117397cb3fd168a0a1090b7.tar.gz | |
Patch by arrowdodger (http://keeda.stanford.edu/pipermail/klee-dev/2011-April/000617.html) for compiling KLEE with the latest LLVM changes. Tested against LLVM 2.7 and 2.8. The AsmAddresses test fails in 2.8 unless assertions are explicitely enabled (--enable-assertions).
git-svn-id: https://llvm.org/svn/llvm-project/klee/trunk@130065 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
| -rw-r--r-- | include/klee/Internal/Module/KInstruction.h | 6 | ||||
| -rw-r--r-- | include/klee/Statistic.h | 6 | ||||
| -rw-r--r-- | include/klee/util/Bits.h | 6 | ||||
| -rw-r--r-- | include/klee/util/GetElementPtrTypeIterator.h | 3 |
4 files changed, 12 insertions, 9 deletions
diff --git a/include/klee/Internal/Module/KInstruction.h b/include/klee/Internal/Module/KInstruction.h index b35cf107..f6becd4a 100644 --- a/include/klee/Internal/Module/KInstruction.h +++ b/include/klee/Internal/Module/KInstruction.h @@ -11,10 +11,10 @@ #define KLEE_KINSTRUCTION_H #include "klee/Config/config.h" -#if (LLVM_VERSION_MAJOR == 2 && LLVM_VERSION_MINOR < 7) -#include "llvm/Support/DataTypes.h" -#else +#if (LLVM_VERSION_MAJOR == 2 && LLVM_VERSION_MINOR < 9) #include "llvm/System/DataTypes.h" +#else +#include "llvm/Support/DataTypes.h" #endif #include <vector> diff --git a/include/klee/Statistic.h b/include/klee/Statistic.h index 7ade8dd0..6261fd95 100644 --- a/include/klee/Statistic.h +++ b/include/klee/Statistic.h @@ -11,10 +11,10 @@ #define KLEE_STATISTIC_H #include "klee/Config/config.h" -#if (LLVM_VERSION_MAJOR == 2 && LLVM_VERSION_MINOR < 7) -#include "llvm/Support/DataTypes.h" -#else +#if (LLVM_VERSION_MAJOR == 2 && LLVM_VERSION_MINOR < 9) #include "llvm/System/DataTypes.h" +#else +#include "llvm/Support/DataTypes.h" #endif #include <string> diff --git a/include/klee/util/Bits.h b/include/klee/util/Bits.h index db45acac..06703604 100644 --- a/include/klee/util/Bits.h +++ b/include/klee/util/Bits.h @@ -11,10 +11,10 @@ #define KLEE_UTIL_BITS_H #include "klee/Config/config.h" -#if (LLVM_VERSION_MAJOR == 2 && LLVM_VERSION_MINOR < 7) -#include "llvm/Support/DataTypes.h" -#else +#if (LLVM_VERSION_MAJOR == 2 && LLVM_VERSION_MINOR < 9) #include "llvm/System/DataTypes.h" +#else +#include "llvm/Support/DataTypes.h" #endif namespace klee { diff --git a/include/klee/util/GetElementPtrTypeIterator.h b/include/klee/util/GetElementPtrTypeIterator.h index 690aaa95..c552595c 100644 --- a/include/klee/util/GetElementPtrTypeIterator.h +++ b/include/klee/util/GetElementPtrTypeIterator.h @@ -21,6 +21,9 @@ #include "llvm/User.h" #include "llvm/DerivedTypes.h" #include "llvm/Instructions.h" +#if (LLVM_VERSION_MAJOR > 2) +#include "llvm/Constants.h" +#endif namespace klee { template<typename ItTy = llvm::User::const_op_iterator> |