Updated to u144
This commit is contained in:
parent
482d973b4b
commit
c6b7d2e724
19
.gitignore
vendored
19
.gitignore
vendored
@ -58,11 +58,18 @@
|
||||
/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-aarch64-jdk8u101-b13.tar.xz
|
||||
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u92-b14.tar.xz
|
||||
/aarch64-port-jdk8u-aarch64-jdk8u101-b14.tar.xz
|
||||
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u101-b14-shenandoah-merge-2016-07-25.tar.xz
|
||||
/systemtap-tapset-3.1.0.tar.xz
|
||||
/aarch64-port-jdk8u-aarch64-jdk8u101-b15.tar.xz
|
||||
/aarch64-port-jdk8u-aarch64-jdk8u102-b14.tar.xz
|
||||
/aarch64-port-jdk8u-aarch64-jdk8u111-b14.tar.xz
|
||||
/aarch64-port-jdk8u-aarch64-jdk8u111-b15.tar.xz
|
||||
/aarch64-port-jdk8u-aarch64-jdk8u111-b18.tar.xz
|
||||
/aarch64-port-jdk8u-aarch64-jdk8u112-b16.tar.xz
|
||||
/aarch64-port-jdk8u-aarch64-jdk8u121-b13.tar.xz
|
||||
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u102-b14.tar.xz
|
||||
/aarch64-port-jdk8u-aarch64-jdk8u111-b16.tar.xz
|
||||
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u111-b16.tar.xz
|
||||
@ -70,9 +77,17 @@
|
||||
/openjdk8-forests-latest-shenandoah-aarch64-shenandoah-jdk8u121-b14.tar.xz
|
||||
/aarch64-port-jdk8u-aarch64-jdk8u121-b14.tar.xz
|
||||
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u121-b14-shenandoah-merge-2017-02-20.tar.xz
|
||||
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u121-b14-shenandoah-merge-2017-03-08.tar.xz
|
||||
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u121-b14-shenandoah-merge-2017-03-09.tar.xz
|
||||
/aarch64-port-jdk8u-aarch64-jdk8u131-b12.tar.xz
|
||||
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u131-b12-shenandoah-merge-2017-04-20.tar.xz
|
||||
/systemtap-tapset-3.4.0.tar.xz
|
||||
/aarch64-port-jdk8u-aarch64-jdk8u131-b11.tar.xz
|
||||
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u131-b11.tar.xz
|
||||
/systemtap-tapset-3.4.0pre01.tar.xz
|
||||
/aarch64-port-jdk8u-aarch64-jdk8u131-b12.tar.xz
|
||||
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u131-b12.tar.xz
|
||||
/aarch64-port-jdk8u-aarch64-jdk8u141-b15.tar.xz
|
||||
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u141-b15.tar.xz
|
||||
/aarch64-port-jdk8u-aarch64-jdk8u141-b16.tar.xz
|
||||
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u141-b16.tar.xz
|
||||
/aarch64-port-jdk8u-aarch64-jdk8u144-b01.tar.xz
|
||||
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u144-b01.tar.xz
|
||||
|
48
8164293-pr3412-rh1459641.patch
Normal file
48
8164293-pr3412-rh1459641.patch
Normal file
@ -0,0 +1,48 @@
|
||||
# HG changeset patch
|
||||
# User jcm
|
||||
# Date 1484137609 28800
|
||||
# Wed Jan 11 04:26:49 2017 -0800
|
||||
# Node ID 1faf7c17089922f6f72b580253725f2ecb6ba2f8
|
||||
# Parent 3d07e14d65bc223dbfe94be9224e4aa8c6e63762
|
||||
8164293, PR3412, RH1459641: HotSpot leaking memory in long-running requests
|
||||
Summary: Applied RMs in sweep_code_cache and related codes.
|
||||
Reviewed-by: kvn, thartmann
|
||||
|
||||
diff --git a/src/share/vm/code/nmethod.cpp b/src/share/vm/code/nmethod.cpp
|
||||
--- openjdk/hotspot/src/share/vm/code/nmethod.cpp
|
||||
+++ openjdk/hotspot/src/share/vm/code/nmethod.cpp
|
||||
@@ -1172,6 +1172,7 @@
|
||||
// Clear ICStubs of all compiled ICs
|
||||
void nmethod::clear_ic_stubs() {
|
||||
assert_locked_or_safepoint(CompiledIC_lock);
|
||||
+ ResourceMark rm;
|
||||
RelocIterator iter(this);
|
||||
while(iter.next()) {
|
||||
if (iter.type() == relocInfo::virtual_call_type) {
|
||||
diff --git a/src/share/vm/runtime/sweeper.cpp b/src/share/vm/runtime/sweeper.cpp
|
||||
--- openjdk/hotspot/src/share/vm/runtime/sweeper.cpp
|
||||
+++ openjdk/hotspot/src/share/vm/runtime/sweeper.cpp
|
||||
@@ -319,6 +319,7 @@
|
||||
}
|
||||
|
||||
void NMethodSweeper::sweep_code_cache() {
|
||||
+ ResourceMark rm;
|
||||
Ticks sweep_start_counter = Ticks::now();
|
||||
|
||||
_flushed_count = 0;
|
||||
@@ -626,6 +627,7 @@
|
||||
// state of the code cache if it's requested.
|
||||
void NMethodSweeper::log_sweep(const char* msg, const char* format, ...) {
|
||||
if (PrintMethodFlushing) {
|
||||
+ ResourceMark rm;
|
||||
stringStream s;
|
||||
// Dump code cache state into a buffer before locking the tty,
|
||||
// because log_state() will use locks causing lock conflicts.
|
||||
@@ -643,6 +645,7 @@
|
||||
}
|
||||
|
||||
if (LogCompilation && (xtty != NULL)) {
|
||||
+ ResourceMark rm;
|
||||
stringStream s;
|
||||
// Dump code cache state into a buffer before locking the tty,
|
||||
// because log_state() will use locks causing lock conflicts.
|
@ -204,7 +204,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-jdk8u141-b16
|
||||
%global revision aarch64-jdk8u144-b01
|
||||
# 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
|
||||
@ -572,9 +572,58 @@ exit 0
|
||||
%dir %{_jvmdir}/%{sdkdir %%1}/bin
|
||||
%dir %{_jvmdir}/%{sdkdir %%1}/include
|
||||
%dir %{_jvmdir}/%{sdkdir %%1}/lib
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/*
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/appletviewer
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/extcheck
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/idlj
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/jar
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/jarsigner
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/java
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/javac
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/javadoc
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/javah
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/javap
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/java-rmi.cgi
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/jcmd
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/jconsole
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/jdb
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/jdeps
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/jhat
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/jinfo
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/jjs
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/jmap
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/jps
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/jrunscript
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/jsadebugd
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/jstack
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/jstat
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/jstatd
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/keytool
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/native2ascii
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/orbd
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/pack200
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/policytool
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/rmic
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/rmid
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/rmiregistry
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/schemagen
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/serialver
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/servertool
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/tnameserv
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/unpack200
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/wsgen
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/wsimport
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/xjc
|
||||
%{_jvmdir}/%{sdkdir %%1}/include/*
|
||||
%{_jvmdir}/%{sdkdir %%1}/lib/*
|
||||
%{_jvmdir}/%{sdkdir %%1}/lib/amd64
|
||||
%{_jvmdir}/%{sdkdir %%1}/lib/ct.sym
|
||||
%{_jvmdir}/%{sdkdir %%1}/lib/ir.idl
|
||||
%{_jvmdir}/%{sdkdir %%1}/lib/jconsole.jar
|
||||
%{_jvmdir}/%{sdkdir %%1}/lib/orb.idl
|
||||
%{_jvmdir}/%{sdkdir %%1}/lib/sa-jdi.jar
|
||||
%{_jvmdir}/%{sdkdir %%1}/lib/dt.jar
|
||||
%{_jvmdir}/%{sdkdir %%1}/lib/jexec
|
||||
%{_jvmdir}/%{sdkdir %%1}/lib/tools.jar
|
||||
%{_jvmjardir}/%{sdkdir %%1}
|
||||
%{_datadir}/applications/*jconsole%1.desktop
|
||||
%{_mandir}/man1/appletviewer-%{uniquesuffix %%1}.1*
|
||||
%{_mandir}/man1/extcheck-%{uniquesuffix %%1}.1*
|
||||
@ -790,7 +839,7 @@ Requires: java-atk-wrapper%{?_isa}
|
||||
Requires: %{name}%1%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
OrderWithRequires: %{name}-headless%1%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
|
||||
Provides: java-%{javaver}-%{origin}-accessiblity = %{epoch}:%{version}-%{release}
|
||||
Provides: java-%{javaver}-%{origin}-accessibility = %{epoch}:%{version}-%{release}
|
||||
|
||||
Obsoletes: java-1.7.0-openjdk-accessibility%1
|
||||
}
|
||||
@ -800,7 +849,7 @@ Obsoletes: java-1.7.0-openjdk-accessibility%1
|
||||
|
||||
Name: java-%{javaver}-%{origin}
|
||||
Version: %{javaver}.%{updatever}
|
||||
Release: 5.%{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
|
||||
@ -826,7 +875,7 @@ URL: http://openjdk.java.net/
|
||||
Source0: %{project}-%{repo}-%{revision}.tar.xz
|
||||
|
||||
# Shenandoah HotSpot
|
||||
Source1: aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u141-b16.tar.xz
|
||||
Source1: aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u144-b01.tar.xz
|
||||
|
||||
# Custom README for -src subpackage
|
||||
Source2: README.src
|
||||
@ -952,6 +1001,10 @@ Patch552: 8179084-pr3409-rh1455694.patch
|
||||
# 8175887, PR3415: C1 value numbering handling of Unsafe.get*Volatile is incorrect
|
||||
Patch554: 8175887-pr3415.patch
|
||||
|
||||
# Patches upstream and appearing in 8u161
|
||||
# 8164293, PR3412, RH1459641: HotSpot leaking memory in long-running requests
|
||||
Patch555: 8164293-pr3412-rh1459641.patch
|
||||
|
||||
# Patches ineligible for 8u
|
||||
# 8043805: Allow using a system-installed libjpeg
|
||||
Patch201: system-libjpeg.patch
|
||||
@ -1354,7 +1407,7 @@ sh %{SOURCE12}
|
||||
%patch551
|
||||
%patch552
|
||||
%patch553
|
||||
%patch554
|
||||
%patch555
|
||||
|
||||
# RPM-only fixes
|
||||
%patch525
|
||||
@ -1366,6 +1419,12 @@ sh %{SOURCE12}
|
||||
%patch534
|
||||
%endif
|
||||
|
||||
# 8175887 was added to the Shenandoah HotSpot ahead of time
|
||||
%if %{use_shenandoah_hotspot}
|
||||
%else
|
||||
%patch554
|
||||
%endif
|
||||
|
||||
%patch1000
|
||||
|
||||
# Extract systemtap tapsets
|
||||
@ -2027,6 +2086,12 @@ require "copy_jdk_configs.lua"
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Aug 23 2017 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.144-1.b01
|
||||
- Update to aarch64-jdk8u144-b01 and aarch64-shenandoah-jdk8u144-b01.
|
||||
- Exclude 8175887 from Shenandoah builds as it has been included in that repo.
|
||||
- Added 8164293-pr3412-rh1459641.patch backport from 8u development tree
|
||||
- get rid of bin/* and lib/*, fixed rhbz1480777
|
||||
|
||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.0.141-5.b16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
|
4
sources
4
sources
@ -1,3 +1,3 @@
|
||||
SHA512 (systemtap-tapset-3.4.0pre01.tar.xz) = 4446fa20f88bbce53b583484bf06cb2b476c9372beb898dc2b7739eaa5c98b9979fbd72e12474fb344833d831a19366b82216ee03b452411745e6cd3527faa4e
|
||||
SHA512 (aarch64-port-jdk8u-aarch64-jdk8u141-b16.tar.xz) = 154cc4bebb9a0809f548f630b5d4fa45befe7e5cf784236540205f254913495157f99f63a5b2223487bbff4c430e60cc53b4aacd9e843309f657929b500b061d
|
||||
SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u141-b16.tar.xz) = b6bf3383fcd8fb44308eff3ba93a4a635851a4c30e91957c5771990523b0c7c1f7a2acc7ec0472e196c26633a5df7d7b592b933f55ec9cdda63b37a14395ef10
|
||||
SHA512 (aarch64-port-jdk8u-aarch64-jdk8u144-b01.tar.xz) = dbad1a2a4b58606d2aaaf2124b917362b883b1a5f43eb06c33f8c9b5e5de7cfb00926d39efb6b10fd59792d140302640f8ec2d6b45839e80e3f42a3d027932ad
|
||||
SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u144-b01.tar.xz) = 8330d8864f860c54705ec72caefd8e02a0d75bc435ec3c8b10a4c96825155d0473617caa7dde45042211f3c1151042d419853eed3514032e8d71333ed14eebc1
|
||||
|
@ -31,7 +31,7 @@ if [ "x$REPO_NAME" = "x" ] ; then
|
||||
REPO_NAME="jdk8u"
|
||||
fi
|
||||
if [ "x$VERSION" = "x" ] ; then
|
||||
VERSION="aarch64-jdk8u141-b16"
|
||||
VERSION="aarch64-jdk8u144-b01"
|
||||
fi
|
||||
|
||||
if [ "x$COMPRESSION" = "x" ] ; then
|
||||
@ -109,7 +109,7 @@ if [ "x$VERSION" = "xtip" ] ; then
|
||||
VERSION="tip"
|
||||
else
|
||||
#hardcoding version for anything else except tip
|
||||
VERSION="aarch64-shenandoah-jdk8u141-b16"
|
||||
VERSION="aarch64-shenandoah-jdk8u144-b01"
|
||||
fi
|
||||
MAIN_REPO_NAME=$REPO_NAME
|
||||
REPO_NAME=jdk8u-shenandoah
|
||||
|
Loading…
Reference in New Issue
Block a user