Update. cvs/libc-ud-970802

1997-08-02 21:27  Ulrich Drepper  <drepper@cygnus.com>

	* inet/Makefile (headers): Rename netinet/inbits.h to bits/in.h.
	* inet/netinet/in.h: Include bits/in.h instead of netinet/inbits.h.
	* sysdeps/generic/netinet/inbits.h: Move to...
	* sysdeps/generic/bits/in.h: ... here.
	* sysdeps/unix/sysv/linux/bits/inbits.h: Move to ...
	* sysdeps/unix/sysv/linux/bits/in.h: ... here.

	* nis/Makefile (headers): Add bits/nislib.h.
	* nis/rpcsvc/nislib.h: Moved to ....
	* nis/bits/nislib.h: ... here.

	* nis/nss_compat/compat-grp.c: Don't include <rpcsvc/nislib.h>.
	* nis/nss_compat/compat-pwd.c: Likewise.
	* nis/nss_compat/compat-spwd.c: Likewise.
	* nis/nss_nisplus/nisplus-alias.c: Likewise.
	* nis/nss_nisplus/nisplus-ethers.c: Likewise.
	* nis/nss_nisplus/nisplus-grp.c: Likewise.
	* nis/nss_nisplus/nisplus-hosts.c: Likewise.
	* nis/nss_nisplus/nisplus-netgrp.c: Likewise.
	* nis/nss_nisplus/nisplus-ntework.c: Likewise.
	* nis/nss_nisplus/nisplus-proto.c: Likewise.
	* nis/nss_nisplus/nisplus-publickey.c: Likewise.
	* nis/nss_nisplus/nisplus-pwd.c: Likewise.
	* nis/nss_nisplus/nisplus-rpc.c: Likewise.
	* nis/nss_nisplus/nisplus-service.c: Likewise.
	* nis/nss_nisplus/nisplus-spwd.c: Likewise.

	* nis/rpcsvc/nis.x: Include bits/nislib.h, not rpcsvc/nislib.h.
	* nis/rpcsvc/nis.h: Likewise.

	* inet/getnameinfo.c (nrl_domainname): Change return type to const
	char *.
	(getnameinfo): Change type of local variable c to const char *.

	* inet/inet_ntoa.c: Rewrite to use __libc_once for initialization.
	* stdlib/fmtmsg.c: Likewise.

	* intl/bindtextdom.c: Update from latest gettext.
	* intl/dcgettext.c: Likewise.
	* intl/finddomain.c: Likewise.
	* intl/l10nflist.c: Likewise.
	* intl/localealias.c: Likewise.
	* intl/textdomain.c: Likewise.

	* login/getutid_r.c: Remove parameter to setutent call.
	* login/getutline_r.c: Likewise.

	* posix/wordexp.c: Complete rewrite.  Not fully implemented yet,
	though.  Patch by Tim Waugh <tim@cyberelk.demon.co.uk>.

	* stdio-common/printf_fp.c: Remove relative include paths.
	* stdio-common/printf_fphex.c: Likewise.

	* sysdeps/generic/crypt.h: Cleanup.  Don't define non standard
	elements unless __USE_GNU.

	* sysdeps/generic/vlimit.c: Pretty print.
	* sysdeps/generic/vtimes.c: Likewise.

	* sysdeps/i386/elf/bsd-_setjmp.S: New file.  Empty dummy file.
	* sysdeps/i386/elf/bsd-setjmp.S: New file.  Empty dummy file.
	* sysdeps/i386/elf/setjmp.S: New file.  Define __setjmp and also
	weak definitions of setjmp and _setjmp.

	* sysdeps/i386/fpu/bits/mathinline.h: More patches by John Bowman.

	* sysdeps/stub/if_index.h: Set errno in all functions and add
	stub warnings.

	* sysdeps/stub/libc-lock.h: Add __libc_once.

1997-08-02 01:57  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/ptrace.c: Don't set errno in error
	case since the __syscall_ptrace call already did this.
	Reported by Philip Gladstone <philip@talon.raptor.com>.

1997-07-29  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* sysdeps/unix/sysv/linux/sys/fsuid.h: Change include
	<gnu/types.h> to <sys/types.h>.

1997-08-01 23:18  Ulrich Drepper  <drepper@cygnus.com>

	* csu/defs.awk: Fix regexp for end and align.
	Patch by Klaus Espenlaub <kespenla@hydra.informatik.uni-ulm.de>.

	* locale/programs/localedef.c (print_escaped): New function.
	(show_info): Use print_escaped if strings can control unprintable
	characters.
	Patch by Jochen Hein <jochen.hein@delphi.central.de>.

1997-08-01 18:45  Thorsten Kukuk  <kukuk@vt.uni-paderborn.de>

	* nis/nss_nisplus/nisplus-alias.c: Fix NULL pointer problems
	* nis/nss_nisplus/nisplus-grp.c: Likewise.

1997-07-31  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* elf/dl-profile.c (_dl_start_profile): Use _dl_sysdep_error
	instead of fprintf.

1997-07-31  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* manual/socket.texi (Host Address Functions): Fix arguments of
	@deftypefun.

1997-07-31  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* elf/dl-runtime.c: Avoid warning about profile_fixup being
	unused.

	* sysdeps/m68k/dl-machine.h: Add support for shared library
	profiling.

1997-07-31  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* md5-crypt/Makefile (extra-objs): Add onlymd5-crypt.o for
	dependencies.

1997-07-31  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* Make-dist (subdirs): Distribute both aout and elf.

1997-07-31 23:04  Mark Kettenis  <kettenis@phys.uva.nl>

	* login/utmp-private.h: Remove reset argument from backend
	setutent.
	* login/getutent_r.c (__setutent): Allways call the setutent
	function in the daemon backend.
	(setutent_unknown): Function removed.
	(getutent_unknown, pututline_unknown): Call __setutent instead of
	setutent_unknown.
	* login/utmp_file.c (setutent_file): Removed reset argument.  All
	callers changed.
	* login/utmp_daemon.c (setutent_daemon): Removed reset
	argument.  All callers changed.  Try to open connection even if a
	previous connection failed, but first check if the sockets exist
	in the filesystem.

	* login/utmp_daemon.c (pututline_daemon): Try to open connection
	before reporting failure.

	* login/programs/database.c (open_database): Create compatibility
	file if it does not already exist.  Supply mode argument in open
	calls to guarantee that created files have the proper protection.

	* login/programs/utmpd.c (main): Remove files created by a
	previous `bind' before creating sockets.
	Suggested by a sun <asum@zoology.washington.edu>.

1997-07-29  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* math/libm-test.c: Remove unneeded function check_int_exec.

	* BUGS: Correct typos.

	* gmon/gmon.c: Add alias for monstartup, declare _strerror_internal.

1997-07-30  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* manual/socket.texi (Host Address Functions): Reformat inet_ntop
	entry to confirm with expected behaviour of some scripts.

	* libc.map: Add functions/variables in global namespace,
	remove wildcards.

1997-07-29  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* resolv/libresolv.map: Add variables and routines used by named,
	nslookup and other bind utils.
	* libc.map: Likewise.

1997-07-31 00:35  Philip Blundell  <Philip.Blundell@pobox.com>

	* sysdeps/unix/sysv/linux/if_index.c: Rewrite to avoid using /proc
	filesystem.
	* inet/test_ifindex.c: New file.
	* inet/Makefile (tests): Add test_ifindex.

1997-08-01 04:25  Ulrich Drepper  <drepper@cygnus.com>

	* nis/nss_nisplus/nisplus-parser.c: Fix another bug in the parser.
	Patch by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>.

	* manual/errno.texi: Fix typo.
	Reported by Erik Talvola <etalvo@sapient.com>.

	(write_hist): Remove dependency on 32 bit int.

17 files changed, 334 insertions, 146 deletions

diff --git a/sysdeps/generic/netinet/inbits.h b/sysdeps/generic/bits/in.h
index 7241bd24c3..7241bd24c3 100644
--- a/sysdeps/generic/netinet/inbits.h
+++ b/sysdeps/generic/bits/in.h
diff --git a/sysdeps/generic/crypt.h b/sysdeps/generic/crypt.h
index 0fdef1843a..3f8f960140 100644
--- a/sysdeps/generic/crypt.h
+++ b/sysdeps/generic/crypt.h
@@ -29,28 +29,30 @@
 
 __BEGIN_DECLS
 
-struct crypt_data
-{
-  char keysched[(16 * 8) / sizeof (char)];
-  char sb0[32768 / sizeof (char)];
-  char sb1[32768 / sizeof (char)];
-  char sb2[32768 / sizeof (char)];
-  char sb3[32768 / sizeof (char)];
-  /* end-of-alignment-critical-data */
-  char crypt_3_buf[14];
-  char current_salt[2];
-  long current_saltbits;
-  int  direction, initialized;
-};
-
 /* Encrypt at most 8 characters from KEY using salt to perturb DES.  */
 extern char *crypt __P ((__const char *__key, __const char *__salt));
 
 
+#ifdef __USE_GNU
 /* Reentrant versions of the functions above.  The additional argument
    points to a structure where the results are placed in.  */
+struct crypt_data
+  {
+    char keysched[16 * 8];
+    char sb0[32768];
+    char sb1[32768];
+    char sb2[32768];
+    char sb3[32768];
+    /* end-of-alignment-critical-data */
+    char crypt_3_buf[14];
+    char current_salt[2];
+    long int current_saltbits;
+    int direction, initialized;
+  };
+
 extern char *crypt_r __P ((__const char *__key, __const char *__salt,
 			   struct crypt_data *__data));
+#endif
 
 __END_DECLS
 
diff --git a/sysdeps/generic/vlimit.c b/sysdeps/generic/vlimit.c
index 045eece010..5654be1205 100644
--- a/sysdeps/generic/vlimit.c
+++ b/sysdeps/generic/vlimit.c
@@ -43,7 +43,7 @@ vlimit (resource, value)
 	return -1;
 
       lims.rlim_cur = value;
-      return setrlimit(rlimit_res, &lims);
+      return setrlimit (rlimit_res, &lims);
     }
 
   __set_errno (EINVAL);
diff --git a/sysdeps/generic/vtimes.c b/sysdeps/generic/vtimes.c
index 0c19a918f8..e448da6de1 100644
--- a/sysdeps/generic/vtimes.c
+++ b/sysdeps/generic/vtimes.c
@@ -38,8 +38,8 @@ vtimes_one (struct vtimes *vt, enum __rusage_who who)
       if (getrusage (who, &usage) < 0)
 	return -1;
 
-      vt->vm_utime = TIMEVAL_TO_VTIMES(usage.ru_utime);
-      vt->vm_stime = TIMEVAL_TO_VTIMES(usage.ru_stime);
+      vt->vm_utime = TIMEVAL_TO_VTIMES (usage.ru_utime);
+      vt->vm_stime = TIMEVAL_TO_VTIMES (usage.ru_stime);
       vt->vm_idsrss = usage.ru_idrss + usage.ru_isrss;
       vt->vm_majflt = usage.ru_majflt;
       vt->vm_minflt = usage.ru_minflt;
@@ -58,8 +58,8 @@ vtimes (current, child)
      struct vtimes *current;
      struct vtimes *child;
 {
-  if (vtimes_one(current, RUSAGE_SELF) < 0 ||
-      vtimes_one(child, RUSAGE_CHILDREN) < 0)
+  if (vtimes_one (current, RUSAGE_SELF) < 0
+      || vtimes_one (child, RUSAGE_CHILDREN) < 0)
     return -1;
   return 0;
 }
diff --git a/sysdeps/gnu/errlist.c b/sysdeps/gnu/errlist.c
index f998747848..3333f1d467 100644
--- a/sysdeps/gnu/errlist.c
+++ b/sysdeps/gnu/errlist.c
@@ -249,7 +249,7 @@ TRANS until some external condition makes it possible to read, write, or
 TRANS connect (whatever the operation).  You can use @code{select} to find out
 TRANS when the operation will be possible; @pxref{Waiting for I/O}.
 TRANS 
-TRANS @strong{Portability Note:} In older Unix many systems, this condition
+TRANS @strong{Portability Note:} In older many Unix systems, this condition
 TRANS was indicated by @code{EWOULDBLOCK}, which was a distinct error code
 TRANS different from @code{EAGAIN}.  To make your program portable, you should
 TRANS check for both codes and treat them the same.
diff --git a/sysdeps/i386/elf/bsd-_setjmp.S b/sysdeps/i386/elf/bsd-_setjmp.S
new file mode 100644
index 0000000000..1417270201
--- /dev/null
+++ b/sysdeps/i386/elf/bsd-_setjmp.S
@@ -0,0 +1 @@
+/* We don't need any code here since the setjmp.S file contains it.  */
diff --git a/sysdeps/i386/elf/bsd-setjmp.S b/sysdeps/i386/elf/bsd-setjmp.S
new file mode 100644
index 0000000000..1417270201
--- /dev/null
+++ b/sysdeps/i386/elf/bsd-setjmp.S
@@ -0,0 +1 @@
+/* We don't need any code here since the setjmp.S file contains it.  */
diff --git a/sysdeps/i386/elf/setjmp.S b/sysdeps/i386/elf/setjmp.S
new file mode 100644
index 0000000000..d73e84364f
--- /dev/null
+++ b/sysdeps/i386/elf/setjmp.S
@@ -0,0 +1,72 @@
+/* setjmp for i386, ELF version.
+   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   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 <sysdep.h>
+#define _ASM
+#include <bits/setjmp.h>
+
+	/* We include the BSD entry points here as well but we make
+	   them weak.  */
+ENTRY (setjmp)
+	.weak C_SYMBOL_NAME (setjmp)
+	popl %eax		/* Pop return PC.  */
+	popl %ecx		/* Pop jmp_buf argument.  */
+	pushl $1		/* Push second argument of zero.  */
+	pushl %ecx		/* Push back first argument.  */
+	pushl %eax		/* Push back return PC.  */
+	jmp __sigsetjmp
+END (setjmp)
+
+	/* Binary compatibility entry point.  */
+ENTRY (_setjmp)
+	.weak C_SYMBOL_NAME (_setjmp)
+ENTRY (__setjmp)
+	popl %eax		/* Pop return address.  */
+	popl %ecx		/* Pop jmp_buf.  */
+	pushl $0		/* Push zero argument.  */
+	pushl %ecx		/* Push jmp_buf.  */
+	pushl %eax		/* Push back return address.  */
+
+ENTRY (__sigsetjmp)
+	movl 4(%esp), %eax	/* User's jmp_buf in %eax.  */
+     	/* Save registers.  */
+	movl %ebx, (JB_BX*4)(%eax)
+	movl %esi, (JB_SI*4)(%eax)
+	movl %edi, (JB_DI*4)(%eax)
+	movl %ebp, (JB_BP*4)(%eax)
+	leal 4(%esp), %ecx	/* Save SP as it will be after we return.  */
+     	movl %ecx, (JB_SP*4)(%eax)
+	movl 0(%esp), %ecx	/* Save PC we are returning to now.  */
+     	movl %ecx, (JB_PC*4)(%eax)
+
+	/* Make a tail call to __sigjmp_save; it takes the same args.  */
+#ifdef	PIC
+	/* We cannot use the PLT, because it requires that %ebx be set, but
+           we can't save and restore our caller's value.  Instead, we do an
+           indirect jump through the GOT, using for the temporary register
+           %ecx, which is call-clobbered.  */
+	call here
+here:	popl %ecx
+	addl $_GLOBAL_OFFSET_TABLE_+[.-here], %ecx
+	movl C_SYMBOL_NAME(__sigjmp_save@GOT)(%ecx), %ecx
+	jmp *%ecx
+#else
+	jmp __sigjmp_save
+#endif
+END (__sigsetjmp)
diff --git a/sysdeps/i386/fpu/bits/mathinline.h b/sysdeps/i386/fpu/bits/mathinline.h
index 2fc5baf81e..b3736f8417 100644
--- a/sysdeps/i386/fpu/bits/mathinline.h
+++ b/sysdeps/i386/fpu/bits/mathinline.h
@@ -29,7 +29,7 @@
    all floating-point types.  */
 # define isgreater(x, y) \
      ({ int __result;							      \
-	__asm__ ("fucompp; fnstsw; andb $0x45, %%ah; setz %%al;"	      \
+	__asm__ ("fucompp; fnstsw; testb $0x45, %%ah; setz %%al;"	      \
 		 "andl $0x01, %0"					      \
 		 : "=a" (__result) : "u" (y), "t" (x) : "cc", "st", "st(1)"); \
 	__result; })
@@ -118,11 +118,11 @@
 #endif
 
 #define __inline_mathop_decl_(float_type, func, op, params...) \
-  __MATHINLINE float_type func (float_type);				      \
-  __MATHINLINE float_type func (float_type __x)				      \
+  __MATH_INLINE float_type func (float_type);				      \
+  __MATH_INLINE float_type func (float_type __x)			      \
   {									      \
     register float_type __result;					      \
-    __asm __volatile__ (op : "=t" (__results) : params);		      \
+    __asm __volatile__ (op : "=t" (__result) : params);			      \
     return __result;							      \
   }
 
@@ -163,8 +163,9 @@
   }
 
 
-/* Optimized inline implementation, sometimes woth reduced precision
+/* Optimized inline implementation, sometimes with reduced precision
    and/or argument range.  */
+
 #define __expm1_code \
   register long double __value;						      \
   register long double __exponent;					      \
@@ -266,7 +267,7 @@ __inline_mathcode2 (pow, __x, __y, \
       /* NOTREACHED */							      \
     }									      \
   __asm __volatile__							      \
-    ("fyl2x" : "=t" (__value) : "0" (__x), "u" (1.0) : "st1");		      \
+    ("fyl2x" : "=t" (__value) : "0" (__x), "u" (1.0) : "st(1)");	      \
   __asm __volatile__							      \
     ("fmul	%%st(1)		# y * log2(x)\n\t"			      \
      "fst	%%st(1)\n\t"						      \
@@ -285,26 +286,34 @@ __inline_mathcode2 (pow, __x, __y, \
 __inline_mathop (sqrt, "fsqrt")
 __inline_mathop_ (long double, __sqrtl, "fsqrt")
 
+#if defined __GNUC__ && (__GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ >= 8)
+__inline_mathcode_ (fabs, __x, return __builtin_fabs (__x))
+__inline_mathcode_ (fabsf, __x, return __builtin_fabsf (__x))
+__inline_mathcode_ (fabsl, __x, return __builtin_fabsl (__x))
+__inline_mathcode_ (__fabsl, __x, return __builtin_fabsl (__x))
+#else
 __inline_mathop (fabs, "fabs")
+__inline_mathop_ (long double, __fabsl, "fabs")
+#endif
 
 /* The argument range of this inline version is reduced.  */
 __inline_mathop (sin, "fsin")
 /* The argument range of this inline version is reduced.  */
 __inline_mathop (cos, "fcos")
 
-__inline_mathop (atan, "fld1; fpatan")
+__inline_mathop_decl (atan, "fpatan", "u" (__x), "0" (1.0) : "st(1)")
 __inline_mathop (log, "fldln2; fxch; fyl2x")
 __inline_mathop (log10, "fldlg2; fxch; fyl2x")
 
 __inline_mathcode (asin, __x, return __atan2l (__x, __sqrtl (1.0 - __x * __x)))
 __inline_mathcode (acos, __x, return __atan2l (__sqrtl (1.0 - __x * __x), __x))
 
-__inline_mathcode (__sgn1, __x, return __x >= 0.0 ? 1.0 : -1.0)
+__inline_mathcode_ (long double, __sgn1l, __x, return __x >= 0.0 ? 1.0 : -1.0)
 
 
 /* The argument range of the inline version of sinhl is slightly reduced.  */
 __inline_mathcode (sinh, __x, \
-  register long double __exm1 = __expm1l (__builtin_fabsl (__x));	      \
+  register long double __exm1 = __expm1l (__fabsl (__x));		      \
   return 0.5 * (__exm1 / (__exm1 + 1.0) + __exm1) * __sgn1l (__x))
 
 __inline_mathcode (cosh, __x, \
@@ -312,7 +321,7 @@ __inline_mathcode (cosh, __x, \
   return 0.5 * (__ex + 1.0 / __ex))
 
 __inline_mathcode (tanh, __x, \
-  register long double __exm1 = __expm1l (-__builtin_fabsl (__x + __x));      \
+  register long double __exm1 = __expm1l (-__fabsl (__x + __x));	      \
   return __exm1 / (__exm1 + 2.0) * __sgn1l (-__x))
 
 
@@ -338,6 +347,20 @@ __inline_mathcode (ceil, __x, \
   __asm __volatile ("fldcw %0" : : "m" (__cw));				      \
   return __value)
 
+#define __ldexp_code \
+  register long double __value;						      \
+  __asm __volatile__							      \
+    ("fscale"								      \
+     : "=t" (__value) : "0" (__x), "u" ((long double) __y));		      \
+  return __value
+
+__MATH_INLINE double ldexp (double __x, int __y);
+__MATH_INLINE double
+ldexp (double __x, int __y)
+{
+  __ldexp_code;
+}
+
 
 /* Optimized versions for some non-standardized functions.  */
 #if defined __USE_ISOC9X || defined __USE_MISC
@@ -352,7 +375,7 @@ __inline_mathcode (expm1, __x, __expm1_code)
 
 __inline_mathcode (log1p, __x, \
   register long double __value;						      \
-  if (__builtin_fabsl (__x) >= 1.0 - 0.5 * __M_SQRT2)			      \
+  if (__fabsl (__x) >= 1.0 - 0.5 * __M_SQRT2)				      \
     __value = logl (1.0 + __x);						      \
   else									      \
     __asm __volatile__							      \
@@ -365,7 +388,7 @@ __inline_mathcode (log1p, __x, \
 
 /* The argument range of the inline version of asinhl is slightly reduced.  */
 __inline_mathcode (asinh, __x, \
-  register long double  __y = __builtin_fabsl (__x);			      \
+  register long double  __y = __fabsl (__x);				      \
   return (log1pl (__y * __y / (__sqrtl (__y * __y + 1.0) + 1.0) + __y)	      \
 	  * __sgn1l (__x))
 
@@ -373,7 +396,7 @@ __inline_mathcode (acosh, __x, \
   return logl (__x + __sqrtl (__x - 1.0) * __sqrtl (__x + 1.0)))
 
 __inline_mathcode (atanh, __x, \
-  register long double __y = __builtin_fabsl (__x);			      \
+  register long double __y = __fabsl (__x);				      \
   return (-0.5 * log1pl (-(__y + __y) / (1.0 + __y)) *			      \
 	  __sgn1l (__x)))
 
@@ -389,17 +412,25 @@ __inline_mathcode(logb, __x, \
      : "=t" (__junk), "=u" (__value) : "0" (__x));			      \
   return __value)
 
+__MATH_INLINE float ldexpf (float __x, int __y);
+__MATH_INLINE float
+ldexpf (float __x, int __y)
+{
+  __ldexp_code;
+}
+
+__MATH_INLINE long double ldexpl (long double __x, int __y);
+__MATH_INLINE long double
+ldexpl (long double __x, int __y)
+{
+  __ldexp_code;
+}
 
-__inline_mathcode2 (ldexp, __x, __y, \
-  register long double __value;						      \
-  __asm __volatile__							      \
-    ("fscale"								      \
-     : "=t" (__value) : "0" (__x), "u" ((long double) __y));		      \
-  return __value)
 #endif
 
 
 #ifdef __USE_MISC
+
 __inline_mathcode2 (drem, __x, __y, \
   register double __value;						      \
   __asm __volatile__							      \
@@ -431,7 +462,7 @@ __inline_mathcode (__sgn, __x, \
   return __x == 0.0 ? 0.0 : (__x > 0.0 ? 1.0 : -1.0))
 
 __inline_mathcode (__coshm1, __x, \
-  register long double __exm1 = __expm1l (__builtin_fabsl (__x));	      \
+  register long double __exm1 = __expm1l (__fabsl (__x));		      \
   return 0.5 * (__exm1 / (__exm1 + 1.0)) * __exm1)
 
 __inline_mathcode (__acosh1p, __x, \
diff --git a/sysdeps/m68k/dl-machine.h b/sysdeps/m68k/dl-machine.h
index 7c62aa2aad..01fc339928 100644
--- a/sysdeps/m68k/dl-machine.h
+++ b/sysdeps/m68k/dl-machine.h
@@ -80,6 +80,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
 {
   Elf32_Addr *got;
   extern void _dl_runtime_resolve (Elf32_Word);
+  extern void _dl_runtime_profile (Elf32_Word);
 
   if (l->l_info[DT_JMPREL] && lazy)
     {
@@ -90,10 +91,23 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
 	 _GLOBAL_OFFSET_TABLE_[2].  */
       got = (Elf32_Addr *) (l->l_addr + l->l_info[DT_PLTGOT]->d_un.d_ptr);
       got[1] = (Elf32_Addr) l;	/* Identify this shared object.  */
-      /* This function will get called to fix up the GOT entry
-	 indicated by the offset on the stack, and then jump to the
-	 resolved address.  */
-      got[2] = (Elf32_Addr) &_dl_runtime_resolve;
+
+      /* The got[2] entry contains the address of a function which gets
+	 called to get the address of a so far unresolved function and
+	 jump to it.  The profiling extension of the dynamic linker allows
+	 to intercept the calls to collect information.  In this case we
+	 don't store the address in the GOT so that all future calls also
+	 end in this function.  */
+      if (profile)
+	{
+	  got[2] = (Elf32_Addr) &_dl_runtime_profile;
+	  /* Say that we really want profiling and the timers are started.  */
+	  _dl_profile_map = l;
+	}
+      else
+	/* This function will get called to fix up the GOT entry indicated by
+	   the offset on the stack, and then jump to the resolved address.  */
+	got[2] = (Elf32_Addr) &_dl_runtime_resolve;
     }
 
   return lazy;
@@ -101,16 +115,16 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
 
 /* This code is used in dl-runtime.c to call the `fixup' function
    and then redirect to the address it returns.  */
-#define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\
-| Trampoline for _dl_runtime_resolver
-	.globl _dl_runtime_resolve
-	.type _dl_runtime_resolve, @function
-_dl_runtime_resolve:
+#define TRAMPOLINE_TEMPLATE(tramp_name, fixup_name) \
+"| Trampoline for " #fixup_name "
+	.globl " #tramp_name "
+	.type " #tramp_name ", @function
+" #tramp_name ":
 	| Save %a0 (struct return address) and %a1.
 	move.l %a0, -(%sp)
 	move.l %a1, -(%sp)
 	| Call the real address resolver.
-	jbsr fixup
+	jbsr " #fixup_name "
 	| Restore register %a0 and %a1.
 	move.l (%sp)+, %a1
 	move.l (%sp)+, %a0
@@ -118,8 +132,17 @@ _dl_runtime_resolve:
 	addq.l #8, %sp
 	| Call real function.
 	jmp (%d0)
-	.size _dl_runtime_resolve, . - _dl_runtime_resolve
-");
+	.size " #tramp_name ", . - " #tramp_name "\n"
+#ifndef PROF
+#define ELF_MACHINE_RUNTIME_TRAMPOLINE \
+asm (TRAMPOLINE_TEMPLATE (_dl_runtime_resolve, fixup) \
+     TRAMPOLINE_TEMPLATE (_dl_runtime_profile, profile_fixup));
+#else
+#define ELF_MACHINE_RUNTIME_TRAMPOLINE \
+asm (TRAMPOLINE_TEMPLATE (_dl_runtime_resolve, fixup) \
+     ".globl _dl_runtime_profile\n" \
+     ".set _dl_runtime_profile, _dl_runtime_resolve");
+#endif
 #define ELF_MACHINE_RUNTIME_FIXUP_ARGS long int save_a0, long int save_a1
 /* The PLT uses Elf32_Rela relocs.  */
 #define elf_machine_relplt elf_machine_rela
diff --git a/sysdeps/sparc/dl-machine.h b/sysdeps/sparc/dl-machine.h
index b50549c0ec..dc38e17292 100644
--- a/sysdeps/sparc/dl-machine.h
+++ b/sysdeps/sparc/dl-machine.h
@@ -100,9 +100,9 @@ elf_machine_load_address (void)
 
 static inline void
 elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
-		  const Elf32_Sym *sym, const struct r_found_version *version)
+		  const Elf32_Sym *sym, const struct r_found_version *version,
+		  Elf32_Addr *const reloc_addr)
 {
-  Elf32_Addr *const reloc_addr = (void *) (map->l_addr + reloc->r_offset);
   Elf32_Addr loadbase;
 
   if (ELF32_R_TYPE (reloc->r_info) == R_SPARC_RELATIVE)
diff --git a/sysdeps/stub/bits/libc-lock.h b/sysdeps/stub/bits/libc-lock.h
index fa4dcdde1d..9efd799dab 100644
--- a/sysdeps/stub/bits/libc-lock.h
+++ b/sysdeps/stub/bits/libc-lock.h
@@ -70,6 +70,20 @@
 /* Unlock the recursive named lock variable.  */
 #define __libc_lock_unlock_recursive(NAME)
 
+
+/* Define once control variable.  */
+#define __libc_once_define(NAME) int NAME = 0
+
+/* Call handler iff the first call.  */
+#define __libc_once(ONCE_CONTROL, INIT_FUNCTION) \
+  do {									      \
+    if ((ONCE_CONTROL) == 0) {						      \
+      INIT_FUNCTION ();							      \
+      (ONCE_CONTROL) = 1;						      \
+    }									      \
+  } while (0)
+
+
 /* Start critical region with cleanup.  */
 #define __libc_cleanup_region_start(FCT, ARG)
 
diff --git a/sysdeps/stub/if_index.c b/sysdeps/stub/if_index.c
index c8f9ea8929..ca859f75fc 100644
--- a/sysdeps/stub/if_index.c
+++ b/sysdeps/stub/if_index.c
@@ -16,28 +16,36 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#include <errno.h>
 #define __need_NULL
 #include <stddef.h>
 
 unsigned int
 if_nametoindex (const char *ifname)
 {
+  __set_errno (ENOSYS);
   return 0;
 }
+stub_warning (if_nametoindex)
 
 char *
 if_indextoname (unsigned int ifindex, char *ifname)
 {
+  __set_errno (ENOSYS);
   return NULL;
 }
+stub_warning (if_indextoname)
 
 void
 if_freenameindex (struct if_nameindex *ifn)
 {
 }
+stub_warning (if_freenameindex)
 
 struct if_nameindex *
 if_nameindex (void)
 {
+  __set_errno (ENOSYS);
   return NULL;
 }
+stub_warning (if_nameindex)
diff --git a/sysdeps/unix/sysv/linux/netinet/inbits.h b/sysdeps/unix/sysv/linux/bits/in.h
index 0dd94bef96..0dd94bef96 100644
--- a/sysdeps/unix/sysv/linux/netinet/inbits.h
+++ b/sysdeps/unix/sysv/linux/bits/in.h
diff --git a/sysdeps/unix/sysv/linux/if_index.c b/sysdeps/unix/sysv/linux/if_index.c
index fc3bd3324f..41bd0535c9 100644
--- a/sysdeps/unix/sysv/linux/if_index.c
+++ b/sysdeps/unix/sysv/linux/if_index.c
@@ -20,121 +20,158 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <net/if.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <bits/libc-lock.h>
 
-#define IF_INET6_FILENAME   "/proc/net/if_inet6"
-
-/* /proc/net/if_inet6 contains lines that look like this:
- *
- * fe8000000000000000000000836fc168 0b 00 20 80     sit7
- *
- *                               |   |  |  |  |      |
- *                     address --'   |  |  |  |      |
- *                     index --------'  |  |  |      |
- *                     prefix length ---'  |  |      |
- *                     scope --------------'  |      |
- *                     flags -----------------'      |
- *                     name -------------------------'
- *
- */
-
-static int get_one_interface(FILE *fd, char *interface, int iflen, unsigned int *index)
+/* Try to get a socket to talk to the kernel.  */
+static int
+opensock (void)
 {
-  char buffer[80];
-  static char seps[] = " \012";
-  char *c = buffer;
-  char *sp;
-  if (!fgets(buffer, 80, fd))
-    return 1;
-  if (strtok_r(buffer, seps, &sp) == NULL) return 1;
-  if (c = strtok_r(NULL, seps, &sp), c == NULL) return 1;
-  *index = strtoul(c, NULL, 16);
-  if (strtok_r(NULL, seps, &sp) == NULL) return 1;
-  if (strtok_r(NULL, seps, &sp) == NULL) return 1;
-  if (strtok_r(NULL, seps, &sp) == NULL) return 1;
-  if (c = strtok_r(NULL, seps, &sp), c == NULL) return 1;
-  strncpy(interface, c, iflen);
-  return 0;
-}
+  /* Cache the last AF that worked, to avoid many redundant calls to
+     socket().  */
+  static int sock_af = -1;
+  int fd = -1;
+  __libc_lock_define_initialized (static, lock);
 
-unsigned int if_nametoindex(const char *ifname)
-{
-  FILE *fd = fopen(IF_INET6_FILENAME, "r");
-  char this_ifname[IFNAMSIZ];
-  unsigned int this_index;
-  if (!fd) return 0;
-  while (get_one_interface(fd, this_ifname, IFNAMSIZ, &this_index) == 0) {
-    if (!strcmp(this_ifname, ifname)) {
-      fclose(fd);
-      return this_index;
+  if (sock_af != -1)
+    {
+      fd = socket (sock_af, SOCK_DGRAM, 0);
+      if (fd != -1)
+        return fd;
+    }
+
+  __libc_lock_lock (lock);
+
+  if (sock_af != -1)
+    fd = socket (sock_af, SOCK_DGRAM, 0);
+
+  if (fd == -1)
+    {
+      fd = socket (sock_af = AF_INET6, SOCK_DGRAM, 0);
+      if (fd < 0)
+	fd = socket (sock_af = AF_INET, SOCK_DGRAM, 0);
+      if (fd < 0)
+	fd = socket (sock_af = AF_IPX, SOCK_DGRAM, 0);
+      if (fd < 0)
+	fd = socket (sock_af = AF_AX25, SOCK_DGRAM, 0);
+      if (fd < 0)
+	fd = socket (sock_af = AF_APPLETALK, SOCK_DGRAM, 0);
     }
-  }
-  fclose(fd);
-  return 0;
+
+  __libc_lock_unlock (lock);
+  return fd;
 }
 
-char *if_indextoname(unsigned int ifindex, char *ifname)
+unsigned int
+if_nametoindex (const char *ifname)
 {
-  FILE *fd = fopen(IF_INET6_FILENAME, "r");
-  unsigned int this_index;
-  if (!fd) return NULL;
-  while (get_one_interface(fd, ifname, IFNAMSIZ, &this_index) == 0) {
-    if (this_index == ifindex) {
-      fclose(fd);
-      return ifname;
+  struct ifreq ifr;
+  int fd = opensock ();
+
+  if (fd < 0)
+    return 0;
+
+  strncpy (ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
+  if (ioctl (fd, SIOGIFINDEX, &ifr) < 0)
+    {
+      close (fd);
+      return 0;
     }
-  }
-  fclose(fd);
-  return NULL;
+  close (fd);
+  return ifr.ifr_ifindex;
 }
 
-void if_freenameindex(struct if_nameindex *ifn)
+void
+if_freenameindex (struct if_nameindex *ifn)
 {
   struct if_nameindex *ptr = ifn;
   while (ptr->if_name || ptr->if_index)
     {
       if (ptr->if_name)
-	free(ptr->if_name);
-      ptr++;
+	free (ptr->if_name);
+      ++ptr;
     }
-  free(ifn);
+  free (ifn);
 }
 
-struct if_nameindex *if_nameindex(void)
+struct if_nameindex *
+if_nameindex (void)
 {
-  FILE *fd = fopen(IF_INET6_FILENAME, "r");
-  struct if_nameindex *ifn = NULL;
-  int nifs = 0;
-  if (!fd) return NULL;
+  int fd = opensock ();
+  struct ifconf ifc;
+  unsigned int rq_ifs = 4, nifs, i;
+  struct if_nameindex *idx = NULL;
+
+  if (fd < 0)
+    return NULL;
+
+  ifc.ifc_buf = NULL;
+
+  /* Read all the interfaces out of the kernel.  */
   do
     {
-      struct if_nameindex *newifn;
-      nifs++;
-      newifn = realloc(ifn, nifs*sizeof(struct if_nameindex));
-      if (!newifn)
+      rq_ifs *= 2;
+      ifc.ifc_len = rq_ifs * sizeof (struct ifreq);
+      ifc.ifc_buf = realloc (ifc.ifc_buf, ifc.ifc_len);
+      if (ifc.ifc_buf == NULL)
 	{
-	  /* We ran out of memory. */
-	  if (--nifs)
-	    {
-	      free(ifn[nifs-1].if_name);
-	      ifn[nifs-1].if_name = 0;
-	      ifn[nifs-1].if_index = 0;
-	      if_freenameindex(ifn);
-	    }
+	  close(fd);
 	  return NULL;
 	}
-      ifn = newifn;
-      ifn[nifs-1].if_index = 0;
-      ifn[nifs-1].if_name = malloc(IFNAMSIZ);
-      if (ifn[nifs-1].if_name == NULL)
+      if (ioctl (fd, SIOCGIFCONF, &ifc) < 0)
+	goto jump;
+    }
+  while ((unsigned int) ifc.ifc_len == (rq_ifs * sizeof (struct ifreq)));
+
+  nifs = ifc.ifc_len / sizeof (struct ifreq);
+  ifc.ifc_buf = realloc (ifc.ifc_buf, ifc.ifc_len);
+
+  idx = malloc ((nifs+1) * sizeof (struct if_nameindex));
+  if (idx == NULL)
+    goto jump;
+
+  for (i = 0; i < nifs; ++i)
+    {
+      struct ifreq *ifr = &ifc.ifc_req[i];
+      if ((idx[i].if_name = malloc (strlen (ifr->ifr_name)+1)) == NULL)
 	{
-	  if_freenameindex(ifn);
-	  return NULL;
+	  free (idx);
+	  idx = NULL;
+	  goto jump;
+	}
+      strcpy (idx[i].if_name, ifr->ifr_name);
+      if (ioctl (fd, SIOGIFINDEX, ifr) < 0)
+	{
+	  free (idx);
+	  idx = NULL;
+	  goto jump;
 	}
+      idx[i].if_index = ifr->ifr_ifindex;
     }
-  while (get_one_interface(fd, ifn[nifs-1].if_name, IFNAMSIZ,
-			   &ifn[nifs-1].if_index) == 0);
-  free(ifn[nifs-1].if_name);
-  ifn[nifs-1].if_name = NULL;
-  fclose(fd);
-  return ifn;
+  idx[i].if_index = 0;
+  idx[i].if_name = NULL;
+
+jump:
+  free (ifc.ifc_buf);
+  close (fd);
+  return idx;
+}
+
+char *
+if_indextoname (unsigned int ifindex, char *ifname)
+{
+  struct if_nameindex *idx = if_nameindex ();
+  struct if_nameindex *p;
+
+  for (p = idx; p->if_index || p->if_name; ++p)
+    if (p->if_index == ifindex)
+      {
+	strncpy (ifname, p->if_name, IFNAMSIZ);
+	if_freenameindex (idx);
+	return ifname;
+      }
+
+  if_freenameindex (idx);
+  return NULL;
 }
diff --git a/sysdeps/unix/sysv/linux/ptrace.c b/sysdeps/unix/sysv/linux/ptrace.c
index 9f8053b0f0..b50234d2a1 100644
--- a/sysdeps/unix/sysv/linux/ptrace.c
+++ b/sysdeps/unix/sysv/linux/ptrace.c
@@ -52,6 +52,5 @@ ptrace (enum __ptrace_request request, ...)
       return res;
     }
 
-  __set_errno (-res);
   return -1;
 }
diff --git a/sysdeps/unix/sysv/linux/sys/fsuid.h b/sysdeps/unix/sysv/linux/sys/fsuid.h
index 8185b95724..fd30542e9f 100644
--- a/sysdeps/unix/sysv/linux/sys/fsuid.h
+++ b/sysdeps/unix/sysv/linux/sys/fsuid.h
@@ -20,7 +20,7 @@
 #define _SYS_FSUID_H	1
 
 #include <features.h>
-#include <gnu/types.h>
+#include <sys/types.h>
 
 __BEGIN_DECLS