From nobody Sun Feb 20 12:31:03 2022 X-Original-To: dev-commits-src-branches@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 7A6AA19DB10A; Sun, 20 Feb 2022 12:31:04 +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 4K1lCW6MCkz4p8Z; Sun, 20 Feb 2022 12:31:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645360263; 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=sNrmpuzbUtiPiuJwA1UyIJOQEp3JCpIt6sqSN9DjSkw=; b=QvL90nXd4DDstMfqli316LW69lM3i9lmIVBmdWA7lAet8+Z0q4Tlu/VIb1UoK40CzOf9gW uJZYxjjlXTBl8tqkLB8eJ8XaRr2mJLZZrDsm9JQVVjnt/+S64vefOVNXkusMhn3wmSdFRw CRvgXlYRm6ouvY7MQDTA4phcaMI743+ISZAksUwWlGGvHXykRCCak7aQPucPJpSe4KGBrj OKrmGP9XF2k1TbzGjEyZ3IptBjwFvi6anMQHEVvVUeYjND9Hx5sTDFsr/FJUrFsRjCkD2g JqRvHqL5UBRPpDLU4QbnN+NigLX7cQ+A86jsU0nDFtxe39LxnNWHiMeR5v4EJQ== 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 7FD901CA8E; Sun, 20 Feb 2022 12:31:03 +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 21KCV3rD050816; Sun, 20 Feb 2022 12:31:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21KCV32G050815; Sun, 20 Feb 2022 12:31:03 GMT (envelope-from git) Date: Sun, 20 Feb 2022 12:31:03 GMT Message-Id: <202202201231.21KCV32G050815@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: 3d6285b4dd1c - stable/13 - Use uintptr_t for return type of _Unwind_GetCFA. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 3d6285b4dd1c32e290b0a901aa2bf3581b38eb58 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645360263; 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=sNrmpuzbUtiPiuJwA1UyIJOQEp3JCpIt6sqSN9DjSkw=; b=ngfBwyNjBM2PI3OTPw8hLf2dsZQl6GeCbu4nl2uRdeRrpsdOJoRIrlDecmm83tyeJYlAZW /9UDa4j1el7CJ7jW12vsMQzHI/XIyDErvhsU/IdF+6+xuoEffsDTHiy9s6UrQgreY3Ts2k 1Bk1imOeJDrzyjNVYIESBbiHIIJSMMF+HNBDLxKx0N2isk90idRYWHPT/uCPz6dL6pfgw0 l9N0Xv+SaairnShubYcj6C9CyTaTh/BzZ8/Fj5D4Zsnc/BoTtjioUJ1QyqGaJuq4pKypSW 3N+qhGkKMhy2aBPKhpDTbaGlvTpUXMJfBu026Cg1uCutRDxqgjOM8E/M/4y8jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645360263; a=rsa-sha256; cv=none; b=h6e/kKniAnQXRCmBOIK0PhzqH+G66dr+rq6hlz9OWQEktl6jOdQVcP6n7xHrXZrISTrPv1 viFh8tLnqgYOwtqfnxy7Ia6Tj5CCVoQ2FwO65LWrgEmFCAi9i5IbZTZq3xXQaatuzn7Vjp UkCwtUH901fvgJF4xRGyhh7k01V/+Uvl0f/mzEcRS2SpbIVqLEGMBz47T94f4jZpY/Ywv/ pzZyHEXpf1lxk7e+Z+5lTnAKjvjs7p3F4vQsot0hWMlc6/TpSPrGv/Thpajo+54V2qbT4Z ZqNRf8vnf236RhsoysMB3uPTY/MIASdZQ8jmMViDsME1q4MyOnQOTuN1HxbRaQ== 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=3d6285b4dd1c32e290b0a901aa2bf3581b38eb58 commit 3d6285b4dd1c32e290b0a901aa2bf3581b38eb58 Author: John Baldwin AuthorDate: 2022-01-27 18:53:21 +0000 Commit: Dimitry Andric CommitDate: 2022-02-20 12:29:05 +0000 Use uintptr_t for return type of _Unwind_GetCFA. This matches the type in other unwind headers. Reviewed by: dim, emaste Differential Revision: https://reviews.freebsd.org/D34050 (cherry picked from commit 3a502289d316f726fec24087012fabb06313a2bf) --- lib/libthr/thread/thr_exit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libthr/thread/thr_exit.c b/lib/libthr/thread/thr_exit.c index c1244962f192..b9d81787c3bb 100644 --- a/lib/libthr/thread/thr_exit.c +++ b/lib/libthr/thread/thr_exit.c @@ -67,7 +67,7 @@ static _Unwind_Reason_Code thread_unwind_stop(int version, /* unwind library pointers */ static _Unwind_Reason_Code (*uwl_forcedunwind)(struct _Unwind_Exception *, _Unwind_Stop_Fn, void *); -static unsigned long (*uwl_getcfa)(struct _Unwind_Context *); +static uintptr_t (*uwl_getcfa)(struct _Unwind_Context *); static void thread_uw_init(void) @@ -109,7 +109,7 @@ _Unwind_ForcedUnwind(struct _Unwind_Exception *ex, _Unwind_Stop_Fn stop_func, return (*uwl_forcedunwind)(ex, stop_func, stop_arg); } -unsigned long +uintptr_t _Unwind_GetCFA(struct _Unwind_Context *context) { return (*uwl_getcfa)(context);