From nobody Sun Jan 2 19:08:21 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 8422E191F866; Sun, 2 Jan 2022 19:08:24 +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 4JRpLZ6Jkdz4YDm; Sun, 2 Jan 2022 19:08:22 +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 1A0BE17529; Sun, 2 Jan 2022 19:08:22 +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 202J8LnU057970; Sun, 2 Jan 2022 19:08:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 202J8Lrl057969; Sun, 2 Jan 2022 19:08:21 GMT (envelope-from git) Date: Sun, 2 Jan 2022 19:08:21 GMT Message-Id: <202201021908.202J8Lrl057969@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 682886d1116f - stable/13 - amd64 sigtramp: comment-out annotations for registers with DWARF number >= 32 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 682886d1116f2b5ad7a6e69d65670cbe8efc6a2f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641150503; 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=vBuSGMe9rWOIlCGg8mhFQaA6dZNpWtmQVldmfv6FQM0=; b=nK2qHNuupFhuGc/pjXfrHHAPdvPRy7TlLQ2sZQXIIqSlDNCUbofLq0IJUK+xfvL5YBNL8G fsTyzXkcl17gsYsXmAUf+PVGeEuYrDlhvbWFFiTcF2trHW4PQVZ1AqkNZAWnT+4kAZE98J PwR7pGu/z1sYCUSd7EYf1uj6FA458fG85TgxTsuHvsPq+KJ+MCV+cDaoiDiajnb08nkkMW L1adZ0d1TgYIufiPJ+KonYdPft2flAva4YA1GlzPZN5nNH8UVRYVpIcbFEIAK8REn6+TG9 QCoxgQHCoGcmYjQbr6qntdZjbF01CXU/X5zVMFfpjcYiktAMqoOSyx8TVcqm3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641150503; a=rsa-sha256; cv=none; b=S9DvU6xOF5z0XPEqwK+v+jcUA0FaaAABEHXvuEmx6b7PlOg5z1X4/KHGhxHYHPcYrR3KvN rknM5/nDRVehWl3YAdiXyS0NssjtwIEqKR5LMz+JUVs6lA9quZRu5ILtU6zAafJjPEh49E 2xZtn2hfFv/KAJAsUtSl00GL7bhiR6NDks5kMiOrL7JzKtSQWokDCceJT5DbEI9gSyVibh wcwiBR8Xc5MQ5dkc240FbavyjWTvDaNZubmX/H6KkjC5audaH8GQ8VwDmI6fOPkM6/N6qP HD4UMlf+vN1krgKddBV6iAky12/w5WdFay/tvTAYzNBbAOCkMGRmjOTLTNKPkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=682886d1116f2b5ad7a6e69d65670cbe8efc6a2f commit 682886d1116f2b5ad7a6e69d65670cbe8efc6a2f Author: Konstantin Belousov AuthorDate: 2022-01-02 18:39:07 +0000 Commit: Konstantin Belousov CommitDate: 2022-01-02 19:03:01 +0000 amd64 sigtramp: comment-out annotations for registers with DWARF number >= 32 (cherry picked from commit 642f77be1d10b57cd7635573aa8a3757913778ad) --- sys/amd64/amd64/sigtramp.S | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/amd64/amd64/sigtramp.S b/sys/amd64/amd64/sigtramp.S index 6c2895a14a0a..f951ee14c2f7 100644 --- a/sys/amd64/amd64/sigtramp.S +++ b/sys/amd64/amd64/sigtramp.S @@ -67,6 +67,9 @@ ENTRY(__vdso_sigcode) * Clang IAS + ld.lld combination cannot handle any of the segment * registers. Also, clang IAS does not know %rflags/%fs.base/%gs.base * registers names, use dwarf registers numbers from psABI directly. + * + * LLVM libunwind from stable/13 cannot parse register numbers higher + * than 32. Disable %rflags, %fs.base, and %gs.base annotations. */ .cfi_offset %fs, SIGF_UC + UC_FS .cfi_offset %gs, SIGF_UC + UC_GS @@ -76,14 +79,14 @@ ENTRY(__vdso_sigcode) .cfi_offset %rip, SIGF_UC + UC_RIP #if 0 .cfi_offset %cs, SIGF_UC + UC_CS -#endif .cfi_offset 49 /* %rflags */, SIGF_UC + UC_RFLAGS +#endif .cfi_offset %rsp, SIGF_UC + UC_RSP #if 0 .cfi_offset %ss, SIGF_UC + UC_SS -#endif .cfi_offset 58 /* %fs.base */, SIGF_UC + UC_FSBASE .cfi_offset 59 /* %gs.base */, SIGF_UC + UC_GSBASE +#endif call *SIGF_HANDLER(%rsp) /* call signal handler */ lea SIGF_UC(%rsp),%rdi /* get ucontext_t */ pushq $0 /* junk to fake return addr. */