src/share/vm/shark/llvmHeaders.hpp

*** 34,58 ****
    #define SHARK_DEBUG
    #undef DEBUG
  #endif
  
  #include <llvm/Analysis/Verifier.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
  #include <llvm/IRBuilder.h>
  #endif
  #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>
  #include <llvm/ExecutionEngine/JIT.h>
  #include <llvm/ADT/StringMap.h>
--- 34,80 ----
    #define SHARK_DEBUG
    #undef DEBUG
  #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/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/ExecutionEngine/JITMemoryManager.h>
  #include <llvm/Support/CommandLine.h>
  #include <llvm/ExecutionEngine/MCJIT.h>
  #include <llvm/ExecutionEngine/JIT.h>
  #include <llvm/ADT/StringMap.h>