Update.

2000-08-17  Ulrich Drepper  <drepper@redhat.com>

	* stdio-common/printf_fp.c: Fix chars_needed computation.
	Patch by Greg McGary <greg@mcgary.org>.

2000-08-17  Jakub Jelinek  <jakub@redhat.com>

	* elf/dl-load.c (_dl_map_object): Don't crash if both loader and
	_dl_loaded are NULL.

2000-08-17  Jakub Jelinek  <jakub@redhat.com>

	* manual/arith.texi (feholdexcept): Returns 0 on success.

2000-08-17  Andreas Jaeger  <aj@suse.de>

	* sysdeps/gnu/net/if.h (struct ifreq): Add ifru_newname.
	(ifr_newname): New.
	Reported by Andi Kleen <ak@suse.de>.

2000-08-17  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/alpha/fpu/fedisblxcpt.c: New file.
	* sysdeps/alpha/fpu/feenablxcpt.c: New file.
	* sysdeps/alpha/fpu/fegetexcept.c: New file.

2000-08-16  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/unix/sysv/linux/xstatconv.c (xstat32_conv): Test sizes
	of buf->st_ino and kbuf->st_ino, not __st_ino.
	If _HAVE_STAT64___ST_INO is not defined, don't use __st_ino at all.
	* sysdeps/unix/sysv/linux/getdents64.c: Change path in #include
	directive so that only linux/getdents.c is used, not some
	architecture specific one.

2000-08-16  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/i386/fpu/fegetexcept.c (fegetexcept): Return currently
	enabled, not disabled exceptions.
	* sysdeps/i386/fpu/fedisblxcpt.c (fedisableexcept): Likewise.
	* sysdeps/i386/fpu/feenablxcpt.c (feenableexcept): Likewise.

	($(addprefix $(objpfx),$(tests)),
	$(addprefix $(objpfx),$(librt-tests))):
	* include/link.h: Undo last patches.  Hurd now has stat64.

10 files changed, 172 insertions, 23 deletions

diff --git a/ChangeLog b/ChangeLog
index 46d945ccf1..9cad0a7198 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,45 @@
+2000-08-17  Ulrich Drepper  <drepper@redhat.com>
+
+	* stdio-common/printf_fp.c: Fix chars_needed computation.
+	Patch by Greg McGary <greg@mcgary.org>.
+
+2000-08-17  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf/dl-load.c (_dl_map_object): Don't crash if both loader and
+	_dl_loaded are NULL.
+
+2000-08-17  Jakub Jelinek  <jakub@redhat.com>
+
+	* manual/arith.texi (feholdexcept): Returns 0 on success.
+
+2000-08-17  Andreas Jaeger  <aj@suse.de>
+
+	* sysdeps/gnu/net/if.h (struct ifreq): Add ifru_newname.
+	(ifr_newname): New.
+	Reported by Andi Kleen <ak@suse.de>.
+
+2000-08-17  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/alpha/fpu/fedisblxcpt.c: New file.
+	* sysdeps/alpha/fpu/feenablxcpt.c: New file.
+	* sysdeps/alpha/fpu/fegetexcept.c: New file.
+
+2000-08-16  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/unix/sysv/linux/xstatconv.c (xstat32_conv): Test sizes
+	of buf->st_ino and kbuf->st_ino, not __st_ino.
+	If _HAVE_STAT64___ST_INO is not defined, don't use __st_ino at all.
+	* sysdeps/unix/sysv/linux/getdents64.c: Change path in #include
+	directive so that only linux/getdents.c is used, not some
+	architecture specific one.
+
+2000-08-16  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/i386/fpu/fegetexcept.c (fegetexcept): Return currently
+	enabled, not disabled exceptions.
+	* sysdeps/i386/fpu/fedisblxcpt.c (fedisableexcept): Likewise.
+	* sysdeps/i386/fpu/feenablxcpt.c (feenableexcept): Likewise.
+
 2000-08-17  Greg McGary  <greg@mcgary.org>
 
 	* Makeconfig (link-extra-libs-bounded): Strip `-bp' suffix
@@ -10,7 +52,8 @@
 	* linuxthreads/Makefile (libpthread, librt): Remove variables.
 	(librt-tests): Add variable.  (tests): Use it.
 	[build-shared, build-static]
-	($(addprefix $(objpfx),$(tests)), $(addprefix $(objpfx),$(librt-tests))):
+	($(addprefix $(objpfx),$(tests)),
+	$(addprefix $(objpfx),$(librt-tests))):
 	Consolidate individual dependencies.
 	[build-bounded]
 	($(tests:%=$(objpfx)%-bp), $(librt-tests:%=$(objpfx)%-bp)):
@@ -91,7 +134,7 @@
 	* sysdeps/unix/sysv/linux/powerpc/oldgetrlimit64.c: New file.
 	Patch by Franz Sirl <Franz.Sirl-kernel@lauterbach.com>.
 
-	* include/link.h: Undo last patches.  Hurd now had stat64.
+	* include/link.h: Undo last patches.  Hurd now has stat64.
 	* elf/Makefile: Likewise.
 	* elf/dl-load.c: Likewise.
 	* elf/dl-misc.c: Likewise.
diff --git a/elf/dl-load.c b/elf/dl-load.c
index ffaca6e55d..adeb7dced2 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1466,16 +1466,18 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
 	     for compatibility with Linux's ldconfig program.  */
 	  extern const char *_dl_load_cache_lookup (const char *name);
 	  const char *cached = _dl_load_cache_lookup (name);
+
+#ifdef SHARED
+	  l = loader ?: _dl_loaded;
+#else
+	  l = loader;
+#endif
+
 	  if (cached)
 	    {
 	      /* If the loader has the DF_1_NODEFLIB flag set we must not
 		 use a cache entry from any of these directories.  */
-	      if (
-#ifndef SHARED
-		  loader != NULL &&
-#endif
-		  __builtin_expect ((loader ?: _dl_loaded)->l_flags_1
-				    & DF_1_NODEFLIB, 0))
+	      if (l && __builtin_expect (l->l_flags_1 & DF_1_NODEFLIB, 0))
 		{
 		  const char *dirp = system_dirs;
 		  int cnt = 0;
@@ -1514,12 +1516,8 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
 
       /* Finally, try the default path.  */
       if (fd == -1
-	  && (
-#ifndef SHARED
-	      loader == NULL ||
-#endif
-	      __builtin_expect (!((loader ?: _dl_loaded)->l_flags_1
-				  & DF_1_NODEFLIB), 1)))
+	  && (l == NULL ||
+	      __builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1)))
 	fd = open_path (name, namelen, preloaded, &rtld_search_dirs,
 			&realname);
 
diff --git a/manual/arith.texi b/manual/arith.texi
index c967bc670c..5ab6a14fef 100644
--- a/manual/arith.texi
+++ b/manual/arith.texi
@@ -1018,8 +1018,8 @@ non-zero value otherwise.
 Store the current floating-point environment in the object pointed to by
 @var{envp}.  Then clear all exception flags, and set the FPU to trap no
 exceptions.  Not all FPUs support trapping no exceptions; if
-@code{feholdexcept} cannot set this mode, it returns zero.  If it
-succeeds, it returns a nonzero value.
+@code{feholdexcept} cannot set this mode, it returns nonzero value.  If it
+succeeds, it returns zero.
 @end deftypefun
 
 The functions which restore the floating-point environment can take two
diff --git a/stdio-common/printf_fp.c b/stdio-common/printf_fp.c
index 67161be586..47052d7797 100644
--- a/stdio-common/printf_fp.c
+++ b/stdio-common/printf_fp.c
@@ -835,9 +835,12 @@ __printf_fp (FILE *fp,
 	    type = 'f';
 	    intdig_max = expsign == 0 ? exponent + 1 : 0;
 	    fracdig_max = dig_max - intdig_max;
-	    /* We need space for the significant digits and perhaps for
-	       leading zeros when < 1.0.  Pessimistic guess: dig_max.  */
-	    chars_needed = dig_max + dig_max + 1;
+	    /* We need space for the significant digits and perhaps
+	       for leading zeros when < 1.0.  The number of leading
+	       zeros can be as many as would be required for
+	       exponential notation with a negative two-digit
+	       exponent, which is 4.  */
+	    chars_needed = dig_max + 1 + 4;
 	  }
 	fracdig_min = info->alt ? fracdig_max : 0;
 	significant = 0;		/* We count significant digits.	 */
diff --git a/sysdeps/alpha/fpu/fedisblxcpt.c b/sysdeps/alpha/fpu/fedisblxcpt.c
new file mode 100644
index 0000000000..ab0630c084
--- /dev/null
+++ b/sysdeps/alpha/fpu/fedisblxcpt.c
@@ -0,0 +1,36 @@
+/* Disable floating-point exceptions.
+   Copyright (C) 2000 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Jakub Jelinek <jakub@redhat.com>, 2000.
+
+   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 <fenv.h>
+
+int
+fedisableexcept (int excepts)
+{
+  unsigned long int new_exc, old_exc;
+
+  new_exc = __ieee_get_fp_control ();
+
+  old_exc = (new_exc << 16) & FE_ALL_EXCEPT;
+  new_exc &= ~((excepts & FE_ALL_EXCEPT) >> 16);
+
+  __ieee_set_fp_control (new_exc);
+
+  return old_exc;
+}
diff --git a/sysdeps/alpha/fpu/feenablxcpt.c b/sysdeps/alpha/fpu/feenablxcpt.c
new file mode 100644
index 0000000000..d2b0f2e5e5
--- /dev/null
+++ b/sysdeps/alpha/fpu/feenablxcpt.c
@@ -0,0 +1,36 @@
+/* Enable floating-point exceptions.
+   Copyright (C) 2000 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Jakub Jelinek <jakub@redhat.com>, 2000.
+
+   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 <fenv.h>
+
+int
+feenableexcept (int excepts)
+{
+  unsigned long int new_exc, old_exc;
+
+  new_exc = __ieee_get_fp_control ();
+
+  old_exc = (new_exc << 16) & FE_ALL_EXCEPT;
+  new_exc |= (excepts & FE_ALL_EXCEPT) >> 16;
+
+  __ieee_set_fp_control (new_exc);
+
+  return old_exc;
+}
diff --git a/sysdeps/alpha/fpu/fegetexcept.c b/sysdeps/alpha/fpu/fegetexcept.c
new file mode 100644
index 0000000000..e4d5e784ea
--- /dev/null
+++ b/sysdeps/alpha/fpu/fegetexcept.c
@@ -0,0 +1,31 @@
+/* Get enabled floating-point exceptions.
+   Copyright (C) 2000 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Jakub Jelinek <jakub@redhat.com>, 2000.
+
+   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 <fenv.h>
+
+int
+fegetexcept (void)
+{
+  unsigned long int exc;
+
+  exc = __ieee_get_fp_control ();
+
+  return (exc << 16) & FE_ALL_EXCEPT;
+}
diff --git a/sysdeps/gnu/net/if.h b/sysdeps/gnu/net/if.h
index c51c735d9c..0be2637ea8 100644
--- a/sysdeps/gnu/net/if.h
+++ b/sysdeps/gnu/net/if.h
@@ -129,6 +129,7 @@ struct ifreq
 	int ifru_mtu;
 	struct ifmap ifru_map;
 	char ifru_slave[IFNAMSIZ];	/* Just fits the size */
+	char ifru_newname[IFNAMSIZ];
 	__caddr_t ifru_data;
       } ifr_ifru;
   };
@@ -147,6 +148,7 @@ struct ifreq
 #define ifr_ifindex	ifr_ifru.ifru_ivalue    /* interface index      */
 #define ifr_bandwidth	ifr_ifru.ifru_ivalue	/* link bandwidth	*/
 #define ifr_qlen	ifr_ifru.ifru_ivalue	/* queue length		*/
+#define ifr_newname	ifr_ifru.ifru_newname	/* New name		*/
 #define _IOT_ifreq	_IOT(_IOTS(struct ifreq),1,0,0,0,0) /* not right */
 
 
diff --git a/sysdeps/unix/sysv/linux/getdents64.c b/sysdeps/unix/sysv/linux/getdents64.c
index 0078ccd19f..805917e274 100644
--- a/sysdeps/unix/sysv/linux/getdents64.c
+++ b/sysdeps/unix/sysv/linux/getdents64.c
@@ -1,3 +1,3 @@
 #define __GETDENTS __getdents64
 #define DIRENT_TYPE struct dirent64
-#include <getdents.c>
+#include <sysdeps/unix/sysv/linux/getdents.c>
diff --git a/sysdeps/unix/sysv/linux/xstatconv.c b/sysdeps/unix/sysv/linux/xstatconv.c
index 21620a2e00..d4cf9c1451 100644
--- a/sysdeps/unix/sysv/linux/xstatconv.c
+++ b/sysdeps/unix/sysv/linux/xstatconv.c
@@ -168,7 +168,7 @@ xstat32_conv (int vers, struct stat64 *kbuf, struct stat *buf)
 # endif
 	  {
 	    buf->st_ino = kbuf->st_ino;
-	    if (sizeof (buf->st_ino) != sizeof (kbuf->__st_ino)
+	    if (sizeof (buf->st_ino) != sizeof (kbuf->st_ino)
 		&& buf->st_ino != kbuf->st_ino)
 	      {
 		__set_errno (EOVERFLOW);
@@ -176,8 +176,8 @@ xstat32_conv (int vers, struct stat64 *kbuf, struct stat *buf)
 	      }
 	  }
 #else
-	buf->st_ino = kbuf->__st_ino;
-	if (sizeof (buf->st_ino) != sizeof (kbuf->__st_ino)
+	buf->st_ino = kbuf->st_ino;
+	if (sizeof (buf->st_ino) != sizeof (kbuf->st_ino)
 	    && buf->st_ino != kbuf->st_ino)
 	  {
 	    __set_errno (EOVERFLOW);