Mercurial > hg > icedtea8

changeset 2846:a71ed6325859

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bump aarch32 to jdk8u181-b13-aarch32-180802. Upstream changes: - S8038636: speculative traps break when classes are redefined - S8055008: Clean up code that saves the previous versions of redefined classes - S8057570: RedefineClasses() tests fail assert(((Metadata*)obj)->is_valid()) failed: obj is valid - S8078628: linux-zero does not build without precompiled header - S8156137: SIGSEGV in ReceiverTypeData::clean_weak_klass_links - S8169201: Montgomery multiply intrinsic should use correct name - S8187045: [linux] Not all libraries in the VM are linked with -z,noexecstack - S8187577: JVM crash during gc doing concurrent marking - S8188223: IfNode::range_check_trap_proj() should handler dying subgraph with single if proj - S8198794: Hotspot crash on Cassandra 3.11.1 startup with libnuma 2.0.3 - S8199406: Performance drop with Java JDK 1.8.0_162-b32 - S8204874: Update THIRDPARYREADME file ChangeLog: 2018-09-10 Andrew John Hughes <gnu_andrew@member.fsf.org> Bump aarch32 to jdk8u181-b13-aarch32-180802. * patches/hotspot/aarch32/8187577-pr3578.patch: Removed as applied upstream in 8u181. * Makefile.am: (ICEDTEA_PATCHES): Remove upstreamed patch. * hotspot.map.in: Bump aarch32 to jdk8u181-b13-aarch32-180802. * patches/hotspot/aarch32/pr3539-rh1548475.patch: Revert to symlink now we share the same 8u base as Shenandoah again.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Tue, 11 Sep 2018 21:53:38 +0100
parents 378ad9776199
children 363243729df8
files ChangeLog Makefile.am hotspot.map.in patches/hotspot/aarch32/8187577-pr3578.patch patches/hotspot/aarch32/pr3539-rh1548475.patch
diffstat 5 files changed, 16 insertions(+), 178 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Sep 10 19:20:41 2018 +0100
+++ b/ChangeLog	Tue Sep 11 21:53:38 2018 +0100
@@ -1,3 +1,16 @@
+2018-09-10  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	Bump aarch32 to jdk8u181-b13-aarch32-180802.
+	* patches/hotspot/aarch32/8187577-pr3578.patch:
+	Removed as applied upstream in 8u181.
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Remove upstreamed patch.
+	* hotspot.map.in: Bump aarch32 to
+	jdk8u181-b13-aarch32-180802.
+	* patches/hotspot/aarch32/pr3539-rh1548475.patch:
+	Revert to symlink now we share the same 8u base
+	as Shenandoah again.
+
 2018-09-10  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	Bump shenandoah to
--- a/Makefile.am	Mon Sep 10 19:20:41 2018 +0100
+++ b/Makefile.am	Tue Sep 11 21:53:38 2018 +0100
@@ -354,8 +354,7 @@
 ICEDTEA_PATCHES += \
 	patches/hotspot/$(HSBUILD)/pr3548-aarch32.patch \
 	patches/hotspot/$(HSBUILD)/8078628-pr3208.patch \
-	patches/hotspot/$(HSBUILD)/8165489-pr3589.patch \
-	patches/hotspot/$(HSBUILD)/8187577-pr3578.patch
+	patches/hotspot/$(HSBUILD)/8165489-pr3589.patch
 endif
 
 ICEDTEA_PATCHES += \
--- a/hotspot.map.in	Mon Sep 10 19:20:41 2018 +0100
+++ b/hotspot.map.in	Tue Sep 11 21:53:38 2018 +0100
@@ -1,4 +1,4 @@
 # version type(drop/hg) url changeset sha256sum
 default drop http://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ 16ee3c35fef2 afd62ca7af0af93ab3cdad29ade1b90dfb39d3443884f382b3a817a26e21c3f4
 shenandoah drop http://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ b8b742251e42 551e84e3477a777867c56023203ea73f10b4ebfb3fd1c0fe84302abcdb5f08e6
-aarch32 drop http://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ e749b2f34b5e f69d992385d607b46ddb78373f7964c1a3b30f95c809e4669b804cf2f0f137ad
+aarch32 drop http://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ 891d70e93fb0 af4e52f9ce43d9b5856465bb2f20a3c20d9a8dad26630858641b34be4ecb0af9
--- a/patches/hotspot/aarch32/8187577-pr3578.patch	Mon Sep 10 19:20:41 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-# HG changeset patch
-# User poonam
-# Date 1525279722 -3600
-#      Wed May 02 17:48:42 2018 +0100
-# Node ID ffd5260fe5adcb26f87a14f1aaaf3e1a075d712a
-# Parent  5460c427c0dcb335f510cbc2ea1d76c6921b1aaa
-8187577, PR3546: JVM crash during gc doing concurrent marking
-Summary: Inform G1's SATB that a klass has been resurrected and it should not be unloaded
-Reviewed-by: coleenp, tschatzl, kbarrett
-
-diff --git openjdk.orig/hotspot/src/share/vm/prims/jvmtiGetLoadedClasses.cpp openjdk/hotspot/src/share/vm/prims/jvmtiGetLoadedClasses.cpp
---- openjdk.orig/hotspot/src/share/vm/prims/jvmtiGetLoadedClasses.cpp
-+++ openjdk/hotspot/src/share/vm/prims/jvmtiGetLoadedClasses.cpp
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2003, 2018, 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
-@@ -27,6 +27,9 @@
- #include "memory/universe.inline.hpp"
- #include "prims/jvmtiGetLoadedClasses.hpp"
- #include "runtime/thread.hpp"
-+#if INCLUDE_ALL_GCS
-+#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
-+#endif
- 
- 
- // The closure for GetLoadedClasses
-@@ -35,6 +38,20 @@
-   Stack<jclass, mtInternal> _classStack;
-   JvmtiEnv* _env;
- 
-+// Tell the GC to keep this klass alive
-+static void ensure_klass_alive(oop o) {
-+  // A klass that was previously considered dead can be looked up in the
-+  // CLD/SD, and its _java_mirror or _class_loader can be stored in a root
-+  // or a reachable object making it alive again. The SATB part of G1 needs
-+  // to get notified about this potential resurrection, otherwise the marking
-+  // might not find the object.
-+#if INCLUDE_ALL_GCS
-+  if (UseG1GC && o != NULL) {
-+    G1SATBCardTableModRefBS::enqueue(o);
-+  }
-+#endif
-+}
-+
- public:
-   LoadedClassesClosure(JvmtiEnv* env) {
-     _env = env;
-@@ -43,6 +60,7 @@
-   void do_klass(Klass* k) {
-     // Collect all jclasses
-     _classStack.push((jclass) _env->jni_reference(k->java_mirror()));
-+    ensure_klass_alive(k->java_mirror());
-   }
- 
-   int extract(jclass* result_list) {
--- a/patches/hotspot/aarch32/pr3539-rh1548475.patch	Mon Sep 10 19:20:41 2018 +0100
+++ b/patches/hotspot/aarch32/pr3539-rh1548475.patch	Tue Sep 11 21:53:38 2018 +0100
@@ -1,116 +1,1 @@
-# HG changeset patch
-# User andrew
-# Date 1526065930 -3600
-#      Fri May 11 20:12:10 2018 +0100
-# Node ID b8fc1e640c4c7f38ca94131279cb67c4d3de6961
-# Parent  afb31413c73cbc06420fdb447aa90a7a38258904
-PR3539, RH1548475: Pass EXTRA_LDFLAGS to HotSpot build
-
-diff --git openjdk.orig/hotspot/make/aix/makefiles/jsig.make openjdk/hotspot/make/aix/makefiles/jsig.make
---- openjdk.orig/hotspot/make/aix/makefiles/jsig.make
-+++ openjdk/hotspot/make/aix/makefiles/jsig.make
-@@ -45,7 +45,7 @@
- # cause problems with interposing. See CR: 6466665
- # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
- 
--LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE)
-+LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
- 
- LFLAGS_JSIG += $(BIN_UTILS)
- 
-diff --git openjdk.orig/hotspot/make/aix/makefiles/saproc.make openjdk/hotspot/make/aix/makefiles/saproc.make
---- openjdk.orig/hotspot/make/aix/makefiles/saproc.make
-+++ openjdk/hotspot/make/aix/makefiles/saproc.make
-@@ -66,7 +66,7 @@
- endif
- 
- 
--SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE)
-+SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
- 
- $(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE)
- 	$(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
-diff --git openjdk.orig/hotspot/make/aix/makefiles/vm.make openjdk/hotspot/make/aix/makefiles/vm.make
---- openjdk.orig/hotspot/make/aix/makefiles/vm.make
-+++ openjdk/hotspot/make/aix/makefiles/vm.make
-@@ -117,7 +117,7 @@
- 
- # Extra flags from gnumake's invocation or environment
- CFLAGS += $(EXTRA_CFLAGS)
--LFLAGS += $(EXTRA_CFLAGS)
-+LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)
- 
- # Don't set excutable bit on stack segment
- # the same could be done by separate execstack command
-diff --git openjdk.orig/hotspot/make/bsd/makefiles/jsig.make openjdk/hotspot/make/bsd/makefiles/jsig.make
---- openjdk.orig/hotspot/make/bsd/makefiles/jsig.make
-+++ openjdk/hotspot/make/bsd/makefiles/jsig.make
-@@ -52,7 +52,7 @@
- # cause problems with interposing. See CR: 6466665
- # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
- 
--LFLAGS_JSIG += -D_GNU_SOURCE -pthread $(LDFLAGS_HASH_STYLE)
-+LFLAGS_JSIG += -D_GNU_SOURCE -pthread $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
- 
- # DEBUG_BINARIES overrides everything, use full -g debug information
- ifeq ($(DEBUG_BINARIES), true)
-diff --git openjdk.orig/hotspot/make/bsd/makefiles/saproc.make openjdk/hotspot/make/bsd/makefiles/saproc.make
---- openjdk.orig/hotspot/make/bsd/makefiles/saproc.make
-+++ openjdk/hotspot/make/bsd/makefiles/saproc.make
-@@ -114,7 +114,7 @@
- # bring in minimum version argument or we'll fail on OSX 10.10
- SA_LFLAGS = $(LFLAGS)
- endif
--SA_LFLAGS += $(LDFLAGS_HASH_STYLE)
-+SA_LFLAGS += $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
- 
- BOOT_JAVA_INCLUDES = -I$(BOOT_JAVA_HOME)/include \
-   -I$(BOOT_JAVA_HOME)/include/$(shell uname -s | tr "[:upper:]" "[:lower:]")
-diff --git openjdk.orig/hotspot/make/bsd/makefiles/vm.make openjdk/hotspot/make/bsd/makefiles/vm.make
---- openjdk.orig/hotspot/make/bsd/makefiles/vm.make
-+++ openjdk/hotspot/make/bsd/makefiles/vm.make
-@@ -119,7 +119,7 @@
- 
- # Extra flags from gnumake's invocation or environment
- CFLAGS += $(EXTRA_CFLAGS)
--LFLAGS += $(EXTRA_CFLAGS)
-+LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)
- 
- # Don't set excutable bit on stack segment
- # the same could be done by separate execstack command
-diff --git openjdk.orig/hotspot/make/linux/makefiles/jsig.make openjdk/hotspot/make/linux/makefiles/jsig.make
---- openjdk.orig/hotspot/make/linux/makefiles/jsig.make
-+++ openjdk/hotspot/make/linux/makefiles/jsig.make
-@@ -44,7 +44,7 @@
- # cause problems with interposing. See CR: 6466665
- # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
- 
--LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE)
-+LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
- 
- # DEBUG_BINARIES overrides everything, use full -g debug information
- ifeq ($(DEBUG_BINARIES), true)
-diff --git openjdk.orig/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
-@@ -73,7 +73,7 @@
- else
- ALT_SAINCDIR=
- endif
--SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE)
-+SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
- 
- SAARCH ?= $(BUILDARCH)
- 
-diff --git openjdk.orig/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
-@@ -130,7 +130,7 @@
- 
- # Extra flags from gnumake's invocation or environment
- CFLAGS += $(EXTRA_CFLAGS)
--LFLAGS += $(EXTRA_CFLAGS)
-+LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)
- 
- # Don't set excutable bit on stack segment
- # the same could be done by separate execstack command
+../shenandoah/pr3539-rh1548475.patch
\ No newline at end of file