diff options
Diffstat (limited to 'nptl/sysdeps/unix/sysv')
5 files changed, 20 insertions, 14 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S index b80c369a3c..49b4e6d6e0 100644 --- a/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S +++ b/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S @@ -52,7 +52,7 @@ # define LOAD_PRIVATE_FUTEX_WAIT(reg,tmp,tmp2) \ stc gbr, tmp ; \ mov.w 99f, reg ; \ - add reg, tmp ; \ + add reg, tmp ; \ bra 98f ; \ mov.l @tmp, reg ; \ 99: .word PRIVATE_FUTEX - TLS_PRE_TCB_SIZE ; \ @@ -61,7 +61,7 @@ # define LOAD_PRIVATE_FUTEX_WAIT(reg,tmp,tmp2) \ stc gbr, tmp ; \ mov.w 99f, reg ; \ - add reg, tmp ; \ + add reg, tmp ; \ mov.l @tmp, reg ; \ bra 98f ; \ mov #FUTEX_WAIT, tmp ; \ @@ -71,7 +71,7 @@ # define LOAD_PRIVATE_FUTEX_WAKE(reg,tmp,tmp2) \ stc gbr, tmp ; \ mov.w 99f, reg ; \ - add reg, tmp ; \ + add reg, tmp ; \ mov.l @tmp, reg ; \ bra 98f ; \ mov #FUTEX_WAKE, tmp ; \ @@ -81,7 +81,7 @@ # define LOAD_FUTEX_WAIT(reg,tmp,tmp2) \ stc gbr, tmp ; \ mov.w 99f, tmp2 ; \ - add tmp2, tmp ; \ + add tmp2, tmp ; \ mov.l @tmp, tmp2 ; \ bra 98f ; \ mov #FUTEX_PRIVATE_FLAG, tmp ; \ @@ -93,7 +93,7 @@ # define LOAD_FUTEX_WAIT(reg,tmp,tmp2) \ stc gbr, tmp ; \ mov.w 99f, tmp2 ; \ - add tmp2, tmp ; \ + add tmp2, tmp ; \ mov.l @tmp, tmp2 ; \ bra 98f ; \ mov #FUTEX_PRIVATE_FLAG, tmp ; \ @@ -107,7 +107,7 @@ # define LOAD_FUTEX_WAIT_ABS(reg,tmp,tmp2) \ stc gbr, tmp ; \ mov.w 99f, tmp2 ; \ - add tmp2, tmp ; \ + add tmp2, tmp ; \ mov.l @tmp, tmp2 ; \ bra 98f ; \ mov #FUTEX_PRIVATE_FLAG, tmp ; \ @@ -123,7 +123,7 @@ # define LOAD_FUTEX_WAKE(reg,tmp,tmp2) \ stc gbr, tmp ; \ mov.w 99f, tmp2 ; \ - add tmp2, tmp ; \ + add tmp2, tmp ; \ mov.l @tmp, tmp2 ; \ bra 98f ; \ mov #FUTEX_PRIVATE_FLAG, tmp ; \ @@ -253,7 +253,7 @@ __lll_timedlock_wait: mov #2, r6 cmp/eq r6, r2 bf/s 2f - mov r2, r6 + mov r6, r2 1: mov #2, r6 @@ -327,7 +327,7 @@ __lll_timedlock_wait: tst r3, r3 bt 6f - + 1: /* Get current time. */ mov r15, r4 diff --git a/nptl/sysdeps/unix/sysv/linux/timer_create.c b/nptl/sysdeps/unix/sysv/linux/timer_create.c index a07234d7d1..cdf127cb44 100644 --- a/nptl/sysdeps/unix/sysv/linux/timer_create.c +++ b/nptl/sysdeps/unix/sysv/linux/timer_create.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2003,2004, 2007 Free Software Foundation, Inc. +/* Copyright (C) 2003,2004, 2007, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2003. @@ -167,6 +167,7 @@ timer_create (clock_id, evp, timerid) /* Copy the thread parameters the user provided. */ newp->sival = evp->sigev_value; newp->thrfunc = evp->sigev_notify_function; + newp->sigev_notify = SIGEV_THREAD; /* We cannot simply copy the thread attributes since the implementation might keep internal information for diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S index 80fedd4ab1..35eb09cd0c 100644 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2005, 2007 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2005, 2007, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -30,6 +30,7 @@ .type __pthread_rwlock_rdlock,@function .align 16 __pthread_rwlock_rdlock: + cfi_startproc xorq %r10, %r10 /* Get the lock. */ @@ -167,6 +168,7 @@ __pthread_rwlock_rdlock: subq $MUTEX, %rdi #endif jmp 13b + cfi_endproc .size __pthread_rwlock_rdlock,.-__pthread_rwlock_rdlock .globl pthread_rwlock_rdlock diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_unlock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_unlock.S index cf7f607d9c..03391d0fc2 100644 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_unlock.S +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_unlock.S @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2005, 2007 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2005, 2007, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -29,6 +29,7 @@ .type __pthread_rwlock_unlock,@function .align 16 __pthread_rwlock_unlock: + cfi_startproc /* Get the lock. */ movl $1, %esi xorl %eax, %eax @@ -119,7 +120,7 @@ __pthread_rwlock_unlock: #endif callq __lll_unlock_wake jmp 8b - + cfi_endproc .size __pthread_rwlock_unlock,.-__pthread_rwlock_unlock .globl pthread_rwlock_unlock diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S index 209c0e9a94..be6b8d8e20 100644 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2005, 2007 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2005, 2007, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -30,6 +30,7 @@ .type __pthread_rwlock_wrlock,@function .align 16 __pthread_rwlock_wrlock: + cfi_startproc xorq %r10, %r10 /* Get the lock. */ @@ -155,6 +156,7 @@ __pthread_rwlock_wrlock: subq $MUTEX, %rdi #endif jmp 13b + cfi_endproc .size __pthread_rwlock_wrlock,.-__pthread_rwlock_wrlock .globl pthread_rwlock_wrlock |