From nobody Thu Jan 27 18:55:10 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 279DE19813EF; Thu, 27 Jan 2022 18:55:11 +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 4Jl8sp37HNz4STH; Thu, 27 Jan 2022 18:55:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643309711; 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=CLRNP6iJQ91xr6s3nRjZnRw7HYwrC7qBb0w8mVy4kmQ=; b=xgiG3X/ZokMdun4WCruZUUq3JsFc5aVcRmVuAbTALf6oN20y4c5dqnFLNfeq95qJTUTUV7 VRRhC0hoEnhRKnC7eKZl3Zd+RuEj9r22RyN3yW4z9CM7qjdDXGhlZ2fqkZxbtF94M4q7z9 6gtClJHXhx0/Jg3o2AY/Fp8JKV2HM1IPCe0Vb6y0QD7nG4qmD64Tp91EqLa/XOv2a/Gl1v AuqRzcHbyVrFFFo0dqIPtn0N8lrHd1EQIonUUL+NqJkfzCtRymVE3rqeT4OBzyPZUCDqSd 4rYz1N5A07Se5kz9oN4zWxmDLuzrMKPwJZGxfD+mftJ/TWbKUr7uCSTk1DRicA== 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 288271BCEE; Thu, 27 Jan 2022 18:55:10 +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 20RItAMB002137; Thu, 27 Jan 2022 18:55:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20RItAJS002136; Thu, 27 Jan 2022 18:55:10 GMT (envelope-from git) Date: Thu, 27 Jan 2022 18:55:10 GMT Message-Id: <202201271855.20RItAJS002136@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 3a502289d316 - main - 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a502289d316f726fec24087012fabb06313a2bf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643309710; 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=CLRNP6iJQ91xr6s3nRjZnRw7HYwrC7qBb0w8mVy4kmQ=; b=cN7WoYuNcY8oR54NFDgBMYOQ6v9SHTAdfF3nyxhIopyx2AqSONUaiT4qfRxCVg8wT36suL +WP0a01jLNBpGE3YKcPf2m/+d6U6bt28zQe8klnk313GdSWqHk1p5Jkl1JnkYYovmaj7Zm 8fxTzzGH5MqyKgHMSY5uDmtVlpwoI4v84bYMRieZLFyQSaAhGeqDSyacqL6TWXjfAcFFTD r8HiuwNN6jsxt2PIQncBwIWAikhgsnVdlqdEAZKDZeMpUMmAPfgVYvAstP/NiguDRZDIvA OwjWeUCn3uX+dbrr7ej31WwAjU5/SopVDxcVmtfbOhl56l4eO9kONMvyJD0DWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643309710; a=rsa-sha256; cv=none; b=tIv5wBCZ9WmN1YHLEAvTE8Y+7RfS6Qc3JPLldc9Vvp0QKRNSRp/D6qONXRsodPh1aH3ZgH qmlSIO4QQzH6Wpy0J2kxUz2U07HtQpL3r2oVFB9taBKVX8B2e0K/ibJnMOMjXgLI7AyB00 5sFTEa1n97ZSy0kJBu1jGxqoX1vJZa+Km6MFqUp0l2yulDtHyIVFaIKq+M3po434MKJvnO vWnHcrXMmCDSXInDeK7W2ct5jFnQoPIVUFflwyQo8Qknl6xHnn0a6SemPZW2xKEKGDuUQm iPaNwTR7isK4BgH2TSkAzrC1Z5AcGmhlyp5ZlePGYrwN0PXBuFokk9h3nMFuwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3a502289d316f726fec24087012fabb06313a2bf commit 3a502289d316f726fec24087012fabb06313a2bf Author: John Baldwin AuthorDate: 2022-01-27 18:53:21 +0000 Commit: John Baldwin CommitDate: 2022-01-27 18:53:21 +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 --- 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);