From nobody Sun Feb 20 17:03:43 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 2136819E94B0; Sun, 20 Feb 2022 17:03:44 +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 4K1sG748dsz3sg1; Sun, 20 Feb 2022 17:03:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645376623; 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=th8vO6+mjPTW0P86LHPSDtqEwQFC2LV67g9RynbpTxw=; b=Nm4jMLD7gox3nGho2ITG9WklRhXhFjCM2CQdkAdQpfEeYX6Bf41o3l5LQznIHuVigrczp7 0ah1Rk5k4LQyj+9uMrs1d8m/KHcYal8aPqU1mgzdY4InX63k9zTcoM+7syvMouGn+FrfWo mrUdgIhoae8WICfyLi6MqVvWEeLnmEtImoW15X8dqR317tElEwCOBAyptsVGLb4y6jUtU/ d8dvKnsdWTvcp8frG/ewVf8f+A9LyO0POGAUA4RW/Kl4/dywwJFQY5UnwUbcFXNbxbcKMn oHy1jbl/dEuKNT9k/QhApsEj0Ac1dVs3ukl7rRxJXjskZZRbabRrUI0zoZG17w== 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 58C9420591; Sun, 20 Feb 2022 17:03:43 +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 21KH3hgg027045; Sun, 20 Feb 2022 17:03:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21KH3hQc027044; Sun, 20 Feb 2022 17:03:43 GMT (envelope-from git) Date: Sun, 20 Feb 2022 17:03:43 GMT Message-Id: <202202201703.21KH3hQc027044@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: bd75df196d7e - stable/12 - Change the return value of _Unwind_GetCFA in include/unwind.h. 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/12 X-Git-Reftype: branch X-Git-Commit: bd75df196d7e34a6d5e92185cc8c6dbe4f24a222 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645376623; 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=th8vO6+mjPTW0P86LHPSDtqEwQFC2LV67g9RynbpTxw=; b=mtPSwJkVAESDwl2M8Ln84wq1TCuOcOkVPa1pV3k2Sa5Ppt2sx/xKSRIYIlwIewbmsSoWoh IEsCUG4qQfDw+RfgaWThogmr5UKazne2qEHlB7MMlC+jFSxm8+4WwNrzaavDZT8RzIo6vQ aiSEgD1pw3kYznH1iKgtcRIg9Pd+w2Zy4Px8od7Ryn5ZfFn5OGD9VMrw7RsyAp9B08kkBu Ly209aoykdjR9cyrO7kWKkPm9OGeHAqXkeKX5ibuTUfkQ1SMdVwosDTZa4equXJxrN6FKZ b0lTHCEhrRObayd6/c2g1HaU4l+z1bfle9egDe0jap3LpJcoEOTfGNHKWTpecw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645376623; a=rsa-sha256; cv=none; b=OU93tNxWYq+t/gzC20+SH4NOG3MyWl4EtYKo/OKCrysqGmA1pP9BP05h/d4+xj0l9cR1vc 1MPXq/iAtzZ+UssTjg7BnoXZohRuU2SzipqfkAxCd1GE981yheb7SrQd2/3vb4hY5AwBL0 5TJaouqtc/26mYuNk0wz4FNtShQcojlVGBx1BStmmpvrk+cWnSMDenBt0rlbj3bshcMAOg VCYVLw0IDBpxT5Dx2CWyZ29YpvO954/wavCyFCmpYYu/GSk47Fq/2IvlqsYKZNQd8em1yL 6gzBQ38etw1Ce1dMZXRkuqeQO/YTfIfDsMuuGSfrYlJaKsHloqU/44rRMWWdPg== 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=bd75df196d7e34a6d5e92185cc8c6dbe4f24a222 commit bd75df196d7e34a6d5e92185cc8c6dbe4f24a222 Author: John Baldwin AuthorDate: 2022-01-27 22:42:40 +0000 Commit: Dimitry Andric CommitDate: 2022-02-20 12:33:42 +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 *);