about summary refs log tree commit diff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2015-07-12 14:40:25 -0700
committerH.J. Lu <hjl.tools@gmail.com>2015-08-03 14:32:47 -0700
commit1c8f0fb6a4ebef1080e254753e6a4e6c07a66a4f (patch)
tree63c32a7a3e3d15974a32d1304c0b7a3022b97bc5
parent08094d48c130d3ae6182296ef3c9561ca1066b39 (diff)
downloadglibc-1c8f0fb6a4ebef1080e254753e6a4e6c07a66a4f.tar.gz
glibc-1c8f0fb6a4ebef1080e254753e6a4e6c07a66a4f.tar.xz
glibc-1c8f0fb6a4ebef1080e254753e6a4e6c07a66a4f.zip
Align stack to 16 bytes when calling __gettimeofday
Subtract stack by 24 bytes instead of 16 bytes so that stack is aligned
to 16 bytes when calling __gettimeofday.

	[BZ #18661]
	* sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
	(__lll_timedwait_tid): Align stack to 16 bytes when calling
	__gettimeofday.
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/lowlevellock.S9
1 files changed, 5 insertions, 4 deletions
diff --git a/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S b/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
index 0935db5ba4..8e1a39dafb 100644
--- a/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
+++ b/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
@@ -394,8 +394,9 @@ __lll_timedwait_tid:
 	movq	%rdi, %r12
 	movq	%rsi, %r13
 
-	subq	$16, %rsp
-	cfi_adjust_cfa_offset(16)
+	/* Align stack to 16 bytes when calling __gettimeofday.  */
+	subq	$24, %rsp
+	cfi_adjust_cfa_offset(24)
 
 	/* Get current time.  */
 2:	movq	%rsp, %rdi
@@ -441,8 +442,8 @@ __lll_timedwait_tid:
 	jne	1f
 4:	xorl	%eax, %eax
 
-8:	addq	$16, %rsp
-	cfi_adjust_cfa_offset(-16)
+8:	addq	$24, %rsp
+	cfi_adjust_cfa_offset(-24)
 	popq	%r13
 	cfi_adjust_cfa_offset(-8)
 	cfi_restore(%r13)