From 67254a97d98f73a35ab995e8afccb3ded433c8b1 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 8 Sep 2004 06:31:04 +0000 Subject: Update. * malloc/malloc.h: Don't define __THROW if it is already defined. --- nptl/ChangeLog | 17 +++++++++++++++++ nptl/sysdeps/unix/sysv/linux/alpha/pthread_once.c | 4 ++-- nptl/sysdeps/unix/sysv/linux/ia64/pthread_once.c | 4 ++-- nptl/sysdeps/unix/sysv/linux/powerpc/pthread_once.c | 4 ++-- nptl/sysdeps/unix/sysv/linux/sparc/pthread_once.c | 4 ++-- 5 files changed, 25 insertions(+), 8 deletions(-) (limited to 'nptl') diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 0530809..6857273 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,5 +1,22 @@ 2004-09-07 Ulrich Drepper + * sysdeps/unix/sysv/linux/alpha/pthread_once.c (__pthread_once): + Use atomic_increment instead of atomic_exchange_and_add. + * sysdeps/unix/sysv/linux/sparc/pthread_once.c (__pthread_once): + Likewise. + * sysdeps/unix/sysv/linux/ia64/pthread_once.c (__pthread_once): + Likewise. + * sysdeps/unix/sysv/linux/powerpc/pthread_once.c (__pthread_once): + Likewise. + + * allocatestack.c (allocate_stack): Use atomic_increment_val + instead of atomic_exchange_and_add. + * sysdeps/unix/sysv/linux/sem_post.c (__new_sem_post): Likewise. + * sysdeps/unix/sysv/linux/powerpc/sem_post.c (__new_sem_post): + Likewise. + * sysdeps/pthread/pthread_barrier_wait.c (pthread_barrier_wait): + Likewise. + * sysdeps/pthread/pthread.h (pthread_once): Remove __THROW since the initialization function might throw. diff --git a/nptl/sysdeps/unix/sysv/linux/alpha/pthread_once.c b/nptl/sysdeps/unix/sysv/linux/alpha/pthread_once.c index 82f72de..79a3c47 100644 --- a/nptl/sysdeps/unix/sysv/linux/alpha/pthread_once.c +++ b/nptl/sysdeps/unix/sysv/linux/alpha/pthread_once.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2003 Free Software Foundation, Inc. +/* Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -85,7 +85,7 @@ __pthread_once (pthread_once_t *once_control, void (*init_routine) (void)) pthread_cleanup_pop (0); /* Add one to *once_control to take the bottom 2 bits from 01 to 10. */ - atomic_exchange_and_add (once_control, 1); + atomic_increment (once_control); /* Wake up all other threads. */ lll_futex_wake (once_control, INT_MAX); diff --git a/nptl/sysdeps/unix/sysv/linux/ia64/pthread_once.c b/nptl/sysdeps/unix/sysv/linux/ia64/pthread_once.c index 16f1279..3b07cc1 100644 --- a/nptl/sysdeps/unix/sysv/linux/ia64/pthread_once.c +++ b/nptl/sysdeps/unix/sysv/linux/ia64/pthread_once.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2003 Free Software Foundation, Inc. +/* Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek , 2003. @@ -81,7 +81,7 @@ __pthread_once (once_control, init_routine) /* Add one to *once_control. */ - atomic_exchange_and_add (once_control, 1); + atomic_increment (once_control); /* Wake up all other threads. */ lll_futex_wake (once_control, INT_MAX); diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/pthread_once.c b/nptl/sysdeps/unix/sysv/linux/powerpc/pthread_once.c index ea46cc9..e1afff8 100644 --- a/nptl/sysdeps/unix/sysv/linux/powerpc/pthread_once.c +++ b/nptl/sysdeps/unix/sysv/linux/powerpc/pthread_once.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2003 Free Software Foundation, Inc. +/* Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Paul Mackerras , 2003. @@ -89,7 +89,7 @@ __pthread_once (pthread_once_t *once_control, void (*init_routine) (void)) /* Add one to *once_control to take the bottom 2 bits from 01 to 10. */ - atomic_exchange_and_add (once_control, 1); + atomic_increment (once_control); /* Wake up all other threads. */ lll_futex_wake (once_control, INT_MAX); diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/pthread_once.c b/nptl/sysdeps/unix/sysv/linux/sparc/pthread_once.c index 16f1279..3b07cc1 100644 --- a/nptl/sysdeps/unix/sysv/linux/sparc/pthread_once.c +++ b/nptl/sysdeps/unix/sysv/linux/sparc/pthread_once.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2003 Free Software Foundation, Inc. +/* Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek , 2003. @@ -81,7 +81,7 @@ __pthread_once (once_control, init_routine) /* Add one to *once_control. */ - atomic_exchange_and_add (once_control, 1); + atomic_increment (once_control); /* Wake up all other threads. */ lll_futex_wake (once_control, INT_MAX); -- cgit v1.1