Mercurial > hg > truffle

comparison src/share/vm/shark/llvmHeaders.hpp @ 7212:291ffc492eb6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
7163:2ed8d74e5984 7212:291ffc492eb6
33 #ifdef DEBUG 33 #ifdef DEBUG
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/Argument.h> 39 #include <llvm/Argument.h>
39 #include <llvm/Constants.h> 40 #include <llvm/Constants.h>
40 #include <llvm/DerivedTypes.h> 41 #include <llvm/DerivedTypes.h>
41 #include <llvm/ExecutionEngine/ExecutionEngine.h> 42 #include <llvm/ExecutionEngine/ExecutionEngine.h>
42 #include <llvm/Instructions.h> 43 #include <llvm/Instructions.h>
43 #include <llvm/LLVMContext.h> 44 #include <llvm/LLVMContext.h>
44 #include <llvm/Module.h> 45 #include <llvm/Module.h>
45 #if SHARK_LLVM_VERSION < 27 46 #if SHARK_LLVM_VERSION <= 31
46 #include <llvm/ModuleProvider.h> 47 #include <llvm/Support/IRBuilder.h>
48 #else
49 #include <llvm/IRBuilder.h>
47 #endif 50 #endif
48 #include <llvm/Support/IRBuilder.h>
49 #if SHARK_LLVM_VERSION >= 29
50 #include <llvm/Support/Threading.h> 51 #include <llvm/Support/Threading.h>
51 #else 52 #include <llvm/Support/TargetSelect.h>
52 #include <llvm/System/Threading.h>
53 #endif
54 #include <llvm/Target/TargetSelect.h>
55 #include <llvm/Type.h> 53 #include <llvm/Type.h>
56 #include <llvm/ExecutionEngine/JITMemoryManager.h> 54 #include <llvm/ExecutionEngine/JITMemoryManager.h>
57 #include <llvm/Support/CommandLine.h> 55 #include <llvm/Support/CommandLine.h>
58 #if SHARK_LLVM_VERSION >= 27 56 #include <llvm/ExecutionEngine/MCJIT.h>
59 #include <llvm/ExecutionEngine/JIT.h> 57 #include <llvm/ExecutionEngine/JIT.h>
60 #include <llvm/ADT/StringMap.h> 58 #include <llvm/ADT/StringMap.h>
61 #include <llvm/Support/Debug.h> 59 #include <llvm/Support/Debug.h>
62 #if SHARK_LLVM_VERSION >= 29
63 #include <llvm/Support/Host.h> 60 #include <llvm/Support/Host.h>
64 #else
65 #include <llvm/System/Host.h>
66 #endif
67 #endif
68 61
69 #include <map> 62 #include <map>
70 63
71 #ifdef assert 64 #ifdef assert
72 #undef assert 65 #undef assert