Mercurial > hg > truffle
diff src/share/vm/shark/llvmHeaders.hpp @ 14726:92aa6797d639
Backed out merge changeset: b51e29501f30
Backed out merge revision to its first parent (8f483e200405)
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Mon, 24 Mar 2014 21:30:43 +0100 |
| parents | 81ccf2c854c7 |
| children |
line wrap: on
line diff
--- a/src/share/vm/shark/llvmHeaders.hpp Fri Mar 21 16:36:59 2014 -0700 +++ b/src/share/vm/shark/llvmHeaders.hpp Mon Mar 24 21:30:43 2014 +0100 @@ -36,43 +36,21 @@ #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/Instructions.h> -#include <llvm/LLVMContext.h> -#include <llvm/Module.h> -#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/ExecutionEngine/ExecutionEngine.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> +#if SHARK_LLVM_VERSION <= 31 +#include <llvm/Support/IRBuilder.h> +#else +#include <llvm/IRBuilder.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>