Date: Wed, 4 Aug 2021 19:34:26 GMT From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 3700c180db55 - main - java/openjdk8: fix build on powerpc64* Message-ID: <202108041934.174JYQp3095305@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=3700c180db55788e43e20599afd234b63b7e2161 commit 3700c180db55788e43e20599afd234b63b7e2161 Author: Piotr Kubaj <pkubaj@FreeBSD.org> AuthorDate: 2021-08-04 19:34:19 +0000 Commit: Piotr Kubaj <pkubaj@FreeBSD.org> CommitDate: 2021-08-04 19:34:19 +0000 java/openjdk8: fix build on powerpc64* /wrkdirs/usr/ports/java/openjdk8/work/jdk8u-jdk8u302-b08.1/hotspot/src/os_cpu/bsd_ppc/vm/thread_bsd_ppc.cpp:45:37: error: use of undeclared identifier 'uc_mcontext' frame ret_frame((intptr_t*)uc->>uc_mcontext.mc_gpr[1/*REG_SP*/], ^ /wrkdirs/usr/ports/java/openjdk8/work/jdk8u-jdk8u302-b08.1/hotspot/src/os_cpu/bsd_ppc/vm/thread_bsd_ppc.cpp:88:18: error: redefinition of 'pd_get_top_frame_for_signal_handler' bool JavaThread::pd_get_top_frame_for_signal_handler(frame* fr_addr, void* ucontext, bool isInJava) { ^ /wrkdirs/usr/ports/java/openjdk8/work/jdk8u-jdk8u302-b08.1/hotspot/src/os_cpu/bsd_ppc/vm/thread_bsd_ppc.cpp:83:18: note: previous definition is here bool JavaThread::pd_get_top_frame_for_signal_handler(frame* fr_addr, void* ucontext, bool isInJava) { --- ...ot_src_os__cpu_bsd__ppc_vm_thread__bsd__ppc.cpp | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__ppc_vm_thread__bsd__ppc.cpp b/java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__ppc_vm_thread__bsd__ppc.cpp new file mode 100644 index 000000000000..ec6dbea73cc9 --- /dev/null +++ b/java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__ppc_vm_thread__bsd__ppc.cpp @@ -0,0 +1,23 @@ +--- hotspot/src/os_cpu/bsd_ppc/vm/thread_bsd_ppc.cpp.orig 2021-08-04 17:59:22 UTC ++++ hotspot/src/os_cpu/bsd_ppc/vm/thread_bsd_ppc.cpp +@@ -42,7 +42,7 @@ bool JavaThread::pd_get_top_frame_for_profiling(frame* + // if we were running Java code when SIGPROF came in. + if (isInJava) { + ucontext_t* uc = (ucontext_t*) ucontext; +- frame ret_frame((intptr_t*)uc->>uc_mcontext.mc_gpr[1/*REG_SP*/], ++ frame ret_frame((intptr_t*)uc->uc_mcontext.mc_gpr[1/*REG_SP*/], + (address)uc->uc_mcontext.mc_srr0); + + if (ret_frame.pc() == NULL) { +@@ -83,11 +83,6 @@ bool JavaThread::pd_get_top_frame_for_profiling(frame* + bool JavaThread::pd_get_top_frame_for_signal_handler(frame* fr_addr, void* ucontext, bool isInJava) { + assert(this->is_Java_thread(), "must be JavaThread"); + return pd_get_top_frame_for_profiling(fr_addr, ucontext, isInJava); +-} +-// Forte Analyzer AsyncGetCallTrace profiling support is not implemented on Bsd/PPC. +-bool JavaThread::pd_get_top_frame_for_signal_handler(frame* fr_addr, void* ucontext, bool isInJava) { +- Unimplemented(); +- return false; + } + + void JavaThread::cache_global_variables() { }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108041934.174JYQp3095305>