[Git][java-team/openjdk-11-jre-dcevm][master] 5 commits: New upstream version 11.0.1+8

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / openjdk-11-jre-dcevm


Commits:
5007f6d8 by Emmanuel Bourg at 2019-02-25T06:53:41Z
New upstream version 11.0.1+8
- - - - -
50353906 by Emmanuel Bourg at 2019-02-25T06:54:48Z
Update upstream source from tag 'upstream/11.0.1+8'

Update to upstream version '11.0.1+8'
with Debian dir 5f79b64dc56934c6cf9f2740909131856f6b29ad
- - - - -
d5b0cc8b by Emmanuel Bourg at 2019-02-25T07:22:56Z
New upstream release (11.0.1+8)

- - - - -
957cd536 by Matthias Klose at 2019-02-25T07:23:48Z
Fix ftbfs on i386 (Closes: #922678)

- - - - -
888d4601 by Emmanuel Bourg at 2019-02-25T07:24:08Z
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/rules
- src/hotspot/share/classfile/javaClasses.cpp
- src/hotspot/share/runtime/arguments.cpp


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+openjdk-11-jre-dcevm (11.0.1+8-1) unstable; urgency=medium
+
+  [ Emmanuel Bourg ]
+  * New upstream release
+
+  [ Matthias Klose ]
+  * Fix ftbfs on i386 (Closes: #922678)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 25 Feb 2019 08:24:01 +0100
+
 openjdk-11-jre-dcevm (11.0.1+7-1) unstable; urgency=medium
 
   * Switch to OpenJDK 11:


=====================================
debian/rules
=====================================
@@ -13,7 +13,7 @@ override_dh_auto_test:
 
 override_dh_auto_install:
 	dh_install -popenjdk-11-jre-dcevm \
-	           build/linux-$(DEB_HOST_GNU_CPU)-normal-server-release/jdk/lib/server/libjvm.so \
+	           build/linux-$(subst i686,x86,$(DEB_HOST_GNU_CPU))-normal-server-release/jdk/lib/server/libjvm.so \
 	           /usr/lib/jvm/java-11-openjdk-$(DEB_HOST_ARCH)/lib/dcevm/
 
 override_dh_auto_clean:


=====================================
src/hotspot/share/classfile/javaClasses.cpp
=====================================
@@ -4193,12 +4193,14 @@ const char* java_lang_ClassLoader::describe_external(const oop loader) {
   if (!well_known_loader) {
     oop pl = java_lang_ClassLoader::parent(loader);
     ClassLoaderData *pl_cld = ClassLoaderData::class_loader_data(pl);
-    const char* parentName = pl_cld->loader_name_and_id();
-    if (pl != NULL) {
-      ss.print(", child of %s %s", parentName, pl->klass()->external_name());
-    } else {
-      // bootstrap loader
-      ss.print(", child of %s", parentName);
+    if (pl_cld != NULL) {
+      const char* parentName = pl_cld->loader_name_and_id();
+      if (pl != NULL) {
+        ss.print(", child of %s %s", parentName, pl->klass()->external_name());
+      } else {
+        // bootstrap loader
+        ss.print(", child of %s", parentName);
+      }
     }
   }
   ss.print(")");


=====================================
src/hotspot/share/runtime/arguments.cpp
=====================================
@@ -4247,6 +4247,9 @@ bool Arguments::copy_expand_pid(const char* src, size_t srclen,
 
 void Arguments::setup_hotswap_agent() {
 
+  if (DumpSharedSpaces)
+    return;
+
   if (!AllowEnhancedClassRedefinition)
     return;
 



View it on GitLab: https://salsa.debian.org/java-team/openjdk-11-jre-dcevm/compare/3d82ca57b6b3f250fa4dbf6ae5992ac121301205...888d4601655755abf3d7813db1ea8fb1b6d97e6c

-- 
View it on GitLab: https://salsa.debian.org/java-team/openjdk-11-jre-dcevm/compare/3d82ca57b6b3f250fa4dbf6ae5992ac121301205...888d4601655755abf3d7813db1ea8fb1b6d97e6c
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20190225/e1373915/attachment.html>