From 20125b23ff1532a61775c32e28bd78d9a8835737 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Thu, 29 Sep 2022 15:06:01 -0700 Subject: [PATCH] linux32: binutils as requires %eflags instead of %flags for CFI. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D36781 (cherry picked from commit a35572b16e38420f5f7573b13bfe2c3b07a79d19) --- 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 f4cdc5fc155..bf1158185a1 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 -- 2.45.0