Mercurial > hg > graal-jvmci-8
comparison 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 |
comparison
equal
deleted
inserted
replaced
14719:0bdd0d157040 | 14726:92aa6797d639 |
---|---|
34 #define SHARK_DEBUG | 34 #define SHARK_DEBUG |
35 #undef DEBUG | 35 #undef DEBUG |
36 #endif | 36 #endif |
37 | 37 |
38 #include <llvm/Analysis/Verifier.h> | 38 #include <llvm/Analysis/Verifier.h> |
39 #include <llvm/ExecutionEngine/ExecutionEngine.h> | |
40 | |
41 // includes specific to each version | |
42 #if SHARK_LLVM_VERSION <= 31 | |
43 #include <llvm/Support/IRBuilder.h> | |
44 #include <llvm/Type.h> | |
45 #include <llvm/Argument.h> | 39 #include <llvm/Argument.h> |
46 #include <llvm/Constants.h> | 40 #include <llvm/Constants.h> |
47 #include <llvm/DerivedTypes.h> | 41 #include <llvm/DerivedTypes.h> |
42 #include <llvm/ExecutionEngine/ExecutionEngine.h> | |
48 #include <llvm/Instructions.h> | 43 #include <llvm/Instructions.h> |
49 #include <llvm/LLVMContext.h> | 44 #include <llvm/LLVMContext.h> |
50 #include <llvm/Module.h> | 45 #include <llvm/Module.h> |
51 #elif SHARK_LLVM_VERSION <= 32 | 46 #if SHARK_LLVM_VERSION <= 31 |
47 #include <llvm/Support/IRBuilder.h> | |
48 #else | |
52 #include <llvm/IRBuilder.h> | 49 #include <llvm/IRBuilder.h> |
53 #include <llvm/Type.h> | |
54 #include <llvm/Argument.h> | |
55 #include <llvm/Constants.h> | |
56 #include <llvm/DerivedTypes.h> | |
57 #include <llvm/Instructions.h> | |
58 #include <llvm/LLVMContext.h> | |
59 #include <llvm/Module.h> | |
60 #else // SHARK_LLVM_VERSION <= 34 | |
61 #include <llvm/IR/IRBuilder.h> | |
62 #include <llvm/IR/Argument.h> | |
63 #include <llvm/IR/Constants.h> | |
64 #include <llvm/IR/DerivedTypes.h> | |
65 #include <llvm/ExecutionEngine/ExecutionEngine.h> | |
66 #include <llvm/IR/Instructions.h> | |
67 #include <llvm/IR/LLVMContext.h> | |
68 #include <llvm/IR/Module.h> | |
69 #include <llvm/ADT/StringRef.h> | |
70 #include <llvm/IR/Type.h> | |
71 #endif | 50 #endif |
72 | |
73 // common includes | |
74 #include <llvm/Support/Threading.h> | 51 #include <llvm/Support/Threading.h> |
75 #include <llvm/Support/TargetSelect.h> | 52 #include <llvm/Support/TargetSelect.h> |
53 #include <llvm/Type.h> | |
76 #include <llvm/ExecutionEngine/JITMemoryManager.h> | 54 #include <llvm/ExecutionEngine/JITMemoryManager.h> |
77 #include <llvm/Support/CommandLine.h> | 55 #include <llvm/Support/CommandLine.h> |
78 #include <llvm/ExecutionEngine/MCJIT.h> | 56 #include <llvm/ExecutionEngine/MCJIT.h> |
79 #include <llvm/ExecutionEngine/JIT.h> | 57 #include <llvm/ExecutionEngine/JIT.h> |
80 #include <llvm/ADT/StringMap.h> | 58 #include <llvm/ADT/StringMap.h> |