1 |
chithanh 13/10/04 23:53:41 |
2 |
|
3 |
Added: lightspark-0.7.2-llvm33.patch |
4 |
Log: |
5 |
Drop obsolete elog message, bug #476478. Add patch from Fedora for llvm-3.3 compatibility, bug #479548. |
6 |
|
7 |
(Portage version: 2.2.1/cvs/Linux x86_64, unsigned Manifest commit) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 www-plugins/lightspark/files/lightspark-0.7.2-llvm33.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/lightspark/files/lightspark-0.7.2-llvm33.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/lightspark/files/lightspark-0.7.2-llvm33.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: lightspark-0.7.2-llvm33.patch |
16 |
=================================================================== |
17 |
diff -up lightspark-0.7.2/conf/FindLLVM.cmake.llvm33 lightspark-0.7.2/conf/FindLLVM.cmake |
18 |
--- lightspark-0.7.2/conf/FindLLVM.cmake.llvm33 2013-03-16 12:19:18.000000000 +0100 |
19 |
+++ lightspark-0.7.2/conf/FindLLVM.cmake 2013-05-11 11:57:36.455450049 +0200 |
20 |
@@ -168,11 +168,16 @@ else (LLVM_INCLUDE_DIR) |
21 |
|
22 |
set(CMAKE_REQUIRED_INCLUDES ${LLVM_INCLUDE_DIR}) |
23 |
check_include_file_cxx("llvm/DataLayout.h" HAVE_DATALAYOUT_H) |
24 |
+ check_include_file_cxx("llvm/IR/DataLayout.h" HAVE_IR_DATALAYOUT_H) |
25 |
unset(CMAKE_REQUIRED_INCLUDES) |
26 |
MESSAGE(STATUS "HAVE_DATALAYOUT_H: " ${HAVE_DATALAYOUT_H}) |
27 |
+ MESSAGE(STATUS "HAVE_IR_DATALAYOUT_H: " ${HAVE_IR_DATALAYOUT_H}) |
28 |
IF(HAVE_DATALAYOUT_H) |
29 |
ADD_DEFINITIONS(-DHAVE_DATALAYOUT_H) |
30 |
ENDIF(HAVE_DATALAYOUT_H) |
31 |
+ IF(HAVE_IR_DATALAYOUT_H) |
32 |
+ ADD_DEFINITIONS(-DHAVE_IR_DATALAYOUT_H) |
33 |
+ ENDIF(HAVE_IR_DATALAYOUT_H) |
34 |
|
35 |
exec_program(${LLVM_CONFIG_EXECUTABLE} ARGS --cxxflags OUTPUT_VARIABLE LLVM_COMPILE_FLAGS ) |
36 |
MESSAGE(STATUS "LLVM CXX flags: " ${LLVM_COMPILE_FLAGS}) |
37 |
diff -up lightspark-0.7.2/src/scripting/abc.cpp.llvm33 lightspark-0.7.2/src/scripting/abc.cpp |
38 |
--- lightspark-0.7.2/src/scripting/abc.cpp.llvm33 2013-03-16 12:19:18.000000000 +0100 |
39 |
+++ lightspark-0.7.2/src/scripting/abc.cpp 2013-05-11 11:57:36.451450048 +0200 |
40 |
@@ -23,12 +23,19 @@ |
41 |
|
42 |
#include "compat.h" |
43 |
|
44 |
-#include <llvm/Module.h> |
45 |
#include <llvm/ExecutionEngine/ExecutionEngine.h> |
46 |
#include <llvm/ExecutionEngine/JIT.h> |
47 |
#include <llvm/PassManager.h> |
48 |
-#include <llvm/LLVMContext.h> |
49 |
-#ifdef HAVE_DATALAYOUT_H |
50 |
+#ifdef HAVE_IR_DATALAYOUT_H |
51 |
+# include <llvm/IR/Module.h> |
52 |
+# include <llvm/IR/LLVMContext.h> |
53 |
+#else |
54 |
+# include <llvm/Module.h> |
55 |
+# include <llvm/LLVMContext.h> |
56 |
+#endif |
57 |
+#ifdef HAVE_IR_DATALAYOUT_H |
58 |
+# include <llvm/IR/DataLayout.h> |
59 |
+#elif defined HAVE_DATALAYOUT_H |
60 |
# include <llvm/DataLayout.h> |
61 |
#else |
62 |
# include <llvm/Target/TargetData.h> |
63 |
@@ -1489,7 +1496,7 @@ void ABCVm::Run(ABCVm* th) |
64 |
assert_and_throw(th->ex); |
65 |
|
66 |
th->FPM=new llvm::FunctionPassManager(th->module); |
67 |
-#ifdef HAVE_DATALAYOUT_H |
68 |
+#if defined HAVE_DATALAYOUT_H || defined HAVE_IR_DATALAYOUT_H |
69 |
th->FPM->add(new llvm::DataLayout(*th->ex->getDataLayout())); |
70 |
#else |
71 |
th->FPM->add(new llvm::TargetData(*th->ex->getTargetData())); |
72 |
diff -up lightspark-0.7.2/src/scripting/abc_codesynt.cpp.llvm33 lightspark-0.7.2/src/scripting/abc_codesynt.cpp |
73 |
--- lightspark-0.7.2/src/scripting/abc_codesynt.cpp.llvm33 2013-03-16 12:19:18.000000000 +0100 |
74 |
+++ lightspark-0.7.2/src/scripting/abc_codesynt.cpp 2013-05-11 11:59:23.066458300 +0200 |
75 |
@@ -25,18 +25,29 @@ |
76 |
#endif |
77 |
|
78 |
#include "compat.h" |
79 |
-#include <llvm/Module.h> |
80 |
-#include <llvm/DerivedTypes.h> |
81 |
#include <llvm/ExecutionEngine/ExecutionEngine.h> |
82 |
#include <llvm/PassManager.h> |
83 |
-#include <llvm/Constants.h> |
84 |
-#ifdef HAVE_IRBUILDER_H |
85 |
+#ifdef HAVE_IR_DATALAYOUT_H |
86 |
+# include <llvm/IR/Constants.h> |
87 |
+# include <llvm/IR/DerivedTypes.h> |
88 |
+# include <llvm/IR/Module.h> |
89 |
+# include <llvm/IR/LLVMContext.h> |
90 |
+#else |
91 |
+# include <llvm/Constants.h> |
92 |
+# include <llvm/DerivedTypes.h> |
93 |
+# include <llvm/Module.h> |
94 |
+# include <llvm/LLVMContext.h> |
95 |
+#endif |
96 |
+#ifdef HAVE_IR_DATALAYOUT_H |
97 |
+# include <llvm/IR/IRBuilder.h> |
98 |
+#elif defined HAVE_IRBUILDER_H |
99 |
# include <llvm/IRBuilder.h> |
100 |
#else |
101 |
# include <llvm/Support/IRBuilder.h> |
102 |
#endif |
103 |
-#include <llvm/LLVMContext.h> |
104 |
-#ifdef HAVE_DATALAYOUT_H |
105 |
+#ifdef HAVE_IR_DATALAYOUT_H |
106 |
+# include <llvm/IR/DataLayout.h> |
107 |
+#elif defined HAVE_DATALAYOUT_H |
108 |
# include <llvm/DataLayout.h> |
109 |
#else |
110 |
# include <llvm/Target/TargetData.h> |
111 |
@@ -279,7 +290,7 @@ void ABCVm::registerFunctions() |
112 |
llvm::FunctionType* FT=NULL; |
113 |
|
114 |
//Create types |
115 |
-#ifdef HAVE_DATALAYOUT_H |
116 |
+#if defined HAVE_DATALAYOUT_H || defined HAVE_IR_DATALAYOUT_H |
117 |
ptr_type=ex->getDataLayout()->getIntPtrType(llvm_context()); |
118 |
#else |
119 |
ptr_type=ex->getTargetData()->getIntPtrType(llvm_context()); |