From 3448505502dfe737f99551a1d07d5583151e17a8 Mon Sep 17 00:00:00 2001 From: Peter Shipton Date: Wed, 20 Nov 2024 10:40:37 -0500 Subject: [PATCH] Remove ORBBase, ORBVMHelpers from OpenJ9 builds Afaik they are only needed for IBM Java 8. Signed-off-by: Peter Shipton --- .../java.base/share/classes/com/ibm/oti/vm/ORBBase.java | 2 +- .../share/classes/com/ibm/oti/vm/ORBVMHelpers.java | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/jcl/src/java.base/share/classes/com/ibm/oti/vm/ORBBase.java b/jcl/src/java.base/share/classes/com/ibm/oti/vm/ORBBase.java index d6596750346..c7aa3c23cf6 100644 --- a/jcl/src/java.base/share/classes/com/ibm/oti/vm/ORBBase.java +++ b/jcl/src/java.base/share/classes/com/ibm/oti/vm/ORBBase.java @@ -1,4 +1,4 @@ -/*[INCLUDE-IF JAVA_SPEC_VERSION >= 8]*/ +/*[INCLUDE-IF (JAVA_SPEC_VERSION == 8) & !Sidecar18-SE-OpenJ9]*/ /* * Copyright IBM Corp. and others 2010 * diff --git a/jcl/src/java.base/share/classes/com/ibm/oti/vm/ORBVMHelpers.java b/jcl/src/java.base/share/classes/com/ibm/oti/vm/ORBVMHelpers.java index 2f8f3ed1d57..2331437672c 100644 --- a/jcl/src/java.base/share/classes/com/ibm/oti/vm/ORBVMHelpers.java +++ b/jcl/src/java.base/share/classes/com/ibm/oti/vm/ORBVMHelpers.java @@ -1,4 +1,4 @@ -/*[INCLUDE-IF JAVA_SPEC_VERSION >= 8]*/ +/*[INCLUDE-IF (JAVA_SPEC_VERSION == 8) & !Sidecar18-SE-OpenJ9]*/ /* * Copyright IBM Corp. and others 2010 * @@ -28,13 +28,8 @@ import java.security.AccessController; import java.security.PrivilegedAction; -/*[IF JAVA_SPEC_VERSION >= 9] -import jdk.internal.misc.Unsafe; -import jdk.internal.reflect.CallerSensitive; -/*[ELSE] JAVA_SPEC_VERSION >= 9 */ import sun.reflect.CallerSensitive; import sun.misc.Unsafe; -/*[ENDIF] JAVA_SPEC_VERSION >= 9 */ public class ORBVMHelpers {