Updated to u181
This commit is contained in:
parent
3f1969e9e2
commit
6e6e3ea448
2
.gitignore
vendored
2
.gitignore
vendored
@ -112,3 +112,5 @@
|
|||||||
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u171-b10.tar.xz
|
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u171-b10.tar.xz
|
||||||
/aarch64-port-jdk8u-aarch64-jdk8u172-b11.tar.xz
|
/aarch64-port-jdk8u-aarch64-jdk8u172-b11.tar.xz
|
||||||
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u172-b11--shenandoah-merge-2018-05-15.tar.xz
|
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u172-b11--shenandoah-merge-2018-05-15.tar.xz
|
||||||
|
/aarch64-port-jdk8u-aarch64-jdk8u181-b13.tar.xz
|
||||||
|
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u181-b13.tar.xz
|
||||||
|
95
8075942-pr3602-rh1582032.patch
Normal file
95
8075942-pr3602-rh1582032.patch
Normal file
@ -0,0 +1,95 @@
|
|||||||
|
# HG changeset patch
|
||||||
|
# User prr
|
||||||
|
# Date 1429299166 25200
|
||||||
|
# Fri Apr 17 12:32:46 2015 -0700
|
||||||
|
# Node ID 1f4b038b9550afaf88a70cee4cf9c1422ecd86d6
|
||||||
|
# Parent 533117ae5b7587c8d9c0612581682ab984475430
|
||||||
|
8075942, PR3602: ArrayIndexOutOfBoundsException in sun.java2d.pisces.Dasher.goTo
|
||||||
|
Reviewed-by: flar, lbourges
|
||||||
|
|
||||||
|
diff --git openjdk.orig/jdk/src/share/classes/sun/java2d/pisces/Dasher.java openjdk/jdk/src/share/classes/sun/java2d/pisces/Dasher.java
|
||||||
|
--- openjdk.orig/jdk/src/share/classes/sun/java2d/pisces/Dasher.java
|
||||||
|
+++ openjdk/jdk/src/share/classes/sun/java2d/pisces/Dasher.java
|
||||||
|
@@ -146,7 +146,7 @@
|
||||||
|
if (dashOn) {
|
||||||
|
if (starting) {
|
||||||
|
firstSegmentsBuffer = Helpers.widenArray(firstSegmentsBuffer,
|
||||||
|
- firstSegidx, type - 2);
|
||||||
|
+ firstSegidx, type - 2 + 1);
|
||||||
|
firstSegmentsBuffer[firstSegidx++] = type;
|
||||||
|
System.arraycopy(pts, off, firstSegmentsBuffer, firstSegidx, type - 2);
|
||||||
|
firstSegidx += type - 2;
|
||||||
|
diff --git a/test/javopenjdk.orig/jdk/awt/BasicStroke/DashStrokeTest.java openjdk/jdk/test/java/awt/BasicStroke/DashStrokeTest.java
|
||||||
|
new file mode 100644
|
||||||
|
--- /dev/null
|
||||||
|
+++ openjdk/jdk/test/java/awt/BasicStroke/DashStrokeTest.java
|
||||||
|
@@ -0,0 +1,69 @@
|
||||||
|
+/*
|
||||||
|
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
|
||||||
|
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
|
+ *
|
||||||
|
+ * This code is free software; you can redistribute it and/or modify it
|
||||||
|
+ * under the terms of the GNU General Public License version 2 only, as
|
||||||
|
+ * published by the Free Software Foundation.
|
||||||
|
+ *
|
||||||
|
+ * This code is distributed in the hope that it will be useful, but WITHOUT
|
||||||
|
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
|
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||||
|
+ * version 2 for more details (a copy is included in the LICENSE file that
|
||||||
|
+ * accompanied this code).
|
||||||
|
+ *
|
||||||
|
+ * You should have received a copy of the GNU General Public License version
|
||||||
|
+ * 2 along with this work; if not, write to the Free Software Foundation,
|
||||||
|
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
+ *
|
||||||
|
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||||
|
+ * or visit www.oracle.com if you need additional information or have any
|
||||||
|
+ * questions.
|
||||||
|
+ *
|
||||||
|
+ * @test
|
||||||
|
+ * @bug 8075942
|
||||||
|
+ * @summary test there is no exception rendering a dashed stroke
|
||||||
|
+ * @run DashStrokeTest
|
||||||
|
+ * @run -Dsun.java2d.renderer=sun.java2d.pisces.PiscesRenderingEngine
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+import java.awt.BasicStroke;
|
||||||
|
+import java.awt.Color;
|
||||||
|
+import java.awt.Graphics2D;
|
||||||
|
+import java.awt.Stroke;
|
||||||
|
+import java.awt.geom.GeneralPath;
|
||||||
|
+import java.awt.image.BufferedImage;
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+public class DashStrokeTest {
|
||||||
|
+
|
||||||
|
+ public static void main(String[] args) {
|
||||||
|
+
|
||||||
|
+ GeneralPath shape = new GeneralPath();
|
||||||
|
+ int[] pointTypes = {0, 0, 1, 1, 0, 1, 1, 0};
|
||||||
|
+ double[] xpoints = {428, 420, 400, 400, 400, 400, 420, 733};
|
||||||
|
+ double[] ypoints = {180, 180, 180, 160, 30, 10, 10, 10};
|
||||||
|
+ shape.moveTo(xpoints[0], ypoints[0]);
|
||||||
|
+ for (int i = 1; i < pointTypes.length; i++) {
|
||||||
|
+ if (pointTypes[i] == 1 && i < pointTypes.length - 1) {
|
||||||
|
+ shape.quadTo(xpoints[i], ypoints[i],
|
||||||
|
+ xpoints[i + 1], ypoints[i + 1]);
|
||||||
|
+ } else {
|
||||||
|
+ shape.lineTo(xpoints[i], ypoints[i]);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ BufferedImage image = new
|
||||||
|
+ BufferedImage(1000, 1000, BufferedImage.TYPE_INT_ARGB);
|
||||||
|
+ Graphics2D g2 = image.createGraphics();
|
||||||
|
+
|
||||||
|
+ Color color = new Color(124, 0, 124, 255);
|
||||||
|
+ g2.setColor(color);
|
||||||
|
+ Stroke stroke = new BasicStroke(1.0f,
|
||||||
|
+ BasicStroke.CAP_BUTT,
|
||||||
|
+ BasicStroke.JOIN_BEVEL,
|
||||||
|
+ 10.0f, new float[] {9, 6}, 0.0f);
|
||||||
|
+ g2.setStroke(stroke);
|
||||||
|
+ g2.draw(shape);
|
||||||
|
+ }
|
||||||
|
+}
|
1494
8146115-pr3508-rh1463098.patch
Normal file
1494
8146115-pr3508-rh1463098.patch
Normal file
File diff suppressed because it is too large
Load Diff
131
8203182-pr3603-rh1568033.patch
Normal file
131
8203182-pr3603-rh1568033.patch
Normal file
@ -0,0 +1,131 @@
|
|||||||
|
# HG changeset patch
|
||||||
|
# User igerasim
|
||||||
|
# Date 1528992969 25200
|
||||||
|
# Thu Jun 14 09:16:09 2018 -0700
|
||||||
|
# Node ID d9b0b4bd2526818afa73b60da77403245554caa8
|
||||||
|
# Parent 1f4b038b9550afaf88a70cee4cf9c1422ecd86d6
|
||||||
|
8203182, PR3603: Release session if initialization of SunPKCS11 Signature fails
|
||||||
|
Summary: Ensure session is properly released in P11Signature class
|
||||||
|
Reviewed-by: valeriep
|
||||||
|
Contributed-by: Martin Balao <mbalao@redhat.com>
|
||||||
|
|
||||||
|
diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11Signature.java openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Signature.java
|
||||||
|
--- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11Signature.java
|
||||||
|
+++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Signature.java
|
||||||
|
@@ -309,47 +309,51 @@
|
||||||
|
session = token.killSession(session);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
- // "cancel" operation by finishing it
|
||||||
|
- // XXX make sure all this always works correctly
|
||||||
|
- if (mode == M_SIGN) {
|
||||||
|
- try {
|
||||||
|
- if (type == T_UPDATE) {
|
||||||
|
- token.p11.C_SignFinal(session.id(), 0);
|
||||||
|
- } else {
|
||||||
|
- byte[] digest;
|
||||||
|
- if (type == T_DIGEST) {
|
||||||
|
- digest = md.digest();
|
||||||
|
- } else { // T_RAW
|
||||||
|
- digest = buffer;
|
||||||
|
+ try {
|
||||||
|
+ // "cancel" operation by finishing it
|
||||||
|
+ // XXX make sure all this always works correctly
|
||||||
|
+ if (mode == M_SIGN) {
|
||||||
|
+ try {
|
||||||
|
+ if (type == T_UPDATE) {
|
||||||
|
+ token.p11.C_SignFinal(session.id(), 0);
|
||||||
|
+ } else {
|
||||||
|
+ byte[] digest;
|
||||||
|
+ if (type == T_DIGEST) {
|
||||||
|
+ digest = md.digest();
|
||||||
|
+ } else { // T_RAW
|
||||||
|
+ digest = buffer;
|
||||||
|
+ }
|
||||||
|
+ token.p11.C_Sign(session.id(), digest);
|
||||||
|
}
|
||||||
|
- token.p11.C_Sign(session.id(), digest);
|
||||||
|
+ } catch (PKCS11Exception e) {
|
||||||
|
+ throw new ProviderException("cancel failed", e);
|
||||||
|
}
|
||||||
|
- } catch (PKCS11Exception e) {
|
||||||
|
- throw new ProviderException("cancel failed", e);
|
||||||
|
+ } else { // M_VERIFY
|
||||||
|
+ try {
|
||||||
|
+ byte[] signature;
|
||||||
|
+ if (keyAlgorithm.equals("DSA")) {
|
||||||
|
+ signature = new byte[40];
|
||||||
|
+ } else {
|
||||||
|
+ signature = new byte[(p11Key.length() + 7) >> 3];
|
||||||
|
+ }
|
||||||
|
+ if (type == T_UPDATE) {
|
||||||
|
+ token.p11.C_VerifyFinal(session.id(), signature);
|
||||||
|
+ } else {
|
||||||
|
+ byte[] digest;
|
||||||
|
+ if (type == T_DIGEST) {
|
||||||
|
+ digest = md.digest();
|
||||||
|
+ } else { // T_RAW
|
||||||
|
+ digest = buffer;
|
||||||
|
+ }
|
||||||
|
+ token.p11.C_Verify(session.id(), digest, signature);
|
||||||
|
+ }
|
||||||
|
+ } catch (PKCS11Exception e) {
|
||||||
|
+ // will fail since the signature is incorrect
|
||||||
|
+ // XXX check error code
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
- } else { // M_VERIFY
|
||||||
|
- try {
|
||||||
|
- byte[] signature;
|
||||||
|
- if (keyAlgorithm.equals("DSA")) {
|
||||||
|
- signature = new byte[40];
|
||||||
|
- } else {
|
||||||
|
- signature = new byte[(p11Key.length() + 7) >> 3];
|
||||||
|
- }
|
||||||
|
- if (type == T_UPDATE) {
|
||||||
|
- token.p11.C_VerifyFinal(session.id(), signature);
|
||||||
|
- } else {
|
||||||
|
- byte[] digest;
|
||||||
|
- if (type == T_DIGEST) {
|
||||||
|
- digest = md.digest();
|
||||||
|
- } else { // T_RAW
|
||||||
|
- digest = buffer;
|
||||||
|
- }
|
||||||
|
- token.p11.C_Verify(session.id(), digest, signature);
|
||||||
|
- }
|
||||||
|
- } catch (PKCS11Exception e) {
|
||||||
|
- // will fail since the signature is incorrect
|
||||||
|
- // XXX check error code
|
||||||
|
- }
|
||||||
|
+ } finally {
|
||||||
|
+ session = token.releaseSession(session);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -368,6 +372,8 @@
|
||||||
|
}
|
||||||
|
initialized = true;
|
||||||
|
} catch (PKCS11Exception e) {
|
||||||
|
+ // release session when initialization failed
|
||||||
|
+ session = token.releaseSession(session);
|
||||||
|
throw new ProviderException("Initialization failed", e);
|
||||||
|
}
|
||||||
|
if (bytesProcessed != 0) {
|
||||||
|
@@ -529,6 +535,8 @@
|
||||||
|
}
|
||||||
|
bytesProcessed += len;
|
||||||
|
} catch (PKCS11Exception e) {
|
||||||
|
+ initialized = false;
|
||||||
|
+ session = token.releaseSession(session);
|
||||||
|
throw new ProviderException(e);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
@@ -576,6 +584,8 @@
|
||||||
|
bytesProcessed += len;
|
||||||
|
byteBuffer.position(ofs + len);
|
||||||
|
} catch (PKCS11Exception e) {
|
||||||
|
+ initialized = false;
|
||||||
|
+ session = token.releaseSession(session);
|
||||||
|
throw new ProviderException("Update failed", e);
|
||||||
|
}
|
||||||
|
break;
|
65
8206406-pr3610-rh1597825.patch
Normal file
65
8206406-pr3610-rh1597825.patch
Normal file
@ -0,0 +1,65 @@
|
|||||||
|
# HG changeset patch
|
||||||
|
# User aph
|
||||||
|
# Date 1531146945 -3600
|
||||||
|
# Mon Jul 09 15:35:45 2018 +0100
|
||||||
|
# Node ID 95b72537801cc9946c27ad27f07e3f0790a21b08
|
||||||
|
# Parent f6341f4635dacb56678264d29a88cd052b74036b
|
||||||
|
8206406, PR3610, RH1597825: StubCodeDesc constructor publishes partially-constructed objects on StubCodeDesc::_list
|
||||||
|
Reviewed-by: dholmes
|
||||||
|
|
||||||
|
diff --git openjdk.orig/hotspot/src/share/vm/runtime/stubCodeGenerator.cpp openjdk/hotspot/src/share/vm/runtime/stubCodeGenerator.cpp
|
||||||
|
--- openjdk.orig/hotspot/src/share/vm/runtime/stubCodeGenerator.cpp
|
||||||
|
+++ openjdk/hotspot/src/share/vm/runtime/stubCodeGenerator.cpp
|
||||||
|
@@ -34,12 +34,12 @@
|
||||||
|
|
||||||
|
// Implementation of StubCodeDesc
|
||||||
|
|
||||||
|
-StubCodeDesc* StubCodeDesc::_list = NULL;
|
||||||
|
-int StubCodeDesc::_count = 0;
|
||||||
|
+StubCodeDesc* volatile StubCodeDesc::_list = NULL;
|
||||||
|
+int StubCodeDesc::_count = 0;
|
||||||
|
|
||||||
|
|
||||||
|
StubCodeDesc* StubCodeDesc::desc_for(address pc) {
|
||||||
|
- StubCodeDesc* p = _list;
|
||||||
|
+ StubCodeDesc* p = (StubCodeDesc*)OrderAccess::load_ptr_acquire(&_list);
|
||||||
|
while (p != NULL && !p->contains(pc)) p = p->_next;
|
||||||
|
// p == NULL || p->contains(pc)
|
||||||
|
return p;
|
||||||
|
@@ -47,7 +47,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
StubCodeDesc* StubCodeDesc::desc_for_index(int index) {
|
||||||
|
- StubCodeDesc* p = _list;
|
||||||
|
+ StubCodeDesc* p = (StubCodeDesc*)OrderAccess::load_ptr_acquire(&_list);
|
||||||
|
while (p != NULL && p->index() != index) p = p->_next;
|
||||||
|
return p;
|
||||||
|
}
|
||||||
|
diff --git openjdk.orig/hotspot/src/share/vm/runtime/stubCodeGenerator.hpp openjdk/hotspot/src/share/vm/runtime/stubCodeGenerator.hpp
|
||||||
|
--- openjdk.orig/hotspot/src/share/vm/runtime/stubCodeGenerator.hpp
|
||||||
|
+++ openjdk/hotspot/src/share/vm/runtime/stubCodeGenerator.hpp
|
||||||
|
@@ -38,7 +38,7 @@
|
||||||
|
|
||||||
|
class StubCodeDesc: public CHeapObj<mtCode> {
|
||||||
|
protected:
|
||||||
|
- static StubCodeDesc* _list; // the list of all descriptors
|
||||||
|
+ static StubCodeDesc* volatile _list; // the list of all descriptors
|
||||||
|
static int _count; // length of list
|
||||||
|
|
||||||
|
StubCodeDesc* _next; // the next element in the linked list
|
||||||
|
@@ -69,13 +69,13 @@
|
||||||
|
|
||||||
|
StubCodeDesc(const char* group, const char* name, address begin) {
|
||||||
|
assert(name != NULL, "no name specified");
|
||||||
|
- _next = _list;
|
||||||
|
+ _next = (StubCodeDesc*)OrderAccess::load_ptr_acquire(&_list);
|
||||||
|
_group = group;
|
||||||
|
_name = name;
|
||||||
|
_index = ++_count; // (never zero)
|
||||||
|
_begin = begin;
|
||||||
|
_end = NULL;
|
||||||
|
- _list = this;
|
||||||
|
+ OrderAccess::release_store_ptr(&_list, this);
|
||||||
|
};
|
||||||
|
|
||||||
|
const char* group() const { return _group; }
|
@ -1,15 +1,15 @@
|
|||||||
Remove unnecessary .gnu_debuglink sections from libjvm
|
# HG changeset patch
|
||||||
|
# User sgehwolf
|
||||||
|
# Date 1530808022 -7200
|
||||||
|
# Thu Jul 05 18:27:02 2018 +0200
|
||||||
|
# Node ID 5ba59d58d976db456c4455640111e8107b8d80e8
|
||||||
|
# Parent ad057f2e3211cd18bc56550d8a2c400d92ec35b1
|
||||||
|
8206425: .gnu_debuglink sections added unconditionally when no debuginfo is stripped
|
||||||
|
Summary: Only add .gnu_debuglink sections when there is some stripping done.
|
||||||
|
Reviewed-by: erikj, dholmes
|
||||||
|
|
||||||
The .gnu_debuglink section indicates which file contains the debuginfo. This
|
diff --git openjdk.orig/hotspot/make/linux/makefiles/jsig.make openjdk/hotspot/make/linux/makefiles/jsig.make
|
||||||
is not needed if we not stripping the shared object.
|
--- openjdk.orig/hotspot/make/linux/makefiles/jsig.make
|
||||||
|
|
||||||
RPM's debuginfo extraction code will add the right file links automatically. As
|
|
||||||
it is, RPM copies over the .gnu_debuglink link to the debug info file. Without
|
|
||||||
this patch, the debug info file also ends up containing the .gnu_debuglink
|
|
||||||
section pointing to a missing (and not needed) file.
|
|
||||||
|
|
||||||
diff --git a/make/linux/makefiles/jsig.make b/make/linux/makefiles/jsig.make
|
|
||||||
--- openjdk/hotspot/make/linux/makefiles/jsig.make
|
|
||||||
+++ openjdk/hotspot/make/linux/makefiles/jsig.make
|
+++ openjdk/hotspot/make/linux/makefiles/jsig.make
|
||||||
@@ -57,14 +57,15 @@
|
@@ -57,14 +57,15 @@
|
||||||
$(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(EXTRA_CFLAGS) -o $@ $< -ldl
|
$(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(EXTRA_CFLAGS) -o $@ $< -ldl
|
||||||
@ -29,10 +29,10 @@ diff --git a/make/linux/makefiles/jsig.make b/make/linux/makefiles/jsig.make
|
|||||||
endif
|
endif
|
||||||
ifeq ($(ZIP_DEBUGINFO_FILES),1)
|
ifeq ($(ZIP_DEBUGINFO_FILES),1)
|
||||||
$(ZIPEXE) -q -y $(LIBJSIG_DIZ) $(LIBJSIG_DEBUGINFO)
|
$(ZIPEXE) -q -y $(LIBJSIG_DIZ) $(LIBJSIG_DEBUGINFO)
|
||||||
diff --git a/make/linux/makefiles/saproc.make b/make/linux/makefiles/saproc.make
|
diff --git openjdk.orig/hotspot/make/linux/makefiles/saproc.make openjdk/hotspot/make/linux/makefiles/saproc.make
|
||||||
--- openjdk/hotspot/make/linux/makefiles/saproc.make
|
--- openjdk.orig/hotspot/make/linux/makefiles/saproc.make
|
||||||
+++ openjdk/hotspot/make/linux/makefiles/saproc.make
|
+++ openjdk/hotspot/make/linux/makefiles/saproc.make
|
||||||
@@ -99,14 +99,15 @@
|
@@ -100,14 +100,15 @@
|
||||||
-lthread_db
|
-lthread_db
|
||||||
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
|
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
|
||||||
$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO)
|
$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO)
|
||||||
@ -50,21 +50,21 @@ diff --git a/make/linux/makefiles/saproc.make b/make/linux/makefiles/saproc.make
|
|||||||
endif
|
endif
|
||||||
ifeq ($(ZIP_DEBUGINFO_FILES),1)
|
ifeq ($(ZIP_DEBUGINFO_FILES),1)
|
||||||
$(ZIPEXE) -q -y $(LIBSAPROC_DIZ) $(LIBSAPROC_DEBUGINFO)
|
$(ZIPEXE) -q -y $(LIBSAPROC_DIZ) $(LIBSAPROC_DEBUGINFO)
|
||||||
diff --git a/make/linux/makefiles/vm.make b/make/linux/makefiles/vm.make
|
diff --git openjdk.orig/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make
|
||||||
--- openjdk/hotspot/make/linux/makefiles/vm.make
|
--- openjdk.orig/hotspot/make/linux/makefiles/vm.make
|
||||||
+++ openjdk/hotspot/make/linux/makefiles/vm.make
|
+++ openjdk/hotspot/make/linux/makefiles/vm.make
|
||||||
@@ -358,14 +358,15 @@
|
@@ -358,14 +358,15 @@
|
||||||
|
|
||||||
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
|
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
|
||||||
$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO)
|
$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO)
|
||||||
- $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
|
+ ifeq ($(STRIP_POLICY),all_strip)
|
||||||
ifeq ($(STRIP_POLICY),all_strip)
|
$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
|
||||||
|
- ifeq ($(STRIP_POLICY),all_strip)
|
||||||
$(QUIETLY) $(STRIP) $@
|
$(QUIETLY) $(STRIP) $@
|
||||||
+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
|
|
||||||
else
|
else
|
||||||
ifeq ($(STRIP_POLICY),min_strip)
|
ifeq ($(STRIP_POLICY),min_strip)
|
||||||
$(QUIETLY) $(STRIP) -g $@
|
|
||||||
+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
|
+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
|
||||||
|
$(QUIETLY) $(STRIP) -g $@
|
||||||
+ endif
|
+ endif
|
||||||
# implied else here is no stripping at all
|
# implied else here is no stripping at all
|
||||||
- endif
|
- endif
|
@ -221,7 +221,11 @@
|
|||||||
# note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there.
|
# note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there.
|
||||||
%global project aarch64-port
|
%global project aarch64-port
|
||||||
%global repo jdk8u
|
%global repo jdk8u
|
||||||
%global revision aarch64-jdk8u172-b11
|
%global revision aarch64-jdk8u181-b13
|
||||||
|
%global shenandoah_project aarch64-port
|
||||||
|
%global shenandoah_repo jdk8u-shenandoah
|
||||||
|
%global shenandoah_revision aarch64-shenandoah-jdk8u181-b13
|
||||||
|
|
||||||
# eg # jdk8u60-b27 -> jdk8u60 or # aarch64-jdk8u60-b27 -> aarch64-jdk8u60 (dont forget spec escape % by %%)
|
# eg # jdk8u60-b27 -> jdk8u60 or # aarch64-jdk8u60-b27 -> aarch64-jdk8u60 (dont forget spec escape % by %%)
|
||||||
%global whole_update %(VERSION=%{revision}; echo ${VERSION%%-*})
|
%global whole_update %(VERSION=%{revision}; echo ${VERSION%%-*})
|
||||||
# eg jdk8u60 -> 60 or aarch64-jdk8u60 -> 60
|
# eg jdk8u60 -> 60 or aarch64-jdk8u60 -> 60
|
||||||
@ -957,7 +961,7 @@ Provides: java-%{javaver}-%{origin}-accessibility = %{epoch}:%{version}-%{releas
|
|||||||
|
|
||||||
Name: java-%{javaver}-%{origin}
|
Name: java-%{javaver}-%{origin}
|
||||||
Version: %{javaver}.%{updatever}
|
Version: %{javaver}.%{updatever}
|
||||||
Release: 16.%{buildver}%{?dist}
|
Release: 7.%{buildver}%{?dist}
|
||||||
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
|
# 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
|
# 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
|
# also included the epoch in their virtual provides. This created a
|
||||||
@ -993,13 +997,20 @@ URL: http://openjdk.java.net/
|
|||||||
Source0: %{project}-%{repo}-%{revision}.tar.xz
|
Source0: %{project}-%{repo}-%{revision}.tar.xz
|
||||||
|
|
||||||
# Shenandoah HotSpot
|
# Shenandoah HotSpot
|
||||||
Source1: aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u172-b11--shenandoah-merge-2018-05-15.tar.xz
|
# aarch64-port/jdk8u-shenandoah contains an integration forest of
|
||||||
|
# OpenJDK 8u, the aarch64 port and Shenandoah
|
||||||
|
# To regenerate, use:
|
||||||
|
# VERSION=%%{shenandoah_revision}
|
||||||
|
# FILE_NAME_ROOT=%%{shenandoah_project}-%%{shenandoah_repo}-${VERSION}
|
||||||
|
# REPO_ROOT=<path to checked-out repository> REPOS=hotspot generate_source_tarball.sh
|
||||||
|
# where the source is obtained from http://hg.openjdk.java.net/%%{project}/%%{repo}
|
||||||
|
Source1: %{shenandoah_project}-%{shenandoah_repo}-%{shenandoah_revision}.tar.xz
|
||||||
|
|
||||||
# Custom README for -src subpackage
|
# Custom README for -src subpackage
|
||||||
Source2: README.md
|
Source2: README.md
|
||||||
|
|
||||||
# Use 'generate_tarballs.sh' to generate the following tarballs
|
# Use 'generate_tarballs.sh' to generate the following tarballs
|
||||||
# They are based on code contained in the IcedTea7 project
|
# They are based on code contained in the IcedTea project (3.x)
|
||||||
|
|
||||||
# Systemtap tapsets. Zipped up to keep it small
|
# Systemtap tapsets. Zipped up to keep it small
|
||||||
Source8: systemtap-tapset-3.6.0pre02.tar.xz
|
Source8: systemtap-tapset-3.6.0pre02.tar.xz
|
||||||
@ -1087,10 +1098,8 @@ Patch531: rhbz_1538767_fix_linking.patch
|
|||||||
#
|
#
|
||||||
#############################################
|
#############################################
|
||||||
# Patches 204 and 205 stop the build adding .gnu_debuglink sections to unstripped files
|
# Patches 204 and 205 stop the build adding .gnu_debuglink sections to unstripped files
|
||||||
Patch204: hotspot-remove-debuglink.patch
|
# 8207234: More libraries with .gnu_debuglink sections added unconditionally
|
||||||
Patch205: dont-add-unnecessary-debug-links.patch
|
Patch205: 8207234-dont-add-unnecessary-debug-links.patch
|
||||||
# Enable debug information for assembly code files
|
|
||||||
Patch206: hotspot-assembler-debuginfo.patch
|
|
||||||
|
|
||||||
# Arch-specific upstreamable patches
|
# Arch-specific upstreamable patches
|
||||||
# s390: PR2415: JVM -Xmx requirement is too high on s390
|
# s390: PR2415: JVM -Xmx requirement is too high on s390
|
||||||
@ -1121,40 +1130,21 @@ Patch7: include-all-srcs.patch
|
|||||||
Patch202: system-libpng.patch
|
Patch202: system-libpng.patch
|
||||||
# 8042159: Allow using a system-installed lcms2
|
# 8042159: Allow using a system-installed lcms2
|
||||||
Patch203: system-lcms.patch
|
Patch203: system-lcms.patch
|
||||||
# PR2462: Backport "8074839: Resolve disabled warnings for libunpack and the unpack200 binary"
|
# S8074839, PR2462: Resolve disabled warnings for libunpack and the unpack200 binary
|
||||||
# This fixes printf warnings that lead to build failure with -Werror=format-security from optflags
|
# This fixes printf warnings that lead to build failure with -Werror=format-security from optflags
|
||||||
Patch502: pr2462.patch
|
Patch502: pr2462.patch
|
||||||
# S8148351, PR2842: Only display resolved symlink for compiler, do not change path
|
|
||||||
Patch506: pr2842-01.patch
|
|
||||||
Patch507: pr2842-02.patch
|
|
||||||
# S8154313: Generated javadoc scattered all over the place
|
# S8154313: Generated javadoc scattered all over the place
|
||||||
Patch400: 8154313.patch
|
Patch400: 8154313.patch
|
||||||
# S6260348, PR3066: GTK+ L&F JTextComponent not respecting desktop caret blink rate
|
|
||||||
Patch526: 6260348-pr3066.patch
|
|
||||||
# 8061305, PR3335, RH1423421: Javadoc crashes when method name ends with "Property"
|
|
||||||
Patch538: 8061305-pr3335-rh1423421.patch
|
|
||||||
# 8188030, PR3459, RH1484079: AWT java apps fail to start when some minimal fonts are present
|
|
||||||
Patch560: 8188030-pr3459-rh1484079.patch
|
|
||||||
# 8197429, PR3546, RH153662{2,3}: 32 bit java app started via JNI crashes with larger stack sizes
|
# 8197429, PR3546, RH153662{2,3}: 32 bit java app started via JNI crashes with larger stack sizes
|
||||||
Patch561: 8197429-pr3546-rh1536622.patch
|
Patch561: 8197429-pr3546-rh1536622.patch
|
||||||
# PR3539, RH1548475: Pass EXTRA_LDFLAGS to HotSpot build
|
|
||||||
Patch562: pr3539-rh1548475.patch
|
|
||||||
# 8171000, PR3542, RH1402819: Robot.createScreenCapture() crashes in wayland mode
|
# 8171000, PR3542, RH1402819: Robot.createScreenCapture() crashes in wayland mode
|
||||||
Patch563: 8171000-pr3542-rh1402819.patch
|
Patch563: 8171000-pr3542-rh1402819.patch
|
||||||
# 8197546, PR3542, RH1402819: Fix for 8171000 breaks Solaris + Linux builds
|
# 8197546, PR3542, RH1402819: Fix for 8171000 breaks Solaris + Linux builds
|
||||||
Patch564: 8197546-pr3542-rh1402819.patch
|
Patch564: 8197546-pr3542-rh1402819.patch
|
||||||
# 8185723, PR3553: Zero: segfaults on Power PC 32-bit
|
|
||||||
Patch565: 8185723-pr3553.patch
|
|
||||||
# 8186461, PR3557: Zero's atomic_copy64() should use SPE instructions on linux-powerpcspe
|
|
||||||
Patch566: 8186461-pr3557.patch
|
|
||||||
# PR3559: Use ldrexd for atomic reads on ARMv7.
|
# PR3559: Use ldrexd for atomic reads on ARMv7.
|
||||||
Patch567: pr3559.patch
|
Patch567: pr3559.patch
|
||||||
# 8187577, PR3578: JVM crash during gc doing concurrent marking
|
# 8187577, PR3578: JVM crash during gc doing concurrent marking
|
||||||
Patch568: 8187577-pr3578.patch
|
Patch568: 8187577-pr3578.patch
|
||||||
# 8201509, PR3579: Zero: S390 31bit atomic_copy64 inline assembler is wrong
|
|
||||||
Patch569: 8201509-pr3579.patch
|
|
||||||
# 8165489, PR3589: Missing G1 barrier in Unsafe_GetObjectVolatile
|
|
||||||
Patch570: 8165489-pr3589.patch
|
|
||||||
# PR3591: Fix for bug 3533 doesn't add -mstackrealign to JDK code
|
# PR3591: Fix for bug 3533 doesn't add -mstackrealign to JDK code
|
||||||
Patch571: pr3591.patch
|
Patch571: pr3591.patch
|
||||||
# 8184309, PR3596: Build warnings from GCC 7.1 on Fedora 26
|
# 8184309, PR3596: Build warnings from GCC 7.1 on Fedora 26
|
||||||
@ -1169,6 +1159,44 @@ Patch575: 8197981-pr3548.patch
|
|||||||
Patch576: 8064786-pr3599.patch
|
Patch576: 8064786-pr3599.patch
|
||||||
# 8062808, PR3548: Turn on the -Wreturn-type warning
|
# 8062808, PR3548: Turn on the -Wreturn-type warning
|
||||||
Patch577: 8062808-pr3548.patch
|
Patch577: 8062808-pr3548.patch
|
||||||
|
# 8207057, PR3613: Enable debug information for assembly code files
|
||||||
|
Patch206: 8207057-pr3613-hotspot-assembler-debuginfo.patch
|
||||||
|
|
||||||
|
#############################################
|
||||||
|
#
|
||||||
|
# Patches appearing in 8u192
|
||||||
|
#
|
||||||
|
#############################################
|
||||||
|
# S8031668, PR2842: TOOLCHAIN_FIND_COMPILER unexpectedly resolves symbolic links
|
||||||
|
Patch506: pr2842-01.patch
|
||||||
|
# S8148351, PR2842: Only display resolved symlink for compiler, do not change path
|
||||||
|
Patch507: pr2842-02.patch
|
||||||
|
# S6260348, PR3066: GTK+ L&F JTextComponent not respecting desktop caret blink rate
|
||||||
|
Patch526: 6260348-pr3066.patch
|
||||||
|
# 8061305, PR3335, RH1423421: Javadoc crashes when method name ends with "Property"
|
||||||
|
Patch538: 8061305-pr3335-rh1423421.patch
|
||||||
|
# 8188030, PR3459, RH1484079: AWT java apps fail to start when some minimal fonts are present
|
||||||
|
Patch560: 8188030-pr3459-rh1484079.patch
|
||||||
|
# 8205104, PR3539, RH1548475: Pass EXTRA_LDFLAGS to HotSpot build
|
||||||
|
Patch562: pr3539-rh1548475.patch
|
||||||
|
# 8185723, PR3553: Zero: segfaults on Power PC 32-bit
|
||||||
|
Patch565: 8185723-pr3553.patch
|
||||||
|
# 8186461, PR3557: Zero's atomic_copy64() should use SPE instructions on linux-powerpcspe
|
||||||
|
Patch566: 8186461-pr3557.patch
|
||||||
|
# 8201509, PR3579: Zero: S390 31bit atomic_copy64 inline assembler is wrong
|
||||||
|
Patch569: 8201509-pr3579.patch
|
||||||
|
# 8165489, PR3589: Missing G1 barrier in Unsafe_GetObjectVolatile
|
||||||
|
Patch570: 8165489-pr3589.patch
|
||||||
|
# 8075942, PR3602: ArrayIndexOutOfBoundsException in sun.java2d.pisces.Dasher.goTo
|
||||||
|
Patch578: 8075942-pr3602-rh1582032.patch
|
||||||
|
# 8203182, PR3603: Release session if initialization of SunPKCS11 Signature fails
|
||||||
|
Patch579: 8203182-pr3603-rh1568033.patch
|
||||||
|
# 8206406, PR3610, RH1597825: StubCodeDesc constructor publishes partially-constructed objects on StubCodeDesc::_list
|
||||||
|
Patch580: 8206406-pr3610-rh1597825.patch
|
||||||
|
# 8146115, PR3508, RH1463098: Improve docker container detection and resource configuration usage
|
||||||
|
Patch581: 8146115-pr3508-rh1463098.patch
|
||||||
|
# 8206425: .gnu_debuglink sections added unconditionally when no debuginfo is stripped
|
||||||
|
Patch204: 8206425-hotspot-remove-debuglink.patch
|
||||||
|
|
||||||
#############################################
|
#############################################
|
||||||
#
|
#
|
||||||
@ -1186,7 +1214,6 @@ Patch300: PR3183.patch
|
|||||||
# Local fixes
|
# Local fixes
|
||||||
#
|
#
|
||||||
#############################################
|
#############################################
|
||||||
|
|
||||||
# PR1834, RH1022017: Reduce curves reported by SSL to those in NSS
|
# PR1834, RH1022017: Reduce curves reported by SSL to those in NSS
|
||||||
Patch525: pr1834-rh1022017.patch
|
Patch525: pr1834-rh1022017.patch
|
||||||
# Turn on AssumeMP by default on RHEL systems
|
# Turn on AssumeMP by default on RHEL systems
|
||||||
@ -1612,6 +1639,10 @@ popd
|
|||||||
%patch575
|
%patch575
|
||||||
%patch576
|
%patch576
|
||||||
%patch577
|
%patch577
|
||||||
|
%patch578
|
||||||
|
%patch579
|
||||||
|
%patch580
|
||||||
|
%patch581
|
||||||
|
|
||||||
# RPM-only fixes
|
# RPM-only fixes
|
||||||
%patch525
|
%patch525
|
||||||
|
4
sources
4
sources
@ -1,3 +1,3 @@
|
|||||||
SHA512 (systemtap-tapset-3.6.0pre02.tar.xz) = 848f42ef7ca751e723fd50e3a6da14c0965ad4da37ea3331568658e27497b7a7e4b9aad3dedd264ad0bb5566c37a92302b905f10258a4e2c89dc4ba609e55481
|
SHA512 (systemtap-tapset-3.6.0pre02.tar.xz) = 848f42ef7ca751e723fd50e3a6da14c0965ad4da37ea3331568658e27497b7a7e4b9aad3dedd264ad0bb5566c37a92302b905f10258a4e2c89dc4ba609e55481
|
||||||
SHA512 (aarch64-port-jdk8u-aarch64-jdk8u172-b11.tar.xz) = 2c322d161fdc5feeaf80011698ac1bcf4311513f9dc7484cefea91a1eba1a1c5aaad024ce6a525995fe88adc30ef68100032eaaa4d00082f2310f676592d3790
|
SHA512 (aarch64-port-jdk8u-aarch64-jdk8u181-b13.tar.xz) = d22ddb8b0b76faa18067fe383a147345be5fe1bad77b50940ff2993f3356166143e5ac9e14d9ead4437c13b00c6b2a5c62093ad57645da15a3419238990a74ac
|
||||||
SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u172-b11--shenandoah-merge-2018-05-15.tar.xz) = 7020590f7d618460ab3fc81513edfcd2452c222c15800a376628a864b6bbb611f890e66143a26011f9e4cc534e516047c2c573f7682e5b0f325425eeee05a280
|
SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u181-b13.tar.xz) = b5611a5b13a8aa3c0e07e015e39b11241f96124bb9454d4151c54d4e9af004ea038cc3a27e3b9099b3061bb9225cb298551e0e726f79bc9bc9837aa912f1586c
|
||||||
|
@ -31,7 +31,7 @@ if [ "x$REPO_NAME" = "x" ] ; then
|
|||||||
REPO_NAME="jdk8u"
|
REPO_NAME="jdk8u"
|
||||||
fi
|
fi
|
||||||
if [ "x$VERSION" = "x" ] ; then
|
if [ "x$VERSION" = "x" ] ; then
|
||||||
VERSION="aarch64-jdk8u172-b11"
|
VERSION="aarch64-jdk8u181-b13"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "x$COMPRESSION" = "x" ] ; then
|
if [ "x$COMPRESSION" = "x" ] ; then
|
||||||
@ -109,7 +109,7 @@ if [ "x$VERSION" = "xtip" ] ; then
|
|||||||
VERSION="tip"
|
VERSION="tip"
|
||||||
else
|
else
|
||||||
#hardcoding version for anything else except tip
|
#hardcoding version for anything else except tip
|
||||||
VERSION="aarch64-shenandoah-jdk8u172-b11--shenandoah-merge-2018-05-15"
|
VERSION="aarch64-shenandoah-jdk8u181-b13"
|
||||||
fi
|
fi
|
||||||
MAIN_REPO_NAME=$REPO_NAME
|
MAIN_REPO_NAME=$REPO_NAME
|
||||||
REPO_NAME=jdk8u-shenandoah
|
REPO_NAME=jdk8u-shenandoah
|
||||||
|
Loading…
Reference in New Issue
Block a user