Skip to content

Commit 31197d3

Browse files
Peter ZijlstraIngo Molnar
authored andcommitted
objtool/x86: Ignore __x86_indirect_alt_* symbols
Because the __x86_indirect_alt* symbols are just that, objtool will try and validate them as regular symbols, instead of the alternative replacements that they are. This goes sideways for FRAME_POINTER=y builds; which generate a fair amount of warnings. Fixes: 9bc0bb5 ("objtool/x86: Rewrite retpoline thunk calls") Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 13311e7 commit 31197d3

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

arch/x86/lib/retpoline.S

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,16 @@ SYM_FUNC_START_NOALIGN(__x86_indirect_alt_call_\reg)
5858
2: .skip 5-(2b-1b), 0x90
5959
SYM_FUNC_END(__x86_indirect_alt_call_\reg)
6060

61+
STACK_FRAME_NON_STANDARD(__x86_indirect_alt_call_\reg)
62+
6163
SYM_FUNC_START_NOALIGN(__x86_indirect_alt_jmp_\reg)
6264
ANNOTATE_RETPOLINE_SAFE
6365
1: jmp *%\reg
6466
2: .skip 5-(2b-1b), 0x90
6567
SYM_FUNC_END(__x86_indirect_alt_jmp_\reg)
6668

69+
STACK_FRAME_NON_STANDARD(__x86_indirect_alt_jmp_\reg)
70+
6771
.endm
6872

6973
/*

0 commit comments

Comments
 (0)