From 825b58f3fb04781e559858510fe83a8c4bf28425 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sat, 1 Feb 2020 05:44:55 -0800 Subject: [PATCH] i386-mcount.S: Add _CET_ENDBR to _mcount and __fentry__ Since _mcount and __fentry__ don't use ENTRY, we need to add _CET_ENDBR by hand. Reviewed-by: Adhemerval Zanella --- sysdeps/i386/i386-mcount.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sysdeps/i386/i386-mcount.S b/sysdeps/i386/i386-mcount.S index 9516265bcb..8b60bd20fe 100644 --- a/sysdeps/i386/i386-mcount.S +++ b/sysdeps/i386/i386-mcount.S @@ -30,6 +30,7 @@ .type C_SYMBOL_NAME(_mcount), @function .align ALIGNARG(4) C_LABEL(_mcount) + _CET_ENDBR /* Save the caller-clobbered registers. */ pushl %eax pushl %ecx @@ -58,6 +59,7 @@ weak_alias (_mcount, mcount) .type C_SYMBOL_NAME(__fentry__), @function .align ALIGNARG(4) C_LABEL(__fentry__) + _CET_ENDBR /* Save the caller-clobbered registers. */ pushl %eax pushl %ecx -- 2.11.4.GIT