The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a35572b16e38420f5f7573b13bfe2c3b07a79d19
commit a35572b16e38420f5f7573b13bfe2c3b07a79d19 Author: John Baldwin <[email protected]> AuthorDate: 2022-09-29 22:06:01 +0000 Commit: John Baldwin <[email protected]> CommitDate: 2022-09-29 22:06:01 +0000 linux32: binutils as requires %eflags instead of %flags for CFI. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D36781 --- sys/amd64/linux32/linux32_locore.asm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/amd64/linux32/linux32_locore.asm b/sys/amd64/linux32/linux32_locore.asm index f4cdc5fc1559..bf1158185a1f 100644 --- a/sys/amd64/linux32/linux32_locore.asm +++ b/sys/amd64/linux32/linux32_locore.asm @@ -24,7 +24,11 @@ ENTRY(linux32_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 @@ -56,7 +60,11 @@ ENTRY(linux32_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
