Update.

1999-10-24  Ulrich Drepper  <drepper@cygnus.com>

	* math/libm-test.inc: Disable some boundary case tests for inline
	function testing.

	* math/math.h: Pretty printing.

	* sysdeps/i386/fpu/e_atanh.S: Correct handling of NaN.
	* sysdeps/i386/fpu/e_atanhf.S: Likewise.
	* sysdeps/i386/fpu/e_atanhl.S: Likewise.
	* sysdeps/i386/fpu/e_log10.S: Likewise.
	* sysdeps/i386/fpu/e_log10f.S: Likewise.
	* sysdeps/i386/fpu/e_log10l.S: Likewise.
	* sysdeps/i386/fpu/s_log1p.S: Likewise.
	* sysdeps/i386/fpu/s_log1pf.S: Likewise.
	* sysdeps/i386/fpu/s_log1pl.S: Likewise.
	* sysdeps/i386/fpu/s_log2.S: Likewise.
	* sysdeps/i386/fpu/s_log2f.S: Likewise.
	* sysdeps/i386/fpu/s_log2l.S: Likewise.

	* sysdeps/i386/fpu/libm-test-ulps: New file.

	* sysdeps/i386/fpu/bits/mathinline.h (__expm1_code): Correct return
	value for x == 0.
	(pow): Correct case x == 0.
	(__sgn1l): Correct handling of -0.0.

1999-10-22  Andreas Jaeger  <aj@suse.de>

	* math/libm-test.inc (asinh_test): Add test for NaN as input parameter.
	(atan_test): Likewise.
	(atanh_test): Likewise.
	(atan2_test): Likewise.
	(carg_test): Likewise.
	(ceil_test): Likewise.
	(cos_test): Likewise.
	(cosh_test): Likewise.
	(cpow_test): Likewise.
	(erf_test): Likewise.
	(erfc_test): Likewise.
	(exp_test): Likewise.
	(exp10_test): Likewise.
	(exp2_test): Likewise.
	(expm1_test): Likewise.
	(fabs_test): Likewise.
	(floor_test): Likewise.
	(fmod_test): Likewise.
	(gamma_test): Likewise.
	(lgamma_test): Likewise.
	(log10_test): Likewise.
	(log1p_test): Likewise.
	(log2_test): Likewise.
	(logb_test): Likewise.
	(nearbyint_test): Likewise.
	(remainder_test): Likewise.
	(remquo_test): Likewise.
	(sin_test): Likewise.
	(sincos_test): Likewise.
	(sinh_test): Likewise.
	(sqrt_test): Likewise.
	(tan_test): Likewise.
	(tanh_test): Likewise.
	(tgamma_test): Likewise.

3 files changed, 53 insertions, 31 deletions

diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index b4a8cea5e0..d56f84f0ac 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,14 @@
+1999-10-21  Xavier Leroy  <Xavier.Leroy@inria.fr>
+
+	* linuxthreads/pthread.c: For i386, wrap pthread_handle_sigrestart
+	and pthread_handle_sigcancel with functions that restore
+	%gs from the signal context.  For each signal handling function,
+	two wrappers are required, one for a non-RT signal and one for
+	a RT signal.
+	* linuxthreads/signal.c: For i386, add code to restore %gs
+	from the signal context in pthread_sighandler and
+	pthread_sighandler_rt.
+
 1999-10-17  Ulrich Drepper  <drepper@cygnus.com>
 
 	* internals.h (PTHREAD_START_ARGS_INITIALIZER): Add cast.
diff --git a/linuxthreads/pthread.c b/linuxthreads/pthread.c
index 2741b211b6..5296c1e349 100644
--- a/linuxthreads/pthread.c
+++ b/linuxthreads/pthread.c
@@ -162,14 +162,15 @@ extern int _h_errno;
 /* Forward declarations */
 
 static void pthread_exit_process(int retcode, void *arg);
-#ifndef __i386__
 static void pthread_handle_sigcancel(int sig);
 static void pthread_handle_sigrestart(int sig);
-#else
-static void pthread_handle_sigcancel(int sig, struct sigcontext ctx);
-static void pthread_handle_sigrestart(int sig, struct sigcontext ctx);
+#ifdef __i386__
+static void pthread_handle_sigrestart_nonrt(int sig, struct sigcontext ctx);
 static void pthread_handle_sigrestart_rt(int sig, struct siginfo *si,
 					 struct ucontext *uc);
+static void pthread_handle_sigcancel_nonrt(int sig, struct sigcontext ctx);
+static void pthread_handle_sigcancel_rt(int sig, struct siginfo *si,
+					 struct ucontext *uc);
 #endif
 static void pthread_handle_sigdebug(int sig);
 
@@ -330,7 +331,7 @@ static void pthread_initialize(void)
   if (__pthread_sig_restart >= SIGRTMIN)
     sa.sa_handler = (__sighandler_t) pthread_handle_sigrestart_rt;
   else
-    sa.sa_handler = (__sighandler_t) pthread_handle_sigrestart;
+    sa.sa_handler = (__sighandler_t) pthread_handle_sigrestart_nonrt;
 #endif
   sigemptyset(&sa.sa_mask);
   sa.sa_flags = 0;
@@ -338,7 +339,10 @@ static void pthread_initialize(void)
 #ifndef __i386__
   sa.sa_handler = pthread_handle_sigcancel;
 #else
-  sa.sa_handler = (__sighandler_t) pthread_handle_sigcancel;
+  if (__pthread_sig_restart >= SIGRTMIN)
+    sa.sa_handler = (__sighandler_t) pthread_handle_sigcancel_rt;
+  else
+    sa.sa_handler = (__sighandler_t) pthread_handle_sigcancel_nonrt;
 #endif
   sa.sa_flags = 0;
   __sigaction(__pthread_sig_cancel, &sa, NULL);
@@ -564,54 +568,38 @@ static void pthread_exit_process(int retcode, void *arg)
    in the thread descriptor, and optionally performs a siglongjmp
    (for pthread_cond_timedwait). */
 
-#ifndef __i386__
 static void pthread_handle_sigrestart(int sig)
 {
   pthread_descr self = thread_self();
-#else
-static void pthread_handle_sigrestart(int sig, struct sigcontext ctx)
-{
-  pthread_descr self;
-  asm volatile ("movw %w0,%%gs" : : "r" (ctx.gs));
-  self = thread_self();
-#endif
   THREAD_SETMEM(self, p_signal, sig);
   if (THREAD_GETMEM(self, p_signal_jmp) != NULL)
     siglongjmp(*THREAD_GETMEM(self, p_signal_jmp), 1);
 }
 
 #ifdef __i386__
+static void pthread_handle_sigrestart_nonrt(int sig, struct sigcontext ctx)
+{
+  asm volatile ("movw %w0,%%gs" : : "r" (ctx.gs));
+  pthread_handle_sigrestart(sig);
+}
+
 static void pthread_handle_sigrestart_rt(int sig, struct siginfo *si,
 					 struct ucontext *uc)
 {
-  pthread_descr self;
   asm volatile ("movw %w0,%%gs" : : "r" (uc->uc_mcontext.gregs[GS]));
-  self = thread_self();
-  THREAD_SETMEM(self, p_signal, sig);
-  if (THREAD_GETMEM(self, p_signal_jmp) != NULL)
-    siglongjmp(*THREAD_GETMEM(self, p_signal_jmp), 1);
+  pthread_handle_sigrestart(sig);
 }
 #endif
 
-
 /* The handler for the CANCEL signal checks for cancellation
    (in asynchronous mode), for process-wide exit and exec requests.
    For the thread manager thread, redirect the signal to
    __pthread_manager_sighandler. */
 
-#ifndef __i386__
 static void pthread_handle_sigcancel(int sig)
 {
   pthread_descr self = thread_self();
   sigjmp_buf * jmpbuf;
-#else
-static void pthread_handle_sigcancel(int sig, struct sigcontext ctx)
-{
-  pthread_descr self;
-  sigjmp_buf * jmpbuf;
-  asm volatile ("movw %w0,%%gs" : : "r" (ctx.gs));
-  self = thread_self();
-#endif
 
   if (self == &__pthread_manager_thread)
     {
@@ -637,6 +625,21 @@ static void pthread_handle_sigcancel(int sig, struct sigcontext ctx)
   }
 }
 
+#ifdef __i386__
+static void pthread_handle_sigcancel_nonrt(int sig, struct sigcontext ctx)
+{
+  asm volatile ("movw %w0,%%gs" : : "r" (ctx.gs));
+  pthread_handle_sigcancel(sig);
+}
+
+static void pthread_handle_sigcancel_rt(int sig, struct siginfo *si,
+					 struct ucontext *uc)
+{
+  asm volatile ("movw %w0,%%gs" : : "r" (uc->uc_mcontext.gregs[GS]));
+  pthread_handle_sigcancel(sig);
+}
+#endif
+
 /* Handler for the DEBUG signal.
    The debugging strategy is as follows:
    On reception of a REQ_DEBUG request (sent by new threads created to
diff --git a/linuxthreads/signals.c b/linuxthreads/signals.c
index 0c9bffd00b..5a4d4f5db4 100644
--- a/linuxthreads/signals.c
+++ b/linuxthreads/signals.c
@@ -79,8 +79,12 @@ static union
 /* The wrapper around user-provided signal handlers */
 static void pthread_sighandler(int signo, SIGCONTEXT ctx)
 {
-  pthread_descr self = thread_self();
+  pthread_descr self;
   char * in_sighandler;
+#ifdef __i386__
+  asm volatile ("movw %w0,%%gs" : : "r" (ctx.gs));
+#endif
+  self = thread_self();
   /* If we're in a sigwait operation, just record the signal received
      and return without calling the user's handler */
   if (THREAD_GETMEM(self, p_sigwaiting)) {
@@ -102,8 +106,12 @@ static void pthread_sighandler(int signo, SIGCONTEXT ctx)
 static void pthread_sighandler_rt(int signo, struct siginfo *si,
 				  struct ucontext *uc)
 {
-  pthread_descr self = thread_self();
+  pthread_descr self;
   char * in_sighandler;
+#ifdef __i386__
+  asm volatile ("movw %w0,%%gs" : : "r" (uc->uc_mcontext.gregs[GS]));
+#endif
+  self =  thread_self();
   /* If we're in a sigwait operation, just record the signal received
      and return without calling the user's handler */
   if (THREAD_GETMEM(self, p_sigwaiting)) {