← Back to branch summary

~ubuntu-branches/ubuntu/precise/eglibc/precise-201308281639

« back to all changes in this revision

Viewing changes to debian/patches/amd64/cvs-pthread-stack-alignment.diff

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2012-02-08 01:58:09 UTC
  • mfrom: (1.5.3) (288.1.12 precise)
  • Revision ID: package-import@ubuntu.com-20120208015809-ulscst7uteq3e22z
Tags: 2.15~pre6-0ubuntu10
Merge from Debian (r5151, 2.13-26).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/amd64/cvs-pthread-stack-alignment.diff
1
 
2011-08-08  Andreas Schwab  <schwab@redhat.com>
2
 
 
3
 
        * sysdeps/unix/sysv/linux/x86_64/cancellation.S: Maintain aligned
4
 
        stack.
5
 
        * sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S: Likewise.
6
 
        * sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S: Likewise.
7
 
 
8
 
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S b/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S
9
 
index 6806962..a06cd9b 100644
10
 
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S
11
 
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S
12
 
@@ -71,7 +71,9 @@ ENTRY(__pthread_enable_asynccancel)
13
 
 
14
 
 1:     ret
15
 
 
16
 
-3:     movq    $TCB_PTHREAD_CANCELED, %fs:RESULT
17
 
+3:     subq    $8, %rsp
18
 
+       cfi_adjust_cfa_offset(8)
19
 
+       movq    $TCB_PTHREAD_CANCELED, %fs:RESULT
20
 
        lock
21
 
        orl     $TCB_EXITING_BITMASK, %fs:CANCELHANDLING
22
 
        movq    %fs:CLEANUP_JMP_BUF, %rdi
23
 
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
24
 
index e6535fb..48ea8b9 100644
25
 
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
26
 
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
27
 
@@ -63,9 +63,9 @@ __pthread_cond_timedwait:
28
 
        cfi_adjust_cfa_offset(8)
29
 
        cfi_rel_offset(%r15, 0)
30
 
 #ifdef __ASSUME_FUTEX_CLOCK_REALTIME
31
 
-# define FRAME_SIZE 32
32
 
+# define FRAME_SIZE (32+8)
33
 
 #else
34
 
-# define FRAME_SIZE 48
35
 
+# define FRAME_SIZE (48+8)
36
 
 #endif
37
 
        subq    $FRAME_SIZE, %rsp
38
 
        cfi_adjust_cfa_offset(FRAME_SIZE)
39
 
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
40
 
index f5b929e..7535baa 100644
41
 
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
42
 
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
43
 
@@ -45,7 +45,7 @@ __pthread_cond_wait:
44
 
        cfi_lsda(DW_EH_PE_udata4, .LexceptSTART)
45
 
 #endif
46
 
 
47
 
-#define FRAME_SIZE 32
48
 
+#define FRAME_SIZE (32+8)
49
 
        leaq    -FRAME_SIZE(%rsp), %rsp
50
 
        cfi_adjust_cfa_offset(FRAME_SIZE)
51