From nobody Sun Feb 20 17:03:42 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 948BC19E942A; Sun, 20 Feb 2022 17:03:42 +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 4K1sG63QSqz3sts; Sun, 20 Feb 2022 17:03:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645376622; 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=u/eX3LUIhx5qx6fYZtCwjn+yTS40AliSzdAYFa8/lcM=; b=JzDY/UUuM4AO2uaZnEm6gJLwUANTe+HMJTe/+OWHf/CLDv78BHknpF+haTxzMO+R60sfRy iyy79AOR3u0yDnur9gYQxY8qUJqNuaByojFhEUbaLQEgX5AA8WLb5APf41DsGpd+5qf17d 8cczh+eqbmpAU5e0Wi2/9cuEDKKiPx5hqLbbdfSEBWLB4rOrucGSLgENTg+/suylWIjWFP Fh5Irr7xYHEvIcQKbCTaZz5s5gubRnHBSaimKuErJMltilZcOj1Wqyc9lQf1lMXS3n5W3A VoZ2cD+DvfqqW7eQg2EgPng+Yt9NfQsXR6RyfCABWr5qvFYhU4Y/BLTkEY56gA== 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 4D7C120070; Sun, 20 Feb 2022 17:03:42 +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 21KH3gs5027017; Sun, 20 Feb 2022 17:03:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21KH3g9V027016; Sun, 20 Feb 2022 17:03:42 GMT (envelope-from git) Date: Sun, 20 Feb 2022 17:03:42 GMT Message-Id: <202202201703.21KH3g9V027016@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: 02e86af39834 - stable/12 - Use uintptr_t for return type of _Unwind_GetCFA. 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/12 X-Git-Reftype: branch X-Git-Commit: 02e86af39834529262ae4cc9059370a64b0a0303 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645376622; 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=u/eX3LUIhx5qx6fYZtCwjn+yTS40AliSzdAYFa8/lcM=; b=hfeCUOXMHz3mE6E3E6R0PnCdDh31ONLZ4942rP7PpKiJRi8aJBBhtdmjx7GAlOBAdSbTLi /kTgFYGNWKDzW5bGZha4BkaOfVDQCkyr6ADU3uNvaxyZIRxy5XaT6C3A935/CZaOn4lTUz D7Z8gdchtqx5KLyMoBnSCGFGWGKi2d1CcvFstfbCPTVyqJR9m9VEHpjr3ttW6j6VVFIqXr X6H3YaRxyRCPJNRzLuBpuMZMRbo1KqG2Ekat6ye5taZVNNkI66Qyx7V0j1EAjxFoL87qZe CUceFY5EctqwPw5zvD7MMsss7C7wf2huCsvIjcuyuRzhNskj3PY8FpnBN/px/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645376622; a=rsa-sha256; cv=none; b=fuu2vIpDYZ5BPxz0ouFsZHpmz+sEh18l4OQ0RAppuGUxxKoiLVBnqMDhoQDg/uR1MH06cz XEZT4oVIB6r144UIH0/r3WOw5cRKxAx8PYQXFwGMmB/kDXCY+ThuTra6aFgG2gQN9KJUp6 aF4idHnm/7IaLCuQbAkurgnTV2zvyHwoAW8gwtRgqFuHK/K2S744ONo8Od3I7j2mZblynY WtIwEZbAYHhC1cZATFnNXROdJkL+mprowa7ZWNO8UvHGYBv7zQvX0USJaXuZYTd2MpF7qg FhgJyoGiaRxxgkAAM84GJxfw+yCLBnuq5TD2rhXwyTAFOAhwk61zPtvZiHBhyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=02e86af39834529262ae4cc9059370a64b0a0303 commit 02e86af39834529262ae4cc9059370a64b0a0303 Author: John Baldwin AuthorDate: 2022-01-27 18:53:21 +0000 Commit: Dimitry Andric CommitDate: 2022-02-20 12:33:41 +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);