diff options
| author | Peter Collingbourne <peter@pcc.me.uk> | 2011-07-20 13:35:52 +0000 |
|---|---|---|
| committer | Peter Collingbourne <peter@pcc.me.uk> | 2011-07-20 13:35:52 +0000 |
| commit | ed9ea0cf9dc856920afc6813fa1bea0ec7660ba1 (patch) | |
| tree | 46de7f5cae7ce4b8a7f5fee7f66f4d2f551b9a47 /lib/Support | |
| parent | 384a6c5652ae815f33e2a6cd1013b1cf14caed63 (diff) | |
| download | klee-ed9ea0cf9dc856920afc6813fa1bea0ec7660ba1.tar.gz | |
Deprecate LLVM_VERSION_MAJOR and LLVM_VERSION_MINOR in favour of
version codes. This makes the preprocessor-based version tests more concise and less error prone. Also, fix the version tests in lib/Expr/Parser.cpp (immutable zext and trunc were introduced in LLVM 2.9); now 2.9 passes "make test". git-svn-id: https://llvm.org/svn/llvm-project/klee/trunk@135583 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Support')
| -rw-r--r-- | lib/Support/Time.cpp | 4 | ||||
| -rw-r--r-- | lib/Support/Timer.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/Support/Time.cpp b/lib/Support/Time.cpp index ebcc390a..fb0e349c 100644 --- a/lib/Support/Time.cpp +++ b/lib/Support/Time.cpp @@ -7,10 +7,10 @@ // //===----------------------------------------------------------------------===// -#include "klee/Config/config.h" +#include "klee/Config/Version.h" #include "klee/Internal/System/Time.h" -#if (LLVM_VERSION_MAJOR == 2 && LLVM_VERSION_MINOR < 9) +#if LLVM_VERSION_CODE < LLVM_VERSION(2, 9) #include "llvm/System/Process.h" #else #include "llvm/Support/Process.h" diff --git a/lib/Support/Timer.cpp b/lib/Support/Timer.cpp index c51815aa..35922d4d 100644 --- a/lib/Support/Timer.cpp +++ b/lib/Support/Timer.cpp @@ -7,10 +7,10 @@ // //===----------------------------------------------------------------------===// -#include "klee/Config/config.h" +#include "klee/Config/Version.h" #include "klee/Internal/Support/Timer.h" -#if (LLVM_VERSION_MAJOR == 2 && LLVM_VERSION_MINOR < 9) +#if LLVM_VERSION_CODE < LLVM_VERSION(2, 9) #include "llvm/System/Process.h" #else #include "llvm/Support/Process.h" |