about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/generic/libc-start.c8
2 files changed, 6 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 102e815b4d..dc5c337339 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,13 @@
 2002-09-14  Ulrich Drepper  <drepper@redhat.com>
 
+	* sysdeps/generic/libc-start.c (__libc_start_main): Remove bogus
+	comment.
+
 	* test-skeleton.c (main): Provide more information in case waitpid
 	fails.
 
 	* include/unistd.h: Declare __exit_thread.
-	* sysdeps/generic/libc-start.c: Remove dummy_addr.
+	* sysdeps/generic/libc-start.c (__libc_start_main): Remove dummy_addr.
 	Wrap call to main in setjmp if HAVE_CANCELBUF is defined.
 	* sysdeps/unix/sysv/linux/exit-thread.S: New file.
 	* sysdeps/unix/sysv/linux/_exit.c: New file.
diff --git a/sysdeps/generic/libc-start.c b/sysdeps/generic/libc-start.c
index c619341e56..3c7f2fa639 100644
--- a/sysdeps/generic/libc-start.c
+++ b/sysdeps/generic/libc-start.c
@@ -145,12 +145,8 @@ BP_SYM (__libc_start_main) (int (*main) (int, char **, char **),
     }
 #ifdef HAVE_CANCELBUF
   else
-    {
-      /* XXX We should free the thread-specific data.  */
-
-      /* Not much left to do but to exit the thread, not the process.  */
-      __exit_thread (0);
-    }
+    /* Not much left to do but to exit the thread, not the process.  */
+    __exit_thread (0);
 #endif
 
   exit (result);