--- /dev/null	Fri Apr 22 12:35:21 2022
+++ a/src/hotspot/os_cpu/solaris_x86/safefetch_solaris_x86_64.S	Fri Apr 22 12:29:28 2022
@@ -0,0 +1,58 @@
+#
+# Copyright (c) 2022 SAP SE. All rights reserved.
+# Copyright (c) 2022, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+    .globl SafeFetch32_impl
+    .globl SafeFetchN_impl
+    .globl _SafeFetch32_fault
+    .globl _SafeFetchN_fault
+    .globl _SafeFetch32_continuation
+    .globl _SafeFetchN_continuation
+
+	.text
+
+
+    # Support for int SafeFetch32(int* address, int defaultval);
+    #
+    #  %rdi : address
+    #  %esi : defaultval
+    .type    SafeFetch32_impl,@function
+SafeFetch32_impl:
+_SafeFetch32_fault:
+    movl (%rdi), %eax       # load target value, may fault
+    ret
+_SafeFetch32_continuation:
+    movl %esi, %eax         # return default
+    ret
+
+    # Support for intptr_t SafeFetchN(intptr_t* address, intptr_t defaultval);
+    #
+    #  %rdi : address
+    #  %rsi : defaultval
+    .type    SafeFetchN_impl,@function
+SafeFetchN_impl:
+_SafeFetchN_fault:
+    movq (%rdi), %rax       # load target value, may fault
+    ret
+_SafeFetchN_continuation:
+    movq %rsi, %rax         # return default
+    ret