llvm35-compat.patch

diff -ur a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt    2013-12-25 20:06:20.000000000 +0300
+++ b/CMakeLists.txt    2014-12-10 11:45:38.937987156 +0300
@@ -238,6 +238,12 @@
 IF(${LLVM_STRING_VERSION} VERSION_GREATER 3.0)
    ADD_DEFINITIONS(-DLLVM_31)
 ENDIF(${LLVM_STRING_VERSION} VERSION_GREATER 3.0)
+IF(${LLVM_STRING_VERSION} VERSION_GREATER 3.3)
+   ADD_DEFINITIONS(-DLLVM_34)
+ENDIF(${LLVM_STRING_VERSION} VERSION_GREATER 3.3)
+IF(${LLVM_STRING_VERSION} VERSION_GREATER 3.4)
+   ADD_DEFINITIONS(-DLLVM_35)
+ENDIF(${LLVM_STRING_VERSION} VERSION_GREATER 3.4)
 INCLUDE(FindZLIB REQUIRED)
 INCLUDE(FindFreetype REQUIRED)
 IF(NOT(ENABLE_GLES2))
diff -ur a/conf/FindLLVM.cmake b/conf/FindLLVM.cmake
--- a/conf/FindLLVM.cmake   2013-12-25 20:06:20.000000000 +0300
+++ b/conf/FindLLVM.cmake   2014-12-10 11:42:55.039905259 +0300
@@ -150,6 +150,7 @@
   exec_program(${LLVM_CONFIG_EXECUTABLE} ARGS --libdir OUTPUT_VARIABLE LLVM_LIB_DIR )
   #MESSAGE(STATUS "LLVM lib dir: " ${LLVM_LIB_DIR})
   exec_program(${LLVM_CONFIG_EXECUTABLE} ARGS --includedir OUTPUT_VARIABLE LLVM_INCLUDE_DIR )
+  #MESSAGE(STATUS "LLVM include dir: " ${LLVM_INCLUDE_DIR})

   INCLUDE(CheckIncludeFileCXX)
   set(CMAKE_REQUIRED_INCLUDES ${LLVM_INCLUDE_DIR})
@@ -161,7 +162,7 @@
   ENDIF(HAVE_SUPPORT_TARGETSELECT_H)

   set(CMAKE_REQUIRED_INCLUDES ${LLVM_INCLUDE_DIR})
-  set(CMAKE_REQUIRED_DEFINITIONS -D__STDC_LIMIT_MACROS=1 -D__STDC_CONSTANT_MACROS=1)
+  set(CMAKE_REQUIRED_DEFINITIONS -D__STDC_LIMIT_MACROS=1 -D__STDC_CONSTANT_MACROS=1 -std=c++11)
   check_include_file_cxx("llvm/IRBuilder.h" HAVE_IRBUILDER_H)
   unset(CMAKE_REQUIRED_INCLUDES)
   MESSAGE(STATUS "HAVE_IRBUILDER_H: " ${HAVE_IRBUILDER_H})
@@ -172,21 +173,33 @@
   set(CMAKE_REQUIRED_INCLUDES ${LLVM_INCLUDE_DIR})
   check_include_file_cxx("llvm/DataLayout.h" HAVE_DATALAYOUT_H)
   check_include_file_cxx("llvm/IR/DataLayout.h" HAVE_IR_DATALAYOUT_H)
+  check_include_file_cxx("llvm/IR/Verifier.h" HAVE_IR_VERIFIER_H)
   unset(CMAKE_REQUIRED_INCLUDES)
   MESSAGE(STATUS "HAVE_DATALAYOUT_H: " ${HAVE_DATALAYOUT_H})
   MESSAGE(STATUS "HAVE_IR_DATALAYOUT_H: " ${HAVE_IR_DATALAYOUT_H})
+  MESSAGE(STATUS "HAVE_IR_VERIFIER_H: " ${HAVE_IR_VERIFIER_H})
   IF(HAVE_DATALAYOUT_H)
     ADD_DEFINITIONS(-DHAVE_DATALAYOUT_H)
   ENDIF(HAVE_DATALAYOUT_H)
   IF(HAVE_IR_DATALAYOUT_H)
     ADD_DEFINITIONS(-DHAVE_IR_DATALAYOUT_H)
   ENDIF(HAVE_IR_DATALAYOUT_H)
+  IF(HAVE_IR_VERIFIER_H)
+    ADD_DEFINITIONS(-DHAVE_IR_VERIFIER_H)
+  ENDIF(HAVE_IR_VERIFIER_H)

   exec_program(${LLVM_CONFIG_EXECUTABLE} ARGS --cxxflags  OUTPUT_VARIABLE LLVM_COMPILE_FLAGS )
   MESSAGE(STATUS "LLVM CXX flags: " ${LLVM_COMPILE_FLAGS})
   exec_program(${LLVM_CONFIG_EXECUTABLE} ARGS --ldflags   OUTPUT_VARIABLE LLVM_LDFLAGS )
   MESSAGE(STATUS "LLVM LD flags: " ${LLVM_LDFLAGS})
-  FIND_LLVM_LIBS( ${LLVM_CONFIG_EXECUTABLE} "core ipa ipo instrumentation bitreader bitwriter linker" LLVM_LIBS_CORE LLVM_LIBS_CORE_OBJECTS )
+  exec_program( ${LLVM_CONFIG_EXECUTABLE} ARGS --system-libs  OUTPUT_VARIABLE LLVM_SYSTEM_LIBS RETURN_VALUE LLVM_SYSTEM_LIBS_FAILED)
+  if(LLVM_SYSTEM_LIBS_FAILED)
+    SET(LLVM_SYSTEM_LIBS "")
+  endif(LLVM_SYSTEM_LIBS_FAILED)
+  FIND_LLVM_LIBS( ${LLVM_CONFIG_EXECUTABLE} "core ipa ipo instrumentation bitreader bitwriter linker" LLVM_LIBS_CORE_ONLY LLVM_LIBS_CORE_OBJECTS )
+  SET(LLVM_LIBS_CORE ${LLVM_LIBS_CORE_ONLY} ${LLVM_SYSTEM_LIBS})
+  UNSET(LLVM_LIBS_CORE_ONLY)
+  UNSET(LLVM_SYSTEM_LIBS_FAILED)
   MESSAGE(STATUS "LLVM core libs: " ${LLVM_LIBS_CORE})
   IF(APPLE AND UNIVERSAL)
     FIND_LLVM_LIBS( ${LLVM_CONFIG_EXECUTABLE} "jit native x86 PowerPC ARM" LLVM_LIBS_JIT LLVM_LIBS_JIT_OBJECTS )
diff -ur a/src/scripting/abc.cpp b/src/scripting/abc.cpp
--- a/src/scripting/abc.cpp 2014-12-10 11:07:54.870958000 +0300
+++ b/src/scripting/abc.cpp 2014-12-10 11:54:25.675189273 +0300
@@ -46,7 +46,11 @@
 #include <llvm/Target/TargetSelect.h>
 #endif
 #include <llvm/Target/TargetOptions.h>
-#include <llvm/Analysis/Verifier.h>
+#ifdef HAVE_IR_VERIFIER_H
+#  include <llvm/IR/Verifier.h>
+#else
+#  include <llvm/Analysis/Verifier.h>
+#endif
 #include <llvm/Transforms/Scalar.h>
 #include "logger.h"
 #include "swftypes.h"
@@ -1530,7 +1534,9 @@
        assert_and_throw(th->ex);

        th->FPM=new llvm::FunctionPassManager(th->module);
-#if defined HAVE_DATALAYOUT_H || defined HAVE_IR_DATALAYOUT_H
+#ifdef LLVM_35
+       th->FPM->add(new llvm::DataLayoutPass(*th->ex->getDataLayout()));
+#elif defined HAVE_DATALAYOUT_H || defined HAVE_IR_DATALAYOUT_H
        th->FPM->add(new llvm::DataLayout(*th->ex->getDataLayout()));
 #else
        th->FPM->add(new llvm::TargetData(*th->ex->getTargetData()));