From 9520a8d47a679f7273f011450b15da5f4acd2313 Mon Sep 17 00:00:00 2001 From: André Draszik Date: Mon, 5 Mar 2018 09:30:55 +0000 Subject: openjdk-8: Upgrade to u162b12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - openjdk8-fix-zero-mode-crash.patch was a backport -> dropped - remaining patches -> refreshed - license checksum change due to address change in license file (see patch) Signed-off-by: André Draszik Signed-off-by: Maxin B. John --- .../openjdk8-fix-zero-mode-crash.patch | 49 ---------------------- 1 file changed, 49 deletions(-) delete mode 100644 recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-zero-mode-crash.patch (limited to 'recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-zero-mode-crash.patch') diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-zero-mode-crash.patch b/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-zero-mode-crash.patch deleted file mode 100644 index 29702fa..0000000 --- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-fix-zero-mode-crash.patch +++ /dev/null @@ -1,49 +0,0 @@ -# HG changeset patch -# User aph -# Date 1461121375 -3600 -# Wed Apr 20 04:02:55 2016 +0100 -# Node ID 6811f311f905409fe71d2b1c2fb34c3268758724 -# Parent c66e4cc0fce57664ab44c55c47fa1a2f1bf02638 -8154210: Zero: Better byte behaviour -Summary: Complete support for 8132051 on Zero and fix failure on 64-bit big-endian systems -Reviewed-by: andrew, chrisphi, coleenp - -Upstream-Status: Backport [Fixed in u112] - -diff --git hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp ---- hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp -+++ hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp -@@ -220,9 +220,16 @@ - // Push our result - for (int i = 0; i < result_slots; i++) { - // Adjust result to smaller -- intptr_t res = result[-i]; -+ union { -+ intptr_t res; -+ jint res_jint; -+ }; -+ res = result[-i]; - if (result_slots == 1) { -- res = narrow(method->result_type(), res); -+ BasicType t = method->result_type(); -+ if (is_subword_type(t)) { -+ res_jint = (jint)narrow(t, res_jint); -+ } - } - stack->push(res); - } -diff --git hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp ---- hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp -+++ hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp -@@ -593,8 +593,9 @@ - /* 0xDC */ &&opc_default, &&opc_default, &&opc_default, &&opc_default, - - /* 0xE0 */ &&opc_default, &&opc_default, &&opc_default, &&opc_default, --/* 0xE4 */ &&opc_default, &&opc_fast_aldc, &&opc_fast_aldc_w, &&opc_return_register_finalizer, --/* 0xE8 */ &&opc_invokehandle,&&opc_default, &&opc_default, &&opc_default, -+/* 0xE4 */ &&opc_default, &&opc_default, &&opc_fast_aldc, &&opc_fast_aldc_w, -+/* 0xE8 */ &&opc_return_register_finalizer, -+ &&opc_invokehandle, &&opc_default, &&opc_default, - /* 0xEC */ &&opc_default, &&opc_default, &&opc_default, &&opc_default, - - /* 0xF0 */ &&opc_default, &&opc_default, &&opc_default, &&opc_default, -- cgit v1.2.3-54-g00ecf