Merge master jdk8u372-b06 into openj9-staging

Signed-off-by: J9 Build <j9build@ca.ibm.com>
ibmruntimes · Mar 24, 2023 · 1457a86 · 1457a86
2 parents e732eb1 + f884e01
commit 1457a86
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 63 deletions.
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