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.

diff --git a/ChangeLog b/ChangeLog
index 8a47768..763771e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 2015-08-05  H.J. Lu  <hongjiu.lu@intel.com>
 
        [BZ #18661]
+       * sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
+       (__lll_timedwait_tid): Align stack to 16 bytes when calling
+       __gettimeofday.
+
+2015-08-05  H.J. Lu  <hongjiu.lu@intel.com>
+
+       [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.

diff --git a/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S b/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
index 0935db5..8e1a39d 100644 (file)
--- 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)