From nobody Mon Oct 02 14:02:17 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 4RzjLy1x72z4w6gB; Mon, 2 Oct 2023 14:02:18 +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 4RzjLy1Sf3z3Yhk; Mon, 2 Oct 2023 14:02:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696255338; 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=xggnhERVoHOQg8B95v9tGHEQ7hLIM4U/ELI1VmsdP2c=; b=s52YAZ4zdC66tWlAE8bFSe5Rb1uygZjYSk0nxyvG4yo9l8ekgb78De53oywm9G0Ml5HLHk 4ckpBxh3VOQVe/hHSpCEtE07MuKhARbEmTWRmaqxpBnZo4rwJvDt0WYVSa+2WQSbQSiFJW 6/+bZP3JT8WMOmc/9nKqPiBIH8z+py0ShVtpW8zVmcAQMs4759NW8HlWAaP++tIAHpbyaH y7ONsIq1sCp7oTcryfbk1nVUqMos2/w3K32LF0B1M91wr1eOE+xce8LpkofYKsYwGrLish tba7lwCBW6AJMqbTqP40pQUUvWBRFwzlDWQhwZtKDgfyjqp//I5/ESHauulgTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696255338; a=rsa-sha256; cv=none; b=rtqQsOyYRl0FyAAvxeCsfv+SZrW8sZ53q1+UDMFTCP1ycrToxMPQd2uAATwsTMy1MnOzgH Azol3S7wbug2YerpWvxSe/thLYqmspcoV1qR8p7pmsg33qhBhvcxgq3/dVfkfajoH+xN+e ogaTPdGeO/75L1/7VGOR5m3dx65QAx30YKxfGH9n39kTSpk4alFPyxm7tj57SkHmPKC5qD VZi13wiB4QjSayy5+VmGbToQ0N2nD8WnChzxSaoxKsmOMFwdUOUbp76z53R5e2hPjL5dt8 KTTDzxhRJ/pt1cdFva55vVn1wZo2Xzdpyi5kYL5+GKGT9w+jhE12o3ryHS+JXw== 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=1696255338; 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=xggnhERVoHOQg8B95v9tGHEQ7hLIM4U/ELI1VmsdP2c=; b=mt0DuI4B8V2cGnTEIx54oKR6oJSH/ps8a2Vs7W7l9P5Ma57LqgTkpDvcXNWh54RhtZnUwC q+MFMeS4SeYBsz7aVvaW7EQjoWGy6+NYc5obeN5CXqqePsrRAl7bU+xy5HM0qWfw/xFJHJ w+ICXMvEgCnKnTRvM1BDXR4kV+pPjUFW/cb9Pt0sZ8VOKqRqyk+14BCww4DENfGr/ydtWq DInxWwxEN+/973OWXLvYt+AWlxR1q+sfDFyJe6TYRM2pimIXF4VEp2Q0YHkqvtyGTmqVEA leDOkeaqSkyjtPayPmYJ6RFhnQXNrFjeaSDxCGS6AlVMr2039d/9Ze3yUoFreg== 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 4RzjLy0WFnz1Cv; Mon, 2 Oct 2023 14:02:18 +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 392E2Hpl051006; Mon, 2 Oct 2023 14:02:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 392E2HpD051003; Mon, 2 Oct 2023 14:02:17 GMT (envelope-from git) Date: Mon, 2 Oct 2023 14:02:17 GMT Message-Id: <202310021402.392E2HpD051003@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: 7bcfdc285927 - main - java/openjdk20: 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: 7bcfdc285927ebf11a47b0ba6e424548959ba6ac Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=7bcfdc285927ebf11a47b0ba6e424548959ba6ac commit 7bcfdc285927ebf11a47b0ba6e424548959ba6ac Author: Piotr Kubaj AuthorDate: 2023-10-02 14:00:12 +0000 Commit: Piotr Kubaj CommitDate: 2023-10-02 14:02:15 +0000 java/openjdk20: fix build on powerpc64 --- java/openjdk20/Makefile | 1 + ...tspot_os__cpu_bsd__ppc_javaThread__bsd__ppc.cpp | 28 ++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/java/openjdk20/Makefile b/java/openjdk20/Makefile index 24694c1357d7..00ae6a7f6247 100644 --- a/java/openjdk20/Makefile +++ b/java/openjdk20/Makefile @@ -175,6 +175,7 @@ ICONV_LIBS= ${ICONV_LIB} .endif post-patch: + @${RM} ${WRKSRC}/src/hotspot/os_cpu/bsd_ppc/thread_bsd_ppc.cpp @${FIND} ${WRKSRC} -name '*.orig' -delete @${CHMOD} 755 ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ diff --git a/java/openjdk20/files/patch-src_hotspot_os__cpu_bsd__ppc_javaThread__bsd__ppc.cpp b/java/openjdk20/files/patch-src_hotspot_os__cpu_bsd__ppc_javaThread__bsd__ppc.cpp new file mode 100644 index 000000000000..513f41c41191 --- /dev/null +++ b/java/openjdk20/files/patch-src_hotspot_os__cpu_bsd__ppc_javaThread__bsd__ppc.cpp @@ -0,0 +1,28 @@ +--- src/hotspot/os_cpu/bsd_ppc/javaThread_bsd_ppc.cpp.orig 2023-10-02 13:02:10 UTC ++++ src/hotspot/os_cpu/bsd_ppc/javaThread_bsd_ppc.cpp +@@ -58,14 +58,14 @@ 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; +- address pc = (address)uc->uc_mcontext.regs->nip; ++ address pc = (address)uc->uc_mcontext.mc_srr0; + + if (pc == NULL) { + // ucontext wasn't useful + return false; + } + +- frame ret_frame((intptr_t*)uc->uc_mcontext.regs->gpr[1/*REG_SP*/], pc); ++ frame ret_frame((intptr_t*)uc->uc_mcontext.mc_gpr[1/*REG_SP*/], pc); + + if (ret_frame.fp() == NULL) { + // The found frame does not have a valid frame pointer. +@@ -84,7 +84,7 @@ bool JavaThread::pd_get_top_frame_for_profiling(frame* + if (!Method::is_valid_method(m)) return false; + if (!Metaspace::contains(m->constMethod())) return false; + +- uint64_t reg_bcp = uc->uc_mcontext.regs->gpr[14/*R14_bcp*/]; ++ uint64_t reg_bcp = uc->uc_mcontext.mc_gpr[14/*R14_bcp*/]; + uint64_t istate_bcp = istate->bcp; + uint64_t code_start = (uint64_t)(m->code_base()); + uint64_t code_end = (uint64_t)(m->code_base() + m->code_size());