Update.

1997-03-29 17:39  Ulrich Drepper  <drepper@cygnus.com>

	* math/Makefile (routines): Add carg, s_ccosh and s_csinh.

	* math/complex.h: Add C++ protection.

	* math/libm-test.c (cexp_test): Correct a few bugs.
	(csinh_test): New function.
	(ccosh_test): New function.
	(cacos_test): New function.
	(cacosh_test): New function.
	(casinh_test): New function.
	(catanh_test): New function.
	(main): Add calls to csinh_test and ccosh_test.

	* misc/Makefile (tests): Add tst-tsearch.
	Add rule to link tst-tsearch against libm.
	* misc/tsearch.c: Rewritten to use Red-Black-Tree algorithm by
	Bernd Schmidt <crux@Pool.Informatik.RWTH-Aachen.DE>.
	* misc/tst-tsearch.c: New file.

	* stdio-common/bug5.c: Clear LD_LIBRARY_PATH environment variable
	before using system.
	* stdio-common/test-popen.c: Clear LD_LIBRARY_PATH environment variable
	before using popen.

	* sysdeps/libm-ieee754/s_cexp.c: Correct handling of special cases.
	* sysdeps/libm-ieee754/s_cexpf.c: Likewise.
	* sysdeps/libm-ieee754/s_cexpl.c: Likewise.

	* sysdeps/libm-i387/s_cexp.S: New file.  ix87 specific implementation
	of complex exponential function.
	* sysdeps/libm-i387/s_cexpf.S: New file.
	* sysdeps/libm-i387/s_cexpl.S: New file.

	* sysdeps/libm-ieee754/s_ccosh.c: New file.  Implementation of
	complex cosh function.
	* sysdeps/libm-ieee754/s_ccoshf.c: New file.
	* sysdeps/libm-ieee754/s_ccoshl.c: New file.
	* sysdeps/libm-ieee754/s_csinh.c: New file.  Implementation of
	complex sinh function.
	* sysdeps/libm-ieee754/s_csinhf.c: New file.
	* sysdeps/libm-ieee754/s_csinhl.c: New file.

	* math/carg.c: New file.  Generic implementatio of carg function.
	* math/cargf.c: New file.
	* math/cargl.c: New file.

1997-03-29 16:07  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/posix/system.c: Update copyright.

1997-03-29 04:18  Ulrich Drepper  <drepper@cygnus.com>

	* elf/dl-error.c (_dl_catch_error): Add another argument which is
	passed to OPERATE.
	(_dl_receive_error): Likewise.
	* elf/link.h: Change prototypes for _dl_catch_error and
	_dl_receive_error to reflect above change.
	* elf/dl-deps.c: Don't use nested function.  Call _dl_catch_error
	with additional argument with pointer to data.
	* elf/dlclose.c: Likewise.
	* elf/dlerror.c: Likewise.
	* elf/dlopen.c: Likewise.
	* elf/dlsym.c: Likewise.
	* elf/dlvsym.c: Likewise.
	* elf/rtld.c: Likewise.
	* nss/nsswitch.c: Likewise.
	Patch by Bernd Schmidt <crux@Pool.Informatik.RWTH-Aachen.DE>.

1997-03-28 21:14  Miguel de Icaza  <miguel@nuclecu.unam.mx>

	* elf/dl-error.c: Manually set up the values of "c", this avoids a
	call to memcpy and a zero 152 bytes structure.

	* sysdeps/sparc/dl-machine.h (elf_machine_rela): Test
	RTLD_BOOTSTRAP to avoid performing relative relocs on a second
	pass.

	* sysdeps/sparc/udiv_qrnnd.S: Make the code PIC aware.

	* sysdeps/unix/sysv/linux/sparc/Dist: Add kernel_stat.h and
	kernel_sigaction.h

	Add Linux/SPARC specific definitions.
	* sysdeps/unix/sysv/linux/sparc/fcntlbits.h: New file.
	* sysdeps/unix/sysv/linux/sparc/ioctls.h: New file.
	* sysdeps/unix/sysv/linux/sparc/kernel_sigaction.h: New file.
	* sysdeps/unix/sysv/linux/sparc/kernel_stat.h: New file.
	* sysdeps/unix/sysv/linux/sparc/sigaction.h: New file.
	* sysdeps/unix/sysv/linux/sparc/signum.h: New file.
	* sysdeps/unix/sysv/linux/sparc/termbits.h: New file.

1997-03-28 13:06  Philip Blundell  <pjb27@cam.ac.uk>

	* sysdeps/posix/getaddrinfo.c (gaih_inet_serv): Use
	__getservbyname_r() not getservbyname().
	(BROKEN_LIKE_POSIX): Define to 1 so we get strict POSIX behaviour.

9 files changed, 661 insertions, 31 deletions

diff --git a/sysdeps/libm-ieee754/s_ccosh.c b/sysdeps/libm-ieee754/s_ccosh.c
new file mode 100644
index 0000000000..f01b245e77
--- /dev/null
+++ b/sysdeps/libm-ieee754/s_ccosh.c
@@ -0,0 +1,95 @@
+/* Complex cosine hyperbole function for double.
+   Copyright (C) 1997 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <complex.h>
+#include <math.h>
+
+
+__complex__ double
+__ccosh (__complex__ double x)
+{
+  __complex__ double retval;
+
+  __real__ x = fabs (__real__ x);
+
+  if (isfinite (__real__ x))
+    {
+      if (isfinite (__imag__ x))
+	{
+	  double exp_val = __exp (__real__ x);
+	  double rec_exp_val = 1.0 / exp_val;
+
+	  __real__ retval = 0.5 * (exp_val + rec_exp_val) * __cos (__imag__ x);
+	  __imag__ retval = 0.5 * (exp_val + rec_exp_val) * __sin (__imag__ x);
+	}
+      else
+	{
+	  if (__real__ x == 0)
+	    {
+	      __imag__ retval = 0.0;
+	      __real__ retval = __nan ("") + __nan ("");
+	    }
+	  else
+	    {
+	      __real__ retval = __nan ("");
+	      __imag__ retval = __nan ("") + __nan ("");
+	    }
+	}
+    }
+  else if (__isinf (__real__ x))
+    {
+      if (__imag__ x == 0.0)
+	{
+	  __real__ retval = HUGE_VAL;
+	  __imag__ retval = __imag__ x;
+	}
+      else if (isfinite (__imag__ x))
+	{
+	  __real__ retval = __copysign (HUGE_VAL, __cos (__imag__ x));
+	  __imag__ retval = __copysign (HUGE_VAL, __sin (__imag__ x));
+	}
+      else
+	{
+	  /* The addition raises the invalid exception.  */
+	  __real__ retval = HUGE_VAL;
+	  __imag__ retval = __nan ("") + __nan ("");
+	}
+    }
+  else
+    {
+      if (__imag__ x == 0.0)
+	{
+	  __real__ retval = __nan ("");
+	  __imag__ retval = __imag__ x;
+	}
+      else
+	{
+	  __real__ retval = __nan ("");
+	  __imag__ retval = __nan ("");
+	}
+    }
+
+  return retval;
+}
+weak_alias (__ccosh, ccosh)
+#ifdef NO_LONG_DOUBLE
+strong_alias (__ccosh, __ccoshl)
+weak_alias (__ccosh, ccoshl)
+#endif
diff --git a/sysdeps/libm-ieee754/s_ccoshf.c b/sysdeps/libm-ieee754/s_ccoshf.c
new file mode 100644
index 0000000000..9f2774b6c7
--- /dev/null
+++ b/sysdeps/libm-ieee754/s_ccoshf.c
@@ -0,0 +1,93 @@
+/* Complex cosine hyperbole function for float.
+   Copyright (C) 1997 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <complex.h>
+#include <math.h>
+
+
+__complex__ float
+__ccoshf (__complex__ float x)
+{
+  __complex__ float retval;
+
+  __real__ x = fabsf (__real__ x);
+
+  if (isfinite (__real__ x))
+    {
+      if (isfinite (__imag__ x))
+	{
+	  float exp_val = __expf (__real__ x);
+	  float rec_exp_val = 1.0 / exp_val;
+
+	  __real__ retval = (0.5 * (exp_val + rec_exp_val)
+			     * __cosf (__imag__ x));
+	  __imag__ retval = (0.5 * (exp_val + rec_exp_val)
+			     * __sinf (__imag__ x));
+	}
+      else
+	{
+	  if (__real__ x == 0)
+	    {
+	      __imag__ retval = 0.0;
+	      __real__ retval = __nanf ("") + __nanf ("");
+	    }
+	  else
+	    {
+	      __real__ retval = __nanf ("");
+	      __imag__ retval = __nanf ("") + __nanf ("");
+	    }
+	}
+    }
+  else if (__isinff (__real__ x))
+    {
+      if (__imag__ x == 0.0)
+	{
+	  __real__ retval = HUGE_VALF;
+	  __imag__ retval = __imag__ x;
+	}
+      else if (isfinite (__imag__ x))
+	{
+	  __real__ retval = __copysignf (HUGE_VALF, __cosf (__imag__ x));
+	  __imag__ retval = __copysignf (HUGE_VALF, __sinf (__imag__ x));
+	}
+      else
+	{
+	  /* The addition raises the invalid exception.  */
+	  __real__ retval = HUGE_VALF;
+	  __imag__ retval = __nanf ("") + __nanf ("");
+	}
+    }
+  else
+    {
+      if (__imag__ x == 0.0)
+	{
+	  __real__ retval = __nanf ("");
+	  __imag__ retval = __imag__ x;
+	}
+      else
+	{
+	  __real__ retval = __nanf ("");
+	  __imag__ retval = __nanf ("");
+	}
+    }
+
+  return retval;
+}
+weak_alias (__ccoshf, ccoshf)
diff --git a/sysdeps/libm-ieee754/s_ccoshl.c b/sysdeps/libm-ieee754/s_ccoshl.c
new file mode 100644
index 0000000000..fd553418b4
--- /dev/null
+++ b/sysdeps/libm-ieee754/s_ccoshl.c
@@ -0,0 +1,93 @@
+/* Complex cosine hyperbole function for long double.
+   Copyright (C) 1997 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <complex.h>
+#include <math.h>
+
+
+__complex__ long double
+__ccoshl (__complex__ long double x)
+{
+  __complex__ long double retval;
+
+  __real__ x = fabsl (__real__ x);
+
+  if (isfinite (__real__ x))
+    {
+      if (isfinite (__imag__ x))
+	{
+	  long double exp_val = __expl (__real__ x);
+	  long double rec_exp_val = 1.0 / exp_val;
+
+	  __real__ retval = (0.5 * (exp_val + rec_exp_val)
+			     * __cosl (__imag__ x));
+	  __imag__ retval = (0.5 * (exp_val + rec_exp_val)
+			     * __sinl (__imag__ x));
+	}
+      else
+	{
+	  if (__real__ x == 0)
+	    {
+	      __imag__ retval = 0.0;
+	      __real__ retval = __nanl ("") + __nanl ("");
+	    }
+	  else
+	    {
+	      __real__ retval = __nanl ("");
+	      __imag__ retval = __nanl ("") + __nanl ("");
+	    }
+	}
+    }
+  else if (__isinfl (__real__ x))
+    {
+      if (__imag__ x == 0.0)
+	{
+	  __real__ retval = HUGE_VALL;
+	  __imag__ retval = __imag__ x;
+	}
+      else if (isfinite (__imag__ x))
+	{
+	  __real__ retval = __copysignl (HUGE_VALL, __cosl (__imag__ x));
+	  __imag__ retval = __copysignl (HUGE_VALL, __sinl (__imag__ x));
+	}
+      else
+	{
+	  /* The addition raises the invalid exception.  */
+	  __real__ retval = HUGE_VALL;
+	  __imag__ retval = __nanl ("") + __nanl ("");
+	}
+    }
+  else
+    {
+      if (__imag__ x == 0.0)
+	{
+	  __real__ retval = __nanl ("");
+	  __imag__ retval = __imag__ x;
+	}
+      else
+	{
+	  __real__ retval = __nanl ("");
+	  __imag__ retval = __nanl ("");
+	}
+    }
+
+  return retval;
+}
+weak_alias (__ccoshl, ccoshl)
diff --git a/sysdeps/libm-ieee754/s_cexp.c b/sysdeps/libm-ieee754/s_cexp.c
index 46f9f612eb..233a40014f 100644
--- a/sysdeps/libm-ieee754/s_cexp.c
+++ b/sysdeps/libm-ieee754/s_cexp.c
@@ -1,4 +1,4 @@
-/* Return value of complex exponential function for double complex value.
+/* Return value of complex exponential function for float complex value.
    Copyright (C) 1997 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -31,33 +31,52 @@ __cexp (__complex__ double x)
     {
       if (isfinite (__imag__ x))
 	{
-	  retval = __exp (__real__ x) * (__cos (__imag__ x)
-					 + 1i * __sin (__imag__ x));
+	  double exp_val = __exp (__real__ x);
+
+	  __real__ retval = exp_val * __cos (__imag__ x);
+	  __imag__ retval = exp_val * __sin (__imag__ x);
 	}
       else
-	/* If the imaginary part is +-inf or NaN and the real part is
-	   not +-inf the result is NaN + iNan.  */
-	retval = __nan ("") + 1.0i * __nan ("");
+	{
+	  /* If the imaginary part is +-inf or NaN and the real part
+	     is not +-inf the result is NaN + iNaN.  */
+	  __real__ retval = __nan ("");
+	  __imag__ retval = __nan ("");
+	}
     }
   else if (__isinf (__real__ x))
     {
-      if (isfinite (__imag x))
+      if (isfinite (__imag__ x))
 	{
 	  if (signbit (__real__ x) == 0 && __imag__ x == 0.0)
 	    retval = HUGE_VAL;
 	  else
-	    retval = ((signbit (__real__ x) ? 0.0 : HUGE_VAL)
-		      * (__cos (__imag__ x) + 1i * __sin (__imag__ x)));
+	    {
+	      double value = signbit (__real__ x) ? 0.0 : HUGE_VAL;
+
+	      __real__ retval = value * __cos (__imag__ x);
+	      __imag__ retval = value * __sin (__imag__ x);
+	    }
+	}
+      else if (signbit (__real__ x) == 0)
+	{
+	  __real__ retval = HUGE_VAL;
+	  __imag__ retval = __nan ("");
 	}
-      else if (signbit (__real__ x))
-	retval = HUGE_VAL + 1.0i * __nan ("");
       else
 	retval = 0.0;
     }
   else
-    /* If the real part is NaN the result is NaN + iNan.  */
-    retval = __nan ("") + 1.0i * __nan ("");
+    {
+      /* If the real part is NaN the result is NaN + iNaN.  */
+      __real__ retval = __nan ("");
+      __imag__ retval = __nan ("");
+    }
 
   return retval;
 }
 weak_alias (__cexp, cexp)
+#ifdef NO_LONG_DOUBLE
+string_alias (__cexp, __cexpl)
+weak_alias (__cexp, cexpl)
+#endif
diff --git a/sysdeps/libm-ieee754/s_cexpf.c b/sysdeps/libm-ieee754/s_cexpf.c
index 261b18cb3a..c5d8f0cc07 100644
--- a/sysdeps/libm-ieee754/s_cexpf.c
+++ b/sysdeps/libm-ieee754/s_cexpf.c
@@ -33,8 +33,16 @@ __cexpf (__complex__ float x)
 	{
 	  float exp_val = __expf (__real__ x);
 
-	  __real__ retval = exp_val * __cosf (__imag__ x);
-	  __imag__ retval = exp_val * __sinf (__imag__ x);
+	  if (isfinite (exp_val))
+	    {
+	      __real__ retval = exp_val * __cosf (__imag__ x);
+	      __imag__ retval = exp_val * __sinf (__imag__ x);
+	    }
+	  else
+	    {
+	      __real__ retval = __copysignf (exp_val, __cosf (__imag__ x));
+	      __imag__ retval = __copysignf (exp_val, __sinf (__imag__ x));
+	    }
 	}
       else
 	{
@@ -48,14 +56,17 @@ __cexpf (__complex__ float x)
     {
       if (isfinite (__imag__ x))
 	{
-	  if (signbit (__real__ x) == 0 && __imag__ x == 0.0)
-	    retval = HUGE_VALF;
+	  float value = signbit (__real__ x) ? 0.0 : HUGE_VALF;
+
+	  if (__imag__ x == 0.0)
+	    {
+	      __real__ retval = value;
+	      __imag__ retval = __imag__ x;
+	    }
 	  else
 	    {
-	      float value = signbit (__real__ x) ? 0.0 : HUGE_VALF;
-
-	      __real__ retval = value * __cosf (__imag__ x);
-	      __imag__ retval = value * __sinf (__imag__ x);
+	      __real__ retval = __copysignf (value, __cosf (__imag__ x));
+	      __imag__ retval = __copysignf (value, __sinf (__imag__ x));
 	    }
 	}
       else if (signbit (__real__ x) == 0)
@@ -64,7 +75,10 @@ __cexpf (__complex__ float x)
 	  __imag__ retval = __nanf ("");
 	}
       else
-	retval = 0.0;
+	{
+	  __real__ retval = 0.0;
+	  __imag__ retval = __copysignf (0.0, __imag__ x);
+	}
     }
   else
     {
diff --git a/sysdeps/libm-ieee754/s_cexpl.c b/sysdeps/libm-ieee754/s_cexpl.c
index 779286f6b3..f1cdf43ec8 100644
--- a/sysdeps/libm-ieee754/s_cexpl.c
+++ b/sysdeps/libm-ieee754/s_cexpl.c
@@ -33,8 +33,16 @@ __cexpl (__complex__ long double x)
 	{
 	  long double exp_val = __expl (__real__ x);
 
-	  __real__ retval = exp_val * __cosl (__imag__ x);
-	  __imag__ retval = exp_val * __sinl (__imag__ x);
+	  if (isfinite (exp_val))
+	    {
+	      __real__ retval = exp_val * __cosl (__imag__ x);
+	      __imag__ retval = exp_val * __sinl (__imag__ x);
+	    }
+	  else
+	    {
+	      __real__ retval = __copysignl (exp_val, __cosl (__imag__ x));
+	      __imag__ retval = __copysignl (exp_val, __sinl (__imag__ x));
+	    }
 	}
       else
 	{
@@ -48,14 +56,17 @@ __cexpl (__complex__ long double x)
     {
       if (isfinite (__imag__ x))
 	{
-	  if (signbit (__real__ x) == 0 && __imag__ x == 0.0)
-	    retval = HUGE_VAL;
+	  long double value = signbit (__real__ x) ? 0.0 : HUGE_VALL;
+
+	  if (__imag__ x == 0.0)
+	    {
+	      __real__ retval = value;
+	      __imag__ retval = __imag__ x;
+	    }
 	  else
 	    {
-	      long double value = signbit (__real__ x) ? 0.0 : HUGE_VALL;
-
-	      __real__ retval = value * __cosl (__imag__ x);
-	      __imag__ retval = value * __sinl (__imag__ x);
+	      __real__ retval = __copysignl (value, __cosl (__imag__ x));
+	      __imag__ retval = __copysignl (value, __sinl (__imag__ x));
 	    }
 	}
       else if (signbit (__real__ x) == 0)
@@ -64,7 +75,10 @@ __cexpl (__complex__ long double x)
 	  __imag__ retval = __nanl ("");
 	}
       else
-	retval = 0.0;
+	{
+	  __real__ retval = 0.0;
+	  __imag__ retval = __copysignl (0.0, __imag__ x);
+	}
     }
   else
     {
diff --git a/sysdeps/libm-ieee754/s_csinh.c b/sysdeps/libm-ieee754/s_csinh.c
new file mode 100644
index 0000000000..aab041bdf9
--- /dev/null
+++ b/sysdeps/libm-ieee754/s_csinh.c
@@ -0,0 +1,102 @@
+/* Complex sine hyperbole function for double.
+   Copyright (C) 1997 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <complex.h>
+#include <math.h>
+
+
+__complex__ double
+__csinh (__complex__ double x)
+{
+  __complex__ double retval;
+  int negate = signbit (__real__ x);
+
+  __real__ x = fabs (__real__ x);
+
+  if (isfinite (__real__ x))
+    {
+      if (isfinite (__imag__ x))
+	{
+	  double exp_val = __exp (__real__ x);
+	  double rec_exp_val = 1.0 / exp_val;
+
+	  __real__ retval = 0.5 * (exp_val - rec_exp_val) * __cos (__imag__ x);
+	  __imag__ retval = 0.5 * (exp_val - rec_exp_val) * __sin (__imag__ x);
+
+	  if (negate)
+	    __real__ retval = -__real__ retval;
+	}
+      else
+	{
+	  if (__real__ x == 0)
+	    {
+	      __real__ retval = __copysign (0.0, negate ? -1.0 : 1.0);
+	      __imag__ retval = __nan ("") + __nan ("");
+	    }
+	  else
+	    {
+	      __real__ retval = __nan ("");
+	      __imag__ retval = __nan ("");
+	    }
+	}
+    }
+  else if (__isinf (__real__ x))
+    {
+      if (__imag__ x == 0.0)
+	{
+	  __real__ retval = negate ? -HUGE_VAL : HUGE_VAL;
+	  __imag__ retval = __imag__ x;
+	}
+      else if (isfinite (__imag__ x))
+	{
+	  __real__ retval = __copysign (HUGE_VAL, __cos (__imag__ x));
+	  __imag__ retval = __copysign (HUGE_VAL, __sin (__imag__ x));
+
+	  if (negate)
+	    __real__ retval = -__real__ retval;
+	}
+      else
+	{
+	  /* The addition raises the invalid exception.  */
+	  __real__ retval = HUGE_VAL;
+	  __imag__ retval = __nan ("") + __nan ("");
+	}
+    }
+  else
+    {
+      if (__imag__ x == 0.0)
+	{
+	  __real__ retval = __nan ("");
+	  __imag__ retval = __imag__ x;
+	}
+      else
+	{
+	  __real__ retval = __nan ("");
+	  __imag__ retval = __nan ("");
+	}
+    }
+
+  return retval;
+}
+weak_alias (__csinh, csinh)
+#ifdef NO_LONG_DOUBLE
+strong_alias (__csinh, __csinhl)
+weak_alias (__csinh, csinhl)
+#endif
diff --git a/sysdeps/libm-ieee754/s_csinhf.c b/sysdeps/libm-ieee754/s_csinhf.c
new file mode 100644
index 0000000000..204bbfebb9
--- /dev/null
+++ b/sysdeps/libm-ieee754/s_csinhf.c
@@ -0,0 +1,100 @@
+/* Complex sine hyperbole function for float.
+   Copyright (C) 1997 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <complex.h>
+#include <math.h>
+
+
+__complex__ float
+__csinhf (__complex__ float x)
+{
+  __complex__ float retval;
+  int negate = signbit (__real__ x);
+
+  __real__ x = fabsf (__real__ x);
+
+  if (isfinite (__real__ x))
+    {
+      if (isfinite (__imag__ x))
+	{
+	  float exp_val = __expf (__real__ x);
+	  float rec_exp_val = 1.0 / exp_val;
+
+	  __real__ retval = (0.5 * (exp_val - rec_exp_val)
+			     * __cosf (__imag__ x));
+	  __imag__ retval = (0.5 * (exp_val - rec_exp_val)
+			     * __sinf (__imag__ x));
+
+	  if (negate)
+	    __real__ retval = -__real__ retval;
+	}
+      else
+	{
+	  if (__real__ x == 0)
+	    {
+	      __real__ retval = __copysignf (0.0, negate ? -1.0 : 1.0);
+	      __imag__ retval = __nanf ("") + __nanf ("");
+	    }
+	  else
+	    {
+	      __real__ retval = __nanf ("");
+	      __imag__ retval = __nanf ("");
+	    }
+	}
+    }
+  else if (__isinff (__real__ x))
+    {
+      if (__imag__ x == 0.0)
+	{
+	  __real__ retval = negate ? -HUGE_VALF : HUGE_VALF;
+	  __imag__ retval = __imag__ x;
+	}
+      else if (isfinite (__imag__ x))
+	{
+	  __real__ retval = __copysignf (HUGE_VALF, __cosf (__imag__ x));
+	  __imag__ retval = __copysignf (HUGE_VALF, __sinf (__imag__ x));
+
+	  if (negate)
+	    __real__ retval = -__real__ retval;
+	}
+      else
+	{
+	  /* The addition raises the invalid exception.  */
+	  __real__ retval = HUGE_VALF;
+	  __imag__ retval = __nanf ("") + __nanf ("");
+	}
+    }
+  else
+    {
+      if (__imag__ x == 0.0)
+	{
+	  __real__ retval = __nanf ("");
+	  __imag__ retval = __imag__ x;
+	}
+      else
+	{
+	  __real__ retval = __nanf ("");
+	  __imag__ retval = __nanf ("");
+	}
+    }
+
+  return retval;
+}
+weak_alias (__csinhf, csinhf)
diff --git a/sysdeps/libm-ieee754/s_csinhl.c b/sysdeps/libm-ieee754/s_csinhl.c
new file mode 100644
index 0000000000..e403dd4796
--- /dev/null
+++ b/sysdeps/libm-ieee754/s_csinhl.c
@@ -0,0 +1,100 @@
+/* Complex sine hyperbole function for long double.
+   Copyright (C) 1997 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <complex.h>
+#include <math.h>
+
+
+__complex__ long double
+__csinhl (__complex__ long double x)
+{
+  __complex__ long double retval;
+  int negate = signbit (__real__ x);
+
+  __real__ x = fabs (__real__ x);
+
+  if (isfinite (__real__ x))
+    {
+      if (isfinite (__imag__ x))
+	{
+	  long double exp_val = __expl (__real__ x);
+	  long double rec_exp_val = 1.0 / exp_val;
+
+	  __real__ retval = (0.5 * (exp_val - rec_exp_val)
+			     * __cosl (__imag__ x));
+	  __imag__ retval = (0.5 * (exp_val - rec_exp_val)
+			     * __sinl (__imag__ x));
+
+	  if (negate)
+	    __real__ retval = -__real__ retval;
+	}
+      else
+	{
+	  if (__real__ x == 0)
+	    {
+	      __real__ retval = __copysignl (0.0, negate ? -1.0 : 1.0);
+	      __imag__ retval = __nanl ("") + __nanl ("");
+	    }
+	  else
+	    {
+	      __real__ retval = __nanl ("");
+	      __imag__ retval = __nanl ("");
+	    }
+	}
+    }
+  else if (__isinfl (__real__ x))
+    {
+      if (__imag__ x == 0.0)
+	{
+	  __real__ retval = negate ? -HUGE_VALL : HUGE_VALL;
+	  __imag__ retval = __imag__ x;
+	}
+      else if (isfinite (__imag__ x))
+	{
+	  __real__ retval = __copysignl (HUGE_VALL, __cosl (__imag__ x));
+	  __imag__ retval = __copysignl (HUGE_VALL, __sinl (__imag__ x));
+
+	  if (negate)
+	    __real__ retval = -__real__ retval;
+	}
+      else
+	{
+	  /* The addition raises the invalid exception.  */
+	  __real__ retval = HUGE_VALL;
+	  __imag__ retval = __nanl ("") + __nanl ("");
+	}
+    }
+  else
+    {
+      if (__imag__ x == 0.0)
+	{
+	  __real__ retval = __nanl ("");
+	  __imag__ retval = __imag__ x;
+	}
+      else
+	{
+	  __real__ retval = __nanl ("");
+	  __imag__ retval = __nanl ("");
+	}
+    }
+
+  return retval;
+}
+weak_alias (__csinhl, csinhl)