update from 961105, second trycvs/libc-961107

45 files changed, 685 insertions, 502 deletions

diff --git a/sysdeps/stub/getpagesize.c b/sysdeps/stub/getpagesize.c
index 2c55df1a15..363151be21 100644
--- a/sysdeps/stub/getpagesize.c
+++ b/sysdeps/stub/getpagesize.c
@@ -1,26 +1,26 @@
 /* Copyright (C) 1991, 1993, 1995, 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   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 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.
+   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., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   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 <errno.h>
-#include <stddef.h>
+#include <unistd.h>
 
 /* Return the system page size.  */
-size_t
+int
 __getpagesize ()
 {
   __set_errno (ENOSYS);
diff --git a/sysdeps/stub/lchown.c b/sysdeps/stub/lchown.c
new file mode 100644
index 0000000000..f3aa2a1425
--- /dev/null
+++ b/sysdeps/stub/lchown.c
@@ -0,0 +1,42 @@
+/* Copyright (C) 1996 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 <errno.h>
+#include <stddef.h>
+#include <unistd.h>
+#include <sys/types.h>
+
+/* Change the owner and group of FILE.  */
+int
+__lchown (file, owner, group)
+     const char *file;
+     uid_t owner;
+     gid_t group;
+{
+  if (file == NULL)
+    {
+      __set_errno (EINVAL);
+      return -1;
+    }
+
+  __set_errno (ENOSYS);
+  return -1;
+}
+stub_warning (lchown)
+
+weak_alias (__lchown, lchown)
diff --git a/sysdeps/stub/lockfile.c b/sysdeps/stub/lockfile.c
index b3ccc7bca7..0328071c08 100644
--- a/sysdeps/stub/lockfile.c
+++ b/sysdeps/stub/lockfile.c
@@ -53,8 +53,8 @@ __internal_ftrylockfile (FILE *stream)
   return 1;
 }
 #ifdef USE_IN_LIBIO
-weak_alias (__internal_ftrylockfile, __ftrylockfile)
-#else
 weak_alias (__internal_ftrylockfile, _IO_ftrylockfile)
+#else
+weak_alias (__internal_ftrylockfile, __ftrylockfile)
 #endif
 weak_alias (__internal_ftrylockfile, ftrylockfile);
diff --git a/sysdeps/stub/mkstemp.c b/sysdeps/stub/mkstemp.c
index 47dd7125b3..ec78145ead 100644
--- a/sysdeps/stub/mkstemp.c
+++ b/sysdeps/stub/mkstemp.c
@@ -1,21 +1,22 @@
 /* Copyright (C) 1992, 1995, 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   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 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.
+   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., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   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 <stdlib.h>
 #include <string.h>
 #include <errno.h>
 
diff --git a/sysdeps/stub/mktemp.c b/sysdeps/stub/mktemp.c
index 06fe3de0c4..7780140a7a 100644
--- a/sysdeps/stub/mktemp.c
+++ b/sysdeps/stub/mktemp.c
@@ -1,21 +1,22 @@
 /* Copyright (C) 1991, 1995, 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   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 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.
+   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., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   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 <stdlib.h>
 #include <string.h>
 #include <errno.h>
 
diff --git a/sysdeps/stub/sysconf.c b/sysdeps/stub/sysconf.c
index 43ad6d93a9..00480fb2e9 100644
--- a/sysdeps/stub/sysconf.c
+++ b/sysdeps/stub/sysconf.c
@@ -1,20 +1,20 @@
 /* Copyright (C) 1991, 1993, 1995, 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   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 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.
+   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., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   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 <errno.h>
 #include <stdio.h>
@@ -87,6 +87,60 @@ __sysconf (name)
 	 allocate a buffer we restrict the value.  */
       return BUFSIZ;
 
+    case _SC_CHAR_BIT:
+      return CHAR_BIT;
+
+    case _SC_CHAR_MAX:
+      return CHAR_MAX;
+
+    case _SC_CHAR_MIN:
+      return CHAR_MIN;
+
+    case _SC_INT_MAX:
+      return INT_MAX;
+
+    case _SC_INT_MIN:
+      return INT_MIN;
+
+    case _SC_LONG_BIT:
+      return sizeof (long int) * CHAR_BIT;
+
+    case _SC_WORD_BIT:
+      return sizeof (int) * CHAR_BIT;
+
+    case _SC_MB_LEN_MAX:
+      return MB_LEN_MAX;
+
+    case _SC_NZERO:
+      return NZERO;
+
+    case _SC_SSIZE_MAX:
+      return _POSIX_SSIZE_MAX;
+
+    case _SC_SCHAR_MAX:
+      return SCHAR_MAX;
+
+    case _SC_SCHAR_MIN:
+      return SCHAR_MIN;
+
+    case _SC_SHRT_MAX:
+      return SHRT_MAX;
+
+    case _SC_SHRT_MIN:
+      return SHRT_MIN;
+
+    case _SC_UCHAR_MAX:
+      return UCHAR_MAX;
+
+    case _SC_UINT_MAX:
+      return UINT_MAX;
+
+    case _SC_ULONG_MAX:
+      return ULONG_MAX;
+
+    case _SC_USHRT_MAX:
+      return USHRT_MAX;
+
     case _SC_ARG_MAX:
     case _SC_CHILD_MAX:
     case _SC_CLK_TCK:
@@ -150,6 +204,9 @@ __sysconf (name)
     case _SC_2_C_DEV:
     case _SC_2_FORT_DEV:
     case _SC_2_SW_DEV:
+    case _SC_2_CHAR_TERM:
+    case _SC_2_C_VERSION:
+    case _SC_2_UPE:
 
     case _SC_THREADS:
     case _SC_THREAD_SAFE_FUNCTIONS:
@@ -169,6 +226,21 @@ __sysconf (name)
     case _SC_THREAD_PROCESS_SHARED:
 
     case _SC_XOPEN_VERSION:
+    case _SC_XOPEN_XCU_VERSION:
+    case _SC_XOPEN_UNIX:
+    case _SC_XOPEN_CRYPT:
+    case _SC_XOPEN_ENH_I18N:
+    case _SC_XOPEN_SHM:
+    case _SC_XOPEN_XPG2:
+    case _SC_XOPEN_XPG3:
+    case _SC_XOPEN_XPG4:
+
+    case _SC_NL_ARGMAX:
+    case _SC_NL_LANGMAX:
+    case _SC_NL_MSGMAX:
+    case _SC_NL_NMAX:
+    case _SC_NL_SETMAX:
+    case _SC_NL_TEXTMAX:
 
       break;
     }
diff --git a/sysdeps/unix/alpha/sysdep.h b/sysdeps/unix/alpha/sysdep.h
index 72d84047c2..e27909ad9b 100644
--- a/sysdeps/unix/alpha/sysdep.h
+++ b/sysdeps/unix/alpha/sysdep.h
@@ -1,20 +1,21 @@
 /* Copyright (C) 1992, 1995, 1996 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
    Contributed by Brendan Kehoe (brendan@zen.org).
 
-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 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.
+   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., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   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 <sysdeps/unix/sysdep.h>
 
@@ -27,36 +28,24 @@ Cambridge, MA 02139, USA.  */
 #endif
 
 #ifdef __STDC__
-#define LEAF(name, framesize)			\
-  .globl name;					\
-  .align 3;					\
-  .ent name, 0;					\
-  name##:					\
-  .frame sp, framesize, ra
+#define __LABEL(x)	x##:
 #else
+#define __LABEL(x)	x/**/:
+#endif
+
 #define LEAF(name, framesize)			\
   .globl name;					\
   .align 3;					\
   .ent name, 0;					\
-  name/**/:					\
+  __LABEL(name)					\
   .frame sp, framesize, ra
-#endif
 
-#ifdef __STDC__
-#define ENTRY(name)				\
-  .globl name;					\
-  .align 3;					\
-  .ent name, 0;					\
-  name##:					\
-  .frame sp, 0, ra
-#else
 #define ENTRY(name)				\
   .globl name;					\
   .align 3;					\
   .ent name, 0;					\
-  name/**/:					\
+  __LABEL(name)					\
   .frame sp, 0, ra
-#endif
 
 /* Mark the end of function SYM.  */
 #undef END
@@ -64,16 +53,20 @@ Cambridge, MA 02139, USA.  */
 
 /* Note that PSEUDO/PSEUDO_END use label number 1996---do not use a
    label of that number between those two macros!  */
- 
-#ifdef __STDC__
+
+#ifdef PROF
 #define PSEUDO(name, syscall_name, args)	\
     .globl name;				\
     .align 3;					\
     .ent name,0;				\
-						\
-name##:						\
-    .frame sp, 0, ra				\
-    .prologue 1; /* yes, we do use gp */	\
+__LABEL(name)					\
+    .frame sp, 0, ra;				\
+    ldgp gp,0(pv);				\
+    .set noat;					\
+    lda AT,_mcount;				\
+    jsr AT,(AT),_mcount;			\
+    .set at;					\
+    .prologue 1;				\
     ldiq	v0, SYS_ify(syscall_name);	\
     .set noat;					\
     call_pal	PAL_callsys;			\
@@ -85,10 +78,9 @@ name##:						\
     .globl name;				\
     .align 3;					\
     .ent name,0;				\
-						\
-name/**/:					\
+__LABEL(name)					\
     .frame sp, 0, ra				\
-    .prologue 1; /* yes, we do use gp */	\
+    .prologue 0;				\
     ldiq	v0, SYS_ify(syscall_name);	\
     .set noat;					\
     call_pal	PAL_callsys;			\
@@ -98,13 +90,19 @@ name/**/:					\
 #endif
 
 #undef PSEUDO_END
-
+#ifdef PROF
+#define PSEUDO_END(sym)				\
+1996:						\
+    jmp		zero, __syscall_error;		\
+    END(sym)
+#else
 #define PSEUDO_END(sym)				\
 1996:						\
     br		gp, 2f;				\
 2:  ldgp	gp, 0(gp);			\
     jmp		zero, __syscall_error;		\
     END(sym)
+#endif
 
 #define r0	v0
 #define r1	a4
diff --git a/sysdeps/unix/getpagesize.c b/sysdeps/unix/getpagesize.c
index 399126e5a1..3470ac7dff 100644
--- a/sysdeps/unix/getpagesize.c
+++ b/sysdeps/unix/getpagesize.c
@@ -1,27 +1,27 @@
-/* Copyright (C) 1991, 1992, 1995 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+/* Copyright (C) 1991, 1992, 1995, 1996 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 General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+   The GNU C Library is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, 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 General Public License for more details.
+   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 General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with the GNU C Library; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   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 <ansidecl.h>
-#include <stddef.h>
+#include <unistd.h>
 #include <sys/param.h>
 
 /* Return the system page size.  */
-size_t
-DEFUN_VOID(__getpagesize)
+int
+__getpagesize ()
 {
 #ifdef	EXEC_PAGESIZE
   return EXEC_PAGESIZE;
diff --git a/sysdeps/unix/sysdep.h b/sysdeps/unix/sysdep.h
index f5845dc7db..f18b2656b1 100644
--- a/sysdeps/unix/sysdep.h
+++ b/sysdeps/unix/sysdep.h
@@ -1,20 +1,20 @@
 /* Copyright (C) 1991, 92, 93, 96 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   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 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.
+   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., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   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 <sysdeps/generic/sysdep.h>
 
@@ -44,4 +44,6 @@ Cambridge, MA 02139, USA.  */
 
 /* Terminate a system call named SYM.  This is used on some platforms
    to generate correct debugging information.  */
+#ifndef PSEUDO_END
 #define PSEUDO_END(sym)
+#endif
diff --git a/sysdeps/unix/sysv/linux/Dist b/sysdeps/unix/sysv/linux/Dist
index ef0dfbce89..365f0468ac 100644
--- a/sysdeps/unix/sysv/linux/Dist
+++ b/sysdeps/unix/sysv/linux/Dist
@@ -1,4 +1,5 @@
 init-first.h
+siglist.h
 sysctl.c
 termio.h
 net/if.h
diff --git a/sysdeps/unix/sysv/linux/alpha/brk.S b/sysdeps/unix/sysv/linux/alpha/brk.S
index 75be949aff..d31d9e9b4d 100644
--- a/sysdeps/unix/sysv/linux/alpha/brk.S
+++ b/sysdeps/unix/sysv/linux/alpha/brk.S
@@ -38,6 +38,10 @@ __curbrk: .skip 8
 	.text
 LEAF(__brk, 0)
 	ldgp	gp, 0(t12)
+#ifdef PROF
+	lda	AT, _mcount
+	jsr	AT, (AT), _mcount
+#endif
 	.prologue 1
 
 	ldiq	v0, __NR_brk
diff --git a/sysdeps/unix/sysv/linux/alpha/clone.S b/sysdeps/unix/sysv/linux/alpha/clone.S
index 71d8053b12..9dbf3034c9 100644
--- a/sysdeps/unix/sysv/linux/alpha/clone.S
+++ b/sysdeps/unix/sysv/linux/alpha/clone.S
@@ -32,6 +32,10 @@ ENTRY(__clone)
 	/* Save rest of argument registers for varargs-type work.  */
 	stq	a4,0(sp)
 	stq	a5,8(sp)
+#ifdef PROF
+	lda	AT, _mcount
+	jsr	AT, (AT), _mcount
+#endif
 	.prologue 1
 
 	/* Sanity check arguments.  */
diff --git a/sysdeps/unix/sysv/linux/alpha/ieee_get_fp_control.S b/sysdeps/unix/sysv/linux/alpha/ieee_get_fp_control.S
index e09fa738e2..1176a2730f 100644
--- a/sysdeps/unix/sysv/linux/alpha/ieee_get_fp_control.S
+++ b/sysdeps/unix/sysv/linux/alpha/ieee_get_fp_control.S
@@ -22,9 +22,17 @@ Cambridge, MA 02139, USA.  */
 
 	.text
 
-LEAF(__ieee_get_fp_control, 8)
-	lda	sp, -8(sp)
+LEAF(__ieee_get_fp_control, 16)
+#ifdef PROF
+	ldgp	gp, 0(pv)
+	lda	sp, -16(sp)
+	lda	AT, _mcount
+	jsr	AT, (AT), _mcount
 	.prologue 1
+#else
+	lda	sp, -16(sp)
+	.prologue 0
+#endif
 
 	mov	sp, a1
 	ldi	a0, GSI_IEEE_FP_CONTROL
@@ -33,12 +41,14 @@ LEAF(__ieee_get_fp_control, 8)
 	bne	a3, error
 
 	ldq	v0, 0(sp)
-	lda	sp, 8(sp)
+	lda	sp, 16(sp)
 	ret
 
-error:	lda	sp, 8(sp)
+error:	lda	sp, 16(sp)
+#ifndef PROF
 	br	gp, 1f
 1:	ldgp	gp, 0(gp)
+#endif
 	jmp	zero, __syscall_error
 
 	END(__ieee_get_fp_control)
diff --git a/sysdeps/unix/sysv/linux/alpha/ieee_set_fp_control.S b/sysdeps/unix/sysv/linux/alpha/ieee_set_fp_control.S
index d748c81142..aa761ecaca 100644
--- a/sysdeps/unix/sysv/linux/alpha/ieee_set_fp_control.S
+++ b/sysdeps/unix/sysv/linux/alpha/ieee_set_fp_control.S
@@ -20,9 +20,17 @@ Cambridge, MA 02139, USA.  */
 
 #define SSI_IEEE_FP_CONTROL	14
 
-LEAF(__ieee_set_fp_control, 8)
-	lda	sp, -8(sp)
+LEAF(__ieee_set_fp_control, 16)
+#ifdef PROF
+	ldgp	gp, 0(sp)
+	lda	sp, -16(sp)
+	lda	AT, _mcount
+	jsr	AT, (AT), _mcount
 	.prologue 1
+#else
+	lda	sp, -16(sp)
+	.prologue 0
+#endif
 
 	stq	a0, 0(sp)
 	mov	sp, a1
@@ -30,13 +38,16 @@ LEAF(__ieee_set_fp_control, 8)
 	ldi	v0, __NR_osf_setsysinfo
 	call_pal PAL_callsys
 
-	lda	sp, 8(sp)
+	lda	sp, 16(sp)
 
 	bne	a3, error
 	ret
 
-error:	br	gp, 1f
+error:
+#ifndef PROF
+	br	gp, 1f
 1:	ldgp	gp, 0(gp)
+#endif
 	jmp	zero, __syscall_error
 
 	END(__ieee_set_fp_control)
diff --git a/sysdeps/unix/sysv/linux/alpha/llseek.S b/sysdeps/unix/sysv/linux/alpha/llseek.S
index 6020f263cd..45fb349236 100644
--- a/sysdeps/unix/sysv/linux/alpha/llseek.S
+++ b/sysdeps/unix/sysv/linux/alpha/llseek.S
@@ -24,7 +24,14 @@ Cambridge, MA 02139, USA.  */
 
 	.text
 ENTRY(llseek)
+#ifdef PROF
+	ldgp	gp, 0(pv)
+	lda	AT, _mcount
+	jsr	AT, (AT), _mcount
 	.prologue 1
+#else
+	.prologue 0
+#endif
 
 	sll	a1, 32, a1	/* build a 64 bit ofs out of 32 bit operands */
 	zap	a2, 0xf0, a2
@@ -40,8 +47,11 @@ ENTRY(llseek)
 	stq	v0, 0(t0)
 	ret
 
-error:	br	gp, 1f
+error:
+#ifndef PROF
+	br	gp, 1f
 1:	ldgp	gp, 0(gp)
+#endif
 	jmp	zero, __syscall_error
 
 	END(llseek)
diff --git a/sysdeps/unix/sysv/linux/alpha/sigsuspend.S b/sysdeps/unix/sysv/linux/alpha/sigsuspend.S
index aaae9a308a..83d331fef0 100644
--- a/sysdeps/unix/sysv/linux/alpha/sigsuspend.S
+++ b/sysdeps/unix/sysv/linux/alpha/sigsuspend.S
@@ -24,7 +24,14 @@ Cambridge, MA 02139, USA.  */
 	.text
 
 LEAF(sigsuspend, 0)
+#ifdef PROF
+	ldgp	gp, 0(pv)
+	lda	AT, _mcount
+	jsr	AT, (AT), _mcount
 	.prologue 1
+#else
+	.prologue 0
+#endif
 
 	ldq	a0, 0(a0)
 	ldi	v0, __NR_sigsuspend
@@ -32,8 +39,11 @@ LEAF(sigsuspend, 0)
 	bne	a3, error
 	ret
 
-error:	br	gp, 1f
+error:
+#ifndef PROF
+	br	gp, 1f
 1:	ldgp	gp, 0(gp)
+#endif
 	jmp	zero, __syscall_error
 
 	END(sigsuspend)
diff --git a/sysdeps/unix/sysv/linux/alpha/syscall.S b/sysdeps/unix/sysv/linux/alpha/syscall.S
index f1b36e9312..81043c2cdb 100644
--- a/sysdeps/unix/sysv/linux/alpha/syscall.S
+++ b/sysdeps/unix/sysv/linux/alpha/syscall.S
@@ -42,6 +42,15 @@ Cambridge, MA 02139, USA.  */
 
 
 LEAF(__syscall, 0)
+#ifdef PROF
+	ldgp	gp, 0(pv)
+	lda	AT, _mcount
+	jsr	AT, (AT), _mcount
+	.prologue 1
+#else
+	.prologue 0
+#endif
+
 	mov	a0, v0		/* Syscall number -> v0 */
 	mov	a1, a0		/* arg1-arg5 -> a0-a4 */
 	mov	a2, a1
@@ -53,8 +62,11 @@ LEAF(__syscall, 0)
 	bne	a3, error
 	ret
 
-error:	br	gp, 2f
+error:
+#ifndef PROF
+	br	gp, 2f
 2:	ldgp	gp, 0(gp)
+#endif
 	jmp	zero, __syscall_error
 
 weak_alias(__syscall, syscall)
diff --git a/sysdeps/unix/sysv/linux/getpriority.c b/sysdeps/unix/sysv/linux/getpriority.c
index 6dd56cce8b..dba7cb3b41 100644
--- a/sysdeps/unix/sysv/linux/getpriority.c
+++ b/sysdeps/unix/sysv/linux/getpriority.c
@@ -1,20 +1,20 @@
 /* getpriority for Linux.
-Copyright (C) 1996 Free Software Foundation, Inc.
-
-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.  */
+   Copyright (C) 1996 Free Software Foundation, Inc.
+
+   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 <errno.h>
 #include <sys/resource.h>
diff --git a/sysdeps/unix/sysv/linux/i386/syscall.S b/sysdeps/unix/sysv/linux/i386/syscall.S
index 018a86ee39..6a020e0d0e 100644
--- a/sysdeps/unix/sysv/linux/i386/syscall.S
+++ b/sysdeps/unix/sysv/linux/i386/syscall.S
@@ -1,25 +1,25 @@
 /* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   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 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.
+   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., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   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>
 
 /* Please consult the file sysdeps/unix/sysv/linux/i386/sysdep.h for
-   more information about the value -125 used below.*/
+   more information about the value -4095 used below.*/
 
 	.text
 ENTRY (syscall)
@@ -29,7 +29,7 @@ ENTRY (syscall)
 	movl 16(%esp), %eax	/* Load syscall number into %eax.  */
 	int $0x80		/* Do the system call.  */
 	POPARGS_5		/* Restore register contents.  */
-	cmpl $-125, %eax	/* Check %eax for error.  */
+	cmpl $-4095, %eax	/* Check %eax for error.  */
 	jae syscall_error	/* Jump to error handler if error.  */
 	ret			/* Return to caller.  */
 
diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.S b/sysdeps/unix/sysv/linux/i386/sysdep.S
index c9c78842d8..d676004084 100644
--- a/sysdeps/unix/sysv/linux/i386/sysdep.S
+++ b/sysdeps/unix/sysv/linux/i386/sysdep.S
@@ -1,20 +1,20 @@
 /* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   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 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.
+   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., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   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>
 
@@ -54,7 +54,11 @@ ENTRY (__syscall_error)
 #endif	/* !PIC */
 
 
-ENTRY (__errno_location)
+	.weak __errno_location
+	.type __errno_location,@function
+	.align 16
+__errno_location:
+	CALL_MCOUNT
 #ifdef PIC
 	call .L2
 .L2:	popl %ecx
diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h
index 5d378fd179..7418982c2a 100644
--- a/sysdeps/unix/sysv/linux/i386/sysdep.h
+++ b/sysdeps/unix/sysv/linux/i386/sysdep.h
@@ -40,16 +40,15 @@ Cambridge, MA 02139, USA.  */
    negative even if the call succeeded.  E.g., the `lseek' system call
    might return a large offset.  Therefore we must not anymore test
    for < 0, but test for a real error by making sure the value in %eax
-   is a real error number.  For now (as of 2.1.1) 122 is the largest
-   defined error number.  Given a bit room for development, Linus
-   chose in <asm/unistd.h> to use the values -125 to -1 for error
-   values.  We follow him here.  */
+   is a real error number.  Linus said he will make sure the no syscall
+   returns a value in -1 .. -4095 as a valid result so we can savely
+   test with -4095.  */
 #undef	PSEUDO
 #define	PSEUDO(name, syscall_name, args)				      \
   .text;								      \
   ENTRY (name)								      \
     DO_CALL (args, syscall_name);					      \
-    cmpl $-125, %eax;							      \
+    cmpl $-4095, %eax;							      \
     jae syscall_error;
 
 #undef	PSEUDO_END
diff --git a/sysdeps/unix/sysv/linux/m68k/syscall.S b/sysdeps/unix/sysv/linux/m68k/syscall.S
index b7417aa911..d2328dc545 100644
--- a/sysdeps/unix/sysv/linux/m68k/syscall.S
+++ b/sysdeps/unix/sysv/linux/m68k/syscall.S
@@ -1,25 +1,25 @@
 /* Copyright (C) 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   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 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.
+   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., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   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>
 
 /* Please consult the file sysdeps/unix/sysv/linux/m68k/sysdep.h for
-   more information about the value -128 used below.*/
+   more information about the value -4096 used below.*/
 
 	.text
 ENTRY (syscall)
@@ -27,7 +27,7 @@ ENTRY (syscall)
 	_DOARGS_5 (24)		/* Frob arguments.  */
 	trap &0			/* Do the system call.  */
 	UNDOARGS_5		/* Unfrob arguments.  */
-	moveq.l &-128, %d1
+	moveq.l &-4096, %d1
 	cmp.l %d1, %d0		/* Check %d0 for error.  */
 	jcc syscall_error	/* Jump to error handler if negative.  */
 	rts			/* Return to caller.  */
diff --git a/sysdeps/unix/sysv/linux/m68k/sysdep.S b/sysdeps/unix/sysv/linux/m68k/sysdep.S
index 7016a26a60..95e63542ee 100644
--- a/sysdeps/unix/sysv/linux/m68k/sysdep.S
+++ b/sysdeps/unix/sysv/linux/m68k/sysdep.S
@@ -1,20 +1,20 @@
 /* Copyright (C) 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   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 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.
+   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., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   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>
 
@@ -62,7 +62,11 @@ __syscall_error:
 END (__syscall_error)
 #endif /* PIC */
 
-ENTRY (__errno_location)
+	.weak __errno_location
+	.type __errno_location,@function
+	.align 4
+__errno_location:
+	CALL_MCOUNT
 #ifdef PIC
 	move.l	(%pc, errno@GOTPC), %a0
 #else
diff --git a/sysdeps/unix/sysv/linux/m68k/sysdep.h b/sysdeps/unix/sysv/linux/m68k/sysdep.h
index 3366caab45..46d5a7e48f 100644
--- a/sysdeps/unix/sysv/linux/m68k/sysdep.h
+++ b/sysdeps/unix/sysv/linux/m68k/sysdep.h
@@ -74,14 +74,13 @@ Cambridge, MA 02139, USA.  */
    even if the call succeeded.  E.g., the `lseek' system call might return
    a large offset.  Therefore we must not anymore test for < 0, but test
    for a real error by making sure the value in %d0 is a real error
-   number.  For now (as of 2.1.1) 122 is the largest defined error number.
-   We allow for a bit of room for development and treat -128 to -1 as
-   error values.  */
+   number.  Linus said he will make sure the no syscall returns a value
+   in -1 .. -4095 as a valid result so we can savely test with -4096.  */
 #define	PSEUDO(name, syscall_name, args)				      \
   .text;								      \
   ENTRY (name)								      \
     DO_CALL (&SYS_ify (syscall_name), args);				      \
-    moveq.l &-128, %d1;							      \
+    moveq.l &-4096, %d1;						      \
     cmp.l %d1, %d0;							      \
     jcc syscall_error
 
diff --git a/sysdeps/unix/sysv/linux/paths.h b/sysdeps/unix/sysv/linux/paths.h
index 80b6362701..2905e9effd 100644
--- a/sysdeps/unix/sysv/linux/paths.h
+++ b/sysdeps/unix/sysv/linux/paths.h
@@ -56,6 +56,7 @@
 #define	_PATH_MOUNTED	"/etc/mtab"
 #define	_PATH_NOLOGIN	"/etc/nologin"
 #define	_PATH_SENDMAIL	"/usr/sbin/sendmail"
+#define	_PATH_SHADOW	"/etc/shadow"
 #define	_PATH_SHELLS	"/etc/shells"
 #define	_PATH_TTY	"/dev/tty"
 #define	_PATH_UNIX	"/vmlinux"
diff --git a/sysdeps/unix/sysv/linux/posix_opt.h b/sysdeps/unix/sysv/linux/posix_opt.h
index 8a6fad0eb1..a467acfb48 100644
--- a/sysdeps/unix/sysv/linux/posix_opt.h
+++ b/sysdeps/unix/sysv/linux/posix_opt.h
@@ -1,21 +1,21 @@
 /* Define POSIX options for Linux.
-Copyright (C) 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   Copyright (C) 1996 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 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.
+   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.  */
+   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.  */
 
 #ifndef	_POSIX_OPT_H
 #define	_POSIX_OPT_H	1
@@ -63,4 +63,7 @@ Boston, MA 02111-1307, USA.  */
 /* Filenames are not silently truncated.  */
 #define	_POSIX_NO_TRUNC	1
 
+/* XPG4.2 shared memory is supported.  */
+#define	_XOPEN_SHM	1
+
 #endif /* posix_opt.h */
diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list
index 129951a6dd..01ca1bc8bb 100644
--- a/sysdeps/unix/sysv/linux/syscalls.list
+++ b/sysdeps/unix/sysv/linux/syscalls.list
@@ -20,7 +20,7 @@ ioperm		-	ioperm		3	ioperm
 iopl		-	iopl		1	iopl
 ipc		msgget	ipc		5	__ipc
 klogctl		EXTRA	syslog		3	klogctl
-llseek		EXTRA	_llseek		5	_llseek
+llseek		EXTRA	_llseek		5	_llseek		llseek
 mlock		EXTRA	mlock		2	__mlock	mlock
 mlockall	EXTRA	mlockall	1	__mlockall	mlockall
 mount		EXTRA	mount		5	__mount	mount
diff --git a/sysvipc/ftok.c b/sysvipc/ftok.c
index 20d98b9d33..aaa20ee94a 100644
--- a/sysvipc/ftok.c
+++ b/sysvipc/ftok.c
@@ -1,29 +1,29 @@
 /* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
 
-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 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.
+   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.  */
+   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 <sys/ipc.h>
 #include <sys/stat.h>
 
 key_t
 ftok (pathname, proj_id)
-     char *pathname;
-     char proj_id;
+     const char *pathname;
+     int proj_id;
 {
   struct stat st;
   key_t key;
@@ -31,7 +31,8 @@ ftok (pathname, proj_id)
   if (__stat (pathname, &st) < 0)
     return (key_t) -1;
 
-  key = (st.st_ino & 0xffff) | ((st.st_dev & 0xff) << 16) | (proj_id << 24);
+  key = ((st.st_ino & 0xffff) | ((st.st_dev & 0xff) << 16)
+	 | ((proj_id & 0xff) << 24));
 
   return key;
 }
diff --git a/sysvipc/sys/ipc.h b/sysvipc/sys/ipc.h
index d459be7754..ea8f3f2132 100644
--- a/sysvipc/sys/ipc.h
+++ b/sysvipc/sys/ipc.h
@@ -1,24 +1,26 @@
-/* Copyright (C) 1995 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
+/* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
 
-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 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.
+   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.  */
+   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.  */
 
 #ifndef _SYS_IPC_H
-#define _SYS_IPC_H
+
+#define _SYS_IPC_H	1
+#include <sys/cdefs.h>
 
 /* Get system dependent definition of `struct ipc_perm' and more.  */
 #include <sys/ipc_buf.h>
@@ -26,7 +28,7 @@ Boston, MA 02111-1307, USA.  */
 __BEGIN_DECLS
 
 /* Generates key for System V style IPC.  */
-extern key_t ftok __P ((char *__pathname, char __proj_id));
+extern key_t ftok __P ((__const char *__pathname, int __proj_id));
 
 __END_DECLS
 
diff --git a/termios/termios.h b/termios/termios.h
index 9943fa6ff6..f1a0fe2d17 100644
--- a/termios/termios.h
+++ b/termios/termios.h
@@ -1,20 +1,20 @@
 /* Copyright (C) 1991, 92, 93, 94, 96 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., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   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.  */
 
 /*
  *	POSIX Standard: 7.1-2 General Terminal Interface	<termios.h>
diff --git a/time/africa b/time/africa
index 110f540064..a3a28c95ea 100644
--- a/time/africa
+++ b/time/africa
@@ -1,4 +1,4 @@
-# @(#)africa	7.14
+# @(#)africa	7.15
 
 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
@@ -229,13 +229,13 @@ Zone	Africa/Djibouti	2:52:36 -	LMT	1911 Jul
 
 # Egypt
 
-# From Bob Devine (January 28, 1988):
+# From Bob Devine (1988-01-28):
 # Egypt: DST from first day of May to first of October (ending may
 # also be on Sept 30th not 31st -- you might want to ask one of the
 # soc.* groups, you might hit someone who could ask an embassy).
 # DST since 1960 except for 1981-82.
 
-# From U. S. Naval Observatory (January 19, 1989):
+# From U. S. Naval Observatory (1989-01-19):
 # EGYPT               2 H  AHEAD OF UTC
 # EGYPT               3 H  AHEAD OF UTC  MAY 17 - SEP 30 (AFTER
 # EGYPT                                  RAMADAN)
@@ -331,7 +331,7 @@ Zone	Africa/Bissau	-1:02:20 -	LMT	1911 May 26
 # uninhabited
 
 # Kenya
-# From Paul Eggert <eggert@twinsun.com> (November 18, 1993):
+# From Paul Eggert <eggert@twinsun.com> (1993-11-18):
 # Shanks says the transition to 2:45 was in 1940, but it must have been 1948.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Nairobi	2:27:16	-	LMT	1928 Jul
@@ -348,7 +348,7 @@ Zone	Africa/Maseru	1:50:00 -	LMT	1903 Mar
 			2:00	-	SAT
 
 # Liberia
-# From Paul Eggert <eggert@twinsun.com> (November 18, 1993):
+# From Paul Eggert <eggert@twinsun.com> (1993-11-18):
 # In 1972 Liberia was the last country to switch
 # from a GMT offset that was not a multiple of 15 minutes.
 # Howse reports that it was in honor of their president's birthday.
@@ -370,7 +370,7 @@ Zone	Africa/Monrovia	-0:43:08 -	LMT	1882
 # From Bob Devine (January 28 1988):
 # Libya: Since 1982 April 1st to September 30th (?)
 
-# From U. S. Naval Observatory (January 19, 1989):
+# From U. S. Naval Observatory (1989-01-19):
 # LIBYAN ARAB         1 H  AHEAD OF UTC  JAMAHIRIYA/LIBYA
 # LIBYAN ARAB         2 H  AHEAD OF UTC  APR 1 - SEP 30 JAMAHIRIYA/LIBYA
 
@@ -544,7 +544,7 @@ Zone	Africa/Freetown	-0:53:00 -	LMT	1882
 			 0:00	SL	WA%sT
 
 # Somalia
-# From Paul Eggert <eggert@twinsun.com> (November 18, 1993):
+# From Paul Eggert <eggert@twinsun.com> (1993-11-18):
 # Shanks omits the 1948 transition to 2:45; this is probably a typo.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Mogadishu	3:01:28 -	LMT	1893 Nov
@@ -565,7 +565,7 @@ Zone Africa/Johannesburg 1:52:00 -	LMT	1892 Feb 8
 # no information
 
 # Sudan
-# From Michael Ross <mross@antigone.com> (November 15, 1995):
+# From Michael Ross <mross@antigone.com> (1995-11-15):
 # Sudan no longer observes any form of daylight time change.
 # I verified this today by telephone with the Sudan Mission to the
 # United Nations: 212-573-6033
diff --git a/time/asia b/time/asia
index 2cc414f1df..b5220f3915 100644
--- a/time/asia
+++ b/time/asia
@@ -1,4 +1,4 @@
-# @(#)asia	7.24
+# @(#)asia	7.25
 
 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
@@ -144,8 +144,8 @@ Zone	Asia/Phnom_Penh	6:59:40 -	LMT	1906 Jun  9
 # From Guy Harris:
 # People's Republic of China.  Yes, they really have only one time zone.
 
-# From Bob Devine (January 28, 1988):
-# No they don't.  See TIME mag, February 17, 1986 p.52.  Even though
+# From Bob Devine (1988-01-28):
+# No they don't.  See TIME mag, 1986-02-17 p.52.  Even though
 # China is across 4 physical time zones, before Feb 1, 1986 only the
 # Peking (Bejing) time zone was recognized.  Since that date, China
 # has two of 'em -- Peking's and Urumqi (named after the capital of
@@ -158,7 +158,7 @@ Zone	Asia/Phnom_Penh	6:59:40 -	LMT	1906 Jun  9
 #     1986 May 4 - Sept 14
 #     1987 mid-April - ??
 
-# From U. S. Naval Observatory (January 19, 1989):
+# From U. S. Naval Observatory (1989-01-19):
 # CHINA               8 H  AHEAD OF UTC  ALL OF CHINA, INCL TAIWAN
 # CHINA               9 H  AHEAD OF UTC  APR 17 - SEP 10
 
@@ -366,11 +366,11 @@ Zone	Asia/Baghdad	2:57:40	-	LMT	1890
 
 # Israel
 
-# From U. S. Naval Observatory (January 19, 1989):
+# From U. S. Naval Observatory (1989-01-19):
 # ISRAEL              2 H  AHEAD OF UTC
 # ISRAEL              3 H  AHEAD OF UTC  APR 10 - SEP 3
 
-# From Paul Eggert <eggert@twinsun.com> (November 18, 1993):
+# From Paul Eggert <eggert@twinsun.com> (1993-11-18):
 #
 # Shanks gives the following rules for Jerusalem from 1918 through 1991.
 # After 1989 Shanks often disagrees with Silverberg; we go with Silverberg.
@@ -464,8 +464,8 @@ Rule	Zion	1995	only	-	Sep	 3	0:00	0	S
 #   ftp://ftp.huji.ac.il/pub/misc/timezones/announcements/1996-1998.ps.gz
 #
 # Emptor Caveat: The dates for the years 1996-1998 were originally announced
-# on August 31, 1995, by the previous Minister of Interior.  The new Minister
-# of Interior changed the dates on January 1, 1996, to take into account the
+# on 1995-08-31, by the previous Minister of Interior.  The new Minister
+# of Interior changed the dates on 1996-01-01, to take into account the
 # desires of certain portions of Israeli society (the next election is in the
 # Fall of 1996).  After this (1996) year's Daylight Savings Time is over, the
 # new minister has announced that a study will be conducted as to the wishes of
@@ -512,7 +512,7 @@ Zone	Asia/Ishigaki	8:16:36	-	LMT	1896
 # Other Japanese possessions are probably like Asia/Tokyo.
 
 # Jordan
-# From Paul Eggert <eggert@twinsun.com> (November 18, 1993):
+# From Paul Eggert <eggert@twinsun.com> (1993-11-18):
 # Most likely Shanks is merely guessing dates from 1992 on.
 # From Shanks (1991):
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
@@ -863,7 +863,7 @@ Zone	Asia/Tashkent	4:37:12 -	LMT	1924 May  2
 # from the American Embassy in Tashkent implies that they have just one.
 
 # Vietnam
-# From Paul Eggert <eggert@twinsun.com> (November 18, 1993):
+# From Paul Eggert <eggert@twinsun.com> (1993-11-18):
 # Saigon's official name is Thanh-Pho Ho Chi Minh, but it's too long.
 # We'll stick with the traditional name for now.
 # From Shanks (1991):
diff --git a/time/australasia b/time/australasia
index e65546feb8..27e018bcde 100644
--- a/time/australasia
+++ b/time/australasia
@@ -1,4 +1,4 @@
-# @(#)australasia	7.28
+# @(#)australasia	7.29
 # This file also includes Pacific islands.
 
 # Notes are at the end of this file
@@ -439,7 +439,7 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 
 # Australia
 
-# From John Mackin (March 6, 1991):
+# From John Mackin (1991-03-06):
 # We in Australia have _never_ referred to DST as `daylight' time.
 # It is called `summer' time.  Now by a happy coincidence, `summer'
 # and `standard' happen to start with the same letter; hence, the
@@ -473,20 +473,20 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 
 # Northern Territory
 
-# From George Shepherd via Simon Woodhead via Robert Elz (March 6, 1991):
+# From George Shepherd via Simon Woodhead via Robert Elz (1991-03-06):
 # # The NORTHERN TERRITORY..  [ Courtesy N.T. Dept of the Chief Minister ]
 # #					[ Nov 1990 ]
 # #	N.T. have never utilised any DST due to sub-tropical/tropical location.
 # ...
 # Zone        Australia/North         9:30    -       CST
 
-# From Bradley White (March 4, 1991):
+# From Bradley White (1991-03-04):
 # A recent excerpt from an Australian newspaper...
 # the Northern Territory do[es] not have daylight saving.
 
 # Western Australia
 
-# From George Shepherd via Simon Woodhead via Robert Elz (March 6, 1991):
+# From George Shepherd via Simon Woodhead via Robert Elz (1991-03-06):
 # #  The state of WESTERN AUSTRALIA..  [ Courtesy W.A. dept Premier+Cabinet ]
 # #						[ Nov 1990 ]
 # #	W.A. suffers from a great deal of public and political opposition to
@@ -501,23 +501,23 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # Rule	AW	1983	only	-	Oct	lastSun	2:00	1:00	D
 # Rule	AW	1984	only	-	Mar	Sun>=1	3:00	0	W
 
-# From Bradley White (March 4, 1991):
+# From Bradley White (1991-03-04):
 # A recent excerpt from an Australian newspaper...
 # Western Australia...do[es] not have daylight saving.
 
-# From John D. Newman via Bradley White (November 2, 1991):
+# From John D. Newman via Bradley White (1991-11-02):
 # Western Australia is still on "winter time". Some DH in Sydney
 # rang me at home a few days ago at 6.00am. (He had just arrived at
 # work at 9.00am.)
 # W.A. is switching to Summer Time on Nov 17th just to confuse
 # everybody again.
 
-# From Arthur David Olson (March 8, 1992):
+# From Arthur David Olson (1992-03-08):
 # The 1992 ending date used in the rules is a best guess;
 # it matches what was used in the past.
 
 # Queensland
-# From George Shepherd via Simon Woodhead via Robert Elz (March 6, 1991):
+# From George Shepherd via Simon Woodhead via Robert Elz (1991-03-06):
 # #   The state of QUEENSLAND.. [ Courtesy Qld. Dept Premier Econ&Trade Devel ]
 # #						[ Dec 1990 ]
 # ...
@@ -528,21 +528,21 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # Rule	AQ	1989	max	-	Oct	lastSun	2:00	1:00	D
 # Rule	AQ	1990	max	-	Mar	Sun>=1	3:00	0	E
 
-# From Bradley White (December 24, 1989):
+# From Bradley White (1989-12-24):
 # "Australia/Queensland" now observes daylight time (i.e. from
 # October 1989).
 
-# From Bradley White (March 4, 1991):
+# From Bradley White (1991-03-04):
 # A recent excerpt from an Australian newspaper...
 # ...Queensland...[has] agreed to end daylight saving
 # at 3am tomorrow (March 3)...
 
-# From John Mackin (March 6, 1991):
+# From John Mackin (1991-03-06):
 # I can certainly confirm for my part that Daylight Saving in NSW did in fact
 # end on Sunday, 3 March.  I don't know at what hour, though.  (It surprised
 # me.)
 
-# From Bradley White (March 8, 1992):
+# From Bradley White (1992-03-08):
 # ...there was recently a referendum in Queensland which resulted
 # in the experimental daylight saving system being abandoned. So, ...
 # ...
@@ -550,12 +550,12 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # Rule	QLD	1990	1992	-	Mar	Sun>=1	3:00	0	S
 # ...
 
-# From Arthur David Olson (March 8, 1992):
+# From Arthur David Olson (1992-03-08):
 # The chosen rules the union of the 1971/1972 change and the 1989-1992 changes.
 
 # South Australia, Tasmania, Victoria
 
-# From Arthur David Olson (March 8, 1992):
+# From Arthur David Olson (1992-03-08):
 # The rules from version 7.1 follow.
 # There are lots of differences between these rules and
 # the Shepherd et al. rules.  Since the Shepherd et al. rules
@@ -573,7 +573,7 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 #				10:00	1:00	EST	1986 Mar Sun<=21 3:00
 #				10:00	Oz	EST
 
-# From Robert Elz (March 6, 1991):
+# From Robert Elz (1991-03-06):
 # I believe that the current start date for DST is "lastSun" in Oct...
 # that changed Oct 89.  That is, we're back to the
 # original rule, and that rule currently applies in all the states
@@ -583,12 +583,12 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 
 # South Australia
 
-# From Bradley White (March 4, 1991):
+# From Bradley White (1991-03-04):
 # A recent excerpt from an Australian newspaper...
 # ...South Australia...[has] agreed to end daylight saving
 # at 3am tomorrow (March 3)...
 
-# From George Shepherd via Simon Woodhead via Robert Elz (March 6, 1991):
+# From George Shepherd via Simon Woodhead via Robert Elz (1991-03-06):
 # #   The state of SOUTH AUSTRALIA....[ Courtesy of S.A. Dept of Labour ]
 # #						[ Nov 1990 ]
 # ...
@@ -599,23 +599,23 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # Rule	 AS	1986	1990	-	Mar	Sun<=21	3:00	0	C
 # Rule	 AS	1991	max	-	Mar	Sun>=1	3:00	0	C
 
-# From Bradley White (March 11, 1992):
+# From Bradley White (1992-03-11):
 # Recent correspondence with a friend in Adelaide
 # contained the following exchange:  "Due to the Adelaide Festival,
 # South Australia delays setting back our clocks for a few weeks."
 
-# From Robert Elz (March 13, 1992):
+# From Robert Elz (1992-03-13):
 # I heard that apparently (or at least, it appears that)
 # South Aus will have an extra 3 weeks daylight saving every even
 # numbered year (from 1990).  That's when the Adelaide Festival
 # is on...
 
-# From Robert Elz (March 16, 1992, 00:57:07 +1000):
+# From Robert Elz (1992-03-16, 00:57:07 +1000):
 # DST didn't end in Adelaide today (yesterday)....
 # But whether it's "4th Sunday" or "2nd last Sunday" I have no idea whatever...
 # (it's just as likely to be "the Sunday we pick for this year"...).
 
-# From Bradley White (April 11, 1994):
+# From Bradley White (1994-04-11):
 # If Sun, 15 March, 1992 was at +1030 as kre asserts, but yet Sun, 20 March,
 # 1994 was at +0930 as John Connolly's customer seems to assert, then I can
 # only conclude that the actual rule is more complicated....
@@ -627,11 +627,11 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 
 # Tasmania
 
-# From Bradley White (March 4, 1991):
+# From Bradley White (1991-03-04):
 # A recent excerpt from an Australian newspaper...
 # ...Tasmania will revert to Australian Eastern Standard Time on March 31...
 
-# From George Shepherd via Simon Woodhead via Robert Elz (March 6, 1991):
+# From George Shepherd via Simon Woodhead via Robert Elz (1991-03-06):
 # #  The state of TASMANIA.. [Courtesy Tasmanian Dept of Premier + Cabinet ]
 # #					[ Nov 1990 ]
 # ...
@@ -652,7 +652,7 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # Rule	AT	1991	max	-	Oct	Sun>=1	2:00	1:00	D
 # Rule	AT	1991	max	-	Mar	lastSun	3:00	0	E
 
-# From Bill Hart via Alexander Dupuy and Guy Harris (October 10, 1991):
+# From Bill Hart via Alexander Dupuy and Guy Harris (1991-10-10):
 # My state Government in there eagerness to get a few more bucks for the
 # tourist industry industry decided to change the daylight savings times
 # yet again (we now have almost 6 months per year)...
@@ -663,18 +663,18 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # Rule  Oz      1987    1990    -       Mar     Sun<=21 3:00    0       -
 # Rule  Oz      1991    max     -       Mar     Sun<=31 3:00    0       -
 
-# From Bill Hart via Guy Harris (October 10, 1991):
+# From Bill Hart via Guy Harris (1991-10-10):
 # Oh yes, the new daylight savings rules are uniquely tasmanian, we have
 # 6 weeks a year now when we are out of sync with the rest of Australia
 # (but nothing new about that).
 
 # Victoria
 
-# From Bradley White (March 4, 1991):
+# From Bradley White (1991-03-04):
 # A recent excerpt from an Australian newspaper...
 # ...Victoria...[has] agreed to end daylight saving at 3am tomorrow (March 3)...
 
-# From George Shepherd via Simon Woodhead via Robert Elz (March 6, 1991):
+# From George Shepherd via Simon Woodhead via Robert Elz (1991-03-06):
 # #   The state of VICTORIA.. [ Courtesy of Vic. Dept of Premier + Cabinet ]
 # #						[ Nov 1990 ]
 # ...
@@ -701,26 +701,26 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 #	legislation.  This is very important to understand.
 #	I have researched New South Wales time only...
 
-# From Dave Davey (March 3, 1990):
+# From Dave Davey (1990-03-03):
 # Rule	NSW	1988	only	-	Mar	Sun>=1	3:00	0	-
 # Rule	NSW	1989	only	-	Mar	Sun<=21	3:00	0	-
 
-# From Bradley White (March 4, 1991):
+# From Bradley White (1991-03-04):
 # A recent excerpt from an Australian newspaper...
 # NSW...[has] agreed to end daylight saving at 3am tomorrow (March 3)...
 
-# From George Shepherd via Simon Woodhead via Robert Elz (March 6, 1991):
+# From George Shepherd via Simon Woodhead via Robert Elz (1991-03-06):
 # # The state of NEW SOUTH WALES.. [confirmed by Attorney General's Dept N.S.W]
 # #					[ Dec 1990 ]
 # ...
 # Rule	 AN	1988	1989	-	Mar	Sun<=21	3:00	0	E
 # ...
 
-# From John Mackin (March 9, 1991)
+# From John Mackin (1991-03-09)
 # I have confirmed the accuracy of the historical data for NSW in the
 # file Robert forwarded
 
-# From Arthur David Olson (March 8, 1992):
+# From Arthur David Olson (1992-03-08):
 # Sources differ on whether DST ended March 6 or March 20 in 1988;
 # March 20 (the "confirmed" date) is in the chosen rules.
 
@@ -730,10 +730,10 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 
 # Yancowinna
 
-# From John Basser (January 4, 1989):
+# From John Basser (1989-01-04):
 # `Broken Hill' means the County of Yancowinna.
 
-# From George Shepherd via Simon Woodhead via Robert Elz (March 6, 1991):
+# From George Shepherd via Simon Woodhead via Robert Elz (1991-03-06):
 # # YANCOWINNA..  [ Confirmation courtesy of Broken Hill Postmaster ]
 # #					[ Dec 1990 ]
 # ...
@@ -751,7 +751,7 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 
 # Lord Howe Island
 
-# From George Shepherd via Simon Woodhead via Robert Elz (March 6, 1991):
+# From George Shepherd via Simon Woodhead via Robert Elz (1991-03-06):
 # LHI...		[ Courtesy of Pauline Van Winsen.. pauline@Aus ]
 #					[ Dec 1990 ]
 # Lord Howe Island is located off the New South Wales coast, and is half an
@@ -768,13 +768,13 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # New Zealand, from Elz' asia 1.1
 # Elz says "no guarantees"
 
-# From Mark Davies (October 3, 1990):
+# From Mark Davies (1990-10-03):
 # the 1989/90 year was a trial of an extended "daylight saving" period.
 # This trial was deemed successful and the extended period adopted for
 # subsequent years (with the addition of a further week at the start).
 # source -- phone call to Ministry of Internal Affairs Head Office.
 
-# From George Shepherd via Simon Woodhead via Robert Elz (March 6, 1991):
+# From George Shepherd via Simon Woodhead via Robert Elz (1991-03-06):
 # # The Country of New Zealand   (Australia's east island -) Gee they hate that!
 # #				   or is Australia the west island of N.Z.
 # #	[ courtesy of Geoff Tribble.. Geofft@Aus.. Auckland N.Z. ]
@@ -788,7 +788,7 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # Zone	NZ			12:00	NZ		NZ%sT	# New Zealand
 # Zone	NZ-CHAT			12:45	-		NZ-CHAT # Chatham Island
 
-# From Arthur David Olson (March 8, 1992):
+# From Arthur David Olson (1992-03-08):
 # The chosen rules use the Davies October 8 values for the start of DST in 1989
 # rather than the October 1 value.
 
@@ -825,7 +825,7 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 
 # In comp.risks 14.87 (26 August 1993), Peter Neumann writes:
 # I wonder what happened in Kwajalein, where there was NO Friday,
-# August 20, 1993.  Thursday night at midnight Kwajalein switched sides with
+# 1993-08-20.  Thursday night at midnight Kwajalein switched sides with
 # respect to the International Date Line, to rejoin its fellow islands,
 # going from 11:59 p.m. Thursday to 12:00 m. Saturday in a blink.
 
diff --git a/time/europe b/time/europe
index 73fa55c410..abeba98386 100644
--- a/time/europe
+++ b/time/europe
@@ -1,4 +1,4 @@
-# @(#)europe	7.39
+# @(#)europe	7.40
 
 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
@@ -34,7 +34,7 @@
 # is Derek Howse, Greenwich time and the discovery of the longitude,
 # Oxford University Press (1980).
 
-# From Peter Ilieve <peter@memex.co.uk> (December 4, 1994),
+# From Peter Ilieve <peter@memex.co.uk> (1994-12-04),
 # The original six [EU members]: Belgium, France, (West) Germany, Italy,
 # Luxembourg, the Netherlands.
 # Plus, from 1 Jan 73: Denmark, Ireland, United Kingdom.
@@ -61,7 +61,7 @@
 # United Kingdom
 # The UK and its colonies adopted the Gregorian calendar on 1752-09-14.
 
-# From Peter Ilieve <peter@memex.co.uk> (July 6, 1994):
+# From Peter Ilieve <peter@memex.co.uk> (1994-07-06):
 #
 # On 17 Jan 1994 the Independent, a UK quality newspaper, had a piece about
 # historical vistas along the Thames in west London. There was a photo
@@ -82,7 +82,7 @@
 #
 # [This yields GMTOFF = -0:01:15 for London LMT in the 18th century.]
 
-# From Paul Eggert <eggert@twinsun.com> (November 18, 1993):
+# From Paul Eggert <eggert@twinsun.com> (1993-11-18):
 #
 # Howse writes that Britain was the first country to use standard time.
 # The railways cared most about the inconsistencies of local mean time,
@@ -123,7 +123,7 @@
 # term appears only in quotes taken from DST's opponents, whereas the
 # proponents (who eventually won the argument) are quoted as using ``Summer''.
 
-# From Arthur David Olson (January 19, 1989):
+# From Arthur David Olson (1989-01-19):
 #
 # A source at the British Information Office in New York avers that it's
 # known as "British" Summer Time in all parts of the United Kingdom.
@@ -134,7 +134,7 @@
 # If you can predict what Parliament will do, you should be in
 # politics making a fortune, not computing.
 
-# From Peter Ilieve <peter@memex.co.uk> (September 3, 1993):
+# From Peter Ilieve <peter@memex.co.uk> (1993-09-03):
 #
 # Our Government...couldn't...make a decision after the 1989 consultation
 # exercise about the UK changing its timezone so it just let things drift
@@ -161,7 +161,7 @@
 # an Order in Council (a Statutary Instrument, the SI thing mentioned above)
 # to specify the EC specified dates.
 
-# From Peter Ilieve <peter@memex.co.uk> (October 18, 1993):
+# From Peter Ilieve <peter@memex.co.uk> (1993-10-18):
 #
 # My contact in the Ministry of Defence Public Relations department
 # accepted the challenge of looking into this and produced the following,
@@ -189,7 +189,7 @@
 # time of sunrise and sunset in The Times, when BDST was in effect, and
 # if you find a zone reference it will say, "All times B.D.S.T."
 
-# From Peter Ilieve <peter@memex.co.uk> (September 3, 1993):
+# From Peter Ilieve <peter@memex.co.uk> (1993-09-03):
 #
 # > # Current rules
 # > Rule GB-Eire 1981	max	-	Mar	lastSun	1:00s	1:00	BST
@@ -213,7 +213,7 @@
 # summer time completely, noon is when the Sun is overhead, and that should
 # be the end of it.
 
-# From Peter Ilieve <peter@memex.co.uk> (October 22, 1993):
+# From Peter Ilieve <peter@memex.co.uk> (1993-10-22):
 #
 # I now have the text of the Summer Time Act 1916, the granddaddy of them all.
 # It is headed: `An Act to provide for the Time in Great Britain and Ireland
@@ -246,7 +246,7 @@
 # It also confirms the fact that Ireland followed Dublin time back then,
 # and 25 minutes behind Greenwich, as Shanks has it, would be correct.
 
-# From Peter Ilieve <peter@memex.co.uk> (October 28, 1993):
+# From Peter Ilieve <peter@memex.co.uk> (1993-10-28):
 #
 # I now have before me, thanks to my learned legal friend Lorna, the text of
 # the Time (Ireland) Act 1916.
@@ -269,7 +269,7 @@
 # of the 1880 date in Shanks.  The little bit of it that is repealed
 # also refers solely to Ireland and Dublin Mean Time.
 
-# From Peter Ilieve <peter@memex.co.uk> (October 29, 1993):
+# From Peter Ilieve <peter@memex.co.uk> (1993-10-29):
 #
 # My case is that, with the sole exception of Ireland in 1916 using Dublin
 # Mean Time, Summer Time has been uniform throughout the United Kingdom
@@ -438,7 +438,7 @@
 # thereby destroying the authority of the Summer Time Order specifying
 # summer time in 1968....
 
-# From Peter Ilieve <peter@memex.co.uk> (November 18, 1993)
+# From Peter Ilieve <peter@memex.co.uk> (1993-11-18)
 #
 # Here is a revised version of my tabrules file for the perl script I sent
 # before. I have personally verified the various Orders back to 1953 and
@@ -603,7 +603,7 @@
 # 1993    28 Mar  24 Oct fixed
 # 1994    27 Mar  23 Oct fixed
 
-# From Peter Ilieve <peter@memex.co.uk> (August 18, 1994):
+# From Peter Ilieve <peter@memex.co.uk> (1994-08-18):
 # I now have the text of the 7th EC directive on summer time arrangements
 # (94/21/EC), which was approved on 30 May....
 # The major changes from existing practice are that 1995 will be the last year
@@ -626,7 +626,7 @@
 # by the Commission by 1 Jan 96. They have not yet appeared (I asked just
 # before Easter).
 
-# From Peter Ilieve <peter@memex.co.uk> (March 28, 1994):
+# From Peter Ilieve <peter@memex.co.uk> (1994-03-28):
 # The [GB-Eire] end date of 22 October [1995] conflicts with your current rule
 # of Oct Sun>=23, and the historical UK formula of Sun after 4th Sat.
 # The last time 4th Sun and Sun after 4th Sat differed was in 1989,
@@ -836,7 +836,7 @@ Rule	Russia	1919	only	-	Jul	 1	 2:00	1:00	S
 Rule	Russia	1919	only	-	Aug	16	 0:00	0	-
 Rule	Russia	1921	only	-	Feb	14	23:00	1:00	S
 # Shanks gives 1921 Mar 21 for the following transition.
-# From Andrew A. Chernov <ache@astral.msk.su> (November 12, 1993):
+# From Andrew A. Chernov <ache@astral.msk.su> (1993-11-12):
 # My sources says, that it is Mar 20, not 21.
 Rule	Russia	1921	only	-	Mar	20	23:00	2:00	DS
 Rule	Russia	1921	only	-	Sep	 1	 0:00	1:00	S
@@ -1284,10 +1284,10 @@ Zone	Europe/Budapest	1:16:20 -	LMT	1890 Oct
 
 # Iceland
 #
-# From Adam David <adam@veda.is> (November 6, 1993):
+# From Adam David <adam@veda.is> (1993-11-06):
 # The name of the timezone in Iceland for system / mail / news purposes is GMT.
 #
-# (December 5, 1993):
+# (1993-12-05):
 # This material is paraphrased from the 1988 edition of the University of
 # Iceland Almanak.
 #
@@ -1301,7 +1301,7 @@ Zone	Europe/Budapest	1:16:20 -	LMT	1890 Oct
 # time the norsemen first settled Iceland.  The first day of winter is always
 # Saturday, but is not dependent on the Julian or Gregorian calendars.
 #
-# (December 10, 1993):
+# (1993-12-10):
 # I have a reference from the Oxford Icelandic-English dictionary for the
 # beginning of winter, which ties it to the ecclesiastical calendar (and thus
 # to the julian/gregorian calendar) over the period in question.
@@ -1311,7 +1311,7 @@ Zone	Europe/Budapest	1:16:20 -	LMT	1890 Oct
 # might be a reference to the Julian calendar as opposed to Gregorian, or it
 # might mean something else (???).
 #
-# From Paul Eggert <eggert@twinsun.com> (December 9, 1993):
+# From Paul Eggert <eggert@twinsun.com> (1993-12-09):
 # The Iceland Almanak, Shanks and Whitman disagree on many points.
 # We go with the Almanak, except for one claim from Shanks, namely that
 # Reykavik was -1:28 from 1837 to 1908, local mean time before that.
@@ -1701,7 +1701,7 @@ Zone	Europe/Lisbon	-0:36:32 -	LMT	1884
 			 0:00	Port	WE%sT	1966 Apr  3 2:00
 			 1:00	-	CET	1976 Sep 26 1:00
 			 0:00	Port	WE%sT	1983 Sep 25 1:00s
-# From Rui Pedro Salgueiro <rps@inescca.inescc.pt> (November 12, 1992):
+# From Rui Pedro Salgueiro <rps@inescca.inescc.pt> (1992-11-12):
 # Portugal has recently (September, 27) changed timezone
 # (from WET to MET or CET) to harmonize with EEC.
 			 0:00	EU	WE%sT	1992 Sep 27 1:00s
@@ -1777,7 +1777,7 @@ Zone Asia/Omsk		 4:53:36 -	LMT	1924 May  2
 			 5:00	1:00	OMSST	1991 Sep 29 2:00s
 			 5:00	-	OMST	1992 Jan 19 2:00s
 			 6:00	Russia	OMS%sT
-# From Stanislaw A. Kuzikowski <S.A.Kuz@iae.nsk.su> (June 29, 1994):
+# From Stanislaw A. Kuzikowski <S.A.Kuz@iae.nsk.su> (1994-06-29):
 # But now it is some months since Novosibirsk is 3 hours ahead of Moscow!
 # I do not know why they have decided to make this change;
 # as far as I remember it was done exactly during winter->summer switching
@@ -2064,7 +2064,7 @@ Zone Europe/Simferopol	2:16:24 -	LMT	1880
 			2:00	-	EET	1930 Jun 21
 			3:00	Russia	MOS%sT	1991 Mar 31 2:00s
 			2:00	1:00	EEST	1991 Sep 29 2:00s
-# From Paul Eggert <eggert@twinsun.com> (May 28, 1994):
+# From Paul Eggert <eggert@twinsun.com> (1994-05-28):
 # Today's _Economist_ (p 45) reports that Crimea switched
 # from Kiev to Moscow time sometime after the January elections.
 # For now, we'll guess that there was a 2-hour leap forward on March 27.
@@ -2148,7 +2148,7 @@ Zone	Europe/Belgrade	1:22:00	-	LMT	1884
 # INTERNET   : dik@cwi.nl
 # BITNET/EARN: dik@mcvax
 
-# From Bob Devine (January 28, 1988):
+# From Bob Devine (1988-01-28):
 # ...
 # Greece: Last Sunday in April to last Sunday in September (iffy on dates).
 # Since 1978.  Change at midnight.
diff --git a/time/northamerica b/time/northamerica
index 1d8bd9e6f5..5c0c02cc93 100644
--- a/time/northamerica
+++ b/time/northamerica
@@ -1,11 +1,11 @@
-# @(#)northamerica	7.27
+# @(#)northamerica	7.28
 # also includes Central America and the Caribbean
 
 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
 # tz@elsie.nci.nih.gov for general use in the future).
 
-# From Paul Eggert <eggert@twinsun.com> (August 17, 1994):
+# From Paul Eggert <eggert@twinsun.com> (1994-08-17):
 # A reliable and entertaining source about time zones is
 # Derek Howse, Greenwich time and the discovery of the longitude,
 # Oxford University Press (1980).
@@ -41,8 +41,8 @@
 
 # From Arthur David Olson:
 # US Daylight Saving Time ended on the last Sunday of *October* in 1974.
-# See, for example, the front page of the Saturday, October 26, 1974
-# and Sunday, October 27, 1974 editions of the Washington Post.
+# See, for example, the front page of the Saturday, 1974-10-26
+# and Sunday, 1974-10-27 editions of the Washington Post.
 
 # From Arthur David Olson:
 # Before the Uniform Time Act of 1966 took effect in 1967, observance of
@@ -60,7 +60,7 @@ Rule	US	1975	only	-	Feb	23	2:00	1:00	D
 Rule	US	1976	1986	-	Apr	lastSun	2:00	1:00	D
 Rule	US	1987	max	-	Apr	Sun>=1	2:00	1:00	D
 
-# From Bob Devine (January 28, 1988):
+# From Bob Devine (1988-01-28):
 # ...Alaska (and Hawaii) had the timezone names changed in 1967.
 #    old			 new
 #    Pacific Standard Time(PST)  -same-
@@ -76,7 +76,7 @@ Rule	US	1987	max	-	Apr	Sun>=1	2:00	1:00	D
 # The tables below use `NST', not `NT', for Nome Standard Time.
 # I invented `CAWT' for Central Alaska War Time.
 
-# From U. S. Naval Observatory (January 19, 1989):
+# From U. S. Naval Observatory (1989-01-19):
 # USA  EASTERN       5 H  BEHIND UTC    NEW YORK, WASHINGTON
 # USA  EASTERN       4 H  BEHIND UTC    APR 3 - OCT 30
 # USA  CENTRAL       6 H  BEHIND UTC    CHICAGO, HOUSTON
@@ -92,16 +92,16 @@ Rule	US	1987	max	-	Apr	Sun>=1	2:00	1:00	D
 # USA  HAWAII       10 H  BEHIND UTC
 # USA  BERING       11 H  BEHIND UTC    SAMOA, MIDWAY
 
-# From Arthur David Olson (January 21, 1989):
+# From Arthur David Olson (1989-01-21):
 # The above dates are for 1988.
 # Note the "AKST" and "AKDT" abbreviations, the claim that there's
 # no DST in Samoa, and the claim that there is DST in Alaska and the
 # Aleutians.
 
-# From Arthur David Olson (February 13, 1988):
+# From Arthur David Olson (1988-02-13):
 # Legal standard time zone names, from United States Code (1982 Edition and
 # Supplement III), Title 15, Chapter 6, Section 260 and forward.  First, names
-# up to April 1, 1967 (when most provisions of the Uniform Time Act of 1966
+# up to 1967-04-01 (when most provisions of the Uniform Time Act of 1966
 # took effect), as explained in sections 263 and 261:
 #	(none)
 #	United States standard eastern time
@@ -111,7 +111,7 @@ Rule	US	1987	max	-	Apr	Sun>=1	2:00	1:00	D
 #	(none)
 #	United States standard Alaska time
 #	(none)
-# Next, names from April 1, 1967 until November 30, 1983 (the date for
+# Next, names from 1967-04-01 until 1983-11-30 (the date for
 # public law 98-181):
 #	Atlantic standard time
 #	eastern standard time
@@ -121,7 +121,7 @@ Rule	US	1987	max	-	Apr	Sun>=1	2:00	1:00	D
 #	Yukon standard time
 #	Alaska-Hawaii standard time
 #	Bering standard time
-# And after November 30, 1983:
+# And after 1983-11-30:
 #	Atlantic standard time
 #	eastern standard time
 #	central standard time
@@ -277,7 +277,7 @@ Zone America/Phoenix	-7:28:18 -	LMT	1883 Nov 18 12:00
 			-7:00	-	MST	1967
 			-7:00	US	M%sT	1968
 			-7:00	-	MST
-# From Arthur David Olson (February 13, 1988):
+# From Arthur David Olson (1988-02-13):
 # A writer from the Inter Tribal Council of Arizona, Inc.,
 # notes in private correspondence dated 12/28/87 that "Presently, only the
 # Navajo Nation participates in the Daylight Saving Time policy, due to its
@@ -350,10 +350,10 @@ Zone America/Indiana/Marengo -5:45:23 -	LMT	1883 Nov 18 12:00
 			-5:00	-	EST
 #
 # Starke County, Indiana
-# From Arthur David Olson (October 28, 1991):
-# An article on page A3 of the Sunday, October 27, 1991 Washington Post
+# From Arthur David Olson (1991-10-28):
+# An article on page A3 of the Sunday, 1991-10-27 Washington Post
 # notes that Starke County switched from Central time to Eastern time as of
-# October 27, 1991.
+# 1991-10-27.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
 Rule	Starke	1947	1961	-	Apr	lastSun	2:00	1:00	D
 Rule	Starke	1947	1954	-	Sep	lastSun	2:00	0	S
@@ -398,7 +398,7 @@ Zone America/Louisville	-5:43:02 -	LMT	1883 Nov 18 12:00
 
 # Michigan
 #
-# From Bob Devine (January 28, 1988):
+# From Bob Devine (1988-01-28):
 # Michigan didn't observe DST from 1968 to 1973.
 #
 # From Paul Eggert (1995-12-19):
@@ -462,7 +462,7 @@ Link	Pacific/Honolulu	HST
 ################################################################################
 
 
-# From Paul Eggert <eggert@twinsun.com> (November 18, 1993):
+# From Paul Eggert <eggert@twinsun.com> (1993-11-18):
 # A good source for time zone historical data outside the US is
 # Thomas G. Shanks, The International Atlas (3rd edition),
 # San Diego: ACS Publications, Inc. (1991).
@@ -714,7 +714,7 @@ Zone America/Winnipeg	-6:28:36 -	LMT	1887 Jul 16
 # Some western towns (e.g. Swift Current) switched from MST/MDT to CST in 1972.
 # Other western towns (e.g. Lloydminster) are like Edmonton.
 
-# From W. Jones <jones@skdad.usask.ca> (November 6, 1992):
+# From W. Jones <jones@skdad.usask.ca> (1992-11-06):
 # The. . .below is based on information I got from our law library, the
 # provincial archives, and the provincial Community Services department.
 # A precise history would require digging through newspaper archives, and
@@ -873,7 +873,7 @@ Zone America/Dawson	-9:17:40 -	LMT	1900 Aug 20
 # as listed there; [there is also] "Baja California Sur and N. Pacific
 # Coast (States of Sinaloa and Sonora)."
 
-# From Bob Devine (January 28, 1988):
+# From Bob Devine (1988-01-28):
 # The Federal District (where Mexico City is) has observed [DST] several
 # times but not recently.
 #
@@ -884,11 +884,11 @@ Zone America/Dawson	-9:17:40 -	LMT	1900 Aug 20
 # The dates of DST probably go back to 1981.  The rules are the same as
 # US's.  This is going to be a headache for US presidential electi[o]n years!
 
-# From Arthur David Olson (February 13, 1988)
+# From Arthur David Olson (1988-02-13)
 # Since the 1981 starting date is only "probable," we'll keep the 1987
 # starting date below.
 
-# From U. S. Naval Observatory (January 19, 1989):
+# From U. S. Naval Observatory (1989-01-19):
 # MEXICO BAJA CAL N   7 H  BEHIND UTC    BAJA CALIFORNIA SUR AND
 # MEXICO BAJA CAL N                      N. PACIFIC COAST (STATES
 # MEXICO BAJA CAL N                      OF SINALOA AND SONORA)
@@ -906,7 +906,7 @@ Zone America/Dawson	-9:17:40 -	LMT	1900 Aug 20
 # MEXICO                                 CAMPECHE, QUINTANA ROO AND
 # MEXICO                                 YUCATAN
 
-# From Arthur David Olson (January 21, 1989):
+# From Arthur David Olson (1989-01-21):
 # April 3 fell on a Sunday in 1988; October 29 fell on a Sunday in 1989.  Ahem.
 # USNO claims there should be four Mexican zones rather than three:
 # a zone that's GMT-8 with DST; a zone that's always GMT-7;
@@ -1082,12 +1082,12 @@ Zone America/Costa_Rica	-5:36:20 -	LMT	1890		# San Jose
 
 # Cuba
 
-# From Bob Devine (January 28, 1988):
+# From Bob Devine (1988-01-28):
 # . . .DST is from 2nd Sunday in May to 2nd Sunday in October since 1981.
 # Change at midnight.  In 1979 & 1980, started at 3rd Sunday in March
 # (I think).
 
-# From U. S. Naval Observatory (January 19, 1989):
+# From U. S. Naval Observatory (1989-01-19):
 # CUBA                5 H  BEHIND UTC
 # CUBA                4 H  BEHIND UTC    MAR 20 - OCT 8
 
@@ -1192,10 +1192,10 @@ Zone America/Tegucigalpa -5:48:52 -	LMT	1921 Apr
 
 # Jamaica
 
-# From Bob Devine (January 28, 1988):
+# From Bob Devine (1988-01-28):
 # Follows US rules.
 
-# From U. S. Naval Observatory (January 19, 1989):
+# From U. S. Naval Observatory (1989-01-19):
 # JAMAICA             5 H  BEHIND UTC
 
 # From Shanks (1991):
diff --git a/time/pacificnew b/time/pacificnew
index 0cabd5a7e8..883ccdca69 100644
--- a/time/pacificnew
+++ b/time/pacificnew
@@ -1,7 +1,7 @@
-# @(#)pacificnew	7.8
+# @(#)pacificnew	7.9
 
-# From Arthur David Olson (April 5, 1989):
-# On April 5, 1989, the U. S. House of Representatives passed (238-154) a bill
+# From Arthur David Olson (1989-04-05):
+# On 1989-04-05, the U. S. House of Representatives passed (238-154) a bill
 # establishing "Pacific Presidential Election Time"; it was not acted on
 # by the Senate or signed into law by the President.
 # You might want to change the "PE" (Presidential Election) below to
diff --git a/time/southamerica b/time/southamerica
index cb5b34bfc6..cd8c84ec6f 100644
--- a/time/southamerica
+++ b/time/southamerica
@@ -1,4 +1,4 @@
-# @(#)southamerica	7.13
+# @(#)southamerica	7.14
 
 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
@@ -45,14 +45,14 @@
 
 # Argentina
 
-# From Bob Devine (January 28, 1988):
+# From Bob Devine (1988-01-28):
 # Argentina: first Sunday in October to first Sunday in April since 1976.
 # Double Summer time from 1969 to 1974.  Switches at midnight.
 
-# From U. S. Naval Observatory (January 19, 19889):
+# From U. S. Naval Observatory (1988-01-199):
 # ARGENTINA           3 H BEHIND   UTC
 
-# From Hernan G. Otero <hernan@isoft.com.ar> (June 26, 1995):
+# From Hernan G. Otero <hernan@isoft.com.ar> (1995-06-26):
 # I am sending modifications to the Argentinian time zone table...
 # AR was chosen because they are the ISO letters that represent Argentina.
 
@@ -87,7 +87,7 @@ Rule	Arg	1987	only	-	Feb	13	0:00	0	-
 Rule	Arg	1988	only	-	Feb	 7	0:00	0	-
 Rule	Arg	1988	only	-	Dec	 1	0:00	1:00	S
 #
-# From Hernan G. Otero <hernan@isoft.com.ar> (June 26, 1995):
+# From Hernan G. Otero <hernan@isoft.com.ar> (1995-06-26):
 # These corrections were contributed by InterSoft Argentina S.A.,
 # obtaining the data from the:
 # Talleres de Hidrografia Naval Argentina
@@ -97,7 +97,7 @@ Rule	Arg	1988	only	-	Dec	 1	0:00	1:00	S
 Rule	Arg	1989	1993	-	Mar	Sun>=1	0:00	0	-
 Rule	Arg	1989	1992	-	Oct	Sun>=15	0:00	1:00	S
 #
-# From Hernan G. Otero <hernan@isoft.com.ar> (June 26, 1995):
+# From Hernan G. Otero <hernan@isoft.com.ar> (1995-06-26):
 # From this moment on, the law that mandated the daylight saving
 # time corrections was derogated and no more modifications
 # to the time zones (for daylight saving) are now made.
@@ -125,18 +125,18 @@ Zone	America/La_Paz	-4:32:36 -	LMT	1890
 # Brazil
 
 # From Guy Harris:
-# The OAG lists October 25, 1987 and February 12, 1988 as the starting and
+# The OAG lists 1987-10-25 and 1988-02-12 as the starting and
 # ending dates, giving them as "estimated date(s) based on previous year".  We
 # infer a rule here from one example, always a dangerous practice....  Yes,
 # they really do switch on Saturday, according to the OAG.
 # "[America/Porto_Acre]" is for the Territory of Acre;
 # "[America/Noronha]" is for Fernando De Noronha.
 
-# From Bob Devine (January 28, 1988):
+# From Bob Devine (1988-01-28):
 # The only information I found is that there was no DST up to 1985.
 # But there was some before 1952!
 
-# From U. S. Naval Observatory (January 16, 1989):
+# From U. S. Naval Observatory (1989-01-16):
 # BRAZIL     WEST     5 H  BEHIND UTC    TERRITORY OF ACRE
 # BRAZIL     WEST     4 H  BEHIND UTC    ACRE OCT 23, '88-FEB 11,
 # BRAZIL                                 '89 (ESTIMATED)
@@ -155,7 +155,7 @@ Zone	America/La_Paz	-4:32:36 -	LMT	1890
 # BRAZIL                                 (ESTIMATED)
 # BRAZIL              3 H  BEHIND UTC    FOR MOST MAJOR AIRPORTS.
 
-# From Paul Eggert <eggert@twinsun.com> (November 18, 1993):
+# From Paul Eggert <eggert@twinsun.com> (1993-11-18):
 # The mayor of Rio recently attempted to change the time zone rules
 # just in his city, in order to leave more summer time for the tourist trade.
 # The rule change lasted only part of the day;
@@ -290,11 +290,11 @@ Zone	America/Guyana	-3:52:40 -	LMT	1915 Mar	# Georgetown
 
 # Paraguay
 
-# From Bob Devine (January 28, 1988):
+# From Bob Devine (1988-01-28):
 # Paraguay: First day in October to last in March.  Midnight switch??
 # Since 1980.
 
-# From U. S. Naval Observatory (January 19, 1989):
+# From U. S. Naval Observatory (1989-01-19):
 # PARAGUAY            4 H  BEHIND UTC
 # PARAGUAY            3 H  BEHIND UTC    OCT 1, '88-MAR 31, '89
 
@@ -352,7 +352,7 @@ Zone America/Port_of_Spain -4:06:04 -	LMT	1912 Mar 2
 			-4:00	-	AST
 
 # Uruguay
-# From Paul Eggert <eggert@twinsun.com> (November 18, 1993):
+# From Paul Eggert <eggert@twinsun.com> (1993-11-18):
 # Uruguay wins the prize for the strangest peacetime manipulation of the rules.
 # From Shanks (1991):
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
diff --git a/time/sys/time.h b/time/sys/time.h
index 3646f9f060..f6c6f74878 100644
--- a/time/sys/time.h
+++ b/time/sys/time.h
@@ -1,20 +1,20 @@
 /* Copyright (C) 1991, 92, 93, 94, 96 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   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 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.
+   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., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   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.  */
 
 #ifndef _SYS_TIME_H
 
@@ -148,16 +148,6 @@ extern int utimes __P ((__const char *__file, struct timeval __tvp[2]));
     }									      \
   } while (0)
 
-
 __END_DECLS
 
-#ifdef __USE_BSD
-/* Set an alarm to go off (generating a SIGALRM signal) in VALUE
-   microseconds.  If INTERVAL is nonzero, when the alarm goes off, the
-   timer is reset to go off every INTERVAL microseconds thereafter.
-   Returns the number of microseconds remaining before the alarm.  */
-extern unsigned int ualarm __P ((unsigned int __value,
-				 unsigned int __interval));
-#endif
-
 #endif /* sys/time.h */
diff --git a/time/sys/timeb.h b/time/sys/timeb.h
index 7035d79fba..b3887b7254 100644
--- a/time/sys/timeb.h
+++ b/time/sys/timeb.h
@@ -1,20 +1,20 @@
-/* Copyright (C) 1994, 1995 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., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+/* Copyright (C) 1994, 1995, 1996 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.  */
 
 #ifndef _SYS_TIMEB_H
 
diff --git a/time/time.h b/time/time.h
index de7214ac52..935de80c7a 100644
--- a/time/time.h
+++ b/time/time.h
@@ -153,7 +153,7 @@ extern time_t __mktime_internal __P ((struct tm *__tp,
 extern size_t strftime __P ((char *__s, size_t __maxsize,
 			     __const char *__format, __const struct tm *__tp));
 
-#ifdef __USE_MISC
+#ifdef __USE_XOPEN
 /* Parse S according to FORMAT and store binary time information in TP.
    The return value is a pointer to the first unparsed character in S.  */
 extern char *strptime __P ((__const char *__s, __const char *__fmt,
@@ -232,10 +232,12 @@ extern long int __tzname_max __P ((void));
 extern void tzset __P ((void));
 #endif
 
-#ifdef	__USE_SVID
+#if defined(__USE_SVID) || defined(__USE_XOPEN)
 extern int daylight;
 extern long int timezone;
+#endif
 
+#ifdef __USE_SVID
 /* Set the system time to *WHEN.
    This call is restricted to the superuser.  */
 extern int stime __P ((__const time_t *__when));
diff --git a/time/tzfile.h b/time/tzfile.h
index cb9b6a1a11..a26fbbeefc 100644
--- a/time/tzfile.h
+++ b/time/tzfile.h
@@ -4,7 +4,7 @@
 
 /*
 ** This file is in the public domain, so clarified as of
-** June 5, 1996 by Arthur David Olson (arthur_david_olson@nih.gov).
+** 1996-06-05 by Arthur David Olson (arthur_david_olson@nih.gov).
 */
 
 /*
@@ -21,7 +21,7 @@
 
 #ifndef lint
 #ifndef NOID
-static char	tzfilehid[] = "@(#)tzfile.h	7.8";
+static char	tzfilehid[] = "@(#)tzfile.h	7.9";
 #endif /* !defined NOID */
 #endif /* !defined lint */
 
diff --git a/wcsmbs/mbrtowc.c b/wcsmbs/mbrtowc.c
index efd382b4c6..8b4dbe2912 100644
--- a/wcsmbs/mbrtowc.c
+++ b/wcsmbs/mbrtowc.c
@@ -1,21 +1,21 @@
 /* Copyright (C) 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996.
-
-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.  */
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996.
+
+   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 <errno.h>
 #include <wchar.h>
diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h
index ec222ea082..4d6d8ffbbe 100644
--- a/wcsmbs/wchar.h
+++ b/wcsmbs/wchar.h
@@ -1,23 +1,24 @@
 /* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   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 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.
+   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., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   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.  */
 
 /*
- *      ISO Standard: 7.16.4 General wide-string utilities	<wchar.h>
+ *      ISO C Standard, Amendment 1, 7.16.4
+ *	General wide-string utilities	<wchar.h>
  */
 
 #ifndef _WCHAR_H
diff --git a/wcsmbs/wcrtomb.c b/wcsmbs/wcrtomb.c
index f5d9f7e1ca..c5b887dce9 100644
--- a/wcsmbs/wcrtomb.c
+++ b/wcsmbs/wcrtomb.c
@@ -1,21 +1,21 @@
 /* Copyright (C) 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996.
-
-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.  */
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996.
+
+   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 <errno.h>
 #include <wchar.h>
diff --git a/wctype/wctype.h b/wctype/wctype.h
index 7a165810cf..1b83b6821c 100644
--- a/wctype/wctype.h
+++ b/wctype/wctype.h
@@ -17,7 +17,7 @@
    Boston, MA 02111-1307, USA.  */
 
 /*
- *	ISO/IEC 9899:1990/Amendment 1:1995 7.15:
+ *	ISO C Standard, Amendment 1, 7.15:
  *	Wide-character classification and mapping utilities  <wctype.h>
  */
 
@@ -26,7 +26,6 @@
 #define _WCTYPE_H	1
 #include <features.h>
 
-
 __BEGIN_DECLS
 
 /* We try to get wint_t from <stddef.h>, but not all GCC versions define it