Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 PTI fixes from Ingo Molnar: "Two fixes: a relatively simple objtool fix that makes Clang built kernels work with ORC debug info, plus an alternatives macro fix" * 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/alternatives: Fixup alternative_call_2 objtool: Add Clang support
This commit is contained in:
commit
93e04d4ad7
@ -218,13 +218,11 @@ static inline int alternatives_text_reserved(void *start, void *end)
|
||||
*/
|
||||
#define alternative_call_2(oldfunc, newfunc1, feature1, newfunc2, feature2, \
|
||||
output, input...) \
|
||||
{ \
|
||||
asm volatile (ALTERNATIVE_2("call %P[old]", "call %P[new1]", feature1,\
|
||||
"call %P[new2]", feature2) \
|
||||
: output, ASM_CALL_CONSTRAINT \
|
||||
: [old] "i" (oldfunc), [new1] "i" (newfunc1), \
|
||||
[new2] "i" (newfunc2), ## input); \
|
||||
}
|
||||
[new2] "i" (newfunc2), ## input)
|
||||
|
||||
/*
|
||||
* use this macro(s) if you need more than one output parameter
|
||||
|
@ -1386,6 +1386,17 @@ static int update_insn_state(struct instruction *insn, struct insn_state *state)
|
||||
state->vals[op->dest.reg].offset = -state->stack_size;
|
||||
}
|
||||
|
||||
else if (op->src.reg == CFI_BP && op->dest.reg == CFI_SP &&
|
||||
cfa->base == CFI_BP) {
|
||||
|
||||
/*
|
||||
* mov %rbp, %rsp
|
||||
*
|
||||
* Restore the original stack pointer (Clang).
|
||||
*/
|
||||
state->stack_size = -state->regs[CFI_BP].offset;
|
||||
}
|
||||
|
||||
else if (op->dest.reg == cfa->base) {
|
||||
|
||||
/* mov %reg, %rsp */
|
||||
|
Loading…
Reference in New Issue
Block a user