Merge "Add missing register preserve in x86/x86_64 longjmp."
This commit is contained in:
commit
cc56abbb00
@ -151,9 +151,11 @@ ENTRY(siglongjmp)
|
|||||||
|
|
||||||
PIC_PROLOGUE
|
PIC_PROLOGUE
|
||||||
pushl %eax
|
pushl %eax
|
||||||
|
pushl %ecx
|
||||||
pushl (_JB_SIGFLAG * 4)(%edx)
|
pushl (_JB_SIGFLAG * 4)(%edx)
|
||||||
call PIC_PLT(__bionic_setjmp_cookie_check)
|
call PIC_PLT(__bionic_setjmp_cookie_check)
|
||||||
addl $4,%esp
|
addl $4,%esp
|
||||||
|
popl %ecx
|
||||||
popl %eax
|
popl %eax
|
||||||
PIC_EPILOGUE
|
PIC_EPILOGUE
|
||||||
|
|
||||||
|
@ -159,8 +159,10 @@ ENTRY(siglongjmp)
|
|||||||
|
|
||||||
// Check the cookie.
|
// Check the cookie.
|
||||||
pushq %rax
|
pushq %rax
|
||||||
|
pushq %r11
|
||||||
movq %rcx, %rdi
|
movq %rcx, %rdi
|
||||||
call PIC_PLT(__bionic_setjmp_cookie_check)
|
call PIC_PLT(__bionic_setjmp_cookie_check)
|
||||||
|
popq %r11
|
||||||
popq %rax
|
popq %rax
|
||||||
|
|
||||||
// Return 1 if value is 0.
|
// Return 1 if value is 0.
|
||||||
|
Loading…
Reference in New Issue
Block a user