From nobody Wed Oct 25 06:43:55 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFfXW4xXXz4y6fX; Wed, 25 Oct 2023 06:43:55 +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 4SFfXW4B4Hz4Wl5; Wed, 25 Oct 2023 06:43:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698216235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YNNgzlESfSzPp45NNjkwFMcDHCZg53tcp15y6Uc2jco=; b=Ea4lWRY9FVv4olriHzavnEc0IrseC1oqgrNkWvHWzr40xWjQ3fXWDKlSvlb7nyihOjX/5Y 6tBHGg0vJV5pbyKuJ0KUIQ/BizDLuRMzidM/l5EcWhes7HtBZKsljYXGD7oOEyLwW3B24L 0d7VFebG9xt76PTPy0B6TGKtJTNkCHtorkdrGPYDKkFLtxR30++TwslQp4kyF++YKKGlTq xjyHoBRSLfm+7CrkOid1XTmhrdvtNH11XEpNlLEQ1SQ/q7f2F+czD/9XUNJ9k1zNMiMj/6 R96Znk1Dis244c08Dbbhrb3QpgB2aFjiNH8hKQOvCIQC+Tq8A/rIKlqOvsV3jg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698216235; a=rsa-sha256; cv=none; b=Rzyr8gjMCfsBrSdjdDFkGMhnQAo4IyxvNiHNHvTcOC6+h37Buwz9i+30ZoJpncwjkfHK5p FNBw7Z+u59DyXX2u7lR9JUkl7omBnHudMhXy5YCmcp1poLlAfvGwGLDXC2trEH0igZUzh7 5KieUtdQ5xBcCzL6aH6w+CHk6pKZ0aNSDTZwwxOGOngSVn9NnLUPCIHRLhmJsKhYRatwMq J9bMfDLmpHxHH17E5lcsfcfwTo8hIECwUfuuDAUF3I2ImPImW0HdyniuPbtFxNKKRagAmx HGKc59EhSAd9qiL3cJPSKBa8vcYnphuIL2O9CHkdEiQZrBiK9TUXrxEURAZ2MQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698216235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YNNgzlESfSzPp45NNjkwFMcDHCZg53tcp15y6Uc2jco=; b=hoV2FFAJ1QHqhcrrG3vdc2I5cq5iX0p1msuQ0S4ncCyuneen1DJbWHI5efEnKgW++e4iKw 24b17WEmOAvh/gKAoxs1OzpIBsYK4OXfRluMm7n0kXpfx67xeKvPO/qEi7Dkcmcm2B5Rvi pBj9jmjDBecXY/Lr+QDtjyXTTiCyYHkpeWVc2TJtr1YpbXCa4pIskmd0yxkiCNBiu/Vt0C V58g3wwGjQHijDc+yKQyYnju/Ml+VsRrjMhuFVfTiB5EmeuzZP3Lz8WAJclC3tHkTgYpKM UdYPGP/XCZdtWtDhf1S/JCBqy/Ifj3xI2SXcjIrwI6zeiLX4CSMfFN9ddCtmBA== 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 4SFfXW3DnDztZf; Wed, 25 Oct 2023 06:43:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39P6htPY005465; Wed, 25 Oct 2023 06:43:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39P6htrw005462; Wed, 25 Oct 2023 06:43:55 GMT (envelope-from git) Date: Wed, 25 Oct 2023 06:43:55 GMT Message-Id: <202310250643.39P6htrw005462@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: d1191b769e7f - main - java/openjdk17: fix build on powerpc64* List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org 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: d1191b769e7f39f0d9d67102a035454a9a486c87 Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=d1191b769e7f39f0d9d67102a035454a9a486c87 commit d1191b769e7f39f0d9d67102a035454a9a486c87 Author: Piotr Kubaj AuthorDate: 2023-10-25 06:31:21 +0000 Commit: Piotr Kubaj CommitDate: 2023-10-25 06:43:52 +0000 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)); ~~~~~~~~~~~~~~^ --- ...atch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) 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;