From nobody Tue May 02 16:27:27 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 4Q9lq51Tmvz497t9; Tue, 2 May 2023 16:27:29 +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 4Q9lq323l8z4PS7; Tue, 2 May 2023 16:27:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683044847; 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=Okix8mqPSLte7TAYYG4YstwJ4m5JqS6QWxSpXusPtIc=; b=Fb7Cc0Ris8bM3hSvbO/AI2Fh1bNLLktxKWcd0a1+AMTJwfzqBFOLS5wY6ryDQJ1tk5Fp53 HduZ2g59d5OeQ6GngfK00JlTSUes/+qfm68tOzvavMr9L4oSNbVM7WTDOPONOpK7BUCyHA OYeL+sBNTt2a5b1qzxfBq3w2hiZYWCZ5ro4hwJwxPftKI6QzZHd70HGa8HtJgCf1ZK+7uf PStCEnn5pL49WOg5jcwrTW/1hNw02kz5ZSUx+EZJAfB/MWrr2dmrPSDfO+Mi8f0nYz4mbv QAwGj6TIlpBRYNf4vgQs4qnP9gFs5ci8zNK8JMI6YHsdq3b3Y8zWHcd0lMv3hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683044847; 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=Okix8mqPSLte7TAYYG4YstwJ4m5JqS6QWxSpXusPtIc=; b=J/mSYiPWAGxGqZqaTr1kdYhNMh7iPQHcnWJR+CzTEBaHHQYkwUawt2o/jbFTP+a2TlnSXT +McHC6s7Knge/D4Iv3FysD5Prv9yeVnXpgL5LtVcJUozB1Cu4dX9pkSmZZI9eB1P0U8vXW H6ROgWcS7qdHeXrl76NNP+GF4bhD0nHI5JGCdbxJzt0Et6D4o80Y6hv361XYiUm8geBOgb rq9Nqq2pQN9WsLSQF4ZJl8IFdIZCfNQukHYHhv8llj4ViNJmoGnOgpXMgfAjP3AoxRF46w tin50hGvf4w2og1DllS6BUJ1ON+ntHLaE6sxZFbck77bSg3xpTOr4RmV5EfkEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683044847; a=rsa-sha256; cv=none; b=MN6jjoubtrxwqxqpa39PBMHEvc8OHwxa6ynz93RTxuSopcT2yu/ljaCLdrDoYZCbPe8YLV 5LefUasLkf03dA9e7l8+upySGjAcyeIqbHRzvpWOg0ViJw+9GIAHNJ01ArB1bgCluwjMbv 6CsZSSlP/OxdwrIH30p/PvHcsjt0uqiF2jTWUdu8/p+C+13ce6AjLJPElK1h+uSquAc+Sh o6zLhDGwKsu3TVrc2iZynqAhwUWjysC2l5UIpraHU/2Q4HHozA/lAvFlGqiBzn1DIa/f2b ZoNg4WbSnI5/cKakHydRWpmqIFeZ6zlmm/wiwurxdMFwx8Nv7UOmpiIL2hdY4A== 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 4Q9lq30tfNzvGR; Tue, 2 May 2023 16:27:27 +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 342GRR4J073778; Tue, 2 May 2023 16:27:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 342GRRBC073777; Tue, 2 May 2023 16:27:27 GMT (envelope-from git) Date: Tue, 2 May 2023 16:27:27 GMT Message-Id: <202305021627.342GRRBC073777@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 0f497b4088a2 - main - devel/libunwind: Fix build on 14-CURRENT on armv6/armv7 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f497b4088a2053bffbdc534bac05f21a9a3f9e7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=0f497b4088a2053bffbdc534bac05f21a9a3f9e7 commit 0f497b4088a2053bffbdc534bac05f21a9a3f9e7 Author: Po-Chuan Hsieh AuthorDate: 2023-05-02 16:17:41 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-05-02 16:17:41 +0000 devel/libunwind: Fix build on 14-CURRENT on armv6/armv7 ptrace/_UPT_access_fpreg.c:107:25: error: no member named 'fpr' in 'struct fpreg' memcpy(&fpreg.fpr[reg], val, sizeof(unw_fpreg_t)); ~~~~~ ^ ptrace/_UPT_access_fpreg.c:123:30: error: no member named 'fpr' in 'struct fpreg' memcpy(val, &fpreg.fpr[reg], sizeof(unw_fpreg_t)); ~~~~~ ^ 2 errors generated. Reported by: Mark Millard Obtained from: https://github.com/libunwind/libunwind/commit/99fb31d5f05ff6c96ca3a9350c792618fab23f2d Reference: https://pkg-status.freebsd.org/beefy8/data/main-armv6-default/pdf5b273c8e36_s83d5725005/logs/libunwind-20211201_2.log https://pkg-status.freebsd.org/ampere2/data/main-armv7-default/p519c178336e5_scb3c414f2f/logs/libunwind-20211201_2.log --- devel/libunwind/files/patch-armv7 | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/devel/libunwind/files/patch-armv7 b/devel/libunwind/files/patch-armv7 new file mode 100644 index 000000000000..e22e4b42fbd4 --- /dev/null +++ b/devel/libunwind/files/patch-armv7 @@ -0,0 +1,29 @@ +Obtained from: https://github.com/libunwind/libunwind/commit/99fb31d5f05ff6c96ca3a9350c792618fab23f2d + +--- src/ptrace/_UPT_access_fpreg.c.orig 2021-11-26 16:58:55 UTC ++++ src/ptrace/_UPT_access_fpreg.c +@@ -104,7 +104,11 @@ _UPT_access_fpreg (unw_addr_space_t as, unw_regnum_t r + #elif defined(__i386__) + memcpy(&fpreg.fpr_acc[reg], val, sizeof(unw_fpreg_t)); + #elif defined(__arm__) ++# if __FreeBSD_version >= 1400079 ++ memcpy(&fpreg.fpr_r[reg], val, sizeof(unw_fpreg_t)); ++# else + memcpy(&fpreg.fpr[reg], val, sizeof(unw_fpreg_t)); ++# endif + #elif defined(__aarch64__) + memcpy(&fpreg.fp_q[reg], val, sizeof(unw_fpreg_t)); + #elif defined(__powerpc64__) +@@ -120,7 +124,11 @@ _UPT_access_fpreg (unw_addr_space_t as, unw_regnum_t r + #elif defined(__i386__) + memcpy(val, &fpreg.fpr_acc[reg], sizeof(unw_fpreg_t)); + #elif defined(__arm__) +- memcpy(val, &fpreg.fpr[reg], sizeof(unw_fpreg_t)); ++# if __FreeBSD_version >= 1400079 ++ memcpy(&fpreg.fpr_r[reg], val, sizeof(unw_fpreg_t)); ++# else ++ memcpy(&fpreg.fpr[reg], val, sizeof(unw_fpreg_t)); ++# endif + #elif defined(__aarch64__) + memcpy(val, &fpreg.fp_q[reg], sizeof(unw_fpreg_t)); + #elif defined(__powerpc64__)