Merge pull request #655 from ibmruntimes/openj9

Merge jdk8u372-b06 to 0.38
ibmruntimes · Mar 24, 2023 · bb6c498 · bb6c498
2 parents 16b4b85 + dd50bfd
commit bb6c498
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 64 deletions.
diff --git a/closed/openjdk-tag.gmk b/closed/openjdk-tag.gmk
@@ -1 +1 @@
-OPENJDK_TAG := jdk8u372-b05
+OPENJDK_TAG := jdk8u372-b06
diff --git a/jdk/make/CompileJavaClasses.gmk b/jdk/make/CompileJavaClasses.gmk
@@ -307,6 +307,10 @@ endif
 LINUX_SRC_DIRS :=
 ifeq ($(OPENJDK_TARGET_OS),linux)
      LINUX_SRC_DIRS += $(JDK_TOPDIR)/src/linux/classes
+
+     # Linux is the only OS with an actual implementation of SystemMetrics.
+     # Exclude the generic null-returning stub from solaris/classes for that reason.
+     EXFILES += $(JDK_TOPDIR)/src/solaris/classes/jdk/internal/platform/SystemMetrics.java
 endif
 
 # The exception handling of swing beaninfo

diff --git a/jdk/src/macosx/classes/jdk/internal/platform/SystemMetrics.java b/jdk/src/macosx/classes/jdk/internal/platform/SystemMetrics.java
diff --git a/.../jdk/internal/platform/SystemMetrics.java → .../jdk/internal/platform/SystemMetrics.java b/.../jdk/internal/platform/SystemMetrics.java → .../jdk/internal/platform/SystemMetrics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 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

diff --git a/jdk/src/unix/classes/jdk/internal/platform/SystemMetrics.java b/jdk/src/unix/classes/jdk/internal/platform/SystemMetrics.java