diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/aarch64/CallArranger.java b/src/java.base/share/classes/jdk/internal/foreign/abi/aarch64/CallArranger.java
index 0c629a7b183..fd75d2abda7 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/aarch64/CallArranger.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/aarch64/CallArranger.java
@@ -26,7 +26,7 @@
 
 /*
  * ===========================================================================
- * (c) Copyright IBM Corp. 2022, 2022 All Rights Reserved
+ * (c) Copyright IBM Corp. 2022, 2023 All Rights Reserved
  * ===========================================================================
  */
 
@@ -154,15 +154,16 @@ public Bindings getBindings(MethodType mt, FunctionDescriptor cDesc, boolean for
     }
 
     /* Replace DowncallLinker in OpenJDK with the implementation of DowncallLinker specific to OpenJ9 */
-    public MethodHandle arrangeDowncall(MethodType mt, FunctionDescriptor cDesc, LinkerOptions options) {
-        MethodHandle handle = DowncallLinker.getBoundMethodHandle(mt, cDesc);
-        return handle;
+    public static MethodHandle arrangeDowncall(MethodType mt, FunctionDescriptor cDesc, LinkerOptions options) {
+        // MethodHandle handle = DowncallLinker.getBoundMethodHandle(mt, cDesc, options);
+        // return handle;
+        return null;
     }
 
     /* Replace UpcallLinker in OpenJDK with the implementation of UpcallLinker specific to OpenJ9 */
-    public MemorySegment arrangeUpcall(MethodHandle target, MethodType mt, FunctionDescriptor cDesc, SegmentScope session) {
-        MethodHandle handle = DowncallLinker.getBoundMethodHandle(mt, cDesc);
-        return handle;
+    public static MemorySegment arrangeUpcall(MethodHandle target, MethodType mt, FunctionDescriptor cDesc, SegmentScope session) {
+        // return UpcallLinker.make(target, mt, cDesc, session);
+        return null;
     }
 
     private static boolean isInMemoryReturn(Optional<MemoryLayout> returnLayout) {
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/ppc64/aix/CallArranger.java b/src/java.base/share/classes/jdk/internal/foreign/abi/ppc64/aix/CallArranger.java
index fc36870e603..3630f819f8f 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/ppc64/aix/CallArranger.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/ppc64/aix/CallArranger.java
@@ -26,7 +26,7 @@
 
 /*
  * ===========================================================================
- * (c) Copyright IBM Corp. 2022, 2022 All Rights Reserved
+ * (c) Copyright IBM Corp. 2022, 2023 All Rights Reserved
  * ===========================================================================
  */
 
@@ -36,11 +36,12 @@
 import java.lang.invoke.MethodType;
 
 import jdk.internal.foreign.abi.DowncallLinker;
+import jdk.internal.foreign.abi.LinkerOptions;
 import jdk.internal.foreign.abi.UpcallLinker;
 
 import java.lang.foreign.FunctionDescriptor;
 import java.lang.foreign.MemorySegment;
-import java.lang.foreign.MemorySession;
+import java.lang.foreign.SegmentScope;
 
 /**
  * PPC64 CallArranger specialized for AIX C ABI
@@ -48,13 +49,15 @@
 public class CallArranger {
 
 	/* Replace DowncallLinker in OpenJDK with the implementation of DowncallLinker specific to OpenJ9 */
-	public static MethodHandle arrangeDowncall(MethodType mt, FunctionDescriptor cDesc) {
-		MethodHandle handle = DowncallLinker.getBoundMethodHandle(mt, cDesc);
-		return handle;
+	public static MethodHandle arrangeDowncall(MethodType mt, FunctionDescriptor cDesc, LinkerOptions options) {
+		// MethodHandle handle = DowncallLinker.getBoundMethodHandle(mt, cDesc, options);
+		// return handle;
+		return null;
 	}
 
 	/* Replace UpcallLinker in OpenJDK with the implementation of UpcallLinker specific to OpenJ9 */
-	public static MemorySegment arrangeUpcall(MethodHandle target, MethodType mt, FunctionDescriptor cDesc, MemorySession session) {
-		return UpcallLinker.make(target, mt, cDesc, session);
+	public static MemorySegment arrangeUpcall(MethodHandle target, MethodType mt, FunctionDescriptor cDesc, SegmentScope session) {
+		// return UpcallLinker.make(target, mt, cDesc, session);
+		return null;
 	}
 }
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/ppc64/sysv/CallArranger.java b/src/java.base/share/classes/jdk/internal/foreign/abi/ppc64/sysv/CallArranger.java
index 3e4db604b3e..14a5b35e813 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/ppc64/sysv/CallArranger.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/ppc64/sysv/CallArranger.java
@@ -26,7 +26,7 @@
 
 /*
  * ===========================================================================
- * (c) Copyright IBM Corp. 2022, 2022 All Rights Reserved
+ * (c) Copyright IBM Corp. 2022, 2023 All Rights Reserved
  * ===========================================================================
  */
 
@@ -36,11 +36,12 @@
 import java.lang.invoke.MethodType;
 
 import jdk.internal.foreign.abi.DowncallLinker;
+import jdk.internal.foreign.abi.LinkerOptions;
 import jdk.internal.foreign.abi.UpcallLinker;
 
 import java.lang.foreign.FunctionDescriptor;
 import java.lang.foreign.MemorySegment;
-import java.lang.foreign.MemorySession;
+import java.lang.foreign.SegmentScope;
 
 /**
  * PPC64LE CallArranger specialized for SysV C ABI
@@ -48,13 +49,15 @@
 public class CallArranger {
 
 	/* Replace DowncallLinker in OpenJDK with the implementation of DowncallLinker specific to OpenJ9 */
-	public static MethodHandle arrangeDowncall(MethodType mt, FunctionDescriptor cDesc) {
-		MethodHandle handle = DowncallLinker.getBoundMethodHandle(mt, cDesc);
-		return handle;
+	public static MethodHandle arrangeDowncall(MethodType mt, FunctionDescriptor cDesc, LinkerOptions options) {
+		// MethodHandle handle = DowncallLinker.getBoundMethodHandle(mt, cDesc, options);
+		// return handle;
+		return null;
 	}
 
 	/* Replace UpcallLinker in OpenJDK with the implementation of UpcallLinker specific to OpenJ9 */
-	public static MemorySegment arrangeUpcall(MethodHandle target, MethodType mt, FunctionDescriptor cDesc, MemorySession session) {
-		return UpcallLinker.make(target, mt, cDesc, session);
+	public static MemorySegment arrangeUpcall(MethodHandle target, MethodType mt, FunctionDescriptor cDesc, SegmentScope session) {
+		// return UpcallLinker.make(target, mt, cDesc, session);
+		return null;
 	}
 }
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/s390x/sysv/CallArranger.java b/src/java.base/share/classes/jdk/internal/foreign/abi/s390x/sysv/CallArranger.java
index 2aa3e4d281e..8a92de0ce78 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/s390x/sysv/CallArranger.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/s390x/sysv/CallArranger.java
@@ -26,7 +26,7 @@
 
 /*
  * ===========================================================================
- * (c) Copyright IBM Corp. 2022, 2022 All Rights Reserved
+ * (c) Copyright IBM Corp. 2022, 2023 All Rights Reserved
  * ===========================================================================
  */
 
@@ -36,11 +36,12 @@
 import java.lang.invoke.MethodType;
 
 import jdk.internal.foreign.abi.DowncallLinker;
+import jdk.internal.foreign.abi.LinkerOptions;
 import jdk.internal.foreign.abi.UpcallLinker;
 
 import java.lang.foreign.FunctionDescriptor;
 import java.lang.foreign.MemorySegment;
-import java.lang.foreign.MemorySession;
+import java.lang.foreign.SegmentScope;
 
 /**
  * S390x CallArranger specialized for SysV C ABI
@@ -48,13 +49,15 @@
 public class CallArranger {
 
 	/* Replace DowncallLinker in OpenJDK with the implementation of DowncallLinker specific to OpenJ9 */
-	public static MethodHandle arrangeDowncall(MethodType mt, FunctionDescriptor cDesc) {
-		MethodHandle handle = DowncallLinker.getBoundMethodHandle(mt, cDesc);
-		return handle;
+	public static MethodHandle arrangeDowncall(MethodType mt, FunctionDescriptor cDesc, LinkerOptions options) {
+		// MethodHandle handle = DowncallLinker.getBoundMethodHandle(mt, cDesc, options);
+		// return handle;
+		return null;
 	}
 
 	/* Replace UpcallLinker in OpenJDK with the implementation of UpcallLinker specific to OpenJ9 */
-	public static MemorySegment arrangeUpcall(MethodHandle target, MethodType mt, FunctionDescriptor cDesc, MemorySession session) {
-		return UpcallLinker.make(target, mt, cDesc, session);
+	public static MemorySegment arrangeUpcall(MethodHandle target, MethodType mt, FunctionDescriptor cDesc, SegmentScope session) {
+		// return UpcallLinker.make(target, mt, cDesc, session);
+		return null;
 	}
 }
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/x64/sysv/CallArranger.java b/src/java.base/share/classes/jdk/internal/foreign/abi/x64/sysv/CallArranger.java
index 76ec9659274..d08e24fa1a4 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/x64/sysv/CallArranger.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/x64/sysv/CallArranger.java
@@ -26,7 +26,7 @@
 
 /*
  * ===========================================================================
- * (c) Copyright IBM Corp. 2022, 2022 All Rights Reserved
+ * (c) Copyright IBM Corp. 2022, 2023 All Rights Reserved
  * ===========================================================================
  */
 
@@ -128,13 +128,15 @@ public static Bindings getBindings(MethodType mt, FunctionDescriptor cDesc, bool
 
     /* Replace DowncallLinker in OpenJDK with the implementation of DowncallLinker specific to OpenJ9 */
     public static MethodHandle arrangeDowncall(MethodType mt, FunctionDescriptor cDesc, LinkerOptions options) {
-        MethodHandle handle = DowncallLinker.getBoundMethodHandle(mt, cDesc);
-        return handle;
+        // MethodHandle handle = DowncallLinker.getBoundMethodHandle(mt, cDesc, options);
+        // return handle;
+        return null;
     }
 
     /* Replace UpcallLinker in OpenJDK with the implementation of UpcallLinker specific to OpenJ9 */
-    public static MemorySegment arrangeUpcall(MethodHandle target, MethodType mt, FunctionDescriptor cDesc, SegmentScope scope) {
-        return UpcallLinker.make(target, mt, cDesc, session);
+    public static MemorySegment arrangeUpcall(MethodHandle target, MethodType mt, FunctionDescriptor cDesc, SegmentScope session) {
+        // return UpcallLinker.make(target, mt, cDesc, session);
+        return null;
     }
 
     private static boolean isInMemoryReturn(Optional<MemoryLayout> returnLayout) {
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/x64/windows/CallArranger.java b/src/java.base/share/classes/jdk/internal/foreign/abi/x64/windows/CallArranger.java
index 8d2911699f7..44db601f844 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/x64/windows/CallArranger.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/x64/windows/CallArranger.java
@@ -25,7 +25,7 @@
 
 /*
  * ===========================================================================
- * (c) Copyright IBM Corp. 2022, 2022 All Rights Reserved
+ * (c) Copyright IBM Corp. 2022, 2023 All Rights Reserved
  * ===========================================================================
  */
 
@@ -128,13 +128,15 @@ void setReturnBindings(Class<?> carrier, MemoryLayout layout) {
 
     /* Replace DowncallLinker in OpenJDK with the implementation of DowncallLinker specific to OpenJ9 */
     public static MethodHandle arrangeDowncall(MethodType mt, FunctionDescriptor cDesc, LinkerOptions options) {
-        MethodHandle handle = DowncallLinker.getBoundMethodHandle(mt, cDesc);
-        return handle;
+        // MethodHandle handle = DowncallLinker.getBoundMethodHandle(mt, cDesc, options);
+        // return handle;
+        return null;
     }
 
     /* Replace UpcallLinker in OpenJDK with the implementation of UpcallLinker specific to OpenJ9 */
-    public static MemorySegment arrangeUpcall(MethodHandle target, MethodType mt, FunctionDescriptor cDesc, SegmentScope scope) {
-        return UpcallLinker.make(target, mt, cDesc, session);
+    public static MemorySegment arrangeUpcall(MethodHandle target, MethodType mt, FunctionDescriptor cDesc, SegmentScope session) {
+        // return UpcallLinker.make(target, mt, cDesc, session);
+        return null;
     }
 
     private static boolean isInMemoryReturn(Optional<MemoryLayout> returnLayout) {