Update.

1999-07-30  Andreas Schwab  <schwab@suse.de>

	* sysdeps/unix/sysv/linux/getsysstats.c (GET_NPROCS_PARSER): New
	definition.
	(__get_nprocs): Use it.
	(__get_nprocs_conf): Define as separate function if
	GET_NPROCS_CONF_PARSER is defined.
	* sysdeps/unix/sysv/linux/alpha/getsysstats.c: New file.

	* include/sys/sysinfo.h: New file.
	* sysdeps/generic/sys/sysinfo.h: Remove declaration of internal
	interface.
	* sysdeps/unix/sysv/linux/sys/sysinfo.h: Likewise.

1999-07-30  H.J. Lu  <hjl@gnu.org>

	* libio/iofflush.c (fflush_unlocked): Weak aliase if
	_IO_MTSAFE_IO is not defined.
	* libio/clearerr.c (clearerr_unlocked): Likewise.
	* libio/feof.c (feof_unlocked): Likewise.
	* libio/ferror.c (ferror_unlocked): Likewise.
	* libio/fputc.c (fputc_unlocked): Likewise.
	* libio/getc.c (getc_unlocked, fgetc_unlocked): Likewise.
	* libio/getchar.c (getchar_unlocked): Likewise.
	* libio/putc.c (putc_unlocked): Likewise.
	* libio/putchar.c (putchar_unlocked): Likewise.

1999-07-30  Thorsten Kukuk  <kukuk@suse.de>

	* sunrpc/Versions: Add svc_getreq_common, svc_getreq_poll,
	  svc_max_pollfd and svc_pollfd to GLIBC_2.2
	* sunrpc/rpc/svc.h: Use rpc*_t types, add new prototypes
	  for svc_run/poll interface.
	* sunrpc/rpc/types.h: Add rpc*_t typedefs.
	* sunrpc/rpc_common.c: Add svc_pollfd and svc_max_pollfd as
	  global variable.
	* sunrpc/svc.c: Add svc_getreq_poll and svc_getreq_common,
	  rewrite other svc_getreq* functions to use svc_getreq_common.
	* sunrpc/svc_run.c: Use poll().

1999-07-30  Andreas Schwab  <schwab@suse.de>

	* Makerules: Put sysd-versions and Versions.all on
	postclean-generated instead of common-generated.

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

	* manual/time.texi (Basic CPU Time): Note that clock_t can wrap
	around and CLOCKS_PER_SEC is 1e6.

23 files changed, 505 insertions, 339 deletions

diff --git a/ChangeLog b/ChangeLog
index 58256b584c..37eb4ad5c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,53 @@
+1999-07-30  Andreas Schwab  <schwab@suse.de>
+
+	* sysdeps/unix/sysv/linux/getsysstats.c (GET_NPROCS_PARSER): New
+	definition.
+	(__get_nprocs): Use it.
+	(__get_nprocs_conf): Define as separate function if
+	GET_NPROCS_CONF_PARSER is defined.
+	* sysdeps/unix/sysv/linux/alpha/getsysstats.c: New file.
+
+	* include/sys/sysinfo.h: New file.
+	* sysdeps/generic/sys/sysinfo.h: Remove declaration of internal
+	interface.
+	* sysdeps/unix/sysv/linux/sys/sysinfo.h: Likewise.
+
+1999-07-30  H.J. Lu  <hjl@gnu.org>
+
+	* libio/iofflush.c (fflush_unlocked): Weak aliase if
+	_IO_MTSAFE_IO is not defined.
+	* libio/clearerr.c (clearerr_unlocked): Likewise.
+	* libio/feof.c (feof_unlocked): Likewise.
+	* libio/ferror.c (ferror_unlocked): Likewise.
+	* libio/fputc.c (fputc_unlocked): Likewise.
+	* libio/getc.c (getc_unlocked, fgetc_unlocked): Likewise.
+	* libio/getchar.c (getchar_unlocked): Likewise.
+	* libio/putc.c (putc_unlocked): Likewise.
+	* libio/putchar.c (putchar_unlocked): Likewise.
+
+1999-07-30  Thorsten Kukuk  <kukuk@suse.de>
+
+	* sunrpc/Versions: Add svc_getreq_common, svc_getreq_poll,
+	  svc_max_pollfd and svc_pollfd to GLIBC_2.2
+	* sunrpc/rpc/svc.h: Use rpc*_t types, add new prototypes
+	  for svc_run/poll interface.
+	* sunrpc/rpc/types.h: Add rpc*_t typedefs.
+	* sunrpc/rpc_common.c: Add svc_pollfd and svc_max_pollfd as
+	  global variable.
+	* sunrpc/svc.c: Add svc_getreq_poll and svc_getreq_common,
+	  rewrite other svc_getreq* functions to use svc_getreq_common.
+	* sunrpc/svc_run.c: Use poll().
+
+1999-07-30  Andreas Schwab  <schwab@suse.de>
+
+	* Makerules: Put sysd-versions and Versions.all on
+	postclean-generated instead of common-generated.
+
+1999-07-29  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+	* manual/time.texi (Basic CPU Time): Note that clock_t can wrap
+	around and CLOCKS_PER_SEC is 1e6.
+
 1999-07-30  Ulrich Drepper  <drepper@cygnus.com>
 
 	* configure.in: Add test for local label subtraction.
diff --git a/Makerules b/Makerules
index 90b05870aa..4d6a48742c 100644
--- a/Makerules
+++ b/Makerules
@@ -269,7 +269,8 @@ ifdef sysd-dirs-done
 ifeq ($(versioning),yes)
 -include $(common-objpfx)sysd-versions
 $(addprefix $(common-objpfx),$(version-maps)): $(common-objpfx)sysd-versions
-common-generated += $(version-maps) sysd-versions Versions.all
+common-generated += $(version-maps)
+postclean-generated += sysd-versions Versions.all
 
 ifndef avoid-generated
 ifneq ($(sysd-versions-subdirs),$(all-subdirs) $(config-sysdirs))
diff --git a/include/sys/sysinfo.h b/include/sys/sysinfo.h
new file mode 100644
index 0000000000..9d1549d225
--- /dev/null
+++ b/include/sys/sysinfo.h
@@ -0,0 +1,18 @@
+#ifndef _SYS_SYSINFO_H
+#include_next <sys/sysinfo.h>
+
+/* Now we define the internal interface.  */
+
+/* Return number of configured processors.  */
+extern int __get_nprocs_conf __P ((void));
+
+/* Return number of available processors.  */
+extern int __get_nprocs __P ((void));
+
+/* Return number of physical pages of memory in the system.  */
+extern int __get_phys_pages __P ((void));
+
+/* Return number of available physical pages of memory in the system.  */
+extern int __get_avphys_pages __P ((void));
+
+#endif /* sys/sysinfo.h */
diff --git a/libio/clearerr.c b/libio/clearerr.c
index 4776250ff8..3831c1cdae 100644
--- a/libio/clearerr.c
+++ b/libio/clearerr.c
@@ -28,3 +28,7 @@ clearerr (fp)
   _IO_clearerr (fp);
   _IO_funlockfile (fp);
 }
+
+#if defined weak_alias && !defined _IO_MTSAFE_IO
+weak_alias (clearerr, clearerr_unlocked)
+#endif
diff --git a/libio/feof.c b/libio/feof.c
index d06de044fb..74074263ad 100644
--- a/libio/feof.c
+++ b/libio/feof.c
@@ -40,4 +40,9 @@ _IO_feof (fp)
 
 #ifdef weak_alias
 weak_alias (_IO_feof, feof)
+
+#ifndef _IO_MTSAFE_IO
+#undef feof_unlocked
+weak_alias (_IO_feof, feof_unlocked)
+#endif
 #endif
diff --git a/libio/ferror.c b/libio/ferror.c
index 855627ade6..b9a3ee8ee1 100644
--- a/libio/ferror.c
+++ b/libio/ferror.c
@@ -40,4 +40,9 @@ _IO_ferror (fp)
 
 #ifdef weak_alias
 weak_alias (_IO_ferror, ferror)
+
+#ifndef _IO_MTSAFE_IO
+#undef ferror_unlocked
+weak_alias (_IO_ferror, ferror_unlocked)
+#endif
 #endif
diff --git a/libio/fputc.c b/libio/fputc.c
index 3ec8b693e9..4684af03e4 100644
--- a/libio/fputc.c
+++ b/libio/fputc.c
@@ -40,3 +40,8 @@ fputc (c, fp)
   _IO_cleanup_region_end (0);
   return result;
 }
+
+#if defined weak_alias && !defined _IO_MTSAFE_IO
+#undef fputc_unlocked
+weak_alias (fputc, fputc_unlocked)
+#endif
diff --git a/libio/getc.c b/libio/getc.c
index 6ccef9960d..b58ea99d1d 100644
--- a/libio/getc.c
+++ b/libio/getc.c
@@ -47,4 +47,10 @@ _IO_getc (fp)
 #ifdef weak_alias
 weak_alias (_IO_getc, getc)
 weak_alias (_IO_getc, fgetc)
+
+#ifndef _IO_MTSAFE_IO
+#undef getc_unlocked
+weak_alias (_IO_getc, getc_unlocked)
+weak_alias (_IO_getc, fgetc_unlocked)
+#endif
 #endif
diff --git a/libio/getchar.c b/libio/getchar.c
index 80c297f0ae..a7a1072027 100644
--- a/libio/getchar.c
+++ b/libio/getchar.c
@@ -40,3 +40,8 @@ getchar ()
   _IO_cleanup_region_end (0);
   return result;
 }
+
+#if defined weak_alias && !defined _IO_MTSAFE_IO
+#undef getchar_unlocked
+weak_alias (getchar, getchar_unlocked)
+#endif
diff --git a/libio/iofflush.c b/libio/iofflush.c
index 724ff26ac8..126947aace 100644
--- a/libio/iofflush.c
+++ b/libio/iofflush.c
@@ -47,4 +47,8 @@ _IO_fflush (fp)
 
 #ifdef weak_alias
 weak_alias (_IO_fflush, fflush)
+
+#ifndef _IO_MTSAFE_IO
+weak_alias (_IO_fflush, fflush_unlocked)
+#endif
 #endif
diff --git a/libio/putc.c b/libio/putc.c
index 72cd2a1a05..0236224cde 100644
--- a/libio/putc.c
+++ b/libio/putc.c
@@ -40,4 +40,9 @@ _IO_putc (c, fp)
 
 #ifdef weak_alias
 weak_alias (_IO_putc, putc)
+
+#ifndef _IO_MTSAFE_IO
+#undef putc_unlocked
+weak_alias (_IO_putc, putc_unlocked)
+#endif
 #endif
diff --git a/libio/putchar.c b/libio/putchar.c
index 143796d20c..e11e3d8f75 100644
--- a/libio/putchar.c
+++ b/libio/putchar.c
@@ -34,3 +34,8 @@ putchar (c)
   _IO_cleanup_region_end (0);
   return result;
 }
+
+#if defined weak_alias && !defined _IO_MTSAFE_IO
+#undef putchar_unlocked
+weak_alias (putchar, putchar_unlocked)
+#endif
diff --git a/manual/time.texi b/manual/time.texi
index 7d5cfdaa65..543042acc6 100644
--- a/manual/time.texi
+++ b/manual/time.texi
@@ -95,11 +95,16 @@ to @code{double}, as in the example above, makes sure that operations
 such as arithmetic and printing work properly and consistently no matter
 what the underlying representation is.
 
+Note that the clock can wrap around.  On a 32bit system with
+@code{CLOCKS_PER_SEC} set to one million a wrap around happens after
+around 36 minutes.
+
 @comment time.h
 @comment ISO
 @deftypevr Macro int CLOCKS_PER_SEC
 The value of this macro is the number of clock ticks per second measured
-by the @code{clock} function.
+by the @code{clock} function.  POSIX requires that this value is one
+million independend of the actual resolution.
 @end deftypevr
 
 @comment time.h
diff --git a/sunrpc/Versions b/sunrpc/Versions
index 1d90bbeaaf..e222b16096 100644
--- a/sunrpc/Versions
+++ b/sunrpc/Versions
@@ -107,4 +107,6 @@ libc {
     xdr_hyper; xdr_u_hyper; xdr_longlong_t; xdr_u_longlong_t;
     xdr_int64_t; xdr_uint64_t;
   }
+  GLIBC_2.2 {
+    svc_getreq_common; svc_getreq_poll; svc_max_pollfd; svc_pollfd;
 }
diff --git a/sunrpc/rpc/svc.h b/sunrpc/rpc/svc.h
index 4ac2a5cdf0..f607d6b659 100644
--- a/sunrpc/rpc/svc.h
+++ b/sunrpc/rpc/svc.h
@@ -1,4 +1,3 @@
-/* @(#)svc.h	2.2 88/07/29 4.0 RPCSRC; from 1.20 88/02/08 SMI */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -147,12 +146,12 @@ struct SVCXPRT {
  * Service request
  */
 struct svc_req {
-	u_long		rq_prog;	/* service program number */
-	u_long		rq_vers;	/* service protocol version */
-	u_long		rq_proc;	/* the desired procedure */
-	struct opaque_auth rq_cred;	/* raw creds from the wire */
-	caddr_t		rq_clntcred;	/* read only cooked cred */
-	SVCXPRT	*rq_xprt;		/* associated transport */
+  rpcprog_t rq_prog;            /* service program number */
+  rpcvers_t rq_vers;            /* service protocol version */
+  rpcproc_t rq_proc;            /* the desired procedure */
+  struct opaque_auth rq_cred;   /* raw creds from the wire */
+  caddr_t rq_clntcred;          /* read only cooked cred */
+  SVCXPRT *rq_xprt;             /* associated transport */
 };
 
 #ifndef __DISPATCH_FN_T
@@ -165,23 +164,23 @@ typedef void (*__dispatch_fn_t) __PMT ((struct svc_req*, SVCXPRT*));
  *
  * svc_register(xprt, prog, vers, dispatch, protocol)
  *	SVCXPRT *xprt;
- *	u_long prog;
- *	u_long vers;
+ *	rpcprog_t prog;
+ *	rpcvers_t vers;
  *	void (*dispatch)();
- *	u_long protocol;  like TCP or UDP, zero means do not register
+ *	rpcprot_t protocol;  like TCP or UDP, zero means do not register
  */
-extern bool_t	svc_register __P ((SVCXPRT *__xprt, u_long __prog,
-				   u_long __vers, __dispatch_fn_t __dispatch,
-				   u_long __protocol));
+extern bool_t svc_register __P ((SVCXPRT *__xprt, rpcprog_t __prog,
+				 rpcvers_t __vers, __dispatch_fn_t __dispatch,
+				 rpcprot_t __protocol));
 
 /*
  * Service un-registration
  *
  * svc_unregister(prog, vers)
- *	u_long prog;
- *	u_long vers;
+ *	rpcprog_t prog;
+ *	rpcvers_t vers;
  */
-extern void	svc_unregister __P ((u_long __prog, u_long __vers));
+extern void svc_unregister __P ((rpcprog_t __prog, rpcvers_t __vers));
 
 /*
  * Transport registration.
@@ -189,7 +188,7 @@ extern void	svc_unregister __P ((u_long __prog, u_long __vers));
  * xprt_register(xprt)
  *	SVCXPRT *xprt;
  */
-extern void	xprt_register __P ((SVCXPRT *__xprt));
+extern void xprt_register __P ((SVCXPRT *__xprt));
 
 /*
  * Transport un-register
@@ -197,9 +196,7 @@ extern void	xprt_register __P ((SVCXPRT *__xprt));
  * xprt_unregister(xprt)
  *	SVCXPRT *xprt;
  */
-extern void	xprt_unregister __P ((SVCXPRT *__xprt));
-
-
+extern void xprt_unregister __P ((SVCXPRT *__xprt));
 
 
 /*
@@ -237,8 +234,8 @@ extern void	svcerr_weakauth __P ((SVCXPRT *__xprt));
 
 extern void	svcerr_noproc __P ((SVCXPRT *__xprt));
 
-extern void	svcerr_progvers __P ((SVCXPRT *__xprt, u_long __low_vers,
-				      u_long __high_vers));
+extern void	svcerr_progvers __P ((SVCXPRT *__xprt, rpcvers_t __low_vers,
+				      rpcvers_t __high_vers));
 
 extern void	svcerr_auth __P ((SVCXPRT *__xprt, enum auth_stat __why));
 
@@ -261,19 +258,20 @@ extern void	svcerr_systemerr __P ((SVCXPRT *__xprt));
  * Global keeper of rpc service descriptors in use
  * dynamic; must be inspected before each call to select
  */
-#ifdef FD_SETSIZE
+
+extern struct pollfd *svc_pollfd;
+extern int svc_max_pollfd;
 extern fd_set svc_fdset;
 #define svc_fds svc_fdset.fds_bits[0]	/* compatibility */
-#else
-extern int svc_fds;
-#endif /* def FD_SETSIZE */
 
 /*
  * a small program implemented by the svc_rpc implementation itself;
  * also see clnt.h for protocol numbers.
  */
 extern void svc_getreq __P ((int __rdfds));
+extern void svc_getreq_common __P ((const int __fd));
 extern void svc_getreqset __P ((fd_set *__readfds));
+extern void svc_getreq_poll __P ((struct pollfd *, const int));
 extern void svc_exit __P ((void));
 extern void svc_run __P ((void));
 
diff --git a/sunrpc/rpc/types.h b/sunrpc/rpc/types.h
index 61ea3c19f8..e2e8402be9 100644
--- a/sunrpc/rpc/types.h
+++ b/sunrpc/rpc/types.h
@@ -1,4 +1,3 @@
-/* @(#)types.h	2.3 88/08/15 4.0 RPCSRC */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -27,8 +26,6 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-/*      @(#)types.h 1.18 87/07/24 SMI      */
-
 /* fixincludes should not add extern "C" to this file */
 /*
  * Rpc additions to <sys/types.h>
@@ -38,6 +35,12 @@
 
 typedef int bool_t;
 typedef int enum_t;
+/* This needs to be changed to uint32_t in the future */
+typedef unsigned long rpcprog_t;
+typedef unsigned long rpcvers_t;
+typedef unsigned long rpcproc_t;
+typedef unsigned long rpcprot_t;
+typedef unsigned long rpcport_t;
 
 #define        __dontcare__    -1
 
diff --git a/sunrpc/rpc_common.c b/sunrpc/rpc_common.c
index 75cead0875..57e14351ea 100644
--- a/sunrpc/rpc_common.c
+++ b/sunrpc/rpc_common.c
@@ -1,4 +1,3 @@
-/* @(#)rpc_commondata.c	2.1 88/07/29 4.0 RPCSRC */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -6,23 +5,23 @@
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user.
- * 
+ *
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
+ *
  * Sun RPC is provided with no support and without any obligation on the
  * part of Sun Microsystems, Inc. to assist in its use, correction,
  * modification or enhancement.
- * 
+ *
  * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
  * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
  * OR ANY PART THEREOF.
- * 
+ *
  * In no event will Sun Microsystems, Inc. be liable for any lost revenue
  * or profits or other special, indirect and consequential damages, even if
  * Sun has been advised of the possibility of such damages.
- * 
+ *
  * Sun Microsystems, Inc.
  * 2550 Garcia Avenue
  * Mountain View, California  94043
@@ -30,12 +29,10 @@
 #include <rpc/rpc.h>
 /*
  * This file should only contain common data (global data) that is exported
- * by public interfaces 
+ * by public interfaces
  */
 struct opaque_auth _null_auth;
-#ifdef FD_SETSIZE
 fd_set svc_fdset;
-#else
-int svc_fds;
-#endif /* def FD_SETSIZE */
 struct rpc_createerr rpc_createerr;
+struct pollfd *svc_pollfd;
+int svc_max_pollfd;
diff --git a/sunrpc/svc.c b/sunrpc/svc.c
index da97098add..59b902dd63 100644
--- a/sunrpc/svc.c
+++ b/sunrpc/svc.c
@@ -1,4 +1,3 @@
-/* @(#)svc.c	2.4 88/08/11 4.0 RPCSRC; from 1.44 88/02/08 SMI */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -27,10 +26,6 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] = "@(#)svc.c 1.41 87/10/13 Copyr 1984 Sun Micro";
-#endif
-
 /*
  * svc.c, Server-side remote procedure call interface.
  *
@@ -42,108 +37,121 @@ static char sccsid[] = "@(#)svc.c 1.41 87/10/13 Copyr 1984 Sun Micro";
  */
 
 #include <errno.h>
+#include <unistd.h>
 #include <rpc/rpc.h>
 #include <rpc/svc.h>
 #include <rpc/pmap_clnt.h>
+#include <sys/poll.h>
 
-#ifndef errno
-extern int errno;
-#endif
-
-#ifdef FD_SETSIZE
 static SVCXPRT **xports;
-#else
-#define NOFILE 32
-
-static SVCXPRT *xports[NOFILE];
-#endif /* def FD_SETSIZE */
 
 #define NULL_SVC ((struct svc_callout *)0)
 #define	RQCRED_SIZE	400	/* this size is excessive */
 
-/*
- * The services list
- * Each entry represents a set of procedures (an rpc program).
- * The dispatch routine takes request structs and runs the
- * appropriate procedure.
- */
-static struct svc_callout
-  {
-    struct svc_callout *sc_next;
-    u_long sc_prog;
-    u_long sc_vers;
-    void (*sc_dispatch) (struct