File 0002-Fix-build-with-newer-LLVM.patch of Package lightspark

File 0002-Fix-build-with-newer-LLVM.patch of Package lightspark (Revision afdfdd5c855ec0aea19d8e6fcaaf5f2d)

Currently displaying revision afdfdd5c855ec0aea19d8e6fcaaf5f2d , Show latest

From 43638ba6183f984c200e207565bd10a5ab15bd53 Mon Sep 17 00:00:00 2001
From: Johannes Obermayr <johannesobermayr@gmx.de>
Date: Mon, 11 Apr 2016 13:58:43 +0200
Subject: [PATCH 2/2] Fix build with newer LLVM.

---
 CMakeLists.txt                 | 11 +++++++++++
 src/scripting/abc_codesynt.cpp |  7 +++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b9790d..93c0829 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -250,6 +250,17 @@ ENDIF(NOT (${LLVM_STRING_VERSION} VERSION_LESS 3.6))
 IF(NOT ${LLVM_STRING_VERSION} VERSION_LESS 3.7)
 	ADD_DEFINITIONS(-DLLVM_37)
 ENDIF(NOT ${LLVM_STRING_VERSION} VERSION_LESS 3.7)
+
+INCLUDE(CheckCXXSourceCompiles)
+SET(CMAKE_REQUIRED_FLAGS "-std=c++11 -DNDEBUG -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS")
+SET(CMAKE_REQUIRED_INCLUDES ${LLVM_INCLUDE_DIR})
+CHECK_CXX_SOURCE_COMPILES("#include <llvm/ExecutionEngine/ExecutionEngine.h>\nint main() { llvm::ExecutionEngine* ex; return ex->getDataLayout().isLittleEndian(); }" EXECUTIONENGINE_OWNING_DATALAYOUT)
+IF(EXECUTIONENGINE_OWNING_DATALAYOUT)
+  ADD_DEFINITIONS(-DEXECUTIONENGINE_OWNING_DATALAYOUT)
+ENDIF(EXECUTIONENGINE_OWNING_DATALAYOUT)
+SET(CMAKE_REQUIRED_FLAGS)
+SET(CMAKE_REQUIRED_INCLUDES)
+
 INCLUDE(FindZLIB REQUIRED)
 INCLUDE(FindFreetype REQUIRED)
 IF(NOT(ENABLE_GLES2))
diff --git a/src/scripting/abc_codesynt.cpp b/src/scripting/abc_codesynt.cpp
index 42a0f9c..d0c8c13 100644
--- a/src/scripting/abc_codesynt.cpp
+++ b/src/scripting/abc_codesynt.cpp
@@ -294,11 +294,15 @@ void ABCVm::registerFunctions()
 	llvm::FunctionType* FT=NULL;
 
 	//Create types
+#if EXECUTIONENGINE_OWNING_DATALAYOUT
+	ptr_type=ex->getDataLayout().getIntPtrType(llvm_context());
+#else
 #if defined HAVE_DATALAYOUT_H || defined HAVE_IR_DATALAYOUT_H
 	ptr_type=ex->getDataLayout()->getIntPtrType(llvm_context());
 #else
 	ptr_type=ex->getTargetData()->getIntPtrType(llvm_context());
 #endif
+#endif
 	//Pointer to 8 bit type, needed for pointer arithmetic
 	voidptr_type=llvm::IntegerType::get(llvm_context(),8)->getPointerTo();
 	number_type=llvm::Type::getDoubleTy(llvm_context());
@@ -1883,9 +1887,8 @@ SyntheticFunction::synt_function method_info::synt_method(SystemState* sys)
 	constant = llvm::ConstantInt::get(ptr_type, (uintptr_t)this);
 	llvm::Value* th = llvm::ConstantExpr::getIntToPtr(constant, voidptr_type);
 
-	llvm::Function::ArgumentListType::iterator it=llvmf->getArgumentList().begin();
 	//The first and only argument to this function is the call_context*
-	llvm::Value* context=it;
+	llvm::Value* context = llvmf->getArgumentList().begin();
 
 	//let's give access to local data storage
 	value=Builder.CreateStructGEP(
-- 
2.8.1