From nobody Sun Feb 20 12:31:04 2022 X-Original-To: dev-commits-src-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 8C51619DAE6C; Sun, 20 Feb 2022 12:31:05 +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 4K1lCY1663z4p8k; Sun, 20 Feb 2022 12:31:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645360265; 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=VI5McbqJC4U2d6hwKJsIwC0Q7j/d+Rhpl+7NhKIHQiE=; b=OqepUkuIYvEPLDh4F3QbJUVJsaFBZaGakDOwJnORU8ZFYXzTxsBJQk59yJkNa1bB0FoDH3 Ry5AgWZh0aWIjHwwACzvOhOA2ZqM5y0iJLSbNjip72YSGmkA6x9OtgWfPOo+2e0HvqsXuD BQRdbOM9kiSSL7rSgrVldTBVD9NACmYVazZgQOPg74MttbM2VzC0LnEuc0J6AyUwdYi83W IJhP2FNyKXdFQqykSsvz0L+K0/AhamrhWuwfT+ZzLK9JaaX2KjCPC46boq5DyL9far2KxY CVtSYLTTrqSos1fMI7zYM+J2vNneCArjwfoWUURwcoXNZ2BB240Po6u0UJ9U+w== 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 A681F1CA1F; Sun, 20 Feb 2022 12:31:04 +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 21KCV42e050840; Sun, 20 Feb 2022 12:31:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21KCV4PW050839; Sun, 20 Feb 2022 12:31:04 GMT (envelope-from git) Date: Sun, 20 Feb 2022 12:31:04 GMT Message-Id: <202202201231.21KCV4PW050839@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 62d39fb7c099 - stable/13 - Change the return value of _Unwind_GetCFA in include/unwind.h. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 62d39fb7c099821fc6f7c3ab1407d71c829c59a6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645360265; 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=VI5McbqJC4U2d6hwKJsIwC0Q7j/d+Rhpl+7NhKIHQiE=; b=Ec0j0GRDVDPbb/NOHpteN2gukwVpE7UTd+1rDJfH0xg9j1L7gR+5ysnAmCXHih3RtERoOz iY/+VIPR+0xmEhdhRAFgtbRG7NgCv1mNBgTa3tx709VbilD/1dHj8+KTJGUAwBcFabj+3W emznHA2wlh4DokZ0mSDlDPBtx+cIkAJXc1m2MuUZpr/bnb+KiL9OT9zV2Hz2zBNA6wU5kV i2xHpYS9ttwLrkSpLz+jDtbpijC/A+Vz7cQzGqO2rSTWAQSVDUG9QAPS+GATci11Xnbwfd 7GmlrXkcg55HzYmk6e9/5guu04kDLLspICCyA1xC+IfbQGKBNNUQmRrn55MedA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645360265; a=rsa-sha256; cv=none; b=FbdaFXEGd+/Iwi5tu1TiTgQHEyX2yS1K2Y1FbClF+uwSEyRVarDVR2jfGsJKmzLLugpPvU 4x0s7HT/kgYohEBPr5c7gNpXCB66LzXKPvylCNVIedcjvJOlZvvm7J3gUu+pOq2npKkSsu UqiutxpAP4mBkR2BVuFd8/ClnWmBo39/rO+oVvYguF7aNUIpZLa3tkdf44ymFlqPnZvbaM jtEMV3KlYMc2cCV9/mQ7RPsenTNPnnHbNqgmtcpCk7yVaMyeiQkyZjSoH8mIkickTd8hqQ YBFs+kgRsq1Z4N34WpmxFVE2h1E+TJkpE4wGjNpOrSgFTnapKYAYMDJ6ENqpCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=62d39fb7c099821fc6f7c3ab1407d71c829c59a6 commit 62d39fb7c099821fc6f7c3ab1407d71c829c59a6 Author: John Baldwin AuthorDate: 2022-01-27 22:42:40 +0000 Commit: Dimitry Andric CommitDate: 2022-02-20 12:29:09 +0000 Change the return value of _Unwind_GetCFA in include/unwind.h. I tested the original commit as part of a series that culminates in removing this header and installing LLVM libunwind's unwind.h in its place so missed updating this header as was done in b84693501af6. Pointy hat to: jhb Reported by: kevans Fixes: 3a502289d316 Use uintptr_t for return type of _Unwind_GetCFA. (cherry picked from commit 522f5383547a2b3980f097a647b25f12c15411af) --- include/unwind.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/unwind.h b/include/unwind.h index 214fb43730aa..a872c0a094ba 100644 --- a/include/unwind.h +++ b/include/unwind.h @@ -124,7 +124,7 @@ extern unsigned long _Unwind_GetBSP (struct _Unwind_Context *); /* Return the "canonical frame address" for the given context. This is used by NPTL... */ -extern unsigned long _Unwind_GetCFA (struct _Unwind_Context *); +extern uintptr_t _Unwind_GetCFA (struct _Unwind_Context *); /* Return the base-address for data references. */ extern unsigned long _Unwind_GetDataRelBase (struct _Unwind_Context *);