diff options
| author | Piotr Kubaj <pkubaj@FreeBSD.org> | 2023-10-25 06:31:21 +0000 |
|---|---|---|
| committer | Piotr Kubaj <pkubaj@FreeBSD.org> | 2023-10-25 06:43:52 +0000 |
| commit | d1191b769e7f39f0d9d67102a035454a9a486c87 (patch) | |
| tree | 8f795b6229a518589622036a8ff13ce70de20a4d | |
| parent | 4ad6ea40a3f7e3a820f66dc6cd998657728bd305 (diff) | |
| download | ports-d1191b769e7f39f0d9d67102a035454a9a486c87.tar.gz ports-d1191b769e7f39f0d9d67102a035454a9a486c87.zip | |
java/openjdk17: fix build on powerpc64*
Backport the patch from openjdk19 to fix the recently appearing error:
/wrkdirs/usr/ports/java/openjdk17/work/jdk17u-jdk-17.0.9-9-1/src/hotspot/os_cpu/bsd_ppc/os_bsd_ppc.cpp:194:29: error: no member named 'is_safefetch_fault' in 'StubRoutines'
if (pc && StubRoutines::is_safefetch_fault(pc)) {
~~~~~~~~~~~~~~^
/wrkdirs/usr/ports/java/openjdk17/work/jdk17u-jdk-17.0.9-9-1/src/hotspot/os_cpu/bsd_ppc/os_bsd_ppc.cpp:195:52: error: no member named 'continuation_for_safefetch_fault' in 'StubRoutines'
os::Posix::ucontext_set_pc(uc, StubRoutines::continuation_for_safefetch_fault(pc));
~~~~~~~~~~~~~~^
| -rw-r--r-- | java/openjdk17/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/java/openjdk17/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp b/java/openjdk17/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp new file mode 100644 index 000000000000..d3b0e0b9821e --- /dev/null +++ b/java/openjdk17/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp @@ -0,0 +1,19 @@ +--- src/hotspot/os_cpu/bsd_ppc/os_bsd_ppc.cpp.orig 2022-12-21 16:54:47 UTC ++++ src/hotspot/os_cpu/bsd_ppc/os_bsd_ppc.cpp +@@ -187,16 +187,6 @@ frame os::current_frame() { + bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info, + ucontext_t* uc, JavaThread* thread) { + +- // Moved SafeFetch32 handling outside thread!=NULL conditional block to make +- // it work if no associated JavaThread object exists. +- if (uc) { +- address const pc = os::Posix::ucontext_get_pc(uc); +- if (pc && StubRoutines::is_safefetch_fault(pc)) { +- os::Posix::ucontext_set_pc(uc, StubRoutines::continuation_for_safefetch_fault(pc)); +- return true; +- } +- } +- + // decide if this trap can be handled by a stub + address stub = NULL; + address pc = NULL; |