Update.cvs/libc-ud-970408

1997-04-09 01:24  Ulrich Drepper  <drepper@cygnus.com>

	* rellns-sh: Rewrite to work also in presence of symlinks.

	* arpg/argp-fmtstream.c: Add casts to prevent warnings.
	* argp/argp-fmtstream.h: Likewise.
	* argp/argp-help.c: Likewise.

	* elf/dl-minimal.c: Add definition of calloc.
	* elf/version.c: Add casts to prevent warnings.
	(_dl_check_map_versions): Use calloc instead of malloc+memset.

	* locale/setlocale.c (_nl_current): Add element with index LC_ALL.
	Reported by Greg McGary <gkm@eng.ascend.com>.

	* manual/libc.texinfo: Update malloc documentation for new malloc.
	* manual/memory.texi: Likewise.
	Patch by Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>.

	* math/libm-test.c (check_long): New function.
	(check_longlong): New function.
	(rinttol_test): New function.
	(rinttoll_test): New function.

	* nis/nss_compat/compat-grp.c (in_blacklist): Improve a bit.
	* nis/nss_compat/compat-pwd.c: Likewise.
	* nis/nss_compat/compat-spwd.c: Likewise.

	* stdlib/erand48_r.c (erand48_r): Build double value using
	ieee754_double union and use random bits in different order to
	increase effect of seed.
	Reported by David Mosberger-Tang <davidm@AZStarNet.com>.

	* sunrpc/svc_auth.c: Moved to ...
	* sysdeps/generic/svc_auth.c: ...here.

	* time/time.h: Pretty print.

1997-04-08 07:19  H.J. Lu  <hjl@gnu.ai.mit.edu>

	* libio/genops.c (_IO_flush_all_linebuffered): don't flush on
	a read-only stream.

1997-04-09 01:19  Ulrich Drepper  <drepper@cygnus.com>

	* malloc/malloc.c (mALLOC_STATs) [MALLOC_DEBUG>1]: Put declaration
	in correct place.
	Patch by Marcus G. Daniels <marcus@cathcart.sysc.pdx.edu>.

1997-04-07 15:34  Ulrich Drepper  <drepper@cygnus.com>

	* stdio-common/Makefile (tests): Add tst-ferror.
	* stdio-common/tst-ferror.c: New file.  Some tests for error
	indicator of streams.
	* stdio-common/tst-ferror.input: New file.

	* isomac.c: Let tests not fail because the compiler defines itself
	symbols which violate the name space rules.  gcc defines symbols
	for the architecture which are not protected by an underscore
	character.

	* math/Makefile (libm-support): Add s_rinttol and s_rinttoll.
	(libm-calls): Add s_clog.
	* sysdeps/libm-ieee754/s_clog.c: New file.  Implementation of
	logarithm of complex value.
	* sysdeps/libm-ieee754/s_clogf.c: New file.
	* sysdeps/libm-ieee754/s_clogl.c: New file.
	* math/libm-test.c (clog_test): Compile this function.  Fix a few
	typos.
	(main): Call clog_test.

	* sysdeps/libm-ieee754/s_rinttol.c: New file.  Round long double
	value to long int.
	* sysdeps/libm-i387/s_rinttol.S: New file.
	* sysdeps/libm-ieee754/s_rinttoll.c: new file.  Round long double
	value to long long int.
	* sysdeps/libm-i387/s_rinttoll.S: New file.

	* sysdeps/libm-ieee754/s_rintl.c: Many corrections.  The previous
	version was full of errors.

	* math/math.h (rinttol): Argument is of type `long double' not
	`double'.
	(rinttoll): Likewise.
	(roundtol): Likewise.
	(roundtoll): Likewise.

1997-04-06 11:32  H.J. Lu  <hjl@gnu.ai.mit.edu>

	* posix/getopt.c (_getopt_initialize): Preserve optind.
	(_getopt_internal): Set optind to 1 if optind == 0 before
	calling _getopt_initialize ().

1997-04-05 16:45  Thorsten Kukuk  <kukuk@vt.uni-paderborn.de>

	* nis/rpcsvc/nislib.h: Change const nis_name to new type
	const_nis_name.
	* nis/nis_intern.c: Likewise.
	* nis/nis_intern.h: Likewise.
	* nis/nis_server.c: Likewise.
	* nis/nis_subr.c: Likewise.
	* nis/nis_table.c: Likewise.
	* nis/nis_names.c: Likewise.  Fill out ns_request structure in
	nis_add().

	* nis/nss_compat/compat-pwd.c: Use reentrant netgroup functions.
	* nis/nss_compat/compat-spwd.c: Likewise.

1997-03-27 07:37  H.J. Lu  <hjl@gnu.ai.mit.edu>

	* libio/fileops.c (_IO_file_overflow): Set error when try to write
	on a read-only stream.

	* sysdeps/gnu/utmpbits.h (ut_xtime): New symbol.
	(ut_time): Define it only if _NO_UT_TIME is not defined.

1997-04-06 00:42  Ulrich Drepper  <drepper@cygnus.com>

	* misc/tst-tsearch.c: Include <string.h>.  Define _GNU_SOURCE only
	if not already defined.

1997-04-05 16:14  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/netatalk/at.h: Include <sys/socket.h> to
	get definition of sa_family_t for <linux/atalk.h>.
	Reported by a sun <asun@zoology.washington.edu>.

	* malloc/malloc.c (cALLOc): Little optimization.

7 files changed, 670 insertions, 11 deletions

diff --git a/sysdeps/libm-ieee754/s_cexp.c b/sysdeps/libm-ieee754/s_cexp.c
index f6b443ddba..b99b042d78 100644
--- a/sysdeps/libm-ieee754/s_cexp.c
+++ b/sysdeps/libm-ieee754/s_cexp.c
@@ -91,6 +91,6 @@ __cexp (__complex__ double x)
 }
 weak_alias (__cexp, cexp)
 #ifdef NO_LONG_DOUBLE
-string_alias (__cexp, __cexpl)
+strong_alias (__cexp, __cexpl)
 weak_alias (__cexp, cexpl)
 #endif
diff --git a/sysdeps/libm-ieee754/s_clog.c b/sysdeps/libm-ieee754/s_clog.c
new file mode 100644
index 0000000000..f00753b3bb
--- /dev/null
+++ b/sysdeps/libm-ieee754/s_clog.c
@@ -0,0 +1,61 @@
+/* Compute complex natural logarithm.
+   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>
+
+#include "math_private.h"
+
+
+__complex__ double
+__clog (__complex__ double x)
+{
+  __complex__ double result;
+
+  if (__real__ x == 0.0 && __imag__ x == 0.0)
+    {
+      __imag__ result = signbit (__real__ x) ? M_PI : 0.0;
+      if (signbit (__imag__ x))
+	__imag__ result = __copysign (__imag__ result, -1.0);
+      /* Yes, the following line raises an exception.  */
+      __real__ result = -1.0 / fabs (__real__ x);
+    }
+  else if (!__isnan (__real__ x) && !__isnan (__imag__ x))
+    {
+      __real__ result = __ieee754_log (__ieee754_hypot (__real__ x,
+							__imag__ x));
+      __imag__ result = __ieee754_atan2 (__imag__ x, __real__ x);
+    }
+  else
+    {
+      __imag__ result = __nan ("");
+      if (__isinf (__real__ x) || __isinf (__imag__ x))
+	__real__ result = HUGE_VAL;
+      else
+	__real__ result = __nan ("");
+    }
+
+  return result;
+}
+weak_alias (__clog, clog)
+#ifdef NO_LONG_DOUBLE
+strong_alias (__clog, __clogl)
+weak_alias (__clog, clogl)
+#endif
diff --git a/sysdeps/libm-ieee754/s_clogf.c b/sysdeps/libm-ieee754/s_clogf.c
new file mode 100644
index 0000000000..4eafc82bf0
--- /dev/null
+++ b/sysdeps/libm-ieee754/s_clogf.c
@@ -0,0 +1,57 @@
+/* Compute complex natural logarithm.
+   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>
+
+#include "math_private.h"
+
+
+__complex__ float
+__clogf (__complex__ float x)
+{
+  __complex__ float result;
+
+  if (__real__ x == 0.0 && __imag__ x == 0.0)
+    {
+      __imag__ result = signbit (__real__ x) ? M_PI : 0.0;
+      if (signbit (__imag__ x))
+	__imag__ result = __copysignf (__imag__ result, -1.0);
+      /* Yes, the following line raises an exception.  */
+      __real__ result = -1.0 / fabsf (__real__ x);
+    }
+  else  if (!__isnanf (__real__ x) && !__isnanf (__imag__ x))
+    {
+      __real__ result = __ieee754_logf (__ieee754_hypotf (__real__ x,
+							  __imag__ x));
+      __imag__ result = __ieee754_atan2f (__imag__ x, __real__ x);
+    }
+  else
+    {
+      __imag__ result = __nanf ("");
+      if (__isinff (__real__ x) || __isinff (__imag__ x))
+	__real__ result = HUGE_VALF;
+      else
+	__real__ result = __nanf ("");
+    }
+
+  return result;
+}
+weak_alias (__clogf, clogf)
diff --git a/sysdeps/libm-ieee754/s_clogl.c b/sysdeps/libm-ieee754/s_clogl.c
new file mode 100644
index 0000000000..a299a95c03
--- /dev/null
+++ b/sysdeps/libm-ieee754/s_clogl.c
@@ -0,0 +1,57 @@
+/* Compute complex natural logarithm.
+   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>
+
+#include "math_private.h"
+
+
+__complex__ long double
+__clogl (__complex__ long double x)
+{
+  __complex__ long double result;
+
+  if (__real__ x == 0.0 && __imag__ x == 0.0)
+    {
+      __imag__ result = signbit (__real__ x) ? M_PI : 0.0;
+      if (signbit (__imag__ x))
+	__imag__ result = __copysignl (__imag__ result, -1.0);
+      /* Yes, the following line raises an exception.  */
+      __real__ result = -1.0 / fabsl (__real__ x);
+    }
+  else if (!__isnanl (__real__ x) && !__isnanl (__imag__ x))
+    {
+      __real__ result = __ieee754_logl (__ieee754_hypotl (__real__ x,
+							  __imag__ x));
+      __imag__ result = __ieee754_atan2l (__imag__ x, __real__ x);
+    }
+  else
+    {
+      __imag__ result = __nanl ("");
+      if (__isinfl (__real__ x) || __isinfl (__imag__ x))
+	__real__ result = HUGE_VALL;
+      else
+	__real__ result = __nanl ("");
+    }
+
+  return result;
+}
+weak_alias (__clogl, clogl)
diff --git a/sysdeps/libm-ieee754/s_rintl.c b/sysdeps/libm-ieee754/s_rintl.c
index 5b4b647880..4e957d8373 100644
--- a/sysdeps/libm-ieee754/s_rintl.c
+++ b/sysdeps/libm-ieee754/s_rintl.c
@@ -36,9 +36,9 @@ static const long double
 #else
 static long double
 #endif
-TWO64[2]={
-  1.844674407370955161600000e+19, /* 0x403F, 0x00000000, 0x00000000 */
- -1.844674407370955161600000e+19, /* 0xC03F, 0x00000000, 0x00000000 */
+TWO63[2]={
+  9.223372036854775808000000e+18, /* 0x403E, 0x00000000, 0x00000000 */
+ -9.223372036854775808000000e+18  /* 0xC03E, 0x00000000, 0x00000000 */
 };
 
 #ifdef __STDC__
@@ -61,8 +61,8 @@ TWO64[2]={
 		i0 &= 0xe0000000;
 		i0 |= (i1|-i1)&0x80000000;
 		SET_LDOUBLE_MSW(x,i0);
-	        w = TWO64[sx]+x;
-	        t = w-TWO64[sx];
+	        w = TWO63[sx]+x;
+	        t = w-TWO63[sx];
 		GET_LDOUBLE_EXP(i0,t);
 		SET_LDOUBLE_EXP(t,(i0&0x7fff)|(sx<<15));
 	        return t;
@@ -80,17 +80,17 @@ TWO64[2]={
 		       s_rintf, too.  -- drepper@cygnus.com */
 		}
 	    }
-	} else if (j0>63) {
+	} else if (j0>62) {
 	    if(j0==0x4000) return x+x;	/* inf or NaN */
 	    else return x;		/* x is integral */
 	} else {
-	    i = ((u_int32_t)(0xffffffff))>>(j0-32);
+	    i = ((u_int32_t)(0xffffffff))>>(j0-31);
 	    if((i1&i)==0) return x;	/* x is integral */
 	    i>>=1;
-	    if((i1&i)!=0) i1 = (i1&(~i))|((0x40000000)>>(j0-32));
+	    if((i1&i)!=0) i1 = (i1&(~i))|((0x40000000)>>(j0-31));
 	}
 	SET_LDOUBLE_WORDS(x,se,i0,i1);
-	w = TWO64[sx]+x;
-	return w-TWO64[sx];
+	w = TWO63[sx]+x;
+	return w-TWO63[sx];
 }
 weak_alias (__rintl, rintl)
diff --git a/sysdeps/libm-ieee754/s_rinttol.c b/sysdeps/libm-ieee754/s_rinttol.c
new file mode 100644
index 0000000000..257bdc744c
--- /dev/null
+++ b/sysdeps/libm-ieee754/s_rinttol.c
@@ -0,0 +1,242 @@
+/* Round argument to nearest integral value according to current rounding
+   direction.
+   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 <math.h>
+
+#include "math_private.h"
+
+#ifdef NO_LONG_DOUBLE
+/* The `long double' is in fact the IEEE `double' type.  */
+static long double two52[2] =
+{
+  4.50359962737049600000e+15, /* 0x43300000, 0x00000000 */
+ -4.50359962737049600000e+15, /* 0xC3300000, 0x00000000 */
+};
+
+
+long int
+__rinttol (long double x)
+{
+  int32_t j0,sx;
+  u_int32_t i0,i1,i;
+  long double t, w;
+  long int result;
+
+  EXTRACT_WORDS (i0, i1, x);
+
+  sx = i0 >> 31;
+  j0 = ((i0 >> 20) & 0x7ff) - 0x3ff;
+
+  if (j0 < 20)
+    {
+      if (j0 < 0)
+	{
+	  if (((i0 & 0x7fffffff) | i1) == 0)
+	    /* The number is 0.  */
+	    result = 0;
+	  else
+	    {
+	      i1 |= i0;
+	      i0 &= 0xfffe0000;
+	      i0 |= ((i1 | -i1) >> 12) & 0x80000;
+	      SET_HIGH_WORD (x, i0);
+	      w = two52[sx] + x;
+	      t = w - two52[sx];
+	      GET_HIGH_WORD (i0, t);
+	      if ((i0 & 0x7fffffff) >= 0x3fff0000)
+		result = sx ? -1 : 1;
+	      else
+		result = 0;
+	    }
+	}
+      else
+	{
+	  u_int32_t i = 0x000fffff >> j0;
+	  if (((i0 & i) | i1) == 0)
+	    {
+	      /* X is not integral.  */
+	      i >>= 1;
+	      if (((i0 & i) | i1) != 0)
+		{
+		  if (j0 == 19)
+		    i1 = 0x40000000;
+		  else
+		    i0 = (i0 & (~i)) | (0x20000 >> j0);
+
+		  INSERT_WORDS (x, i0, i1);
+		  w = two52[sx] + x;
+		  x = w - two52[sx];
+		  EXTRACT_WORDS (i0, i1, x);
+
+		  j0 = ((i0 >> 20) & 0x7ff) - 0x3ff;
+		}
+	    }
+
+	  result = ((i0 >> (20 - j0)) & 0xfffff) | (0x00100000 >> (20 - j0));
+	  if (sx)
+	    result = -result;
+	}
+    }
+  else if ((unsigned int) j0 < sizeof (long int) * 8 && j0 < 53)
+    {
+      i = ((u_int32_t) (0xffffffff)) >> (j0 - 20);
+      if ((i1 & i) != 0)
+	{
+	  /* x is not integral.  */
+	  i >>= 1;
+	  if ((i1 & i) != 0)
+	    i1 = (i1 & (~i)) | (0x40000000 >> (j0 - 20));
+	}
+
+      INSERT_WORDS (x, i0, i1);
+      w = two52[sx] + x;
+      x = w - two52[sx];
+      EXTRACT_WORDS (i0, i1, x);
+
+      j0 = ((i0 >> 20) & 0x7ff) - 0x3ff;
+
+      result = i0 | 0x00100000;
+      if (j0 > 20)
+	{
+	  result <<= j0 - 20;
+	  result |= i1 >> (52 - j0);
+	}
+      if (sx)
+	result = -result;
+    }
+  else
+    /* Too large.  The number is either +-inf or NaN or it is too
+       large to be effected by rounding.  The standard leaves it
+       undefined what to return when the number is too large to fit in
+       a `long int'.  */
+    result = (long int) x;
+
+  return result;
+}
+
+#else
+static long double two63[2] =
+{
+  9.223372036854775808000000e+18, /* 0x403E, 0x00000000, 0x00000000 */
+ -9.223372036854775808000000e+18  /* 0xC03E, 0x00000000, 0x00000000 */
+};
+
+
+long int
+__rinttol (long double x)
+{
+  int32_t se,j0,sx;
+  u_int32_t i0,i1,i;
+  long int result;
+  long double w, t;
+
+  GET_LDOUBLE_WORDS (se, i0, i1, x);
+
+  sx = (se >> 15) & 1;
+  j0 = (se & 0x7fff) - 0x3fff;
+
+  if (j0 < 31)
+    {
+      if (j0 < 0)
+	{
+	  if (((se & 0x7fff) | i0 | i1) == 0)
+	    /* The number is 0.  */
+	    result = 0;
+	  else
+	    {
+	      i1 |= i0;
+	      i0 &= 0xe0000000;
+	      i0 |= (i1 | -i1) & 0x80000000;
+	      SET_LDOUBLE_MSW (x, i0);
+	      w = two63[sx] + x;
+	      t = w - two63[sx];
+	      GET_LDOUBLE_EXP (i0, t);
+	      if ((i0 & 0x7fff) >= 0x3fff)
+		result = sx ? -1 : 1;
+	      else
+		result = 0;
+	    }
+	}
+      else
+	{
+	  u_int32_t i = 0x7fffffff >> j0;
+	  if (((i0 & i) | i1) == 0)
+	    {
+	      /* X is not integral.  */
+	      i >>= 1;
+	      if (((i0 & i) | i1) != 0)
+		{
+		  if (j0 == 31)
+		    i1 = 0x40000000;
+		  else
+		    i0 = (i0 & (~i)) | (0x20000000 >> j0);
+
+		  SET_LDOUBLE_WORDS (x, se, i0, i1);
+		  w = two63[sx] + x;
+		  x = w - two63[sx];
+		  GET_LDOUBLE_WORDS (se, i0, i1, x);
+
+		  sx = (se >> 15) & 1;
+		  j0 = (se & 0x7fff) - 0x3fff;
+		}
+	    }
+
+
+	  result = i0 >> (31 - j0);
+	}
+    }
+  else if ((unsigned int) j0 < sizeof (long int) * 8 && j0 < 64)
+    {
+      i = ((u_int32_t) (0xffffffff)) >> (j0 - 31);
+      if ((i1 & i) != 0)
+	{
+	  /* x is not integral.  */
+	  i >>= 1;
+	  if ((i1 & i) != 0)
+	    i1 = (i1 & (~i)) | (0x40000000 >> (j0 - 31));
+	}
+
+      SET_LDOUBLE_WORDS (x, se, i0, i1);
+      w = two63[sx] + x;
+      x = w - two63[sx];
+      GET_LDOUBLE_WORDS (se, i0, i1, x);
+
+      j0 = (se & 0x7fff) - 0x3fff;
+
+      result = i0;
+      if (j0 > 31)
+	{
+	  result <<= j0 - 31;
+	  result |= i1 >> (63 - j0);
+	}
+    }
+  else
+    /* Too large.  The number is either +-inf or NaN or it is too
+       large to be effected by rounding.  The standard leaves it
+       undefined what to return when the number is too large to fit in
+       a `long int'.  */
+    result = (long int) x;
+
+  return result;
+}
+#endif
+
+weak_alias (__rinttol, rinttol)
diff --git a/sysdeps/libm-ieee754/s_rinttoll.c b/sysdeps/libm-ieee754/s_rinttoll.c
new file mode 100644
index 0000000000..b2fccd17b7
--- /dev/null
+++ b/sysdeps/libm-ieee754/s_rinttoll.c
@@ -0,0 +1,242 @@
+/* Round argument to nearest integral value according to current rounding
+   direction.
+   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 <math.h>
+
+#include "math_private.h"
+
+#ifdef NO_LONG_DOUBLE
+/* The `long double' is in fact the IEEE `double' type.  */
+static long double two52[2] =
+{
+  4.50359962737049600000e+15, /* 0x43300000, 0x00000000 */
+ -4.50359962737049600000e+15, /* 0xC3300000, 0x00000000 */
+};
+
+
+long long int
+__rinttoll (long double x)
+{
+  int32_t j0,sx;
+  u_int32_t i0, i1, i;
+  long double t, w;
+  long long int result;
+
+  EXTRACT_WORDS (i0, i1, x);
+
+  sx = i0 >> 31;
+  j0 = ((i0 >> 20) & 0x7ff) - 0x3ff;
+
+  if (j0 < 20)
+    {
+      if (j0 < 0)
+	{
+	  if (((i0 & 0x7fffffff) | i1) == 0)
+	    /* The number is 0.  */
+	    result = 0;
+	  else
+	    {
+	      i1 |= i0;
+	      i0 &= 0xfffe0000;
+	      i0 |= ((i1 | -i1) >> 12) & 0x80000;
+	      SET_HIGH_WORD (x, i0);
+	      w = two52[sx] + x;
+	      t = w - two52[sx];
+	      GET_HIGH_WORD (i0, t);
+	      if ((i0 & 0x7fffffff) >= 0x3fff0000)
+		result = sx ? -1 : 1;
+	      else
+		result = 0;
+	    }
+	}
+      else
+	{
+	  u_int32_t i = 0x000fffff >> j0;
+	  if (((i0 & i) | i1) == 0)
+	    {
+	      /* X is not integral.  */
+	      i >>= 1;
+	      if (((i0 & i) | i1) != 0)
+		{
+		  if (j0 == 19)
+		    i1 = 0x40000000;
+		  else
+		    i0 = (i0 & (~i)) | (0x20000 >> j0);
+
+		  INSERT_WORDS (x, i0, i1);
+		  w = two52[sx] + x;
+		  x = w - two52[sx];
+		  EXTRACT_WORDS (i0, i1, x);
+
+		  j0 = ((i0 >> 20) & 0x7ff) - 0x3ff;
+		}
+	    }
+
+	  result = ((i0 >> (20 - j0)) & 0xfffff) | (0x00100000 >> (20 - j0));
+	  if (sx)
+	    result = -result;
+	}
+    }
+  else if ((unsigned int) j0 < sizeof (long long int) * 8 && j0 < 53)
+    {
+      i = ((u_int32_t) (0xffffffff)) >> (j0 - 20);
+      if ((i1 & i) != 0)
+	{
+	  /* x is not integral.  */
+	  i >>= 1;
+	  if ((i1 & i) != 0)
+	    i1 = (i1 & (~i)) | (0x40000000 >> (j0 - 20));
+	}
+
+      INSERT_WORDS (x, i0, i1);
+      w = two52[sx] + x;
+      x = w - two52[sx];
+      EXTRACT_WORDS (i0, i1, x);
+
+      j0 = ((i0 >> 20) & 0x7ff) - 0x3ff;
+
+      result = i0 | 0x00100000;
+      if (j0 > 20)
+	{
+	  result <<= j0 - 20;
+	  result |= i1 >> (52 - j0);
+	}
+      if (sx)
+	result = -result;
+    }
+  else
+    /* Too large.  The number is either +-inf or NaN or it is too
+       large to be effected by rounding.  The standard leaves it
+       undefined what to return when the number is too large to fit in
+       a `long int'.  */
+    result = (long long int) x;
+
+  return result;
+}
+
+#else
+static long double two63[2] =
+{
+  9.223372036854775808000000e+18, /* 0x403E, 0x00000000, 0x00000000 */
+ -9.223372036854775808000000e+18  /* 0xC03E, 0x00000000, 0x00000000 */
+};
+
+
+long long int
+__rinttoll (long double x)
+{
+  int32_t se,j0,sx;
+  u_int32_t i0, i1, i;
+  long long int result;
+  long double w, t;
+
+  GET_LDOUBLE_WORDS (se, i0, i1, x);
+
+  sx = (se >> 15) & 1;
+  j0 = (se & 0x7fff) - 0x3fff;
+
+  if (j0 < 31)
+    {
+      if (j0 < 0)
+	{
+	  if (((se & 0x7fff) | i0 | i1) == 0)
+	    /* The number is 0.  */
+	    result = 0;
+	  else
+	    {
+	      i1 |= i0;
+	      i0 &= 0xe0000000;
+	      i0 |= (i1 | -i1) & 0x80000000;
+	      SET_LDOUBLE_MSW (x, i0);
+	      w = two63[sx] + x;
+	      t = w - two63[sx];
+	      GET_LDOUBLE_EXP (i0, t);
+	      if ((i0 & 0x7fff) >= 0x3fff)
+		result = sx ? -1 : 1;
+	      else
+		result = 0;
+	    }
+	}
+      else
+	{
+	  u_int32_t i = 0x7fffffff >> j0;
+	  if (((i0 & i) | i1) == 0)
+	    {
+	      /* X is not integral.  */
+	      i >>= 1;
+	      if (((i0 & i) | i1) != 0)
+		{
+		  if (j0 == 31)
+		    i1 = 0x40000000;
+		  else
+		    i0 = (i0 & (~i)) | (0x20000000 >> j0);
+
+		  SET_LDOUBLE_WORDS (x, se, i0, i1);
+		  w = two63[sx] + x;
+		  x = w - two63[sx];
+		  GET_LDOUBLE_WORDS (se, i0, i1, x);
+
+		  sx = (se >> 15) & 1;
+		  j0 = (se & 0x7fff) - 0x3fff;
+		}
+	    }
+
+
+	  result = i0 >> (31 - j0);
+	}
+    }
+  else if ((unsigned int) j0 < sizeof (long long int) * 8 && j0 < 64)
+    {
+      i = ((u_int32_t) (0xffffffff)) >> (j0 - 31);
+      if ((i1 & i) != 0)
+	{
+	  /* x is not integral.  */
+	  i >>= 1;
+	  if ((i1 & i) != 0)
+	    i1 = (i1 & (~i)) | (0x40000000 >> (j0 - 31));
+	}
+
+      SET_LDOUBLE_WORDS (x, se, i0, i1);
+      w = two63[sx] + x;
+      x = w - two63[sx];
+      GET_LDOUBLE_WORDS (se, i0, i1, x);
+
+      j0 = (se & 0x7fff) - 0x3fff;
+
+      result = i0;
+      if (j0 > 31)
+	{
+	  result <<= j0 - 31;
+	  result |= i1 >> (63 - j0);
+	}
+    }
+  else
+    /* Too large.  The number is either +-inf or NaN or it is too
+       large to be effected by rounding.  The standard leaves it
+       undefined what to return when the number is too large to fit in
+       a `long int'.  */
+    result = (long long int) x;
+
+  return result;
+}
+#endif
+
+weak_alias (__rinttoll, rinttoll)