From nobody Mon Sep 28 01:04:51 2026 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 4htNPw1yRbz6tbD5 for ; Mon, 28 Sep 2026 01:04:52 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4htNPw0Wgdz4pm5 for ; Mon, 28 Sep 2026 01:04:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790557492; 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=Jp4FWigXtCtUqijDJkYQIEQol11PI94L306wyDarpCU=; b=Mbk5MZgLw6hdvy8HAIWCRyGQ5XaCiFL1evSib7N2ctpJ9rahTzsjiqWYOgDLwbf4wm1UUS S3La2O9qBuY4InTtfEWiKy9bdBMwSm1KLqpfwB4uLlvJhuaS/vnJC/66JWBBmdKL5gs78C J3wP3vQiwLEREicgcbJ5HSbr9IHFQHx/C5tC25N3HNuzrm7Hox9kxxfYfj380wTe8wewHs ntZ8KMAvyRH0oAxatpXgNq4M393XIy4jufpldcywJoi6H9AeyU6Bt4J0EnIlrOGZDQ9ugV MuPxBkyHjx3ib6mavKDP97wuJ/PIwHsewCmv25CdwtiiHb+jzmebaScKO9dfUg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790557492; b=hBISPy66EUCtvqq8rgKaDoponwIEwv9am5a8eHoQW8wEprzvM9Wtssx1wAq2tPO7Q8TSn+ w94aAhzlhfDJIIZxs22MCF63ZFCCndsCqEhnFLZ7EpBNS313KvAB+kntCSDyVKDcfP+bD/ 1FEVh2yFDP1IVnivDjsJ5KlOr91ioz8pEElK1EZSNZUOq35LAjluneRUFFTTAmLmhdI+hO OXoMsBLQVO5ZLSWnKKZyToXw9sBudE94QaJHHWu9uBq3mX7QSTXFNK2Zjlv0PVisQGJ0XK WBtf0Rm5yvlw2mhGp+6Q+T9p5HKr3vCpfvjNVSgVPoCzbDX6zWkMSWYBRYHLvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790557492; 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=Jp4FWigXtCtUqijDJkYQIEQol11PI94L306wyDarpCU=; b=I3p3YV9RVi1BQBo3HxlrF6wWfgp3uxMOfEYODJGEwqUQGxD6pg7uH0P/SLjEpx5jg/4gOw PkknoneCYc5eJy6A1N+OAVXFFFpANHB78SIoIihH4GVKL6iYgXQlNKZK4fDdUQee04CP3F udFLnVMx5xkCJXlSBilvry0H0PJ+GLIlV2zsg7Qme0nlaLm/NwQi5QDzi0NgmckIJwI1Mx NeWcbbIj6gk3XMyofG8OgOi4XOFpMB7Z+WkCLgS2G/jM7HSzYDDNjllYOezQMNoyay+DUy QeW15Blxqj7DPH8vwJhEn59HiUEkAt5jyF8tahNGzQ8va7KAcIz5I1zCU808Ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4htNPv5yZDz14Yy for ; Mon, 28 Sep 2026 01:04:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d422 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 28 Sep 2026 01:04:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 9d436d9f2a22 - stable/15 - amd64/*sigtramp.S: re-enable some cfi annotations for special registers 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/15 X-Git-Reftype: branch X-Git-Commit: 9d436d9f2a22bd0c39d0c47577dce1af0a732c57 Auto-Submitted: auto-generated Date: Mon, 28 Sep 2026 01:04:51 +0000 Message-Id: <6ab9bd33.3d422.628f32ff@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9d436d9f2a22bd0c39d0c47577dce1af0a732c57 commit 9d436d9f2a22bd0c39d0c47577dce1af0a732c57 Author: Konstantin Belousov AuthorDate: 2026-09-19 09:46:19 +0000 Commit: Konstantin Belousov CommitDate: 2026-09-28 01:03:26 +0000 amd64/*sigtramp.S: re-enable some cfi annotations for special registers (cherry picked from commit 64a73d1b6dc93d92daea1e2d0603fda1dddadf4a) --- sys/amd64/amd64/sigtramp.S | 44 ++++++++++++++++++++++++++---------------- sys/amd64/ia32/ia32_sigtramp.S | 19 ++++++++++++------ 2 files changed, 40 insertions(+), 23 deletions(-) diff --git a/sys/amd64/amd64/sigtramp.S b/sys/amd64/amd64/sigtramp.S index 9aed66a199a1..13ad8eb1acca 100644 --- a/sys/amd64/amd64/sigtramp.S +++ b/sys/amd64/amd64/sigtramp.S @@ -34,6 +34,25 @@ #include "assym.inc" +/* + * Historical notes. Keep it for now if problems with older versions + * of toolchains reappear. + * + * Gnu as complains about %fs/%gs/%es/%ds registers offsets not being + * multiple of 8, but gas + ld.bfd work for %cs/%ss. + * + * 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. + */ +#if !defined(__clang__) || (__clang_major__ >= 17) +#define WORKING_CFI +#endif + + .cfi_sections .eh_frame .text /* * Signal trampoline, mapped as vdso into shared page. @@ -57,33 +76,24 @@ ENTRY(__vdso_sigcode) .cfi_offset %r13, SIGF_UC + UC_R13 .cfi_offset %r14, SIGF_UC + UC_R14 .cfi_offset %r15, SIGF_UC + UC_R15 -#if 0 -/* - * Gnu as complains about %fs/%gs/%es/%ds registers offsets not being - * multiple of 8, but gas + ld.bfd work for %cs/%ss. - * - * 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. - */ +#ifdef WORKING_CFI +#ifdef __clang__ .cfi_offset %fs, SIGF_UC + UC_FS .cfi_offset %gs, SIGF_UC + UC_GS .cfi_offset %es, SIGF_UC + UC_ES .cfi_offset %ds, SIGF_UC + UC_DS +#endif #endif .cfi_offset %rip, SIGF_UC + UC_RIP -#if 0 +#ifdef WORKING_CFI .cfi_offset %cs, SIGF_UC + UC_CS - .cfi_offset 49 /* %rflags */, SIGF_UC + UC_RFLAGS + .cfi_offset %rflags, SIGF_UC + UC_RFLAGS #endif .cfi_offset %rsp, SIGF_UC + UC_RSP -#if 0 +#ifdef WORKING_CFI .cfi_offset %ss, SIGF_UC + UC_SS - .cfi_offset 58 /* %fs.base */, SIGF_UC + UC_FSBASE - .cfi_offset 59 /* %gs.base */, SIGF_UC + UC_GSBASE + .cfi_offset %fs.base, SIGF_UC + UC_FSBASE + .cfi_offset %gs.base, SIGF_UC + UC_GSBASE #endif call *SIGF_HANDLER(%rsp) /* call signal handler */ lea SIGF_UC(%rsp),%rdi /* get ucontext_t */ diff --git a/sys/amd64/ia32/ia32_sigtramp.S b/sys/amd64/ia32/ia32_sigtramp.S index 1a80f78a3234..9f7df4ddd291 100644 --- a/sys/amd64/ia32/ia32_sigtramp.S +++ b/sys/amd64/ia32/ia32_sigtramp.S @@ -34,6 +34,11 @@ #include "ia32_assym.h" +#if !defined(__clang__) || (__clang_major__ >= 17) +#define WORKING_CFI +#endif + + .cfi_sections .eh_frame .text /* * Signal trampoline, mapped as vdso into shared page, or copied to @@ -45,7 +50,7 @@ __vdso_ia32_sigcode: .cfi_startproc .cfi_signal_frame .cfi_def_cfa %esp, 0 -#if 0 +#ifdef WORKING_CFI .cfi_offset %gs, IA32_SIGF_UC + IA32_UC_GS .cfi_offset %fs, IA32_SIGF_UC + IA32_UC_FS .cfi_offset %es, IA32_SIGF_UC + IA32_UC_ES @@ -59,15 +64,17 @@ __vdso_ia32_sigcode: .cfi_offset %ecx, IA32_SIGF_UC + IA32_UC_ECX .cfi_offset %eax, IA32_SIGF_UC + IA32_UC_EAX .cfi_offset %eip, IA32_SIGF_UC + IA32_UC_EIP -#if 0 +#ifdef WORKING_CFI .cfi_offset %cs, IA32_SIGF_UC + IA32_UC_CS - .cfi_offset %flags, IA32_SIGF_UC + IA32_UC_EFLAGS + .cfi_offset %eflags, IA32_SIGF_UC + IA32_UC_EFLAGS #endif .cfi_offset %esp, IA32_SIGF_UC + IA32_UC_ESP -#if 0 +#ifdef WORKING_CFI .cfi_offset %ss, IA32_SIGF_UC + IA32_UC_SS - .cfi_offset 93 /* %fs.base */, IA32_SIGF_UC + IA32_UC_FSBASE - .cfi_offset 94 /* %gs.base */, IA32_SIGF_UC + IA32_UC_GSBASE +#ifdef __clang__ + .cfi_offset %fs.base, IA32_SIGF_UC + IA32_UC_FSBASE + .cfi_offset %gs.base, IA32_SIGF_UC + IA32_UC_GSBASE +#endif #endif calll *IA32_SIGF_HANDLER(%esp) leal IA32_SIGF_UC(%esp),%eax /* get ucontext */