diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-01-17 10:46:36 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2007-01-17 10:46:36 +0000 |
| commit | a544f6724f8a668e4e2c4e47b5d8b87a47c67db7 (patch) | |
| tree | 98cabfe737e7a0a7a7535e7ee8b3dd204863f167 | |
| parent | af98d46f5a025ae33c60ddb1a5edc753fb714bc5 (diff) | |
| download | glibc-a544f6724f8a668e4e2c4e47b5d8b87a47c67db7.tar.gz | |
Updated to fedora-glibc-20070117T1043cvs/fedora-glibc-2_5_90-15
| -rw-r--r-- | fedora/branch.mk | 4 | ||||
| -rw-r--r-- | nptl/ChangeLog | 3 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S | 15 |
3 files changed, 19 insertions, 3 deletions
diff --git a/fedora/branch.mk b/fedora/branch.mk index 2d72bfd8dd..e4217bc04b 100644 --- a/fedora/branch.mk +++ b/fedora/branch.mk @@ -3,5 +3,5 @@ glibc-branch := fedora glibc-base := HEAD DIST_BRANCH := devel COLLECTION := dist-fc7 -fedora-sync-date := 2007-01-17 08:57 UTC -fedora-sync-tag := fedora-glibc-20070117T0857 +fedora-sync-date := 2007-01-17 10:43 UTC +fedora-sync-tag := fedora-glibc-20070117T1043 diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 425fbf4ba5..842a04f9f0 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,5 +1,8 @@ 2007-01-17 Ulrich Drepper <drepper@redhat.com> + * sysdeps/unix/sysv/linux/x86_64/lowlevellock.S + (__lll_timedwait_tid): Add unwind info. + * sysdeps/unix/sysv/linux/libc_pthread_init.c: Don't just copy the function table, mangle the pointers. * sysdeps/pthread/pthread-functions.h: Define PTHFCT_CALL. diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S index 90f10e6f4f..3783f1ccee 100644 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +/* Copyright (C) 2002-2006, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -269,13 +269,19 @@ __lll_mutex_unlock_wake: .hidden __lll_timedwait_tid .align 16 __lll_timedwait_tid: + cfi_startproc pushq %r12 + cfi_adjust_cfa_offset(8) pushq %r13 + cfi_adjust_cfa_offset(8) + cfi_offset(%r12, -16) + cfi_offset(%r13, -24) movq %rdi, %r12 movq %rsi, %r13 subq $16, %rsp + cfi_adjust_cfa_offset(16) /* Get current time. */ 2: movq %rsp, %rdi @@ -319,14 +325,21 @@ __lll_timedwait_tid: 4: xorl %eax, %eax 8: addq $16, %rsp + cfi_adjust_cfa_offset(-16) popq %r13 + cfi_adjust_cfa_offset(-8) + cfi_restore(%r13) popq %r12 + cfi_adjust_cfa_offset(-8) + cfi_restore(%r12) retq + cfi_adjust_cfa_offset(32) 1: cmpq $-ETIMEDOUT, %rax jne 2b 6: movl $ETIMEDOUT, %eax jmp 8b + cfi_endproc .size __lll_timedwait_tid,.-__lll_timedwait_tid #endif |