aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2015-07-12 14:38:58 -0700
committerH.J. Lu <hjl.tools@gmail.com>2015-08-05 07:32:49 -0700
commit04d16c095375e902063b3ef356826569ef06543a (patch)
tree63b8d6d5d9d036dbd3b528f016c7f2e8fa4dda70
parent1a17624c2f4bc14fbcea2aa7b0e2a7bb812c1434 (diff)
downloadglibc-04d16c095375e902063b3ef356826569ef06543a.tar
glibc-04d16c095375e902063b3ef356826569ef06543a.tar.gz
glibc-04d16c095375e902063b3ef356826569ef06543a.tar.bz2
glibc-04d16c095375e902063b3ef356826569ef06543a.zip
Align stack to 16 bytes when calling __setcontext
Don't use pop to restore %rdi so that stack is aligned to 16 bytes when calling __setcontext. [BZ #18661] * sysdeps/unix/sysv/linux/x86_64/__start_context.S (__start_context): Don't use pop to restore %rdi so that stack is aligned to 16 bytes when calling __setcontext.
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/__start_context.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/x86_64/__start_context.S b/sysdeps/unix/sysv/linux/x86_64/__start_context.S
index 52a5afa9a6..96366e0536 100644
--- a/sysdeps/unix/sysv/linux/x86_64/__start_context.S
+++ b/sysdeps/unix/sysv/linux/x86_64/__start_context.S
@@ -31,8 +31,8 @@ ENTRY(__start_context)
on the stack pointer for the next context. */
movq %rbx, %rsp
- popq %rdi /* This is the next context. */
- cfi_adjust_cfa_offset(-8)
+ /* Don't use pop here so that stack is aligned to 16 bytes. */
+ movq (%rsp), %rdi /* This is the next context. */
testq %rdi, %rdi
je 2f /* If it is zero exit. */