Mercurial > hg > truffle
diff src/share/vm/shark/llvmHeaders.hpp @ 7212:291ffc492eb6
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Fri, 14 Dec 2012 14:35:13 +0100 |
| parents | 2cd5e15048e6 |
| children | 81ccf2c854c7 |
line wrap: on
line diff
--- a/src/share/vm/shark/llvmHeaders.hpp Fri Dec 14 10:20:54 2012 +0100 +++ b/src/share/vm/shark/llvmHeaders.hpp Fri Dec 14 14:35:13 2012 +0100 @@ -35,6 +35,7 @@ #undef DEBUG #endif +#include <llvm/Analysis/Verifier.h> #include <llvm/Argument.h> #include <llvm/Constants.h> #include <llvm/DerivedTypes.h> @@ -42,29 +43,21 @@ #include <llvm/Instructions.h> #include <llvm/LLVMContext.h> #include <llvm/Module.h> -#if SHARK_LLVM_VERSION < 27 -#include <llvm/ModuleProvider.h> -#endif +#if SHARK_LLVM_VERSION <= 31 #include <llvm/Support/IRBuilder.h> -#if SHARK_LLVM_VERSION >= 29 +#else +#include <llvm/IRBuilder.h> +#endif #include <llvm/Support/Threading.h> -#else -#include <llvm/System/Threading.h> -#endif -#include <llvm/Target/TargetSelect.h> +#include <llvm/Support/TargetSelect.h> #include <llvm/Type.h> #include <llvm/ExecutionEngine/JITMemoryManager.h> #include <llvm/Support/CommandLine.h> -#if SHARK_LLVM_VERSION >= 27 +#include <llvm/ExecutionEngine/MCJIT.h> #include <llvm/ExecutionEngine/JIT.h> #include <llvm/ADT/StringMap.h> #include <llvm/Support/Debug.h> -#if SHARK_LLVM_VERSION >= 29 #include <llvm/Support/Host.h> -#else -#include <llvm/System/Host.h> -#endif -#endif #include <map>