diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index e7a98f2..6c2e345 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -735,7 +735,7 @@ Obsoletes: java-1.7.0-openjdk-accessibility%1 Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever} -Release: 9.%{buildver}%{?dist} +Release: 10.%{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 @@ -1696,7 +1696,10 @@ require "copy_jdk_configs.lua" %endif %changelog -* Mon Feb 22 2016 jvanek - 1:1.8.0.72-.b15 +* Tue Feb 23 2016 jvanek - 1:1.8.0.72-10.b15 +- returning accidentlay removed hunk from renamed and so wrongly merged remove_aarch64_jvm.cfg_divergence.patch + +* Mon Feb 22 2016 jvanek - 1:1.8.0.72-9.b15 - sync from rhel * Tue Feb 16 2016 Dan Horák - 1:1.8.0.72-8.b15 diff --git a/remove_aarch64_jvm.cfg_divergence.patch b/remove_aarch64_jvm.cfg_divergence.patch index 64aeb57..586e6f2 100644 --- a/remove_aarch64_jvm.cfg_divergence.patch +++ b/remove_aarch64_jvm.cfg_divergence.patch @@ -1,3 +1,18 @@ +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 -r 57824090cf28 src/share/bin/java.c --- openjdk/jdk/src/share/bin/java.c Fri Feb 05 17:41:45 2016 +0000 +++ openjdk/jdk/src/share/bin/java.c Thu Feb 18 03:43:51 2016 +0000