This commit is contained in:
parent
7a59c13708
commit
0484d1501d
@ -1,15 +0,0 @@
|
|||||||
--- jdk8/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp Sat Dec 13 01:24:10 2014 +0300
|
|
||||||
+++ jdk8/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp Mon Dec 15 09:36:46 2014 +0100
|
|
||||||
@@ -394,7 +394,11 @@
|
|
||||||
// during deoptimization so the interpreter needs to skip it when
|
|
||||||
// the frame is popped.
|
|
||||||
thread->set_do_not_unlock_if_synchronized(true);
|
|
||||||
+#ifdef CC_INTERP
|
|
||||||
+ return (address) -1;
|
|
||||||
+#else
|
|
||||||
return Interpreter::remove_activation_entry();
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
// Need to do this check first since when _do_not_unlock_if_synchronized
|
|
||||||
|
|
@ -3,6 +3,8 @@ Thu Apr 16 15:47:54 UTC 2015 - fstrba@suse.com
|
|||||||
|
|
||||||
- Update the aarch64 tarball to the recent tip
|
- Update the aarch64 tarball to the recent tip
|
||||||
* The revision has merged changes up to jdk8u45-b14
|
* The revision has merged changes up to jdk8u45-b14
|
||||||
|
- Remove upstreamed patch:
|
||||||
|
* cplusplus-interpreter.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Apr 15 08:27:37 UTC 2015 - fstrba@suse.com
|
Wed Apr 15 08:27:37 UTC 2015 - fstrba@suse.com
|
||||||
|
@ -221,8 +221,6 @@ Patch12: adlc-parser.patch
|
|||||||
Patch13: implicit-pointer-decl.patch
|
Patch13: implicit-pointer-decl.patch
|
||||||
# Avoid triggering inactivity timeout while generating javadoc in zero VM
|
# Avoid triggering inactivity timeout while generating javadoc in zero VM
|
||||||
Patch14: zero-javadoc-verbose.patch
|
Patch14: zero-javadoc-verbose.patch
|
||||||
# Fix to build the C++ interpreter that does not have Interpreter::remove_activation_entry
|
|
||||||
Patch15: cplusplus-interpreter.patch
|
|
||||||
#
|
#
|
||||||
# OpenJDK specific patches
|
# OpenJDK specific patches
|
||||||
#
|
#
|
||||||
@ -514,8 +512,6 @@ rm -rvf jdk/src/share/native/sun/java2d/cmm/lcms/lcms2*
|
|||||||
%patch14 -p1
|
%patch14 -p1
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%patch15 -p1
|
|
||||||
|
|
||||||
%patch99 -p1
|
%patch99 -p1
|
||||||
|
|
||||||
# s390 build fixes
|
# s390 build fixes
|
||||||
|
Loading…
x
Reference in New Issue
Block a user