]> git.ipfire.org Git - ipfire-2.x.git/blame - src/patches/glibc/glibc-rh731042.patch
dhcpcd: fix delay after dhcp down.
[ipfire-2.x.git] / src / patches / glibc / glibc-rh731042.patch
CommitLineData
12788f63
MT
12011-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
8Index: glibc-2.12-2-gc4ccff1/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S
9===================================================================
10--- glibc-2.12-2-gc4ccff1.orig/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S
11+++ glibc-2.12-2-gc4ccff1/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
23Index: glibc-2.12-2-gc4ccff1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
24===================================================================
25--- glibc-2.12-2-gc4ccff1.orig/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
26+++ glibc-2.12-2-gc4ccff1/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)
39Index: glibc-2.12-2-gc4ccff1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
40===================================================================
41--- glibc-2.12-2-gc4ccff1.orig/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
42+++ glibc-2.12-2-gc4ccff1/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