From nobody Sun Apr 24 11:17:40 2022 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 AB8931A876D8; Sun, 24 Apr 2022 11:17:40 +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 4KmQbm44RKz4Z4X; Sun, 24 Apr 2022 11:17:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650799060; 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=kbFiQRem4VUQWh2Uzo1t6FJxPJgTgbtr/832Im6KxSs=; b=Efm5MvUT0YzWbt9oCXmyxadDLuzZa+XjMBfZBosFBYrxnH3X88DhGB7H83EPofz6JK7mK0 pdxqml8Q9veWg5377qgPuMW7j6XOd9YeJ4OzbQM9QApwVbIRaDpzLvNFS7f9sJk2YfBkjD A4Lo9nvT7uPyyYvfPRyfNrkcW2mjlbTsmUzjCP5dJXWL7NRHFvXdQ18oNMZdnWBZOCeurv dgfljdm0+/WgIupVrAlafC1hgCi4ESPakuXKKp+lMdOOb2r5H6VLGOu+NvQaCRuwMhoJwe aRcFQP2zYwJTBdoYy8Nm/OIYc1L+Phf9jbonLOtBIrq+VsFibGOHZF4OOSAclA== 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 600D2251F1; Sun, 24 Apr 2022 11:17:40 +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 23OBHeCe034266; Sun, 24 Apr 2022 11:17:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23OBHejk034265; Sun, 24 Apr 2022 11:17:40 GMT (envelope-from git) Date: Sun, 24 Apr 2022 11:17:40 GMT Message-Id: <202204241117.23OBHejk034265@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: f22cc511f320 - 2022Q2 - emulators/rpcs3: unbreak on aarch64 after 66e5089f6d0d 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q2 X-Git-Reftype: branch X-Git-Commit: f22cc511f32018c8342117e6a6bae7bcc98203c8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650799060; 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=kbFiQRem4VUQWh2Uzo1t6FJxPJgTgbtr/832Im6KxSs=; b=V27hgmpsALRBgdfK3SQQ6gmju4dC+S2fSpIaf/j7sBDlcCArij00jW57ZNwixlwd/8zCgG iU85bYTz78UnRKrfriC1TkfC/bsgWuH1b2f4UV/wZzrw4Q5haQgy4VA71jsaCwrIbkJEU2 WUoNk3BjaVWAWsEkNd3kIRrTkfSSuasKkB1V1VgDaH1dgRM9/zTXcl6IrUigsG1hHxvLNZ r04rvNrJIpn49DZi3FFMPAJ6CX4dPZXHiIXMHpNhJFqjtCZJJM1639RuGm1bs2b2VRbthq 1IUjOt1LZ2HWL1AyP5fVPrWeY32zA4OMmfXzvTpE9sghT3g/AJOi/24psCeOnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650799060; a=rsa-sha256; cv=none; b=CQFalYN633RHczSZ1QzuKEY+ti2VI4QrDmRCTQCZ0XhjxmEKeyISNEq0si/CutPxWeDFzV 7fqDFrUj6j646ESuBMMwZdGRpQllUCs3KurUp4g2mIRbKuHdBcYxDmkK3xrNrixrUuXbe1 EYMOA4ixqys7xA6MkTA+CNu5eJXoOI/4EXtWVh/vkpKQQQSw9BPPZU4vSBhreBmGtsEwFs OL4OGh4xUWPx2sfD5SPR6DrlIomzfJWh3O5wizgodI8TIZR9C5/+QbHXm753H9BrGGCk31 Sr5BahV8Se14QLcYpJCeuY2/OWXIvw55V5IoIXPRQOs7vZ3IlmF9EVBM8914IQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=f22cc511f32018c8342117e6a6bae7bcc98203c8 commit f22cc511f32018c8342117e6a6bae7bcc98203c8 Author: Jan Beich AuthorDate: 2022-04-24 10:03:53 +0000 Commit: Jan Beich CommitDate: 2022-04-24 11:17:19 +0000 emulators/rpcs3: unbreak on aarch64 after 66e5089f6d0d Utilities/Thread.cpp:1794:51: error: no member named 'pc' in '__mcontext' const bool is_executing = uptr(info->si_addr) == RIP(context); ^~~~~~~~~~~~ Utilities/Thread.cpp:1795:62: error: no member named 'pc' in '__mcontext' const u32 insn = is_executing ? 0 : *reinterpret_cast(RIP(context)); ^~~~~~~~~~~~ Utilities/Thread.cpp:1831:90: error: no member named 'pc' in '__mcontext' std::string msg = fmt::format("Segfault %s location %p at %p.\n", cause, info->si_addr, RIP(context)); ^~~~~~~~~~~~ Utilities/Thread.cpp:1225:46: note: expanded from macro 'RIP' #define RIP(context) ((context)->uc_mcontext.pc) ~~~~~~~~~~~~~~~~~~~~~~ ^ Reported by: pkg-fallout (cherry picked from commit 30f587d136d4960d7b214bda0046ff166d5fbaf4) --- emulators/rpcs3/Makefile | 3 +++ emulators/rpcs3/distinfo | 2 ++ 2 files changed, 5 insertions(+) diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index a44bf053b1bb..90fa2a22d306 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -4,6 +4,9 @@ DISTVERSION= 0.0.21-13400 # git rev-list --count HEAD DISTVERSIONSUFFIX= -ge53bbd668b CATEGORIES= emulators +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= 41a05f95a057.patch:-p1 # https://github.com/RPCS3/rpcs3/pull/11868 + MAINTAINER= jbeich@FreeBSD.org COMMENT= PS3 emulator/debugger diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo index b7adc4aa4527..e2a7cdd41fd1 100644 --- a/emulators/rpcs3/distinfo +++ b/emulators/rpcs3/distinfo @@ -23,3 +23,5 @@ SHA256 (wolfSSL-wolfssl-v5.2.0-stable-245-gdcaa218ed_GH0.tar.gz) = d5d9d916797dc SIZE (wolfSSL-wolfssl-v5.2.0-stable-245-gdcaa218ed_GH0.tar.gz) = 20570430 SHA256 (llvm-llvm-project-llvmorg-13.0.1-rc1_GH0.tar.gz) = c9411f1882eaf0c190fd5b412deb0bd7dba61a48df243d3408298cc6f53b6921 SIZE (llvm-llvm-project-llvmorg-13.0.1-rc1_GH0.tar.gz) = 147284646 +SHA256 (41a05f95a057.patch) = 9c67561682211462f9a73069dae54f0c955dafeba69021b44c724423ce2788ef +SIZE (41a05f95a057.patch) = 1972