The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=455b78443ee5612557f3f076c6d27c79de9ec1e7
commit 455b78443ee5612557f3f076c6d27c79de9ec1e7 Author: John Baldwin <[email protected]> AuthorDate: 2023-06-30 16:36:16 +0000 Commit: Dmitry Chagin <[email protected]> CommitDate: 2023-08-11 10:08:10 +0000 linux: binutils as requires %eflags instead of %flags for CFI. This applies the changes to linux32_locore.asm from commit a35572b16e38 to the i386 copy. (cherry picked from commit f4de136aa82978107aa98f91ca1928870b7d310a) --- sys/i386/linux/linux_locore.asm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/i386/linux/linux_locore.asm b/sys/i386/linux/linux_locore.asm index 9aef5ad21d26..bebd05686149 100644 --- a/sys/i386/linux/linux_locore.asm +++ b/sys/i386/linux/linux_locore.asm @@ -23,7 +23,11 @@ ENTRY(linux_vdso_sigcode) .cfi_offset %ds, L_SC_DS .cfi_offset %cs, L_SC_CS .cfi_offset %ss, L_SC_SS +#ifdef __clang__ .cfi_offset %flags, L_SC_EFLAGS +#else + .cfi_offset %eflags, L_SC_EFLAGS +#endif .cfi_offset %edi, L_SC_EDI .cfi_offset %esi, L_SC_ESI .cfi_offset %ebp, L_SC_EBP @@ -54,7 +58,11 @@ ENTRY(linux_vdso_rt_sigcode) .cfi_offset %ds, L_SC_DS .cfi_offset %cs, L_SC_CS .cfi_offset %ss, L_SC_SS +#ifdef __clang__ .cfi_offset %flags, L_SC_EFLAGS +#else + .cfi_offset %eflags, L_SC_EFLAGS +#endif .cfi_offset %edi, L_SC_EDI .cfi_offset %esi, L_SC_ESI .cfi_offset %ebp, L_SC_EBP
