Re: [PATCH 13/14] x86/entry/vdso32: Remove conditional omission of '.cfi_offset eflags'

H. Peter Anvin
2026-04-29T03:16:41Z

On April 28, 2026 7:59:19 PM PDT, Nathan Chancellor <nathan@kernel.org> wrote:
>Now that the minimum supported version of LLVM for building the kernel
>has been raised to 17.0.1, the inclusion condition added by
>
> 3e30278e0c71 ("x86/entry/vdso32: Omit '.cfi_offset eflags' for LLVM < 16")
>
>will always be true. Revert the change to clean up the source code.
>
>Signed-off-by: Nathan Chancellor <nathan@kernel.org>
>---
>Cc: Thomas Gleixner <tglx@kernel.org>
>Cc: Ingo Molnar <mingo@redhat.com>
>Cc: Borislav Petkov <bp@alien8.de>
>Cc: Dave Hansen <dave.hansen@linux.intel.com>
>Cc: Peter Zijlstra <peterz@infradead.org>
>Cc: x86@kernel.org
>Cc: H. Peter Anvin <hpa@zytor.com>
>---
> arch/x86/entry/vdso/vdso32/sigreturn.S | 10 ----------
> 1 file changed, 10 deletions(-)
>
>diff --git a/arch/x86/entry/vdso/vdso32/sigreturn.S b/arch/x86/entry/vdso/vdso32/sigreturn.S
>index b33fcc501ba3..328bd3a4ef51 100644
>--- a/arch/x86/entry/vdso/vdso32/sigreturn.S
>+++ b/arch/x86/entry/vdso/vdso32/sigreturn.S
>@@ -22,17 +22,7 @@
> CFI_OFFSET cs, IA32_SIGCONTEXT_cs
> CFI_OFFSET ss, IA32_SIGCONTEXT_ss
> CFI_OFFSET ds, IA32_SIGCONTEXT_ds
>-/*
>- * .cfi_offset eflags requires LLVM 16 or newer:
>- *
>- * https://github.com/llvm/llvm-project/commit/67bd3c58c0c7389e39c5a2f4d3b1a30459ccf5b7
>- *
>- * Check for 16.0.1 to ensure the support is present, as 16.0.0 may be a
>- * prerelease version.
>- */
>-#if defined(CONFIG_AS_IS_GNU) || (defined(CONFIG_AS_IS_LLVM) && CONFIG_AS_VERSION >= 160001)
> CFI_OFFSET eflags, IA32_SIGCONTEXT_flags
>-#endif
> .endm
>
> /*
>

Acked-by: H. Peter Anvin (Intel) <hpa@zytor.com>