java/openjdk8: Fix the build on aarch64

2 files changed, 53 insertions, 0 deletions

diff --git a/java/openjdk8/files/patch-hotspot_src_cpu_aarch64_vm_pauth___aarch64.hpp b/java/openjdk8/files/patch-hotspot_src_cpu_aarch64_vm_pauth___aarch64.hpp
new file mode 100644
index 000000000000..0495a62ccb3b
--- /dev/null
+++ b/java/openjdk8/files/patch-hotspot_src_cpu_aarch64_vm_pauth___aarch64.hpp
@@ -0,0 +1,14 @@
+--- hotspot/src/cpu/aarch64/vm/pauth_aarch64.hpp
++++ hotspot/src/cpu/aarch64/vm/pauth_aarch64.hpp
+@@ -25,7 +25,11 @@
+ #ifndef CPU_AARCH64_PAUTH_AARCH64_INLINE_HPP
+ #define CPU_AARCH64_PAUTH_AARCH64_INLINE_HPP
+ 
++#if defined(LINUX)
+ #include "pauth_linux_aarch64.inline.hpp"
++#elif defined(_ALLBSD_SOURCE)
++#include "pauth_bsd_aarch64.inline.hpp"
++#endif
+ 
+ inline bool pauth_ptr_is_raw(address ptr) {
+   // Confirm none of the high bits are set in the pointer.
diff --git a/java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__aarch64_vm_pauth__bsd__aarch64.inline.hpp b/java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__aarch64_vm_pauth__bsd__aarch64.inline.hpp
new file mode 100644
index 000000000000..1a5fcc0463a8
--- /dev/null
+++ b/java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__aarch64_vm_pauth__bsd__aarch64.inline.hpp
@@ -0,0 +1,39 @@
+--- hotspot/src/os_cpu/bsd_aarch64/vm/pauth_bsd_aarch64.inline.hpp
++++ hotspot/src/os_cpu/bsd_aarch64/vm/pauth_bsd_aarch64.inline.hpp
+@@ -0,0 +1,36 @@
++/*
++ * Copyright (c) 2021, 2022, Arm Limited. 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.
++ *
++ */
++
++#ifndef OS_CPU_BSD_AARCH64_PAUTH_BSD_AARCH64_INLINE_HPP
++#define OS_CPU_BSD_AARCH64_PAUTH_BSD_AARCH64_INLINE_HPP
++
++// OS specific Support for ROP Protection in VM code.
++// For more details on PAC see pauth_aarch64.hpp.
++
++inline address pauth_strip_pointer(address ptr) {
++  // No PAC support in BSD as of yet.
++  return ptr;
++}
++
++#endif // OS_CPU_BSD_AARCH64_PAUTH_BSD_AARCH64_INLINE_HPP