commit cc56abbb007e090b830f510df6cb300ae12e1a89
author Josh Gao <jmgao@google.com> Wed Oct 07 21:17:47 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 07 21:17:47 2015 +0000
tree 590b3e23fff1bb613f51c1dbf05c4b876c5dbbb6
parent f96049062f04a922fda937aecc562517101a38cc
parent 8dbf02d76a245c102e11442305dd5393c4051dbb

Merge "Add missing register preserve in x86/x86_64 longjmp."

libc/arch-x86/bionic/setjmp.S

diff --git a/libc/arch-x86/bionic/setjmp.S b/libc/arch-x86/bionic/setjmp.S
index 8a2f30c..86e6e3c 100644
--- a/libc/arch-x86/bionic/setjmp.S
+++ b/libc/arch-x86/bionic/setjmp.S
@@ -151,9 +151,11 @@
 
   PIC_PROLOGUE
   pushl %eax
+  pushl %ecx
   pushl (_JB_SIGFLAG * 4)(%edx)
   call PIC_PLT(__bionic_setjmp_cookie_check)
   addl $4,%esp
+  popl %ecx
   popl %eax
   PIC_EPILOGUE
 

libc/arch-x86_64/bionic/setjmp.S

diff --git a/libc/arch-x86_64/bionic/setjmp.S b/libc/arch-x86_64/bionic/setjmp.S
index 09d61f5..56ebb07 100644
--- a/libc/arch-x86_64/bionic/setjmp.S
+++ b/libc/arch-x86_64/bionic/setjmp.S
@@ -159,8 +159,10 @@
 
   // Check the cookie.
   pushq %rax
+  pushq %r11
   movq %rcx, %rdi
   call PIC_PLT(__bionic_setjmp_cookie_check)
+  popq %r11
   popq %rax
 
   // Return 1 if value is 0.