diff options
Diffstat (limited to 'recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-jdk-avoid-cdef-collision.patch')
-rw-r--r-- | recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-jdk-avoid-cdef-collision.patch | 203 |
1 files changed, 0 insertions, 203 deletions
diff --git a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-jdk-avoid-cdef-collision.patch b/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-jdk-avoid-cdef-collision.patch deleted file mode 100644 index 023ce4d..0000000 --- a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-jdk-avoid-cdef-collision.patch +++ /dev/null | |||
@@ -1,203 +0,0 @@ | |||
1 | Fixes collisions with standard namespace | ||
2 | |||
3 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
4 | Upstream-Status: Backport | ||
5 | |||
6 | Index: openjdk/hotspot/src/share/vm/opto/addnode.cpp | ||
7 | =================================================================== | ||
8 | --- openjdk/hotspot/src/share/vm/opto/addnode.cpp 2010-02-16 19:11:09.000000000 -0800 | ||
9 | +++ openjdk/hotspot/src/share/vm/opto/addnode.cpp 2012-07-30 15:54:25.999551792 -0700 | ||
10 | @@ -27,8 +27,6 @@ | ||
11 | #include "incls/_precompiled.incl" | ||
12 | #include "incls/_addnode.cpp.incl" | ||
13 | |||
14 | -#define MAXFLOAT ((float)3.40282346638528860e+38) | ||
15 | - | ||
16 | // Classic Add functionality. This covers all the usual 'add' behaviors for | ||
17 | // an algebraic ring. Add-integer, add-float, add-double, and binary-or are | ||
18 | // all inherited from this class. The various identity values are supplied | ||
19 | Index: openjdk/hotspot/src/share/vm/prims/jniCheck.cpp | ||
20 | =================================================================== | ||
21 | --- openjdk/hotspot/src/share/vm/prims/jniCheck.cpp 2010-02-16 19:11:10.000000000 -0800 | ||
22 | +++ openjdk/hotspot/src/share/vm/prims/jniCheck.cpp 2012-07-30 16:05:20.779549364 -0700 | ||
23 | @@ -80,7 +80,7 @@ | ||
24 | if (env != xenv) { \ | ||
25 | NativeReportJNIFatalError(thr, warn_wrong_jnienv); \ | ||
26 | } \ | ||
27 | - __ENTRY(result_type, header, thr) | ||
28 | + VM_ENTRY_BASE(result_type, header, thr) | ||
29 | |||
30 | |||
31 | #define UNCHECKED() (unchecked_jni_NativeInterface) | ||
32 | Index: openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl | ||
33 | =================================================================== | ||
34 | --- openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl 2010-02-16 19:11:10.000000000 -0800 | ||
35 | +++ openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl 2012-07-30 16:03:50.491550815 -0700 | ||
36 | @@ -424,7 +424,7 @@ | ||
37 | <xsl:value-of select="$space"/> | ||
38 | <xsl:text>ThreadInVMfromNative __tiv(current_thread);</xsl:text> | ||
39 | <xsl:value-of select="$space"/> | ||
40 | - <xsl:text>__ENTRY(jvmtiError, </xsl:text> | ||
41 | + <xsl:text>VM_ENTRY_BASE(jvmtiError, </xsl:text> | ||
42 | <xsl:apply-templates select="." mode="functionid"/> | ||
43 | <xsl:text> , current_thread)</xsl:text> | ||
44 | <xsl:value-of select="$space"/> | ||
45 | Index: openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp | ||
46 | =================================================================== | ||
47 | --- openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp 2010-02-16 19:11:10.000000000 -0800 | ||
48 | +++ openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp 2012-07-30 16:04:03.683550594 -0700 | ||
49 | @@ -126,7 +126,7 @@ | ||
50 | // from native so as to resolve the jthread. | ||
51 | |||
52 | ThreadInVMfromNative __tiv(current_thread); | ||
53 | - __ENTRY(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread) | ||
54 | + VM_ENTRY_BASE(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread) | ||
55 | debug_only(VMNativeEntryWrapper __vew;) | ||
56 | |||
57 | oop thread_oop = JNIHandles::resolve_external_guard(thread); | ||
58 | Index: openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp | ||
59 | =================================================================== | ||
60 | --- openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp 2010-02-16 19:11:10.000000000 -0800 | ||
61 | +++ openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp 2012-07-30 15:59:43.175550785 -0700 | ||
62 | @@ -345,7 +345,7 @@ | ||
63 | JavaThread* current_thread = (JavaThread*) ThreadLocalStorage::thread(); | ||
64 | // transition code: native to VM | ||
65 | ThreadInVMfromNative __tiv(current_thread); | ||
66 | - __ENTRY(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread) | ||
67 | + VM_ENTRY_BASE(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread) | ||
68 | debug_only(VMNativeEntryWrapper __vew;) | ||
69 | |||
70 | JvmtiEnv *jvmti_env = JvmtiEnv::create_a_jvmti(version); | ||
71 | Index: openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp | ||
72 | =================================================================== | ||
73 | --- openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp 2010-02-16 19:11:10.000000000 -0800 | ||
74 | +++ openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp 2012-07-30 16:36:53.391544578 -0700 | ||
75 | @@ -46,7 +46,7 @@ | ||
76 | } | ||
77 | }; | ||
78 | |||
79 | -// InterfaceSupport provides functionality used by the __LEAF and __ENTRY | ||
80 | +// InterfaceSupport provides functionality used by the VM_LEAF_BASE and VM_ENTRY_BASE | ||
81 | // macros. These macros are used to guard entry points into the VM and | ||
82 | // perform checks upon leave of the VM. | ||
83 | |||
84 | @@ -391,7 +391,7 @@ | ||
85 | |||
86 | // LEAF routines do not lock, GC or throw exceptions | ||
87 | |||
88 | -#define __LEAF(result_type, header) \ | ||
89 | +#define VM_LEAF_BASE(result_type, header) \ | ||
90 | TRACE_CALL(result_type, header) \ | ||
91 | debug_only(NoHandleMark __hm;) \ | ||
92 | /* begin of body */ | ||
93 | @@ -399,7 +399,7 @@ | ||
94 | |||
95 | // ENTRY routines may lock, GC and throw exceptions | ||
96 | |||
97 | -#define __ENTRY(result_type, header, thread) \ | ||
98 | +#define VM_ENTRY_BASE(result_type, header, thread) \ | ||
99 | TRACE_CALL(result_type, header) \ | ||
100 | HandleMarkCleaner __hm(thread); \ | ||
101 | Thread* THREAD = thread; \ | ||
102 | @@ -421,20 +421,20 @@ | ||
103 | #define IRT_ENTRY(result_type, header) \ | ||
104 | result_type header { \ | ||
105 | ThreadInVMfromJava __tiv(thread); \ | ||
106 | - __ENTRY(result_type, header, thread) \ | ||
107 | + VM_ENTRY_BASE(result_type, header, thread) \ | ||
108 | debug_only(VMEntryWrapper __vew;) | ||
109 | |||
110 | |||
111 | #define IRT_LEAF(result_type, header) \ | ||
112 | result_type header { \ | ||
113 | - __LEAF(result_type, header) \ | ||
114 | + VM_LEAF_BASE(result_type, header) \ | ||
115 | debug_only(No_Safepoint_Verifier __nspv(true);) | ||
116 | |||
117 | |||
118 | #define IRT_ENTRY_NO_ASYNC(result_type, header) \ | ||
119 | result_type header { \ | ||
120 | ThreadInVMfromJavaNoAsyncException __tiv(thread); \ | ||
121 | - __ENTRY(result_type, header, thread) \ | ||
122 | + VM_ENTRY_BASE(result_type, header, thread) \ | ||
123 | debug_only(VMEntryWrapper __vew;) | ||
124 | |||
125 | // Another special case for nmethod_entry_point so the nmethod that the | ||
126 | @@ -445,7 +445,7 @@ | ||
127 | result_type header { \ | ||
128 | nmethodLocker _nmlock(nm); \ | ||
129 | ThreadInVMfromJavaNoAsyncException __tiv(thread); \ | ||
130 | - __ENTRY(result_type, header, thread) | ||
131 | + VM_ENTRY_BASE(result_type, header, thread) | ||
132 | |||
133 | #define IRT_END } | ||
134 | |||
135 | @@ -455,20 +455,20 @@ | ||
136 | #define JRT_ENTRY(result_type, header) \ | ||
137 | result_type header { \ | ||
138 | ThreadInVMfromJava __tiv(thread); \ | ||
139 | - __ENTRY(result_type, header, thread) \ | ||
140 | + VM_ENTRY_BASE(result_type, header, thread) \ | ||
141 | debug_only(VMEntryWrapper __vew;) | ||
142 | |||
143 | |||
144 | #define JRT_LEAF(result_type, header) \ | ||
145 | result_type header { \ | ||
146 | - __LEAF(result_type, header) \ | ||
147 | + VM_LEAF_BASE(result_type, header) \ | ||
148 | debug_only(JRT_Leaf_Verifier __jlv;) | ||
149 | |||
150 | |||
151 | #define JRT_ENTRY_NO_ASYNC(result_type, header) \ | ||
152 | result_type header { \ | ||
153 | ThreadInVMfromJavaNoAsyncException __tiv(thread); \ | ||
154 | - __ENTRY(result_type, header, thread) \ | ||
155 | + VM_ENTRY_BASE(result_type, header, thread) \ | ||
156 | debug_only(VMEntryWrapper __vew;) | ||
157 | |||
158 | // Same as JRT Entry but allows for return value after the safepoint | ||
159 | @@ -501,7 +501,7 @@ | ||
160 | assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \ | ||
161 | ThreadInVMfromNative __tiv(thread); \ | ||
162 | debug_only(VMNativeEntryWrapper __vew;) \ | ||
163 | - __ENTRY(result_type, header, thread) | ||
164 | + VM_ENTRY_BASE(result_type, header, thread) | ||
165 | |||
166 | |||
167 | // Ensure that the VMNativeEntryWrapper constructor, which can cause | ||
168 | @@ -521,7 +521,7 @@ | ||
169 | result_type JNICALL header { \ | ||
170 | JavaThread* thread=JavaThread::thread_from_jni_environment(env); \ | ||
171 | assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \ | ||
172 | - __LEAF(result_type, header) | ||
173 | + VM_LEAF_BASE(result_type, header) | ||
174 | |||
175 | |||
176 | // Close the routine and the extern "C" | ||
177 | @@ -537,7 +537,7 @@ | ||
178 | JavaThread* thread=JavaThread::thread_from_jni_environment(env); \ | ||
179 | ThreadInVMfromNative __tiv(thread); \ | ||
180 | debug_only(VMNativeEntryWrapper __vew;) \ | ||
181 | - __ENTRY(result_type, header, thread) | ||
182 | + VM_ENTRY_BASE(result_type, header, thread) | ||
183 | |||
184 | |||
185 | #define JVM_ENTRY_NO_ENV(result_type, header) \ | ||
186 | @@ -546,7 +546,7 @@ | ||
187 | JavaThread* thread = (JavaThread*)ThreadLocalStorage::thread(); \ | ||
188 | ThreadInVMfromNative __tiv(thread); \ | ||
189 | debug_only(VMNativeEntryWrapper __vew;) \ | ||
190 | - __ENTRY(result_type, header, thread) | ||
191 | + VM_ENTRY_BASE(result_type, header, thread) | ||
192 | |||
193 | |||
194 | #define JVM_QUICK_ENTRY(result_type, header) \ | ||
195 | @@ -562,7 +562,7 @@ | ||
196 | extern "C" { \ | ||
197 | result_type JNICALL header { \ | ||
198 | VM_Exit::block_if_vm_exited(); \ | ||
199 | - __LEAF(result_type, header) | ||
200 | + VM_LEAF_BASE(result_type, header) | ||
201 | |||
202 | |||
203 | #define JVM_END } } | ||