From owner-dev-commits-ports-main@freebsd.org Wed Aug 4 19:34:26 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A3E89654905; Wed, 4 Aug 2021 19:34:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Gg24L42xbz4qxw; Wed, 4 Aug 2021 19:34:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 73CDC44DB; Wed, 4 Aug 2021 19:34:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 174JYQwp095306; Wed, 4 Aug 2021 19:34:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 174JYQp3095305; Wed, 4 Aug 2021 19:34:26 GMT (envelope-from git) Date: Wed, 4 Aug 2021 19:34:26 GMT Message-Id: <202108041934.174JYQp3095305@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 3700c180db55 - main - java/openjdk8: fix build on powerpc64* MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3700c180db55788e43e20599afd234b63b7e2161 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Aug 2021 19:34:26 -0000 The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=3700c180db55788e43e20599afd234b63b7e2161 commit 3700c180db55788e43e20599afd234b63b7e2161 Author: Piotr Kubaj AuthorDate: 2021-08-04 19:34:19 +0000 Commit: Piotr Kubaj 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() { }