From nobody Wed Dec 22 10:05:43 2021 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 84B181905269; Wed, 22 Dec 2021 10:05:47 +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 4JJpqY088bz4YVn; Wed, 22 Dec 2021 10:05:45 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 5B1DB1B263; Wed, 22 Dec 2021 10:05: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 1BMA5hwn091730; Wed, 22 Dec 2021 10:05:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BMA5hws091729; Wed, 22 Dec 2021 10:05:43 GMT (envelope-from git) Date: Wed, 22 Dec 2021 10:05:43 GMT Message-Id: <202112221005.1BMA5hws091729@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: 33b6e6744554 - stable/12 - Reapply r355803 (by mmel): 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: 33b6e67445548c4a5e81fe6d626dbb29c9246042 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640167546; 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=QNToswYYeMmLCBQNEwLmISIwsyuG8LRHU8DcA09z62s=; b=pdRAncuBrAhCgPYMBfUTfFISj4mCYo8hMtd+ayHSFJp/nDGGtb8FHQ+0kxoO0Kno8bHWYY ZGBg6FuUxAQx+3JAViNaVNvhFJQcEtYe5A5PI90mMTgMcl7FPYTte/4KiwBIhWEhLaXGTs jFMvl8DKUh6J8dFVWuotK1zmLFcOd3hyr2JbcCCHB/Hy2Jcp17HIUYkNyXre/8G/QE2oLv ZSBFiX4mo6nYi/EIPHaMrqBD3F2dQffiZmYE16Yqw40DwCBzXOJ2u/lPKYp3WMUQY5UFSB GpSF2QVGoFT/R8nqu4KI9wa9djLW4RJ5Fq43qxwrYxc+nwNnWO/F5M+z6FqG9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640167546; a=rsa-sha256; cv=none; b=m5waLINQmjwx+VPC0jzWGnKP8JCe2RW4KggzwqDVREeguIyhVDEA5ycIvuFrlnb2MLbGjh tmLH2R5DxcZYAkLP1tVacvpyC/xu5aILPYlWL3SzpX97VtHWhMbBIRxAzsQnCQxU4ejK61 zRDenhypPvPER0t0gWzovY3MdtqPQy80XkRl1R+uzNuHcC1So4mggYjhSGsT1nqn8B2m1n So902GjFdJ4k+aS0JNevlJPvXTiDJ4kOuc3mo1GiceVeR1DfXUhiD7HAwfZqt7e4pskvms lbGn5xZd63SV0xzOxZUuKFSJwC+i9FUUVQk0P1+llObkz+nmVeAkkwqVfheYmw== 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=33b6e67445548c4a5e81fe6d626dbb29c9246042 commit 33b6e67445548c4a5e81fe6d626dbb29c9246042 Author: Dimitry Andric AuthorDate: 2020-08-06 19:08:28 +0000 Commit: Dimitry Andric CommitDate: 2021-12-22 09:58:21 +0000 Reapply r355803 (by mmel): Fix LLVM libunwnwind _Unwind_Backtrace symbol version for ARM. In original GNU libgcc, _Unwind_Backtrace is published with GCC_3.3 version for all architectures but ARM. For ARM should be publishes with GCC_4.3.0 version. This was originally omitted in r255095, fixed in r318024 and omitted aging in LLVM libunwind implementation in r354347. For ARM _Unwind_Backtrace should be published as default with GCC_4.3.0 version , (because this is right original version) and again as normal(not-default) with GCC_3.3 version (to maintain ABI compatibility compiled/linked with wrong pre r318024 libgcc) PR: 233664 (cherry picked from commit e8141ad1df2098dd3f6d627c49ce99307315f5fd) --- contrib/llvm-project/libunwind/src/UnwindLevel1-gcc-ext.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/llvm-project/libunwind/src/UnwindLevel1-gcc-ext.c b/contrib/llvm-project/libunwind/src/UnwindLevel1-gcc-ext.c index 30f9cabf241f..ca1a972fc124 100644 --- a/contrib/llvm-project/libunwind/src/UnwindLevel1-gcc-ext.c +++ b/contrib/llvm-project/libunwind/src/UnwindLevel1-gcc-ext.c @@ -181,6 +181,10 @@ _Unwind_Backtrace(_Unwind_Trace_Fn callback, void *ref) { } } } +#ifdef __arm__ +/* Preserve legacy libgcc (pre r318024) ARM ABI mistake */ +__sym_compat(_Unwind_Backtrace, _Unwind_Backtrace, GCC_3.3); +#endif /// Find DWARF unwind info for an address 'pc' in some function.