diff libinterp/corefcn/jit-typeinfo.cc @ 17164:36fd98b9ce48

Add support for llvm 3.3 * configure.ac: Add check for LLVM IR directory. * jit-ir.cc: Update includes. * jit-util.h: Define HAVE_LLVM_DATALAYOUT. * jit-typeinfo.cc: Update includes. * pt-jit.cc: Update includes. * acinclude.m4: Update checks for llvm 3.3
author Max Brister <max@2bass.com>
date Sat, 03 Aug 2013 16:53:46 -0600
parents 38bcfd413db0
children d63878346099
line wrap: on
line diff
--- a/libinterp/corefcn/jit-typeinfo.cc	Sat Aug 03 10:05:07 2013 -0700
+++ b/libinterp/corefcn/jit-typeinfo.cc	Sat Aug 03 16:53:46 2013 -0600
@@ -35,17 +35,30 @@
 #include "jit-typeinfo.h"
 
 #include <llvm/Analysis/Verifier.h>
+#include <llvm/ExecutionEngine/ExecutionEngine.h>
+
+#ifdef HAVE_LLVM_IR_FUNCTION_H
+#include <llvm/IR/GlobalVariable.h>
+#include <llvm/IR/LLVMContext.h>
+#include <llvm/IR/Function.h>
+#include <llvm/IR/Instructions.h>
+#include <llvm/IR/Intrinsics.h>
+#else
 #include <llvm/GlobalVariable.h>
-#include <llvm/ExecutionEngine/ExecutionEngine.h>
 #include <llvm/LLVMContext.h>
 #include <llvm/Function.h>
 #include <llvm/Instructions.h>
 #include <llvm/Intrinsics.h>
-#ifdef IRBUILDER_HEADER_IN_SUPPORT_DIR
+#endif
+
+#ifdef HAVE_LLVM_SUPPORT_IRBUILDER_H
 #include <llvm/Support/IRBuilder.h>
+#elif defined(HAVE_LLVM_IR_IRBUILDER_H)
+#include <llvm/IR/IRBuilder.h>
 #else
 #include <llvm/IRBuilder.h>
 #endif
+
 #include <llvm/Support/raw_os_ostream.h>
 
 #include "jit-ir.h"