OpenGTL-llvm-3.3.patch

   1 diff -up OpenGTL-0.9.18/CMakeLists.txt.jx OpenGTL-0.9.18/CMakeLists.txt
   2 --- OpenGTL-0.9.18/CMakeLists.txt.jx    2012-12-29 06:27:12.000000000 -0500
   3 +++ OpenGTL-0.9.18/CMakeLists.txt       2013-05-08 15:39:25.090057193 -0400
   4 @@ -78,8 +78,8 @@ else(MSVC)
   5    FIND_LLVM_LIBS( ${LLVM_CONFIG_EXECUTABLE} "native bitwriter linker bitreader jit interpreter support ipo" LLVM_LIBS LLVM_NATIVE_OBJECTS )
   6  endif(MSVC)
   7
   8 -if( NOT MSVC AND NOT (LLVM_VERSION STREQUAL "3.1" OR LLVM_VERSION STREQUAL "3.0" OR LLVM_VERSION STREQUAL "3.2svn"  OR LLVM_VERSION STREQUAL "3.2" ) ) # There is no way with MSVC to know the llvm version
   9 -  message(FATAL_ERROR "LLVM 3.0 or 3.1 or 3.2 is required.")
  10 +if( NOT MSVC AND NOT (LLVM_VERSION STREQUAL "3.3svn" OR LLVM_VERSION STREQUAL "3.3" ) ) # There is no way with MSVC to know the llvm version
  11 +  message(FATAL_ERROR "LLVM 3.3 is required.")
  12  endif()
  13
  14  if(MSVC)
  15 diff -up OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/Compiler.cpp.jx OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/Compiler.cpp
  16 --- OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/Compiler.cpp.jx     2012-12-29 06:27:12.000000000 -0500
  17 +++ OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/Compiler.cpp        2013-05-08 15:39:25.091057197 -0400
  18 @@ -27,10 +27,10 @@
  19  #include <climits>
  20
  21  // LLVM
  22 -#include <llvm/InstrTypes.h>
  23 +#include <llvm/IR/InstrTypes.h>
  24  // #include <llvm/Linker.h>
  25 -#include <llvm/DerivedTypes.h>
  26 -#include <llvm/Module.h>
  27 +#include <llvm/IR/DerivedTypes.h>
  28 +#include <llvm/IR/Module.h>
  29  // #include <llvm/Transforms/Utils/Cloning.h>
  30  // Library Loader
  31  #ifdef LLVM_27_OR_28
  32 @@ -214,7 +214,7 @@ bool Compiler::compile(bool _isStandardL
  33    return success;
  34  }
  35
  36 -#include <llvm/ValueSymbolTable.h>
  37 +#include <llvm/IR/ValueSymbolTable.h>
  38
  39  bool Compiler::importModule(const GTLCore::String& name)
  40  {
  41 diff -up OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/ParserNG.cpp.jx OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/ParserNG.cpp
  42 --- OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/ParserNG.cpp.jx     2012-12-29 06:27:12.000000000 -0500
  43 +++ OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/ParserNG.cpp        2013-05-08 15:39:25.091057197 -0400
  44 @@ -19,9 +19,9 @@
  45
  46  #include "ParserNG.h"
  47
  48 -#include <llvm/Constants.h>
  49 -#include <llvm/DerivedTypes.h>
  50 -#include <llvm/Type.h>
  51 +#include <llvm/IR/Constants.h>
  52 +#include <llvm/IR/DerivedTypes.h>
  53 +#include <llvm/IR/Type.h>
  54
  55  #include <GTLCore/LLVMBackend/CodeGenerator_p.h>
  56  #include <GTLCore/CompilationMessage.h>
  57 diff -up OpenGTL-0.9.18/OpenCTL/OpenCTL/Module.cpp.jx OpenGTL-0.9.18/OpenCTL/OpenCTL/Module.cpp
  58 --- OpenGTL-0.9.18/OpenCTL/OpenCTL/Module.cpp.jx        2012-12-29 06:27:12.000000000 -0500
  59 +++ OpenGTL-0.9.18/OpenCTL/OpenCTL/Module.cpp   2013-05-08 15:39:25.091057197 -0400
  60 @@ -38,7 +38,7 @@
  61  using namespace OpenCTL;
  62
  63  // LLVM
  64 -#include <llvm/Module.h>
  65 +#include <llvm/IR/Module.h>
  66  #include <llvm/Bitcode/ReaderWriter.h>
  67  #ifdef LLVM_27_OR_28
  68  #include <llvm/System/Path.h>
  69 @@ -47,8 +47,7 @@ using namespace OpenCTL;
  70  #include <llvm/Support/Path.h>
  71  #include <llvm/Support/DynamicLibrary.h>
  72  #endif
  73 -#include <llvm/Module.h>
  74 -#include <llvm/LLVMContext.h>
  75 +#include <llvm/IR/LLVMContext.h>
  76
  77  struct Module::Private {
  78    Private() : moduleData(0), isStandardLibrary(false) {}
  79 diff -up OpenGTL-0.9.18/OpenCTL/OpenCTL/Program.cpp.jx OpenGTL-0.9.18/OpenCTL/OpenCTL/Program.cpp
  80 --- OpenGTL-0.9.18/OpenCTL/OpenCTL/Program.cpp.jx       2012-12-29 06:27:12.000000000 -0500
  81 +++ OpenGTL-0.9.18/OpenCTL/OpenCTL/Program.cpp  2013-05-08 15:39:25.091057197 -0400
  82 @@ -20,16 +20,16 @@
  83  #include "Program.h"
  84
  85  // LLVM
  86 -#include <llvm/DerivedTypes.h>
  87 -#include <llvm/Instructions.h>
  88 -#include <llvm/Module.h>
  89 +#include <llvm/IR/DerivedTypes.h>
  90 +#include <llvm/IR/Instructions.h>
  91 +#include <llvm/IR/Module.h>
  92  #include <llvm/Transforms/Utils/Cloning.h>
  93
  94  // Passes
  95  #include <llvm/PassManager.h>
  96  #include <llvm/Analysis/LoopPass.h>
  97  #include <llvm/Analysis/Verifier.h>
  98 -#include <llvm/GlobalVariable.h>
  99 +#include <llvm/IR/GlobalVariable.h>
 100
 101  // GTLCore
 102  #include "GTLCore/Buffer.h"
 103 diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/AccessorExpression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/AccessorExpression.cpp
 104 --- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/AccessorExpression.cpp.jx        2012-12-29 06:27:12.000000000 -0500
 105 +++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/AccessorExpression.cpp   2013-05-08 15:39:25.092057201 -0400
 106 @@ -20,9 +20,9 @@
 107  #include "AccessorExpression.h"
 108
 109  #include <llvm/ADT/ArrayRef.h>
 110 -#include <llvm/Constants.h>
 111 -#include <llvm/Function.h>
 112 -#include <llvm/Instructions.h>
 113 +#include <llvm/IR/Constants.h>
 114 +#include <llvm/IR/Function.h>
 115 +#include <llvm/IR/Instructions.h>
 116
 117  #include "../LLVMBackend/CodeGenerator_p.h"
 118  #include "../LLVMBackend/ExpressionResult_p.h"
 119 diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/BinaryExpression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/BinaryExpression.cpp
 120 --- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/BinaryExpression.cpp.jx  2012-12-29 06:27:12.000000000 -0500
 121 +++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/BinaryExpression.cpp     2013-05-08 15:39:25.092057201 -0400
 122 @@ -19,7 +19,7 @@
 123
 124  #include "BinaryExpression.h"
 125
 126 -#include <llvm/Instructions.h>
 127 +#include <llvm/IR/Instructions.h>
 128
 129  #include <GTLCore/Debug.h>
 130  #include <GTLCore/LLVMBackend/CodeGenerator_p.h>
 131 diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/CompoundExpression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/CompoundExpression.cpp
 132 --- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/CompoundExpression.cpp.jx        2012-12-29 06:27:12.000000000 -0500
 133 +++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/CompoundExpression.cpp   2013-05-08 15:39:25.092057201 -0400
 134 @@ -19,10 +19,10 @@
 135
 136  #include "CompoundExpression.h"
 137
 138 -#include <llvm/Constants.h>
 139 -#include <llvm/DerivedTypes.h>
 140 -#include <llvm/GlobalVariable.h>
 141 -#include <llvm/Instructions.h>
 142 +#include <llvm/IR/Constants.h>
 143 +#include <llvm/IR/DerivedTypes.h>
 144 +#include <llvm/IR/GlobalVariable.h>
 145 +#include <llvm/IR/Instructions.h>
 146
 147  #include "../LLVMBackend/CodeGenerator_p.h"
 148  #include "../Debug.h"
 149 diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/ConstantCompoundExpression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/ConstantCompoundExpression.cpp
 150 --- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/ConstantCompoundExpression.cpp.jx        2012-12-29 06:27:12.000000000 -0500
 151 +++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/ConstantCompoundExpression.cpp   2013-05-08 15:39:25.092057201 -0400
 152 @@ -19,10 +19,10 @@
 153
 154  #include "ConstantCompoundExpression.h"
 155
 156 -#include <llvm/Constants.h>
 157 -#include <llvm/DerivedTypes.h>
 158 -#include <llvm/GlobalVariable.h>
 159 -#include <llvm/Instructions.h>
 160 +#include <llvm/IR/Constants.h>
 161 +#include <llvm/IR/DerivedTypes.h>
 162 +#include <llvm/IR/GlobalVariable.h>
 163 +#include <llvm/IR/Instructions.h>
 164
 165  #include "../LLVMBackend/CodeGenerator_p.h"
 166  #include "../Debug.h"
 167 diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Expression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Expression.cpp
 168 --- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Expression.cpp.jx        2012-12-29 06:27:12.000000000 -0500
 169 +++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Expression.cpp   2013-05-08 15:39:25.093057205 -0400
 170 @@ -19,11 +19,11 @@
 171
 172  #include "Expression.h"
 173
 174 -#include <llvm/Constant.h>
 175 -#include <llvm/Constants.h>
 176 -#include <llvm/Function.h>
 177 -#include <llvm/GlobalVariable.h>
 178 -#include <llvm/Instructions.h>
 179 +#include <llvm/IR/Constant.h>
 180 +#include <llvm/IR/Constants.h>
 181 +#include <llvm/IR/Function.h>
 182 +#include <llvm/IR/GlobalVariable.h>
 183 +#include <llvm/IR/Instructions.h>
 184
 185  #include "GTLCore/LLVMBackend/CodeGenerator_p.h"
 186  #include "GTLCore/LLVMBackend/ExpressionResult_p.h"
 187 diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/FunctionDeclaration.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/FunctionDeclaration.cpp
 188 --- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/FunctionDeclaration.cpp.jx       2012-12-29 06:27:12.000000000 -0500
 189 +++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/FunctionDeclaration.cpp  2013-05-08 15:39:25.093057205 -0400
 190 @@ -19,10 +19,10 @@
 191
 192  #include "FunctionDeclaration.h"
 193
 194 -#include <llvm/DerivedTypes.h>
 195 -#include <llvm/Function.h>
 196 -#include <llvm/Instructions.h>
 197 -#include <llvm/Type.h>
 198 +#include <llvm/IR/DerivedTypes.h>
 199 +#include <llvm/IR/Function.h>
 200 +#include <llvm/IR/Instructions.h>
 201 +#include <llvm/IR/Type.h>
 202
 203  #include <GTLCore/LLVMBackend/CodeGenerator_p.h>
 204  #include <GTLCore/LLVMBackend/ExpressionResult_p.h>
 205 diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/GarbageCollectionStatement.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/GarbageCollectionStatement.cpp
 206 --- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/GarbageCollectionStatement.cpp.jx        2012-12-29 06:27:12.000000000 -0500
 207 +++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/GarbageCollectionStatement.cpp   2013-05-08 15:39:25.093057205 -0400
 208 @@ -21,8 +21,8 @@
 209
 210  #include <stdlib.h>
 211
 212 -#include <llvm/Constant.h>
 213 -#include <llvm/Instructions.h>
 214 +#include <llvm/IR/Constant.h>
 215 +#include <llvm/IR/Instructions.h>
 216
 217  #include "../Type.h"
 218  #include "../LLVMBackend/CodeGenerator_p.h"
 219 diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Statement.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Statement.cpp
 220 --- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Statement.cpp.jx 2012-12-29 06:27:12.000000000 -0500
 221 +++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Statement.cpp    2013-05-08 15:39:25.093057205 -0400
 222 @@ -21,12 +21,12 @@
 223
 224  // LLVM
 225  #include <llvm/ADT/ArrayRef.h>
 226 -#include <llvm/BasicBlock.h>
 227 -#include <llvm/Constants.h>
 228 -#include <llvm/Function.h>
 229 -#include <llvm/GlobalVariable.h>
 230 -#include <llvm/Instructions.h>
 231 -#include <llvm/Module.h>
 232 +#include <llvm/IR/BasicBlock.h>
 233 +#include <llvm/IR/Constants.h>
 234 +#include <llvm/IR/Function.h>
 235 +#include <llvm/IR/GlobalVariable.h>
 236 +#include <llvm/IR/Instructions.h>
 237 +#include <llvm/IR/Module.h>
 238
 239  // GTLCore
 240  #include <GTLCore/LLVMBackend/CodeGenerator_p.h>
 241 diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Tree.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Tree.cpp
 242 --- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Tree.cpp.jx      2012-12-29 06:27:12.000000000 -0500
 243 +++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Tree.cpp 2013-05-08 15:39:25.094057209 -0400
 244 @@ -19,9 +19,9 @@
 245
 246  #include "Tree.h"
 247
 248 -#include <llvm/Constant.h>
 249 -#include <llvm/GlobalVariable.h>
 250 -#include <llvm/Type.h>
 251 +#include <llvm/IR/Constant.h>
 252 +#include <llvm/IR/GlobalVariable.h>
 253 +#include <llvm/IR/Type.h>
 254
 255  #include "FunctionDeclaration.h"
 256
 257 @@ -37,8 +37,8 @@
 258  #include "GTLCore/LLVMBackend/Visitor_p.h"
 259
 260  #include "Expression.h"
 261 -#include <llvm/Module.h>
 262 -#include <llvm/DerivedTypes.h>
 263 +#include <llvm/IR/Module.h>
 264 +#include <llvm/IR/DerivedTypes.h>
 265
 266  using namespace GTLCore::AST;
 267
 268 diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Debug.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Debug.cpp
 269 --- OpenGTL-0.9.18/OpenGTL/GTLCore/Debug.cpp.jx 2012-12-29 06:27:12.000000000 -0500
 270 +++ OpenGTL-0.9.18/OpenGTL/GTLCore/Debug.cpp    2013-05-08 15:39:25.094057209 -0400
 271 @@ -22,9 +22,9 @@
 272  #include <map>
 273  #include <fstream>
 274
 275 -#include <llvm/Module.h>
 276 -#include <llvm/Value.h>
 277 -#include <llvm/Type.h>
 278 +#include <llvm/IR/Module.h>
 279 +#include <llvm/IR/Value.h>
 280 +#include <llvm/IR/Type.h>
 281  #include <llvm/Support/Path.h>
 282  #include <llvm/Support/raw_ostream.h>
 283
 284 @@ -418,9 +418,9 @@ namespace GTLCore {
 285
 286  #ifdef OPENGTL_ENABLE_DEBUG_OUTPUT
 287
 288 -#include <llvm/DerivedTypes.h>
 289 -#include <llvm/Function.h>
 290 -#include <llvm/Type.h>
 291 +#include <llvm/IR/DerivedTypes.h>
 292 +#include <llvm/IR/Function.h>
 293 +#include <llvm/IR/Type.h>
 294
 295  void compareFunctionParameters( llvm::Value* func, const std::vector<llvm::Value*>& params  )
 296  {
 297 diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/FunctionCaller_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/FunctionCaller_p.cpp
 298 --- OpenGTL-0.9.18/OpenGTL/GTLCore/FunctionCaller_p.cpp.jx      2012-12-29 06:27:12.000000000 -0500
 299 +++ OpenGTL-0.9.18/OpenGTL/GTLCore/FunctionCaller_p.cpp 2013-05-08 15:39:25.094057209 -0400
 300 @@ -21,9 +21,9 @@
 301
 302  #include <llvm/ExecutionEngine/GenericValue.h>
 303  #include <llvm/ExecutionEngine/ExecutionEngine.h>
 304 -#include <llvm/Function.h>
 305 -
 306 -#include <llvm/DerivedTypes.h> // <- I don't understand why I need to include that file to be able to display llvm::Type on the standard output
 307 +#include <llvm/IR/Function.h>
 308 +#include <llvm/IR/Instructions.h>
 309 +#include <llvm/IR/DerivedTypes.h> // <- I don't understand why I need to include that file to be able to display llvm::Type on the standard output
 310
 311  #include "VirtualMachine_p.h"
 312
 313 @@ -35,7 +35,6 @@
 314  #include "LLVMBackend/GenerationContext_p.h"
 315  #include "ModuleData_p.h"
 316  #include "LLVMBackend/CodeGenerator_p.h"
 317 -#include <llvm/Instructions.h>
 318  #include "Type_p.h"
 319  #include <GTLCore/Parameter.h>
 320  #include "PrimitiveTypesTraits_p.h"
 321 diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Function_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Function_p.cpp
 322 --- OpenGTL-0.9.18/OpenGTL/GTLCore/Function_p.cpp.jx    2012-12-29 06:27:12.000000000 -0500
 323 +++ OpenGTL-0.9.18/OpenGTL/GTLCore/Function_p.cpp       2013-05-08 15:39:25.094057209 -0400
 324 @@ -21,9 +21,9 @@
 325
 326  #include <cstdarg>
 327
 328 -#include <llvm/DerivedTypes.h>
 329 -#include <llvm/Module.h>
 330 -#include <llvm/Type.h>
 331 +#include <llvm/IR/DerivedTypes.h>
 332 +#include <llvm/IR/Module.h>
 333 +#include <llvm/IR/Type.h>
 334
 335  #include "Parameter.h"
 336
 337 diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/CodeGenerator_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/CodeGenerator_p.cpp
 338 --- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/CodeGenerator_p.cpp.jx   2012-12-29 06:27:12.000000000 -0500
 339 +++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/CodeGenerator_p.cpp      2013-05-08 15:39:25.095057213 -0400
 340 @@ -19,12 +19,12 @@
 341
 342  #include "CodeGenerator_p.h"
 343
 344 -#include <llvm/CallingConv.h>
 345 -#include <llvm/Constants.h>
 346 -#include <llvm/Function.h>
 347 -#include <llvm/Instructions.h>
 348 -#include <llvm/Module.h>
 349 -#include <llvm/Value.h>
 350 +#include <llvm/IR/CallingConv.h>
 351 +#include <llvm/IR/Constants.h>
 352 +#include <llvm/IR/Function.h>
 353 +#include <llvm/IR/Instructions.h>
 354 +#include <llvm/IR/Module.h>
 355 +#include <llvm/IR/Value.h>
 356
 357  #include "GTLCore/Debug.h"
 358  #include "ExpressionResult_p.h"
 359 diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ContextManager_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ContextManager_p.cpp
 360 --- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ContextManager_p.cpp.jx  2012-12-29 06:27:12.000000000 -0500
 361 +++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ContextManager_p.cpp     2013-05-08 15:39:25.095057213 -0400
 362 @@ -20,7 +20,7 @@
 363  #include "ContextManager_p.h"
 364
 365  #include <llvm/Support/ThreadLocal.h>
 366 -#include <llvm/LLVMContext.h>
 367 +#include <llvm/IR/LLVMContext.h>
 368
 369  using namespace LLVMBackend;
 370
 371 diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionGenerationContext_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionGenerationContext_p.cpp
 372 --- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionGenerationContext_p.cpp.jx     2012-12-29 06:27:12.000000000 -0500
 373 +++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionGenerationContext_p.cpp        2013-05-08 15:39:25.095057213 -0400
 374 @@ -20,7 +20,7 @@
 375  #include "ExpressionGenerationContext_p.h"
 376
 377  #include "GTLCore/Debug.h"
 378 -#include <llvm/BasicBlock.h>
 379 +#include <llvm/IR/BasicBlock.h>
 380
 381  #include "GTLCore/Macros_p.h"
 382
 383 diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionResult_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionResult_p.cpp
 384 --- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionResult_p.cpp.jx        2012-12-29 06:27:12.000000000 -0500
 385 +++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionResult_p.cpp   2013-05-08 15:39:25.095057213 -0400
 386 @@ -19,8 +19,8 @@
 387
 388  #include "ExpressionResult_p.h"
 389
 390 -#include "llvm/Constant.h"
 391 -#include "llvm/DerivedTypes.h"
 392 +#include "llvm/IR/Constant.h"
 393 +#include "llvm/IR/DerivedTypes.h"
 394
 395  #include "../Type.h"
 396  #include "../Type_p.h"
 397 diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/GenerationContext_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/GenerationContext_p.cpp
 398 --- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/GenerationContext_p.cpp.jx       2012-12-29 06:27:12.000000000 -0500
 399 +++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/GenerationContext_p.cpp  2013-05-08 15:39:25.096057217 -0400
 400 @@ -22,8 +22,8 @@
 401  #include "GTLCore/ModuleData_p.h"
 402  #include "GTLCore/Debug.h"
 403
 404 -#include "llvm/BasicBlock.h"
 405 -#include "llvm/Function.h"
 406 +#include "llvm/IR/BasicBlock.h"
 407 +#include "llvm/IR/Function.h"
 408
 409  #include "GTLCore/AST/Statement.h"
 410
 411 diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/Visitor_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/Visitor_p.cpp
 412 --- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/Visitor_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500
 413 +++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/Visitor_p.cpp    2013-05-08 15:39:25.096057217 -0400
 414 @@ -20,12 +20,12 @@
 415  #include "Visitor_p.h"
 416
 417  // LLVM
 418 -#include <llvm/BasicBlock.h>
 419 -#include <llvm/Constants.h>
 420 -#include <llvm/Function.h>
 421 -#include <llvm/Instructions.h>
 422 -#include <llvm/Module.h>
 423 -#include <llvm/GlobalVariable.h>
 424 +#include <llvm/IR/BasicBlock.h>
 425 +#include <llvm/IR/Constants.h>
 426 +#include <llvm/IR/Function.h>
 427 +#include <llvm/IR/Instructions.h>
 428 +#include <llvm/IR/Module.h>
 429 +#include <llvm/IR/GlobalVariable.h>
 430
 431  // GTLCore
 432  #include "CodeGenerator_p.h"
 433 diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/ModuleData_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/ModuleData_p.cpp
 434 --- OpenGTL-0.9.18/OpenGTL/GTLCore/ModuleData_p.cpp.jx  2012-12-29 06:27:12.000000000 -0500
 435 +++ OpenGTL-0.9.18/OpenGTL/GTLCore/ModuleData_p.cpp     2013-05-08 15:41:21.422512114 -0400
 436 @@ -21,7 +21,7 @@
 437
 438  #include <sstream>
 439
 440 -#include <llvm/Module.h>
 441 +#include <llvm/IR/Module.h>
 442  #include <llvm/PassManager.h>
 443  #include <llvm/Target/TargetMachine.h>
 444  #include <llvm/Analysis/Verifier.h>
 445 @@ -242,7 +242,7 @@ void ModuleData::doLink()
 446    GTL_ASSERT( not m_llvmLinkedModule );
 447    m_llvmLinkedModule = m_llvmModule;
 448    m_llvmModule = llvm::CloneModule( m_llvmModule );
 449 -  llvm::Linker linker("", m_llvmLinkedModule);
 450 +  llvm::Linker linker(m_llvmLinkedModule);
 451    std::string errorMessage;
 452    foreach( const llvm::Module* mod, m_linkModuleWith )
 453    {
 454 @@ -270,18 +270,11 @@ void ModuleData::doLink()
 455          hide.push_back(name);
 456        }
 457      }
 458 -    linker.LinkInModule( clone, &errorMessage );
 459 +    linker.linkInModule( clone, &errorMessage );
 460
 461      GTL_DEBUG("Linking error: " << errorMessage );
 462      delete clone;
 463    }
 464 -  foreach( const GTLCore::String& mod, m_linkModuleWithArchives )
 465 -  {
 466 -    bool v = false;
 467 -    linker.LinkInArchive( llvm::sys::Path( (const std::string&) mod), v);
 468 -  }
 469 -
 470 -  linker.releaseModule();
 471
 472    // Hide symbols
 473    foreach(GTLCore::String name, hide)
 474 diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Type.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Type.cpp
 475 --- OpenGTL-0.9.18/OpenGTL/GTLCore/Type.cpp.jx  2012-12-29 06:27:12.000000000 -0500
 476 +++ OpenGTL-0.9.18/OpenGTL/GTLCore/Type.cpp     2013-05-08 15:39:25.096057217 -0400
 477 @@ -25,7 +25,7 @@
 478
 479  #include <iostream>
 480
 481 -#include <llvm/DerivedTypes.h>
 482 +#include <llvm/IR/DerivedTypes.h>
 483
 484  #include "wrappers/StructWrap.h"
 485  #include "SharedPointer.h"
 486 diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Type_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Type_p.cpp
 487 --- OpenGTL-0.9.18/OpenGTL/GTLCore/Type_p.cpp.jx        2012-12-29 06:27:12.000000000 -0500
 488 +++ OpenGTL-0.9.18/OpenGTL/GTLCore/Type_p.cpp   2013-05-08 15:39:25.097057221 -0400
 489 @@ -30,8 +30,8 @@
 490
 491  using namespace GTLCore;
 492
 493 -#include <llvm/Type.h>
 494 -#include <llvm/DerivedTypes.h>
 495 +#include <llvm/IR/Type.h>
 496 +#include <llvm/IR/DerivedTypes.h>
 497
 498  Type::StructDataMember::Information::~Information()
 499  {
 500 diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Value_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Value_p.cpp
 501 --- OpenGTL-0.9.18/OpenGTL/GTLCore/Value_p.cpp.jx       2012-12-29 06:27:12.000000000 -0500
 502 +++ OpenGTL-0.9.18/OpenGTL/GTLCore/Value_p.cpp  2013-05-08 15:39:25.097057221 -0400
 503 @@ -19,8 +19,8 @@
 504
 505  #include "Value_p.h"
 506
 507 -#include <llvm/DerivedTypes.h>
 508 -#include <llvm/Type.h>
 509 +#include <llvm/IR/DerivedTypes.h>
 510 +#include <llvm/IR/Type.h>
 511
 512  #include "Debug.h"
 513  #include "Value.h"
 514 diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/VariableNG_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/VariableNG_p.cpp
 515 --- OpenGTL-0.9.18/OpenGTL/GTLCore/VariableNG_p.cpp.jx  2012-12-29 06:27:12.000000000 -0500
 516 +++ OpenGTL-0.9.18/OpenGTL/GTLCore/VariableNG_p.cpp     2013-05-08 15:39:25.097057221 -0400
 517 @@ -19,8 +19,8 @@
 518
 519  #include "VariableNG_p.h"
 520
 521 -#include <llvm/Constants.h>
 522 -#include <llvm/Instructions.h>
 523 +#include <llvm/IR/Constants.h>
 524 +#include <llvm/IR/Instructions.h>
 525
 526  #include "LLVMBackend/CodeGenerator_p.h"
 527  #include "Debug.h"
 528 diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/VirtualMachine_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/VirtualMachine_p.cpp
 529 --- OpenGTL-0.9.18/OpenGTL/GTLCore/VirtualMachine_p.cpp.jx      2012-12-29 06:27:12.000000000 -0500
 530 +++ OpenGTL-0.9.18/OpenGTL/GTLCore/VirtualMachine_p.cpp 2013-05-08 15:39:25.097057221 -0400
 531 @@ -21,10 +21,10 @@
 532
 533  // JIT
 534  #include <llvm/ExecutionEngine/ExecutionEngine.h>
 535 -#include <llvm/Module.h>
 536 -#include <llvm/DerivedTypes.h>
 537 +#include <llvm/IR/Module.h>
 538 +#include <llvm/IR/DerivedTypes.h>
 539  #include <llvm/Target/TargetOptions.h>
 540 -#include <llvm/LLVMContext.h>
 541 +#include <llvm/IR/LLVMContext.h>
 542  #include <llvm/Support/CommandLine.h>
 543  #include <llvm/Support/Threading.h>
 544  #include <llvm/Support/ErrorHandling.h>
 545 @@ -48,7 +48,8 @@ struct VirtualMachine::Private {
 546  VirtualMachine* VirtualMachine::Private::virtualMachine = 0;
 547  int VirtualMachine::Private::optimLevel = 2;
 548
 549 -void gtl_llvm_error_handler(void *user_data, const std::string& reason)
 550 +void gtl_llvm_error_handler(void *user_data, const std::string& reason,
 551 +                           bool gen_crash_diag)
 552  {
 553    GTL_ABORT(reason);
 554  }
 555 @@ -58,11 +59,7 @@ VirtualMachine::VirtualMachine() : d(new
 556  {
 557    d->executionEngine = 0;
 558
 559 -#ifdef LLVM_27
 560 -  llvm::llvm_install_error_handler(&gtl_llvm_error_handler);
 561 -#else
 562 -  llvm::install_fatal_error_handler(&gtl_llvm_error_handler);
 563 -#endif
 564 +  llvm::install_fatal_error_handler(gtl_llvm_error_handler);
 565
 566    llvm::llvm_start_multithreaded();
 567
 568 diff -up OpenGTL-0.9.18/OpenGTL/GTLFragment/Compiler_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLFragment/Compiler_p.cpp
 569 --- OpenGTL-0.9.18/OpenGTL/GTLFragment/Compiler_p.cpp.jx        2012-12-29 06:27:12.000000000 -0500
 570 +++ OpenGTL-0.9.18/OpenGTL/GTLFragment/Compiler_p.cpp   2013-05-08 15:39:25.097057221 -0400
 571 @@ -19,7 +19,7 @@
 572
 573  #include "Compiler_p.h"
 574
 575 -#include <llvm/Module.h>
 576 +#include <llvm/IR/Module.h>
 577  #include <llvm/PassManager.h>
 578
 579  #include "GTLCore/AST/Expression.h"
 580 diff -up OpenGTL-0.9.18/OpenGTL/GTLFragment/Library.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLFragment/Library.cpp
 581 --- OpenGTL-0.9.18/OpenGTL/GTLFragment/Library.cpp.jx   2012-12-29 06:27:12.000000000 -0500
 582 +++ OpenGTL-0.9.18/OpenGTL/GTLFragment/Library.cpp      2013-05-08 15:39:25.098057225 -0400
 583 @@ -22,9 +22,9 @@
 584
 585  #include <sstream>
 586
 587 -#include <llvm/Module.h>
 588 +#include <llvm/IR/Module.h>
 589  #include <llvm/Support/DynamicLibrary.h>
 590 -#include <llvm/LLVMContext.h>
 591 +#include <llvm/IR/LLVMContext.h>
 592
 593  #include "GTLCore/CompilationMessage.h"
 594  #include "GTLCore/Function.h"
 595 diff -up OpenGTL-0.9.18/OpenGTL/GTLFragment/Wrapper.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLFragment/Wrapper.cpp
 596 --- OpenGTL-0.9.18/OpenGTL/GTLFragment/Wrapper.cpp.jx   2012-12-29 06:27:12.000000000 -0500
 597 +++ OpenGTL-0.9.18/OpenGTL/GTLFragment/Wrapper.cpp      2013-05-08 15:39:25.098057225 -0400
 598 @@ -29,7 +29,7 @@
 599
 600  #include "Library.h"
 601  #include <GTLCore/Function_p.h>
 602 -#include <llvm/Module.h>
 603 +#include <llvm/IR/Module.h>
 604  #include <GTLCore/Type_p.h>
 605
 606  using namespace GTLFragment;
 607 diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/CodeGenerator_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/CodeGenerator_p.cpp
 608 --- OpenGTL-0.9.18/OpenShiva/OpenShiva/CodeGenerator_p.cpp.jx   2012-12-29 06:27:12.000000000 -0500
 609 +++ OpenGTL-0.9.18/OpenShiva/OpenShiva/CodeGenerator_p.cpp      2013-05-08 15:39:25.098057225 -0400
 610 @@ -21,14 +21,14 @@
 611
 612  #include <vector>
 613
 614 -#include <llvm/CallingConv.h>
 615 -#include <llvm/Constants.h>
 616 -#include <llvm/Constant.h>
 617 -#include <llvm/DerivedTypes.h>
 618 -#include <llvm/Function.h>
 619 -#include <llvm/Instructions.h>
 620 -#include <llvm/Module.h>
 621 -#include <llvm/Value.h>
 622 +#include <llvm/IR/CallingConv.h>
 623 +#include <llvm/IR/Constants.h>
 624 +#include <llvm/IR/Constant.h>
 625 +#include <llvm/IR/DerivedTypes.h>
 626 +#include <llvm/IR/Function.h>
 627 +#include <llvm/IR/Instructions.h>
 628 +#include <llvm/IR/Module.h>
 629 +#include <llvm/IR/Value.h>
 630
 631  #include "GTLCore/LLVMBackend/CodeGenerator_p.h"
 632  #include "GTLCore/LLVMBackend/ExpressionResult_p.h"
 633 diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/ColorToPixelOverloadOperatorFactory_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/ColorToPixelOverloadOperatorFactory_p.cpp
 634 --- OpenGTL-0.9.18/OpenShiva/OpenShiva/ColorToPixelOverloadOperatorFactory_p.cpp.jx     2012-12-29 06:27:12.000000000 -0500
 635 +++ OpenGTL-0.9.18/OpenShiva/OpenShiva/ColorToPixelOverloadOperatorFactory_p.cpp        2013-05-08 15:39:25.098057225 -0400
 636 @@ -28,13 +28,13 @@
 637  #include "CodeGenerator_p.h"
 638  #include <GTLFragment/wrappers/ColorWrap_p.h>
 639  #include <GTLCore/Type_p.h>
 640 -#include <llvm/Value.h>
 641 -#include <llvm/DerivedTypes.h>
 642 -#include <llvm/CallingConv.h>
 643 -#include <llvm/Module.h>
 644 +#include <llvm/IR/Value.h>
 645 +#include <llvm/IR/DerivedTypes.h>
 646 +#include <llvm/IR/CallingConv.h>
 647 +#include <llvm/IR/Module.h>
 648  #include <GTLCore/LLVMBackend/ExpressionGenerationContext_p.h>
 649  #include <GTLCore/LLVMBackend/CodeGenerator_p.h>
 650 -#include <llvm/Instructions.h>
 651 +#include <llvm/IR/Instructions.h>
 652  #include <GTLCore/TypesManager.h>
 653
 654  using namespace OpenShiva;
 655 diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/Kernel.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/Kernel.cpp
 656 --- OpenGTL-0.9.18/OpenShiva/OpenShiva/Kernel.cpp.jx    2012-12-29 06:27:12.000000000 -0500
 657 +++ OpenGTL-0.9.18/OpenShiva/OpenShiva/Kernel.cpp       2013-05-08 15:39:25.099057228 -0400
 658 @@ -22,7 +22,7 @@
 659  #include <sstream>
 660  #include <fstream>
 661
 662 -#include <llvm/Module.h>
 663 +#include <llvm/IR/Module.h>
 664
 665  #include "GTLCore/CompilationMessage.h"
 666  #include "GTLCore/Function.h"
 667 @@ -48,7 +48,7 @@
 668  #include "wrappers/ImageWrap_p.h"
 669  #include "wrappers/RegionWrap_p.h"
 670  #include <GTLCore/AST/Tree.h>
 671 -#include <llvm/DerivedTypes.h>
 672 +#include <llvm/IR/DerivedTypes.h>
 673
 674  using namespace OpenShiva;
 675
 676 diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelConvertExpressionFactory_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelConvertExpressionFactory_p.cpp
 677 --- OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelConvertExpressionFactory_p.cpp.jx   2012-12-29 06:27:12.000000000 -0500
 678 +++ OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelConvertExpressionFactory_p.cpp      2013-05-08 15:39:25.099057228 -0400
 679 @@ -19,7 +19,8 @@
 680
 681  #include "PixelConvertExpressionFactory_p.h"
 682
 683 -#include <llvm/Instructions.h>
 684 +#include <llvm/IR/Instructions.h>
 685 +#include <llvm/IR/Function.h>
 686
 687  #include "GTLCore/Type.h"
 688  #include "GTLCore/AST/ConvertExpression.h"
 689 @@ -34,7 +35,6 @@
 690  #include <GTLCore/VariableNG_p.h>
 691  #include <GTLCore/LLVMBackend/Visitor_p.h>
 692  #include <GTLFragment/wrappers/ColorWrap_p.h>
 693 -#include <llvm/Function.h>
 694  #include <GTLCore/Type_p.h>
 695
 696  using namespace OpenShiva;
 697 diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelVisitor_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelVisitor_p.cpp
 698 --- OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelVisitor_p.cpp.jx    2012-12-29 06:27:12.000000000 -0500
 699 +++ OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelVisitor_p.cpp       2013-05-08 15:39:25.099057228 -0400
 700 @@ -20,11 +20,11 @@
 701  #include "PixelVisitor_p.h"
 702
 703  // LLVM
 704 -#include <llvm/Constant.h>
 705 -#include <llvm/Constants.h>
 706 -#include <llvm/BasicBlock.h>
 707 -#include <llvm/Instructions.h>
 708 -#include <llvm/Function.h>
 709 +#include <llvm/IR/Constant.h>
 710 +#include <llvm/IR/Constants.h>
 711 +#include <llvm/IR/BasicBlock.h>
 712 +#include <llvm/IR/Instructions.h>
 713 +#include <llvm/IR/Function.h>
 714
 715  #include "GTLCore/LLVMBackend/ExpressionResult_p.h"
 716  #include "GTLCore/LLVMBackend/ExpressionGenerationContext_p.h"
 717 diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/Wrapper_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/Wrapper_p.cpp
 718 --- OpenGTL-0.9.18/OpenShiva/OpenShiva/Wrapper_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500
 719 +++ OpenGTL-0.9.18/OpenShiva/OpenShiva/Wrapper_p.cpp    2013-05-08 15:39:25.099057228 -0400
 720 @@ -22,9 +22,9 @@
 721  #include <map>
 722  #include <vector>
 723
 724 -#include <llvm/DerivedTypes.h>
 725 -#include <llvm/Function.h>
 726 -#include <llvm/Module.h>
 727 +#include <llvm/IR/DerivedTypes.h>
 728 +#include <llvm/IR/Function.h>
 729 +#include <llvm/IR/Module.h>
 730
 731  #include "GTLCore/Function_p.h"
 732  #include "GTLCore/Macros.h"