about summary refs log tree commit diff homepage
path: root/lib/Core
diff options
context:
space:
mode:
authorMartin Nowack <martin.nowack@gmail.com>2013-08-29 12:10:35 +0200
committerMartin Nowack <martin.nowack@gmail.com>2013-08-29 12:10:35 +0200
commit5c059018c02a7c7db252a3cb636a39c89c430a06 (patch)
tree33b18a08bee3a8452d6fd78e5a07dac5e9ad5838 /lib/Core
parent6c445f2b1a1f91ffb301bece325dd5a491922ce1 (diff)
downloadklee-5c059018c02a7c7db252a3cb636a39c89c430a06.tar.gz
Use new PathV2 interface for LLVM 2.9 and higher
Enable PathV2 interface starting from LLVM 2.9 and do some minor include
cleanup.
Diffstat (limited to 'lib/Core')
-rw-r--r--lib/Core/StatsTracker.cpp11
1 files changed, 3 insertions, 8 deletions
diff --git a/lib/Core/StatsTracker.cpp b/lib/Core/StatsTracker.cpp
index c0028a05..ae9910e5 100644
--- a/lib/Core/StatsTracker.cpp
+++ b/lib/Core/StatsTracker.cpp
@@ -38,17 +38,12 @@
 #include "llvm/Support/CFG.h"
 #if LLVM_VERSION_CODE < LLVM_VERSION(2, 9)
 #include "llvm/System/Process.h"
-#else
-#include "llvm/Support/Process.h"
-#endif
-#if LLVM_VERSION_CODE < LLVM_VERSION(2, 9)
 #include "llvm/System/Path.h"
 #else
+#include "llvm/Support/Process.h"
 #include "llvm/Support/Path.h"
-#if LLVM_VERSION_CODE >= LLVM_VERSION(3, 1)
 #include "llvm/Support/FileSystem.h"
 #endif
-#endif
 
 #include <iostream>
 #include <fstream>
@@ -180,14 +175,14 @@ StatsTracker::StatsTracker(Executor &_executor, std::string _objectFilename,
   KModule *km = executor.kmodule;
 
   sys::Path module(objectFilename);
-#if LLVM_VERSION_CODE < LLVM_VERSION(3, 1)
+#if LLVM_VERSION_CODE < LLVM_VERSION(2, 9)
   if (!sys::Path(objectFilename).isAbsolute()) {
 #else
   if (!sys::path::is_absolute(objectFilename)) {
 #endif
     sys::Path current = sys::Path::GetCurrentDirectory();
     current.appendComponent(objectFilename);
-#if LLVM_VERSION_CODE < LLVM_VERSION(3, 1)
+#if LLVM_VERSION_CODE < LLVM_VERSION(2, 9)
     if (current.exists())
 #else
     if (sys::fs::exists(current.c_str()))