about summary refs log tree commit diff
path: root/linuxthreads
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-01-11 19:25:07 +0000
committerUlrich Drepper <drepper@redhat.com>2001-01-11 19:25:07 +0000
commit3bbddbe4a37ebd5e015fea42065db59966444224 (patch)
tree7d9e9a7f89c1bac0b241980aed9cd7de61d26764 /linuxthreads
parentbeb5387cf656c281f9cc81d6a04f1085fe534c9a (diff)
downloadglibc-3bbddbe4a37ebd5e015fea42065db59966444224.tar.gz
glibc-3bbddbe4a37ebd5e015fea42065db59966444224.tar.xz
glibc-3bbddbe4a37ebd5e015fea42065db59966444224.zip
Update.
2001-01-11  Ulrich Drepper  <drepper@redhat.com>

	* stdlib/Makefile (routines): Add cxa_on_exit.
	* stdlib/Versions [libc] (GLIBC_2.2.1): Add __cxa_on_exit.
	* stdlib/cxa_on_exit.c: New file.
	* include/stdlib.h: Add prototype for __cxa_on_exit.
	* stdlib/exit.c: Handle ef_cxa2.
	* stdlib/exit.h (enum): Add ef_cxa2.
	(struct exit_function): Add cxa2.

	* Versions.def [ld]: Add GLIBC_2.2.1.
Diffstat (limited to 'linuxthreads')
-rw-r--r--linuxthreads/Examples/ex15.c56
-rw-r--r--linuxthreads/Makefile4
-rw-r--r--linuxthreads/pthread.c6
3 files changed, 60 insertions, 6 deletions
diff --git a/linuxthreads/Examples/ex15.c b/linuxthreads/Examples/ex15.c
new file mode 100644
index 0000000000..f73b940949
--- /dev/null
+++ b/linuxthreads/Examples/ex15.c
@@ -0,0 +1,56 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <pthread.h>
+#include <unistd.h>
+
+static void *
+worker (void *dummy)
+{
+  exit (26);
+}
+
+#define TEST_FUNCTION do_test ()
+#define TIMEOUT 10
+static int
+do_test (void)
+{
+  pthread_t th;
+  pid_t pid;
+  int status;
+
+  switch ((pid = fork ()))
+    {
+    case -1:
+      puts ("Could not fork");
+      exit (1);
+    case 0:
+      if (pthread_create(&th, NULL, worker, NULL) != 0)
+	{
+	  puts ("Failed to start thread");
+	  exit (1);
+	}
+      for (;;);
+      exit (1);
+    default:
+      break;
+    }
+
+  if (waitpid (pid, &status, 0) != pid)
+    {
+      puts ("waitpid failed");
+      exit (1);
+    }
+
+  if (!WIFEXITED (status) || WEXITSTATUS (status) != 26)
+    {
+      printf ("Wrong exit code %d\n", status);
+      exit (1);
+    }
+
+  puts ("All OK");
+  return 0;
+}
+
+#include "../../test-skeleton.c"
diff --git a/linuxthreads/Makefile b/linuxthreads/Makefile
index ea8a82cfde..ce7c5dd437 100644
--- a/linuxthreads/Makefile
+++ b/linuxthreads/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+# Copyright (C) 1996,1997,1998,1999,2000,2001 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
@@ -46,7 +46,7 @@ include ../Makeconfig
 
 librt-tests = ex10 ex11
 tests = ex1 ex2 ex3 ex4 ex5 ex6 ex7 ex8 ex9 $(librt-tests) ex12 ex13 joinrace \
-	tststack $(tests-nodelete-$(have-z-nodelete)) ecmutex ex14
+	tststack $(tests-nodelete-$(have-z-nodelete)) ecmutex ex14 ex15
 
 ifeq (yes,$(build-shared))
 tests-nodelete-yes = unload
diff --git a/linuxthreads/pthread.c b/linuxthreads/pthread.c
index 836d8a81e1..8221787a30 100644
--- a/linuxthreads/pthread.c
+++ b/linuxthreads/pthread.c
@@ -435,10 +435,8 @@ static void pthread_initialize(void)
   /* Do it early so that user-registered atexit functions are called
      before pthread_exit_process. */
   if (__builtin_expect (&__dso_handle != NULL, 1))
-    /* The cast is a bit unclean.  The function expects two arguments but
-       we can only pass one.  Fortunately this is not a problem since the
-       second argument of `pthread_exit_process' is simply ignored.  */
-    __cxa_atexit((void (*) (void *)) pthread_exit_process, NULL, __dso_handle);
+    __cxa_on_exit((void (*) (void *)) pthread_exit_process, NULL,
+		  __dso_handle);
   else
     __on_exit (pthread_exit_process, NULL);
   /* How many processors.  */