diff options
author | Richard Leitner <richard.leitner@skidata.com> | 2020-10-22 09:13:53 +0200 |
---|---|---|
committer | Richard Leitner <richard.leitner@skidata.com> | 2020-10-22 13:14:03 +0200 |
commit | 03537feee539526ec9bb0cf4f55dd4eef6badc71 (patch) | |
tree | 23b51017ae81b7c2082bf3eb9c46795ea2af320d /recipes-core/openjdk/patches-openjdk-8/1010-hotspot-fix-shark-build-common.patch | |
parent | 62d6c0653ad69e14c21db2d4482e578400116a1b (diff) | |
download | meta-java-03537feee539526ec9bb0cf4f55dd4eef6badc71.tar.gz |
openjdk-8: update to latest ga version 272
For aarch32 we need to fall back to b09 as there is no ga tag available
yet.
Patch related changes:
* 0011, 0012 & 0013 were changed to valid git patches
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/1010-hotspot-fix-shark-build-common.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/1010-hotspot-fix-shark-build-common.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/1010-hotspot-fix-shark-build-common.patch b/recipes-core/openjdk/patches-openjdk-8/1010-hotspot-fix-shark-build-common.patch index da93cbe..8e70cab 100644 --- a/recipes-core/openjdk/patches-openjdk-8/1010-hotspot-fix-shark-build-common.patch +++ b/recipes-core/openjdk/patches-openjdk-8/1010-hotspot-fix-shark-build-common.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From cfc5c9089f82bc94fca2407aae6b1ffc4b60955f Mon Sep 17 00:00:00 2001 | 1 | From 3028795037c3440415f3e8904e8015fbd480ab15 Mon Sep 17 00:00:00 2001 |
2 | From: Jens Rehsack <rehsack@gmail.com> | 2 | From: Jens Rehsack <rehsack@gmail.com> |
3 | Date: Thu, 2 Jan 2020 10:22:19 +0100 | 3 | Date: Thu, 2 Jan 2020 10:22:19 +0100 |
4 | Subject: [PATCH 1010/1013] hotspot: fix shark build (common) | 4 | Subject: [PATCH 1010/1013] hotspot: fix shark build (common) |
@@ -79,10 +79,10 @@ index 4707cc96e..a2b297ca0 100644 | |||
79 | flow_block(blk, temp_vector, temp_set); | 79 | flow_block(blk, temp_vector, temp_set); |
80 | if (failing()) return; // Watch for bailouts. | 80 | if (failing()) return; // Watch for bailouts. |
81 | diff --git a/hotspot/src/share/vm/classfile/systemDictionary.cpp b/hotspot/src/share/vm/classfile/systemDictionary.cpp | 81 | diff --git a/hotspot/src/share/vm/classfile/systemDictionary.cpp b/hotspot/src/share/vm/classfile/systemDictionary.cpp |
82 | index 7f8ab9143..91818bf25 100644 | 82 | index 98412e1e1..f62731c43 100644 |
83 | --- a/hotspot/src/share/vm/classfile/systemDictionary.cpp | 83 | --- a/hotspot/src/share/vm/classfile/systemDictionary.cpp |
84 | +++ b/hotspot/src/share/vm/classfile/systemDictionary.cpp | 84 | +++ b/hotspot/src/share/vm/classfile/systemDictionary.cpp |
85 | @@ -2362,6 +2362,7 @@ methodHandle SystemDictionary::find_method_handle_intrinsic(vmIntrinsics::ID iid | 85 | @@ -2392,6 +2392,7 @@ methodHandle SystemDictionary::find_method_handle_intrinsic(vmIntrinsics::ID iid |
86 | spe = NULL; | 86 | spe = NULL; |
87 | // Must create lots of stuff here, but outside of the SystemDictionary lock. | 87 | // Must create lots of stuff here, but outside of the SystemDictionary lock. |
88 | m = Method::make_method_handle_intrinsic(iid, signature, CHECK_(empty)); | 88 | m = Method::make_method_handle_intrinsic(iid, signature, CHECK_(empty)); |
@@ -90,7 +90,7 @@ index 7f8ab9143..91818bf25 100644 | |||
90 | if (!Arguments::is_interpreter_only()) { | 90 | if (!Arguments::is_interpreter_only()) { |
91 | // Generate a compiled form of the MH intrinsic. | 91 | // Generate a compiled form of the MH intrinsic. |
92 | AdapterHandlerLibrary::create_native_wrapper(m); | 92 | AdapterHandlerLibrary::create_native_wrapper(m); |
93 | @@ -2371,6 +2372,7 @@ methodHandle SystemDictionary::find_method_handle_intrinsic(vmIntrinsics::ID iid | 93 | @@ -2401,6 +2402,7 @@ methodHandle SystemDictionary::find_method_handle_intrinsic(vmIntrinsics::ID iid |
94 | "out of space in CodeCache for method handle intrinsic", empty); | 94 | "out of space in CodeCache for method handle intrinsic", empty); |
95 | } | 95 | } |
96 | } | 96 | } |
@@ -98,7 +98,7 @@ index 7f8ab9143..91818bf25 100644 | |||
98 | // Now grab the lock. We might have to throw away the new method, | 98 | // Now grab the lock. We might have to throw away the new method, |
99 | // if a racing thread has managed to install one at the same time. | 99 | // if a racing thread has managed to install one at the same time. |
100 | { | 100 | { |
101 | @@ -2384,9 +2386,11 @@ methodHandle SystemDictionary::find_method_handle_intrinsic(vmIntrinsics::ID iid | 101 | @@ -2414,9 +2416,11 @@ methodHandle SystemDictionary::find_method_handle_intrinsic(vmIntrinsics::ID iid |
102 | } | 102 | } |
103 | 103 | ||
104 | assert(spe != NULL && spe->method() != NULL, ""); | 104 | assert(spe != NULL && spe->method() != NULL, ""); |