aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2004-08-11 18:51:13 +0000
committerRoland McGrath <roland@gnu.org>2004-08-11 18:51:13 +0000
commit3cabdafafa0cd42a86a63affd5d4fee2c10cfbf5 (patch)
tree9a9529bacbe91dc310c2ab8ea75758aec2a61be7
parent304815c6b460729e7b62a857394c6a009bcff30e (diff)
downloadglibc-3cabdafafa0cd42a86a63affd5d4fee2c10cfbf5.tar
glibc-3cabdafafa0cd42a86a63affd5d4fee2c10cfbf5.tar.gz
glibc-3cabdafafa0cd42a86a63affd5d4fee2c10cfbf5.tar.bz2
glibc-3cabdafafa0cd42a86a63affd5d4fee2c10cfbf5.zip
* sysdeps/pthread/aio_misc.c (handle_fildes_io): Remove noreturn
attribute. Return NULL instead of calling pthread_exit at the end.
-rw-r--r--ChangeLog5
-rw-r--r--nptl/tst-rwlock14.c6
-rw-r--r--sysdeps/pthread/aio_misc.c6
3 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index dfdcd0cad4..f4b74e35e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-11 Jakub Jelinek <jakub@redhat.com>
+
+ * sysdeps/pthread/aio_misc.c (handle_fildes_io): Remove noreturn
+ attribute. Return NULL instead of calling pthread_exit at the end.
+
2004-08-11 Roland McGrath <roland@redhat.com>
* iconvdata/testdata/ISO-2022-JP-3: Regenerated.
diff --git a/nptl/tst-rwlock14.c b/nptl/tst-rwlock14.c
index b9611a81f0..fc0d3d219f 100644
--- a/nptl/tst-rwlock14.c
+++ b/nptl/tst-rwlock14.c
@@ -38,12 +38,12 @@ tf (void *arg)
exit (EXIT_FAILURE);
}
- pthread_barrier_wait (&b);
+ pthread_t mt = *(pthread_t *) arg;
- pthread_t *mtp = (pthread_t *) arg;
+ pthread_barrier_wait (&b);
/* This call will never return. */
- pthread_join (*mtp, NULL);
+ pthread_join (mt, NULL);
return NULL;
}
diff --git a/sysdeps/pthread/aio_misc.c b/sysdeps/pthread/aio_misc.c
index 1da3ad2c73..5c9ccb46d0 100644
--- a/sysdeps/pthread/aio_misc.c
+++ b/sysdeps/pthread/aio_misc.c
@@ -1,5 +1,6 @@
/* Handle general operations.
- Copyright (C) 1997,1998,1999,2000,2001,2003 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004
+ Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -470,7 +471,6 @@ __aio_enqueue_request (aiocb_union *aiocbp, int operation)
static void *
-__attribute__ ((noreturn))
handle_fildes_io (void *arg)
{
pthread_t self = pthread_self ();
@@ -676,7 +676,7 @@ handle_fildes_io (void *arg)
}
while (runp != NULL);
- pthread_exit (NULL);
+ return NULL;
}