From b803a9924a124358e84b7cf925f7541137d2f867 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Jun 08 2016 16:25:01 +0000 Subject: updated to u92, removed upstreamed patches --- diff --git a/.gitignore b/.gitignore index 2daa8de..fb9fcf0 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,5 @@ /aarch64-port-jdk8u-aarch64-jdk8u91-b14.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u80-b00-beta01.tar.xz /aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u71-b15-beta02.tar.xz +/aarch64-port-jdk8u-aarch64-jdk8u92-b14.tar.xz +/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u92-b14.tar.xz diff --git a/8132051-zero.patch b/8132051-zero.patch deleted file mode 100644 index 77dd9c2..0000000 --- a/8132051-zero.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -r 388e9d0905e6 src/cpu/zero/vm/cppInterpreter_zero.cpp ---- openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Mon Apr 11 11:33:18 2016 +0000 -+++ openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Mon Apr 11 21:42:21 2016 +0100 -@@ -93,6 +93,7 @@ - case T_SHORT: - return (intptr_t)(jshort)result; - case T_OBJECT: // nothing to do fall through -+ case T_ARRAY: - case T_LONG: - case T_INT: - case T_FLOAT: -@@ -219,9 +219,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(result_type_of(method), res); -+ BasicType t = result_type_of(method); -+ if (is_subword_type(t)) { -+ res_jint = (jint)narrow(t, res_jint); -+ } - } - stack->push(res); - } -@@ -796,22 +797,10 @@ - } - - BasicType CppInterpreter::result_type_of(Method* method) { -- BasicType t; -- switch (method->result_index()) { -- case 0 : t = T_BOOLEAN; break; -- case 1 : t = T_CHAR; break; -- case 2 : t = T_BYTE; break; -- case 3 : t = T_SHORT; break; -- case 4 : t = T_INT; break; -- case 5 : t = T_LONG; break; -- case 6 : t = T_VOID; break; -- case 7 : t = T_FLOAT; break; -- case 8 : t = T_DOUBLE; break; -- case 9 : t = T_OBJECT; break; -- default: ShouldNotReachHere(); -- } -- assert(AbstractInterpreter::BasicType_as_index(t) == method->result_index(), -- "out of step with AbstractInterpreter::BasicType_as_index"); -+ // Get method->_constMethod->_result_type -+ u1 *p = ((unsigned char *)method->constMethod() -+ + in_bytes(ConstMethod::result_type_offset())); -+ BasicType t = (BasicType)*p; - return t; - } - -diff -r 388e9d0905e6 src/share/vm/interpreter/bytecodeInterpreter.cpp ---- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Mon Apr 11 11:33:18 2016 +0000 -+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Mon Apr 11 21:42:21 2016 +0100 -@@ -593,9 +593,10 @@ - /* 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, --/* 0xEC */ &&opc_default, &&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, - /* 0xF4 */ &&opc_default, &&opc_default, &&opc_default, &&opc_default, diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index aed7a5c..c4087e5 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -170,7 +170,7 @@ # note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there. %global project aarch64-port %global repo jdk8u -%global revision aarch64-jdk8u91-b14 +%global revision aarch64-jdk8u92-b14 # eg # jdk8u60-b27 -> jdk8u60 or # aarch64-jdk8u60-b27 -> aarch64-jdk8u60 (dont forget spec escape % by %%) %global whole_update %(VERSION=%{revision}; echo ${VERSION%%-*}) # eg jdk8u60 -> 60 or aarch64-jdk8u60 -> 60 @@ -783,7 +783,7 @@ Obsoletes: java-1.7.0-openjdk-accessibility%1 Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever} -Release: 8.%{buildver}%{?dist} +Release: 1.%{buildver}%{?dist} # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons, # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -839,7 +839,7 @@ Source20: repackReproduciblePolycies.sh Source100: config.guess Source101: config.sub # shenandoah hotpost -Source999: aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u71-b15-beta02.tar.xz +Source999: aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u92-b14.tar.xz # RPM/distribution specific patches @@ -879,10 +879,6 @@ Patch102: %{name}-size_t.patch # Use "%z" for size_t on s390 as size_t != intptr_t Patch103: s390-size_t_format_flags.patch -# AArch64-specific upstreamable patches -# Remove template in AArch64 port which causes issues with GCC 6 -Patch106: remove_aarch64_template_for_gcc6.patch - # Patches which need backporting to 8u # S8073139, RH1191652; fix name of ppc64le architecture Patch601: %{name}-rh1191652-root.patch @@ -907,8 +903,6 @@ Patch507: pr2842-02.patch # In progress: http://mail.openjdk.java.net/pipermail/awt-dev/2016-March/010742.html Patch508: rh1176206-jdk.patch Patch509: rh1176206-root.patch -# S8132051: Better byte behaviour for Zero -Patch606: 8132051-zero.patch # Patches which need adding to aarch64/8u # S8132051: Better byte behaviour for AArch64 @@ -1235,10 +1229,8 @@ sh %{SOURCE12} %patch403 %patch505 %endif -%patch606 # AArch64 fixes -%patch106 %if %{use_shenandoah_hotspot} != 1 %patch701 %endif diff --git a/remove_aarch64_template_for_gcc6.patch b/remove_aarch64_template_for_gcc6.patch deleted file mode 100644 index 298badd..0000000 --- a/remove_aarch64_template_for_gcc6.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp b/java-1.8.0-openjdk-1.8.0.72-5.b15.fc24.x86_64/openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp -index ef50802..9d604d5 100644 ---- openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp -+++ openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp -@@ -194,10 +194,6 @@ static int reg2offset_out(VMReg r) { - return (r->reg2stack() + SharedRuntime::out_preserve_stack_slots()) * VMRegImpl::stack_slot_size; - } - --template static const T& min (const T& a, const T& b) { -- return (a > b) ? b : a; --} -- - // --------------------------------------------------------------------------- - // Read the array of BasicTypes from a signature, and compute where the - // arguments should go. Values in the VMRegPair regs array refer to 4-byte diff --git a/sources b/sources index 15e655f..63c6b5a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 94ca5a45c3cb3b85c4577d0891166007 systemtap-tapset.tar.gz -39880a5af218dfb9ef167bf1800b1b45 aarch64-port-jdk8u-aarch64-jdk8u91-b14.tar.xz -83a45a35718a39381006ed7d6bd0b566 aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u71-b15-beta02.tar.xz +aa905556a4feff9164dba5d0616775ff aarch64-port-jdk8u-aarch64-jdk8u92-b14.tar.xz +88891d2571519b45e65abf9ab8402104 aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u92-b14.tar.xz diff --git a/update_package.sh b/update_package.sh index 3e41345..149848e 100755 --- a/update_package.sh +++ b/update_package.sh @@ -24,7 +24,7 @@ if [ "x$REPO_NAME" = "x" ] ; then REPO_NAME="jdk8u" fi if [ "x$VERSION" = "x" ] ; then - VERSION="aarch64-jdk8u91-b14" + VERSION="aarch64-jdk8u92-b14" fi if [ "x$COMPRESSION" = "x" ] ; then @@ -102,7 +102,7 @@ if [ "x$VERSION" = "xtip" ] ; then VERSION="tip" else #hardcoding version for anything else except tip - VERSION="aarch64-shenandoah-jdk8u71-b15-beta02" + VERSION="aarch64-shenandoah-jdk8u92-b14" fi MAIN_REPO_NAME=$REPO_NAME REPO_NAME=jdk8u-shenandoah