Mercurial > hg > truffle
diff src/share/vm/shark/llvmHeaders.hpp @ 14702:d4dd5204c0aa
Merge
author | ehelin |
---|---|
date | Fri, 14 Mar 2014 13:27:18 +0100 |
parents | 81ccf2c854c7 |
children | 92aa6797d639 |
line wrap: on
line diff
--- a/src/share/vm/shark/llvmHeaders.hpp Fri Mar 14 09:18:39 2014 +0100 +++ b/src/share/vm/shark/llvmHeaders.hpp Fri Mar 14 13:27:18 2014 +0100 @@ -36,21 +36,43 @@ #endif #include <llvm/Analysis/Verifier.h> +#include <llvm/ExecutionEngine/ExecutionEngine.h> + +// includes specific to each version +#if SHARK_LLVM_VERSION <= 31 +#include <llvm/Support/IRBuilder.h> +#include <llvm/Type.h> #include <llvm/Argument.h> #include <llvm/Constants.h> #include <llvm/DerivedTypes.h> -#include <llvm/ExecutionEngine/ExecutionEngine.h> #include <llvm/Instructions.h> #include <llvm/LLVMContext.h> #include <llvm/Module.h> -#if SHARK_LLVM_VERSION <= 31 -#include <llvm/Support/IRBuilder.h> -#else +#elif SHARK_LLVM_VERSION <= 32 #include <llvm/IRBuilder.h> +#include <llvm/Type.h> +#include <llvm/Argument.h> +#include <llvm/Constants.h> +#include <llvm/DerivedTypes.h> +#include <llvm/Instructions.h> +#include <llvm/LLVMContext.h> +#include <llvm/Module.h> +#else // SHARK_LLVM_VERSION <= 34 +#include <llvm/IR/IRBuilder.h> +#include <llvm/IR/Argument.h> +#include <llvm/IR/Constants.h> +#include <llvm/IR/DerivedTypes.h> +#include <llvm/ExecutionEngine/ExecutionEngine.h> +#include <llvm/IR/Instructions.h> +#include <llvm/IR/LLVMContext.h> +#include <llvm/IR/Module.h> +#include <llvm/ADT/StringRef.h> +#include <llvm/IR/Type.h> #endif + +// common includes #include <llvm/Support/Threading.h> #include <llvm/Support/TargetSelect.h> -#include <llvm/Type.h> #include <llvm/ExecutionEngine/JITMemoryManager.h> #include <llvm/Support/CommandLine.h> #include <llvm/ExecutionEngine/MCJIT.h>