From: Ulrich Drepper <drepper@redhat.com>
Date: Thu, 27 Mar 2003 21:14:41 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc-2_3_3~1040
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=18d009ca00eea5127f162b3179a529516a8445d2;p=thirdparty%2Fglibc.git

Update.

	* pthread_create.c (start_thread): Don't use setjmp inside
	__builtin_expect to work around gcc bug.
---

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index fb404d938f6..9490f86776b 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,8 @@
 2003-03-27  Ulrich Drepper  <drepper@redhat.com>
 
+	* pthread_create.c (start_thread): Don't use setjmp inside
+	__builtin_expect to work around gcc bug.
+
 	* sysdeps/unix/sysv/linux/timer_delete.c (timer_delete): Even if
 	timer_delete syscall fails, but not with ENOSYS, set
 	__no_posix_timers.
diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c
index 41218745d65..8598e4c763e 100644
--- a/nptl/pthread_create.c
+++ b/nptl/pthread_create.c
@@ -221,7 +221,8 @@ start_thread (void *arg)
 
   /* This is where the try/finally block should be created.  For
      compilers without that support we do use setjmp.  */
-  if (__builtin_expect (setjmp (pd->cancelbuf) == 0, 1))
+  int not_first_call = setjmp (pd->cancelbuf);
+  if (__builtin_expect (! not_first_call, 1))
     {
       /* Run the code the user provided.  */
 #ifdef CALL_THREAD_FCT
diff --git a/nptl/sysdeps/s390/tls.h b/nptl/sysdeps/s390/tls.h
index 3f318234965..06237ae15b9 100644
--- a/nptl/sysdeps/s390/tls.h
+++ b/nptl/sysdeps/s390/tls.h
@@ -43,9 +43,9 @@ typedef struct
   dtv_t *dtv;
   void *self;		/* Pointer to the thread descriptor.  */
   int multiple_threads;
-#ifdef NEED_DL_SYSINFO
+# ifdef NEED_DL_SYSINFO
   uintptr_t sysinfo;
-#endif
+# endif
 } tcbhead_t;
 
 # ifndef __s390x__