summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog111
-rw-r--r--Make-dist8
-rw-r--r--Makeconfig6
-rw-r--r--assert/Makefile8
-rw-r--r--bare/Makefile25
-rw-r--r--ctype/Makefile8
-rw-r--r--dirent/Makefile8
-rw-r--r--elf/rtld.c11
-rw-r--r--glibcbug.in21
-rw-r--r--gmon/Makefile8
-rw-r--r--gnulib/Makefile8
-rw-r--r--grp/Makefile8
-rw-r--r--hurd/Makefile8
-rw-r--r--intl/Makefile12
-rw-r--r--intl/explodename.c33
-rw-r--r--intl/l10nflist.c3
-rw-r--r--locale/C-time.c14
-rw-r--r--mach/Makefile8
-rw-r--r--manual/Makefile12
-rw-r--r--math/Makefile12
-rw-r--r--po/Makefile12
-rw-r--r--pwd/Makefile8
-rw-r--r--resource/Makefile8
-rw-r--r--setjmp/Makefile8
-rw-r--r--shlib-versions2
-rw-r--r--socket/Makefile8
-rw-r--r--string/Makefile8
-rw-r--r--sunrpc/Makefile8
-rw-r--r--sysdeps/alpha/Makefile9
-rw-r--r--sysdeps/gnu/Makefile8
-rw-r--r--sysdeps/m68k/fpu/switch/68881-sw.h30
-rw-r--r--sysdeps/m68k/fpu/switch/Makefile11
-rw-r--r--sysdeps/m68k/fpu/switch/switch.c39
-rw-r--r--sysdeps/mach/Makefile8
-rw-r--r--sysdeps/mach/hurd/Makefile8
-rw-r--r--sysdeps/sparc/Makefile8
-rw-r--r--sysdeps/standalone/i386/force_cpu386/Makefile9
-rw-r--r--sysdeps/standalone/i960/nindy960/Makefile11
-rw-r--r--sysdeps/standalone/m68k/m68020/mvme136/Makefile9
-rw-r--r--sysdeps/unix/common/Makefile8
-rw-r--r--sysdeps/unix/sysv/Makefile8
-rw-r--r--sysdeps/unix/sysv/irix4/Makefile8
-rw-r--r--sysdeps/unix/sysv/linux/alpha/clone.S54
-rw-r--r--sysdeps/unix/sysv/linux/alpha/ioctl-types.h123
-rw-r--r--sysdeps/unix/sysv/linux/alpha/sigprocmask.c65
-rw-r--r--sysdeps/unix/sysv/linux/alpha/sigsuspend.S4
-rw-r--r--sysdeps/unix/sysv/linux/alpha/syscalls.list2
-rw-r--r--sysdeps/unix/sysv/linux/alpha/termbits.h2
-rw-r--r--sysdeps/unix/sysv/linux/alpha/xmknod.c1
-rw-r--r--sysdeps/unix/sysv/linux/i386/clone.S47
-rw-r--r--sysdeps/unix/sysv/linux/m68k/clone.S41
-rw-r--r--sysdeps/unix/sysv/linux/schedbits.h24
-rw-r--r--sysdeps/unix/sysv/linux/sigset.h37
-rw-r--r--sysdeps/unix/sysv/linux/sparc/clone.S63
-rw-r--r--sysdeps/unix/sysv/linux/tcsetattr.c4
-rw-r--r--sysdeps/unix/sysv/sco3.2/Makefile10
-rw-r--r--sysdeps/unix/sysv/sysv4/Makefile8
-rw-r--r--sysdeps/vax/Makefile8
-rw-r--r--sysvipc/Makefile8
-rw-r--r--time/strptime.c3
-rw-r--r--wcsmbs/Makefile8
-rw-r--r--wctype/Makefile8
62 files changed, 498 insertions, 590 deletions
diff --git a/ChangeLog b/ChangeLog
index 7781e5c371..4df0d5644e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,26 +1,107 @@
-Fri Jan 17 14:16:28 1997 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
+Mon Jan 20 03:02:50 1997 Ulrich Drepper <drepper@cygnus.com>
+
+ * Make-dist: Update and reformat copyright.
+ * Makeconfig: Likewise.
+ * assert/Makefile: Likewise.
+ * bare/Makefile: Likewise.
+ * ctype/Makefile: Likewise.
+ * dirent/Makefile: Likewise.
+ * gmon/Makefile: Likewise.
+ * gnulib/Makefile: Likewise.
+ * grp/Makefile: Likewise.
+ * hurd/Makefile: Likewise.
+ * intl/Makefile: Likewise.
+ * mach/Makefile: Likewise.
+ * malloc/Makefile: Likewise.
+ * manual/Makefile: Likewise.
+ * math/Makefile: Likewise.
+ * po/Makefile: Likewise.
+ * pwd/Makefile: Likewise.
+ * resource/Makefile: Likewise.
+ * setjmp/Makefile: Likewise.
+ * socket/Makefile: Likewise.
+ * string/Makefile: Likewise.
+ * sunrpc/Makefile: Likewise.
+ * sysdeps/alpha/Makefile: Likewise.
+ * sysdeps/gnu/Makefile: Likewise.
+ * sysdeps/m68k/fpu/switch/Makefile: Likewise.
+ * sysdeps/m68k/fpu/switch/68881-sw.h: Likewise.
+ * sysdeps/m68k/fpu/switch/switch.c: Likewise.
+ * sysdeps/mach/Makefile: Likewise.
+ * sysdeps/hurd/Makefile: Likewise.
+ * sysdeps/sparc/Makefile: Likewise.
+ * sysdeps/standalone/i960/nindy960/Makefile: Likewise.
+ * sysdeps/standalone/m68k/m68020/mvme136/Makefile: Likewise.
+ * sysdeps/unix/common/Makefile: Likewise.
+ * sysdeps/unix/sysv/Makefile: Likewise.
+ * sysdeps/unix/sysv/irix4/Makefile: Likewise.
+ * sysdeps/unix/sysv/sco3.2/Makefile: Likewise.
+ * sysdeps/unix/sysv/sysv4/Makefile: Likewise.
+ * sysdeps/vax/Makefile: Likewise.
+ * sysvipc/Makefile: Likewise.
+ * wcsmbs/Makefile: Likewise.
+ * wctype/Makefile: Likewise.
- * stdio/vdprintf.c: Moved file to ...
- * sysdeps/posix/vdprintf.c: Here. De-ansideclificate.
- * sysdeps/stub/vdprintf.c: New file.
- * sysdeps/mach/hurd/vdprintf.c: New file.
+ * elf/rtld.c (dl_main): Objects in LD_PRELOAD environment variable
+ are separated according to Sun docs by white space not colon.
-Thu Jan 9 15:59:35 1997 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
+ * locale/C-time.c (_nl_C_LC_TIME): Use empty string to initialize
+ fields which are not defined for the C locale.
- * sysdeps/mach/hurd/posix_opt.h: New file.
+ * sysdeps/m68k/fpu/switch/Makefile: Don't use ansidecl.h in constructed
+ files.
+ * sysdeps/m68k/fpu/switch/68881-sw.h: Likewise.
+ * sysdeps/m68k/fpu/switch/switch.c: Likewise.
- * sysdeps/mach/hurd/sigwait.c (sigwait): Don't affect signal mask.
+Sun Jan 19 19:43:31 1997 Andreas Jaeger <aj@arthur.pfalz.de>
- * sysdeps/unix/bsd/tcsendbrk.c (tcsendbreak): Finish
- deansideclification.
+ * time/strptime.c: Provide prototype for strptime_internal.
- * sysdeps/mach/libc-lock.h: Add kludges to pretend to implement
- recursive locks.
+Sun Jan 19 23:46:27 1997 Ulrich Drepper <drepper@cygnus.com>
-Tue Jan 7 09:48:15 1997 Andreas Jaeger <aj@arthur.pfalz.de>
+ * glibcbug.in: We don't guarantee confidential handling. Set
+ field to always contain `no'.
- * signal/sigempty.c (sigemptyset): Correct typo: Empty set should
- have all bits zero.
+Sun Jan 19 21:28:01 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
+
+ * intl/explodename.c: Include sys/types.h.
+ * intl/l10nflist.c: Likewise.
+
+Sat Jan 18 22:15:26 1997 Richard Henderson <rth@tamu.edu>
+
+ * config.make.in (install_root): New variable to make it easy to
+ install glibc somewhere other than /.
+
+ * shlib-versions: alpha-*-linux-* libc=6.1.
+
+ Since sigset_t no longer fits in a register, we can't pass in the
+ thread's initial mask so easily. Take this opportunity to simplify
+ the clone implementation by only accepting a single void* argument.
+
+ * sysdeps/unix/sysv/linux/alpha/clone.S: Only take one argument.
+ * sysdeps/unix/sysv/linux/i386/clone.S: Likewise.
+ * sysdeps/unix/sysv/linux/m68k/clone.S: Likewise.
+ * sysdeps/unix/sysv/linux/sparc/clone.S: Likewise.
+ * sysdeps/unix/sysv/linux/schedbits.h: Update clone prototypes.
+
+ * sysdeps/unix/sysv/linux/alpha/ioctl-types.h: Remove.
+ Default Linux version should be sufficient.
+
+ * sysdeps/unix/sysv/linux/alpha/sigprocmask.c: The osf_sigprocmask
+ system call wants the sigset dereferenced.
+
+ * sysdeps/unix/sysv/linux/alpha/syscalls.list: Add entries for
+ __syscall_ustat and __syscall_xmknod.
+ * sysdeps/unix/sysv/linux/alpha/xmknod.c: Include sys/sysmacros.h.
+
+ * sysdeps/unix/sysv/linux/sigset.h: Use longs instead of ints.
+
+ * sysdeps/unix/sysv/linux/tcsetattr.c: Fix pointer dereferences.
+
+ * sysdeps/unix/sysv/linux/alpha/sigsuspend.c: Add comment about
+ dependency to kernel type.
+
+ * sysdeps/unix/sysv/linux/alpha/termbits.h: Correct comment.
Sun Jan 19 04:38:20 1997 Ulrich Drepper <drepper@cygnus.com>
diff --git a/Make-dist b/Make-dist
index c2c6bbdf46..301eb6eda7 100644
--- a/Make-dist
+++ b/Make-dist
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
+# Copyright (C) 1991, 92, 93, 94, 95, 96, 97 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
@@ -12,9 +12,9 @@
# 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.
+# 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.
dist:
diff --git a/Makeconfig b/Makeconfig
index e3f7b5290e..3c658bfcad 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -12,9 +12,9 @@
# 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.
+# 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.
#
# Makefile configuration options for the GNU C library.
diff --git a/assert/Makefile b/assert/Makefile
index 76b75bb2f8..208a71a948 100644
--- a/assert/Makefile
+++ b/assert/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 1994 Free Software Foundation, Inc.
+# Copyright (C) 1991, 1994, 1997 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -12,9 +12,9 @@
# 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.
+# 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.
#
# Sub-makefile for assert portion of the library.
diff --git a/bare/Makefile b/bare/Makefile
index 573515347c..0407c230de 100644
--- a/bare/Makefile
+++ b/bare/Makefile
@@ -1,23 +1,22 @@
-# Copyright (C) 1994 Free Software Foundation, Inc.
-# Contributed by Joel Sherrill (jsherril@redstone-emh2.army.mil),
-# On-Line Applications Research Corporation.
-#
+# Copyright (C) 1994, 1997 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
-#
+# Contributed by Joel Sherrill (jsherril@redstone-emh2.army.mil),
+# On-Line Applications Research Corporation.
+#
# 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.
+# 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.
subdir := bare
@@ -33,11 +32,11 @@ include ../Rules
#
# For bare targets, the $(config-vendor) is the name of the board.
# We will place the board dependent code ONLY in a library which
-# is board dependent. This way many target boards can share a
+# is board dependent. This way many target boards can share a
# single libc.a. To resolve all symbols and successfully link
# a program, the application must link against libc.a and libMY_TARGET.a.
-# For example, the target specific library for the Motorola MVME135
-# board will be named libmvme135.a. To link a program for the
+# For example, the target specific library for the Motorola MVME135
+# board will be named libmvme135.a. To link a program for the
# MVME135, one must link against -lc and -lmvme135.
#
diff --git a/ctype/Makefile b/ctype/Makefile
index 21dfc8e3b1..f76edf0abd 100644
--- a/ctype/Makefile
+++ b/ctype/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc.
+# Copyright (C) 1991, 1992, 1993, 1997 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -12,9 +12,9 @@
# 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.
+# 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.
#
# Sub-makefile for ctype portion of the library.
diff --git a/dirent/Makefile b/dirent/Makefile
index 8d706dfe64..8741faf769 100644
--- a/dirent/Makefile
+++ b/dirent/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
+# Copyright (C) 1991, 92, 93, 94, 95, 96, 97 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
@@ -12,9 +12,9 @@
# 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.
+# 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.
#
# Sub-makefile for dirent portion of the library.
diff --git a/elf/rtld.c b/elf/rtld.c
index 28c9fd796e..39435f8243 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -1,5 +1,5 @@
/* Run time dynamic linker.
- Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -316,12 +316,13 @@ of this helper program; chances are you did not intend to run this program.\n",
const char *preloadlist = getenv ("LD_PRELOAD");
if (preloadlist)
{
- /* The LD_PRELOAD environment variable gives a colon-separated
- list of libraries that are loaded before the executable's
- dependencies and prepended to the global scope list. */
+ /* The LD_PRELOAD environment variable gives a white space
+ separated list of libraries that are loaded before the
+ executable's dependencies and prepended to the global
+ scope list. */
char *list = strdupa (preloadlist);
char *p;
- while ((p = strsep (&list, ":")) != NULL)
+ while ((p = strsep (&list, " ")) != NULL)
{
(void) _dl_map_object (NULL, p, lt_library, 0);
++npreloads;
diff --git a/glibcbug.in b/glibcbug.in
index 6473b2c7e7..31661997cd 100644
--- a/glibcbug.in
+++ b/glibcbug.in
@@ -86,7 +86,6 @@ ARCH=`[ -f /bin/arch ] && /bin/arch`
MACHINE=`[ -f /bin/machine ] && /bin/machine`
ORGANIZATION_C='<organization of PR author (multiple lines)>'
-CONFIDENTIAL_C='<[ yes | no ] (one line)>'
SYNOPSIS_C='<synopsis of the problem (one line)>'
SEVERITY_C='<[ non-critical | serious | critical ] (one line)>'
PRIORITY_C='<[ low | medium | high ] (one line)>'
@@ -111,7 +110,7 @@ Subject: [50 character or so descriptive subject here (for reference)]
>Originator: ${ORIGINATOR}
>Organization:
${ORGANIZATION- $ORGANIZATION_C}
->Confidential: $CONFIDENTIAL_C
+>Confidential: no (the GNU PR database is public)
>Synopsis: $SYNOPSIS_C
>Severity: $SEVERITY_C
>Priority: $PRIORITY_C
@@ -119,7 +118,7 @@ ${ORGANIZATION- $ORGANIZATION_C}
>Class: $CLASS_C
>Release: libc-${VERSION}
>Environment:
- <machine, os, target, libraries (multiple lines)>
+ $ENVIRONMENT_C
`[ -n "$SYSTEM" ] && echo System: $SYSTEM`
`[ -n "$ARCH" ] && echo Architecture: $ARCH`
`[ -n "$MACHINE" ] && echo Machine: $MACHINE`
@@ -163,16 +162,8 @@ q
while :; do
CNT=0
- # 1) Confidential
#
- PATTERN=">Confidential:"
- CONFIDENTIAL=`eval sed -n -e "\"$SED_CMD\"" $TEMP`
- case "$CONFIDENTIAL" in
- ""|yes|no) CNT=`expr $CNT + 1` ;;
- *) echo "$COMMAND: \`$CONFIDENTIAL' is not a valid value for \`Confidential'." ;;
- esac
- #
- # 2) Severity
+ # 1) Severity
#
PATTERN=">Severity:"
SEVERITY=`eval sed -n -e "\"$SED_CMD\"" $TEMP`
@@ -181,7 +172,7 @@ while :; do
*) echo "$COMMAND: \`$SEVERITY' is not a valid value for \`Severity'."
esac
#
- # 3) Priority
+ # 2) Priority
#
PATTERN=">Priority:"
PRIORITY=`eval sed -n -e "\"$SED_CMD\"" $TEMP`
@@ -190,7 +181,7 @@ while :; do
*) echo "$COMMAND: \`$PRIORITY' is not a valid value for \`Priority'."
esac
#
- # 4) Class
+ # 3) Class
#
PATTERN=">Class:"
CLASS=`eval sed -n -e "\"$SED_CMD\"" $TEMP`
@@ -199,7 +190,7 @@ while :; do
*) echo "$COMMAND: \`$CLASS' is not a valid value for \`Class'."
esac
- [ $CNT -lt 4 ] &&
+ [ $CNT -lt 3 ] &&
echo "Errors were found with the problem report."
while :; do
diff --git a/gmon/Makefile b/gmon/Makefile
index fbbc817571..4f8108f82d 100644
--- a/gmon/Makefile
+++ b/gmon/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -12,9 +12,9 @@
# 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.
+# 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.
#
# Sub-makefile for gmon portion of the library.
diff --git a/gnulib/Makefile b/gnulib/Makefile
index 84ebc2e6bc..a7255b38b2 100644
--- a/gnulib/Makefile
+++ b/gnulib/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991 Free Software Foundation, Inc.
+# Copyright (C) 1991, 1997 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -12,9 +12,9 @@
# 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.
+# 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.
subdir := gnulib
diff --git a/grp/Makefile b/grp/Makefile
index 091d8ba84b..20b58fb08c 100644
--- a/grp/Makefile
+++ b/grp/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 1992, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1991, 1992, 1996, 1997 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -12,9 +12,9 @@
# 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.
+# 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.
#
# Sub-makefile for grp portion of the library.
diff --git a/hurd/Makefile b/hurd/Makefile
index e046a7db26..7d0e9713b8 100644
--- a/hurd/Makefile
+++ b/hurd/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
+# Copyright (C) 1991, 92, 93, 94, 95, 96, 97 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
@@ -12,9 +12,9 @@
# 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.
+# 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.
subdir := hurd
diff --git a/intl/Makefile b/intl/Makefile
index 01e1383cb8..356a40ca7f 100644
--- a/intl/Makefile
+++ b/intl/Makefile
@@ -1,6 +1,4 @@
-# Makefile for intl subdirectory: message handling code from GNU gettext.
-
-# Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -14,9 +12,11 @@
# 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.
+# 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.
+
+# Makefile for intl subdirectory: message handling code from GNU gettext.
subdir = intl
headers = libintl.h
diff --git a/intl/explodename.c b/intl/explodename.c
index 7436836f3b..e938ff234b 100644
--- a/intl/explodename.c
+++ b/intl/explodename.c
@@ -1,23 +1,23 @@
-/* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
-Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+ Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-This file is part of the GNU C Library. Its master source is NOT part of
-the C library, however. The master source lives in /gd/gnu/lib.
+ This file is part of the GNU C Library. Its master source is NOT part of
+ the C library, however. The master source lives in /gd/gnu/lib.
-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. */
#ifdef HAVE_CONFIG_H
# include <config.h>
@@ -25,6 +25,7 @@ Cambridge, MA 02139, USA. */
#include <stdlib.h>
#include <string.h>
+#include <sys/types.h>
#include "loadinfo.h"
diff --git a/intl/l10nflist.c b/intl/l10nflist.c
index 0d8c9b48c8..d16bff01fa 100644
--- a/intl/l10nflist.c
+++ b/intl/l10nflist.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
This file is part of the GNU C Library. Its master source is NOT part of
@@ -42,6 +42,7 @@
# include <argz.h>
#endif
#include <ctype.h>
+#include <sys/types.h>
#if defined STDC_HEADERS || defined _LIBC
# include <stdlib.h>
diff --git a/locale/C-time.c b/locale/C-time.c
index 67254b2c53..a71ea93517 100644
--- a/locale/C-time.c
+++ b/locale/C-time.c
@@ -73,13 +73,13 @@ const struct locale_data _nl_C_LC_TIME =
{ string: "%H:%M:%S" },
{ string: "%I:%M:%S %p" },
{ string: NULL },
- { string: NULL },
- { string: NULL },
- { string: NULL },
- { string: NULL },
- { string: NULL },
+ { string: "" },
+ { string: "" },
+ { string: "" },
+ { string: "" },
+ { string: "" },
{ word: 0 },
- { string: NULL },
- { string: NULL },
+ { string: "" },
+ { string: "" },
}
};
diff --git a/mach/Makefile b/mach/Makefile
index 986c2dad51..c5ce28b6df 100644
--- a/mach/Makefile
+++ b/mach/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
+# Copyright (C) 1991, 92, 93, 94, 95, 96, 97 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
@@ -12,9 +12,9 @@
# 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.
+# 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.
subdir := mach
diff --git a/manual/Makefile b/manual/Makefile
index 5c217815b2..9557505b04 100644
--- a/manual/Makefile
+++ b/manual/Makefile
@@ -1,6 +1,4 @@
-# Makefile for the GNU C Library manual.
-
-# Copyright (C) 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1992, 93, 94, 95, 96, 97 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
@@ -14,9 +12,11 @@
# 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.
+# 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.
+
+# Makefile for the GNU C Library manual.
subdir := manual
export subdir := $(subdir)
diff --git a/math/Makefile b/math/Makefile
index 9b15e636b4..550e9d6c50 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -1,6 +1,4 @@
-# Makefile for the math library.
-
-# Copyright (C) 1996 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -14,9 +12,11 @@
# 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.
+# 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.
+
+# Makefile for the math library.
subdir := math
diff --git a/po/Makefile b/po/Makefile
index b013cd964a..ffaecaadaf 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -1,6 +1,4 @@
-# Makefile for installing libc message catalogs.
-
-# Copyright (C) 1996 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -14,9 +12,11 @@
# 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.
+# 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.
+
+# Makefile for installing libc message catalogs.
subdir := po
diff --git a/pwd/Makefile b/pwd/Makefile
index 68cdc4a991..337263246b 100644
--- a/pwd/Makefile
+++ b/pwd/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1991, 1996, 1997 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -12,9 +12,9 @@
# 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.
+# 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.
#
# Sub-makefile for pwd portion of the library.
diff --git a/resource/Makefile b/resource/Makefile
index 4b9bdaaaa1..f25ef2e971 100644
--- a/resource/Makefile
+++ b/resource/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 1992, 1994, 1995 Free Software Foundation, Inc.
+# Copyright (C) 1991, 1992, 1994, 1995, 1997 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -12,9 +12,9 @@
# 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.
+# 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.
subdir := resource
diff --git a/setjmp/Makefile b/setjmp/Makefile
index 3d004852c8..0825dcfaa3 100644
--- a/setjmp/Makefile
+++ b/setjmp/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+# Copyright (C) 1991, 92, 93, 94, 95, 97 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
@@ -12,9 +12,9 @@
# 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.
+# 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.
#
# Makefile for setjmp/longjmp routines
diff --git a/shlib-versions b/shlib-versions
index 243f206fb9..f966662938 100644
--- a/shlib-versions
+++ b/shlib-versions
@@ -16,7 +16,7 @@ alpha-.*-.* libm=6
# We provide libc.so.6 for Linux kernel versions 2.0 and later.
i.86-.*-linux.* libc=6
m68k-.*-linux.* libc=6
-alpha-.*-linux.* libc=6
+alpha-.*-linux.* libc=6.1
# libmachuser.so.1 corresponds to mach/*.defs as of Utah's UK22 release.
.*-.*-gnu-gnu.* libmachuser=1
diff --git a/socket/Makefile b/socket/Makefile
index adae887d11..3af3dc9d39 100644
--- a/socket/Makefile
+++ b/socket/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 1995, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -12,9 +12,9 @@
# 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.
+# 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.
#
# Sub-makefile for socket portion of the library.
diff --git a/string/Makefile b/string/Makefile
index e91bd4deea..97f2eedd79 100644
--- a/string/Makefile
+++ b/string/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
+# Copyright (C) 1991, 92, 93, 94, 95, 96, 97 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
@@ -12,9 +12,9 @@
# 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.
+# 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.
#
# Sub-makefile for string portion of library.
diff --git a/sunrpc/Makefile b/sunrpc/Makefile
index dda826a906..ef8b354756 100644
--- a/sunrpc/Makefile
+++ b/sunrpc/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -12,9 +12,9 @@
# 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.
+# 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.
#
# Sub-makefile for sunrpc portion of the library.
diff --git a/sysdeps/alpha/Makefile b/sysdeps/alpha/Makefile
index 6d4fbbb18b..841dc980a8 100644
--- a/sysdeps/alpha/Makefile
+++ b/sysdeps/alpha/Makefile
@@ -1,4 +1,5 @@
-# Copyright (C) 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1993, 1994, 1995, 1996, 1997 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
@@ -12,9 +13,9 @@
# 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.
+# 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.
ifeq ($(subdir),gmon)
sysdep_routines += _mcount
diff --git a/sysdeps/gnu/Makefile b/sysdeps/gnu/Makefile
index 45c63136f8..d9d36429b7 100644
--- a/sysdeps/gnu/Makefile
+++ b/sysdeps/gnu/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1996 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -12,9 +12,9 @@
# 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.
+# 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.
# Generate the list of strings for errno codes from the section of the
# manual which documents the codes.
diff --git a/sysdeps/m68k/fpu/switch/68881-sw.h b/sysdeps/m68k/fpu/switch/68881-sw.h
index 3d7a3927f5..89bf65cb69 100644
--- a/sysdeps/m68k/fpu/switch/68881-sw.h
+++ b/sysdeps/m68k/fpu/switch/68881-sw.h
@@ -1,20 +1,20 @@
-/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+/* Copyright (C) 1991, 1992, 1997 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+ The GNU C Library is 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 _68881_SWITCH_H
@@ -47,7 +47,7 @@ struct switch_caller
/* Function to determine whether or not a 68881 is available,
and modify its caller (which must be a `struct switch_caller', above,
in data space) to use the appropriate version. */
-extern void EXFUN(__68881_switch, (int __dummy));
+extern void __68881_switch __P ((int __dummy));
/* Define FUNCTION as a `struct switch_caller' which will call
diff --git a/sysdeps/m68k/fpu/switch/Makefile b/sysdeps/m68k/fpu/switch/Makefile
index fd8d7c11f4..67218e7681 100644
--- a/sysdeps/m68k/fpu/switch/Makefile
+++ b/sysdeps/m68k/fpu/switch/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+# Copyright (C) 1991, 1992, 1997 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -12,9 +12,9 @@
# 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.
+# 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.
ifeq ($(subdir),math)
@@ -38,8 +38,7 @@ sysdep_routines := $(sysdep_routines) switch
# 68881 and soft versions.
$(addprefix $(objpfx), \
$(filter-out $(wildcard $(+68881-sources)),$(+68881-sources))):
- (echo '#include <ansidecl.h>' ;\
- echo '#include <68881-sw.h>' ;\
+ (echo '#include <68881-sw.h>' ;\
echo '#define $* __$*_68881' ;\
echo '#include <$(+68881-dir)/$@>' ;\
echo '#undef $*' ;\
diff --git a/sysdeps/m68k/fpu/switch/switch.c b/sysdeps/m68k/fpu/switch/switch.c
index 057bd1509a..44e2b4d2d9 100644
--- a/sysdeps/m68k/fpu/switch/switch.c
+++ b/sysdeps/m68k/fpu/switch/switch.c
@@ -1,22 +1,21 @@
-/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+/* Copyright (C) 1991, 1992, 1997 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+ The GNU C Library is 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 <ansidecl.h>
#include <signal.h>
#include <68881-sw.h>
@@ -33,7 +32,8 @@ static int have_fpu = -1;
/* Signal handler for the trap that happens if we don't have a 68881. */
static void
-DEFUN(trap, (sig), int sig)
+trap (sig)
+ int sig;
{
have_fpu = 0;
}
@@ -44,10 +44,11 @@ DEFUN(trap, (sig), int sig)
to be a static jump to either the 68881 version or the soft version.
It then returns into the function it has chosen to do the work. */
void
-DEFUN(__68881_switch, (dummy), int dummy)
+__68881_switch (dummy)
+ int dummy;
{
- PTR *return_address_location = &((PTR *) &dummy)[-1];
- struct switch_caller *CONST caller
+ void **return_address_location = &((void **) &dummy)[-1];
+ struct switch_caller *const caller
= (struct switch_caller *) (((short int *) *return_address_location) - 1);
if (have_fpu < 0)
diff --git a/sysdeps/mach/Makefile b/sysdeps/mach/Makefile
index e035d5a82a..1f09076e29 100644
--- a/sysdeps/mach/Makefile
+++ b/sysdeps/mach/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1993, 1994, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1993, 1994, 1996, 1997 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -12,9 +12,9 @@
# 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.
+# 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.
ifdef in-Makerules
diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile
index eb3dc01252..b68d53879d 100644
--- a/sysdeps/mach/hurd/Makefile
+++ b/sysdeps/mach/hurd/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -12,9 +12,9 @@
# 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.
+# 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.
ifdef in-Makerules
diff --git a/sysdeps/sparc/Makefile b/sysdeps/sparc/Makefile
index dfe74979b8..deec2f8145 100644
--- a/sysdeps/sparc/Makefile
+++ b/sysdeps/sparc/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1991, 92, 93, 94, 95, 96, 97 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
@@ -12,9 +12,9 @@
# 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.
+# 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.
ifeq ($(subdir),gnulib)
routines = dotmul umul $(divrem) alloca
diff --git a/sysdeps/standalone/i386/force_cpu386/Makefile b/sysdeps/standalone/i386/force_cpu386/Makefile
index 8483724ee3..6381fdc62f 100644
--- a/sysdeps/standalone/i386/force_cpu386/Makefile
+++ b/sysdeps/standalone/i386/force_cpu386/Makefile
@@ -1,4 +1,5 @@
-# Copyright (C) 1994 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1997 Free Software Foundation, Inc.
+# This file is part of the GNU C Library.
# Contributed by Joel Sherrill (jsherril@redstone-emh2.army.mil),
# On-Line Applications Research Corporation.
@@ -13,9 +14,9 @@
# 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.
+# 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.
ifeq (bare,$(subdir))
install-others += $(libdir)/force_cpu386.ld
diff --git a/sysdeps/standalone/i960/nindy960/Makefile b/sysdeps/standalone/i960/nindy960/Makefile
index e6e65ea064..aab52dcb76 100644
--- a/sysdeps/standalone/i960/nindy960/Makefile
+++ b/sysdeps/standalone/i960/nindy960/Makefile
@@ -1,4 +1,5 @@
-# Copyright (C) 1993 Free Software Foundation, Inc.
+# Copyright (C) 1993, 1997 Free Software Foundation, Inc.
+# This file is part of the GNU C Library.
# Contributed by Joel Sherrill (jsherril@redstone-emh2.army.mil),
# On-Line Applications Research Corporation.
@@ -13,11 +14,11 @@
# 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.
+# 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.
# The nindy960 support has only been tested on the following boards:
-#
+#
# + Cyclone CVME961 VMEbus single board computer.
diff --git a/sysdeps/standalone/m68k/m68020/mvme136/Makefile b/sysdeps/standalone/m68k/m68020/mvme136/Makefile
index 33f049c58c..11c0620123 100644
--- a/sysdeps/standalone/m68k/m68020/mvme136/Makefile
+++ b/sysdeps/standalone/m68k/m68020/mvme136/Makefile
@@ -1,4 +1,5 @@
-# Copyright (C) 1993 Free Software Foundation, Inc.
+# Copyright (C) 1993, 1997 Free Software Foundation, Inc.
+# This file is part of the GNU C Library.
# Contributed by Joel Sherrill (jsherril@redstone-emh2.army.mil),
# On-Line Applications Research Corporation.
@@ -13,9 +14,9 @@
# 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.
+# 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.
ifeq (bare,$(subdir))
install-lib += mvme136.ld
diff --git a/sysdeps/unix/common/Makefile b/sysdeps/unix/common/Makefile
index 5c338a269c..eecd648b0f 100644
--- a/sysdeps/unix/common/Makefile
+++ b/sysdeps/unix/common/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
+# Copyright (C) 1991, 1992, 1993, 1994, 1997 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -12,9 +12,9 @@
# 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.
+# 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 inhibit-glue
ifeq ($(subdir),ctype)
diff --git a/sysdeps/unix/sysv/Makefile b/sysdeps/unix/sysv/Makefile
index bc691e3163..885d3b4eca 100644
--- a/sysdeps/unix/sysv/Makefile
+++ b/sysdeps/unix/sysv/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1992, 1993, 1994, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1996, 1997 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -12,9 +12,9 @@
# 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.
+# 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.
ifeq ($(subdir), termios)
diff --git a/sysdeps/unix/sysv/irix4/Makefile b/sysdeps/unix/sysv/irix4/Makefile
index a7f3ea8ce5..b24278a34e 100644
--- a/sysdeps/unix/sysv/irix4/Makefile
+++ b/sysdeps/unix/sysv/irix4/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1993 Free Software Foundation, Inc.
+# Copyright (C) 1993, 1997 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -12,9 +12,9 @@
# 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.
+# 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.
ifeq ($(subdir),signal)
sysdep_routines := $(sysdep_routines) sigtramp __handler
diff --git a/sysdeps/unix/sysv/linux/alpha/clone.S b/sysdeps/unix/sysv/linux/alpha/clone.S
index 03ecddc727..261bd81e57 100644
--- a/sysdeps/unix/sysv/linux/alpha/clone.S
+++ b/sysdeps/unix/sysv/linux/alpha/clone.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Richard Henderson <rth@tamu.edu>, 1996.
@@ -24,15 +24,11 @@
#define _ERRNO_H 1
#include <errnos.h>
-/* int clone(int (*fn)(), void *child_stack, int flags, int nargs, ...) */
+/* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg) */
.text
ENTRY(__clone)
- lda sp,-16(sp)
- .frame sp,16,$26,0
- /* Save rest of argument registers for varargs-type work. */
- stq a4,0(sp)
- stq a5,8(sp)
+ .frame sp,0,ra,0
#ifdef PROF
.set noat
lda AT, _mcount
@@ -42,24 +38,13 @@ ENTRY(__clone)
.prologue 1
/* Sanity check arguments. */
- sextl a3,a3
ldiq v0,EINVAL
beq a0,$error /* no NULL function pointers */
beq a1,$error /* no NULL stack pointers */
- blt a3,$error /* no negative argument counts */
-
- /* Allocate space on the new stack and copy args over */
- mov a3,t0 /* save nargs for thread_start */
- s8addq a3,sp,t1
-1: ldq t2,-8(t1)
- subq t1,8,t1
- stq t2,-8(a1)
- subq a3,1,a3
- subq a1,8,a1
- bne a3,1b
/* Do the system call */
mov a0,pv /* get fn ptr out of the way */
+ mov a3,a4 /* get fn arg out of the way */
mov a2,a0
ldiq v0,__NR_clone
call_pal PAL_callsys
@@ -68,23 +53,19 @@ ENTRY(__clone)
beq v0,thread_start
/* Successful return from the parent */
- lda sp,16(sp)
ret
/* Something bad happened -- no child created */
$error:
br gp,1f
1: ldgp gp,0(gp)
- lda sp,16(sp)
jmp zero,__syscall_error
END(__clone)
/* Load up the arguments to the function. Put this block of code in
its own function so that we can terminate the stack trace with our
- debug info.
-
- At this point we have $t0=nargs, $pv=fn, $sp=&arg[0]. */
+ debug info. */
.ent thread_start
thread_start:
@@ -92,28 +73,8 @@ thread_start:
mov zero,fp
.prologue 0
- /* Calculate address of jump into argument loading code */
- cmple t0,6,t2 /* no more than 6 args in registers */
- cmoveq t2,6,t0
- br v0,1f /* find address of arg0 */
-1: lda v0,$arg0-1b(v0)
- s4addq t0,zero,t1
- subq v0,t1,v0
- jmp (v0)
-
- /* Load the integer register arguments */
- ldq a5,40(sp)
- ldq a4,32(sp)
- ldq a3,24(sp)
- ldq a2,16(sp)
- ldq a1,8(sp)
- ldq a0,0(sp)
-$arg0:
-
- /* Adjust stack to remove the arguments we just loaded */
- s8addq t0,sp,sp
-
/* Call the user's function */
+ mov a4,a0
jsr ra,(pv)
ldgp gp,0(ra)
@@ -121,6 +82,9 @@ $arg0:
mov v0,a0
jsr ra,_exit
+ /* Die horribly. */
+ halt
+
.end thread_start
weak_alias(__clone, clone)
diff --git a/sysdeps/unix/sysv/linux/alpha/ioctl-types.h b/sysdeps/unix/sysv/linux/alpha/ioctl-types.h
deleted file mode 100644
index c51310f4cd..0000000000
--- a/sysdeps/unix/sysv/linux/alpha/ioctl-types.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* Structure types for pre-termios terminal ioctls. Linux version.
- Copyright (C) 1996, 1997 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
-#ifndef _IOCTL_TYPES_H
-#define _IOCTL_TYPES_H 1
-
-/* Get definition of constants for use with `ioctl'. */
-#include <asm/ioctl.h>
-
-
-#define FIOCLEX _IO('f', 1)
-#define FIONCLEX _IO('f', 2)
-#define FIOASYNC _IOW('f', 125, int)
-#define FIONBIO _IOW('f', 126, int)
-#define FIONREAD _IOR('f', 127, int)
-#define TIOCINQ FIONREAD
-
-#define TIOCGETP _IOR('t', 8, struct sgttyb)
-#define TIOCSETP _IOW('t', 9, struct sgttyb)
-#define TIOCSETN _IOW('t', 10, struct sgttyb) /* TIOCSETP wo flush */
-
-#define TIOCSETC _IOW('t', 17, struct tchars)
-#define TIOCGETC _IOR('t', 18, struct tchars)
-#define TCGETS _IOR('t', 19, struct termios)
-#define TCSETS _IOW('t', 20, struct termios)
-#define TCSETSW _IOW('t', 21, struct termios)
-#define TCSETSF _IOW('t', 22, struct termios)
-
-#define TCGETA _IOR('t', 23, struct termio)
-#define TCSETA _IOW('t', 24, struct termio)
-#define TCSETAW _IOW('t', 25, struct termio)
-#define TCSETAF _IOW('t', 28, struct termio)
-
-#define TCSBRK _IO('t', 29)
-#define TCXONC _IO('t', 30)
-#define TCFLSH _IO('t', 31)
-
-#define TIOCSWINSZ _IOW('t', 103, struct winsize)
-#define TIOCGWINSZ _IOR('t', 104, struct winsize)
-#define TIOCSTART _IO('t', 110) /* start output, like ^Q */
-#define TIOCSTOP _IO('t', 111) /* stop output, like ^S */
-#define TIOCOUTQ _IOR('t', 115, int) /* output queue size */
-
-#define TIOCGLTC _IOR('t', 116, struct ltchars)
-#define TIOCSLTC _IOW('t', 117, struct ltchars)
-#define TIOCSPGRP _IOW('t', 118, int)
-#define TIOCGPGRP _IOR('t', 119, int)
-
-#define TIOCEXCL 0x540C
-#define TIOCNXCL 0x540D
-#define TIOCSCTTY 0x540E
-
-#define TIOCSTI 0x5412
-#define TIOCMGET 0x5415
-#define TIOCMBIS 0x5416
-#define TIOCMBIC 0x5417
-#define TIOCMSET 0x5418
-# define TIOCM_LE 0x001
-# define TIOCM_DTR 0x002
-# define TIOCM_RTS 0x004
-# define TIOCM_ST 0x008
-# define TIOCM_SR 0x010
-# define TIOCM_CTS 0x020
-# define TIOCM_CAR 0x040
-# define TIOCM_RNG 0x080
-# define TIOCM_DSR 0x100
-# define TIOCM_CD TIOCM_CAR
-# define TIOCM_RI TIOCM_RNG
-
-#define TIOCGSOFTCAR 0x5419
-#define TIOCSSOFTCAR 0x541A
-#define TIOCLINUX 0x541C
-#define TIOCCONS 0x541D
-#define TIOCGSERIAL 0x541E
-#define TIOCSSERIAL 0x541F
-#define TIOCPKT 0x5420
-# define TIOCPKT_DATA 0
-# define TIOCPKT_FLUSHREAD 1
-# define TIOCPKT_FLUSHWRITE 2
-# define TIOCPKT_STOP 4
-# define TIOCPKT_START 8
-# define TIOCPKT_NOSTOP 16
-# define TIOCPKT_DOSTOP 32
-
-
-#define TIOCNOTTY 0x5422
-#define TIOCSETD 0x5423
-#define TIOCGETD 0x5424
-#define TCSBRKP 0x5425 /* Needed for POSIX tcsendbreak() */
-#define TIOCTTYGSTRUCT 0x5426 /* For debugging only */
-
-#define TIOCSERCONFIG 0x5453
-#define TIOCSERGWILD 0x5454
-#define TIOCSERSWILD 0x5455
-#define TIOCGLCKTRMIOS 0x5456
-#define TIOCSLCKTRMIOS 0x5457
-#define TIOCSERGSTRUCT 0x5458 /* For debugging only */
-#define TIOCSERGETLSR 0x5459 /* Get line status register */
- /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
-# define TIOCSER_TEMT 0x01 /* Transmitter physically empty */
-#define TIOCSERGETMULTI 0x545A /* Get multiport config */
-#define TIOCSERSETMULTI 0x545B /* Set multiport config */
-
-#define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */
-#define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */
-
-#endif /* ioctl-types.h */
diff --git a/sysdeps/unix/sysv/linux/alpha/sigprocmask.c b/sysdeps/unix/sysv/linux/alpha/sigprocmask.c
index a1d5636fcb..7fb58f1d80 100644
--- a/sysdeps/unix/sysv/linux/alpha/sigprocmask.c
+++ b/sysdeps/unix/sysv/linux/alpha/sigprocmask.c
@@ -1,48 +1,59 @@
-/* Copyright (C) 1993, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1995, 1997 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
Contributed by David Mosberger (davidm@azstarnet.com).
-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>
#include <signal.h>
+/* When there is kernel support for more than 64 signals, we'll have to
+ switch to a new system call convention here. */
+
extern unsigned long __osf_sigprocmask (int how, unsigned long newmask);
int
__sigprocmask (int how, const sigset_t *set, sigset_t *oset)
{
- sigset_t setval;
+ unsigned long int setval;
long result;
- if (set) {
- setval = *set;
- } else {
- sigemptyset(&setval);
- how = SIG_BLOCK; /* ensure blocked mask doesn't get changed */
- }
- result = __osf_sigprocmask(how, setval);
- if (result == -1) {
- /* if there are ever more than 63 signals, we need to recode this
+ if (set)
+ {
+ setval = set->__val[0];
+ }
+ else
+ {
+ setval = 0;
+ how = SIG_BLOCK; /* ensure blocked mask doesn't get changed */
+ }
+ result = __osf_sigprocmask (how, setval);
+ if (result == -1)
+ /* If there are ever more than 63 signals, we need to recode this
in assembler since we wouldn't be able to distinguish a mask of
all 1s from -1, but for now, we're doing just fine... */
return result;
- }
- if (oset) {
- *oset = result;
- }
+
+ if (oset)
+ {
+ oset->__val[0] = result;
+ result = _SIGSET_NWORDS;
+ while (--result > 0)
+ oset->__val[result] = 0;
+ }
return 0;
}
diff --git a/sysdeps/unix/sysv/linux/alpha/sigsuspend.S b/sysdeps/unix/sysv/linux/alpha/sigsuspend.S
index f476ed595f..3036b2f8ed 100644
--- a/sysdeps/unix/sysv/linux/alpha/sigsuspend.S
+++ b/sysdeps/unix/sysv/linux/alpha/sigsuspend.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1995, 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1995, 1996, 1997 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by David Mosberger <davidm@cs.arizona.edu>, 1995.
@@ -18,7 +18,7 @@
Boston, MA 02111-1307, USA. */
/* sigsuspend is a special syscall since it needs to dereference the
- sigset. */
+ sigset. This will have to change when we have more than 64 signals. */
#include <sysdep.h>
diff --git a/sysdeps/unix/sysv/linux/alpha/syscalls.list b/sysdeps/unix/sysv/linux/alpha/syscalls.list
index 49cc697489..cf5f439bc4 100644
--- a/sysdeps/unix/sysv/linux/alpha/syscalls.list
+++ b/sysdeps/unix/sysv/linux/alpha/syscalls.list
@@ -26,6 +26,8 @@ llseek EXTRA lseek 3 llseek
# these are actually common with the x86:
fstatfs - fstatfs 2 __fstatfs fstatfs
statfs - statfs 2 __statfs statfs
+sys_ustat ustat ustat 2 __syscall_ustat
+sys_mknod xmknod mknod 3 __syscall_mknod
# override select.S in parent directory:
select - select 5 __select select
diff --git a/sysdeps/unix/sysv/linux/alpha/termbits.h b/sysdeps/unix/sysv/linux/alpha/termbits.h
index 6cb729f7f8..bcd3ff5d63 100644
--- a/sysdeps/unix/sysv/linux/alpha/termbits.h
+++ b/sysdeps/unix/sysv/linux/alpha/termbits.h
@@ -29,7 +29,7 @@ struct termios
tcflag_t c_cflag; /* control mode flags */
tcflag_t c_lflag; /* local mode flags */
cc_t c_cc[NCCS]; /* control characters */
- cc_t c_line; /* line discipline (== c_cc[19]) */
+ cc_t c_line; /* line discipline (== c_cc[33]) */
speed_t c_ispeed; /* input speed */
speed_t c_ospeed; /* output speed */
};
diff --git a/sysdeps/unix/sysv/linux/alpha/xmknod.c b/sysdeps/unix/sysv/linux/alpha/xmknod.c
index f4cdd7135a..25de60ce63 100644
--- a/sysdeps/unix/sysv/linux/alpha/xmknod.c
+++ b/sysdeps/unix/sysv/linux/alpha/xmknod.c
@@ -20,6 +20,7 @@
#include <errno.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <sys/sysmacros.h>
extern int __syscall_mknod (const char *, unsigned int, unsigned int);
diff --git a/sysdeps/unix/sysv/linux/i386/clone.S b/sysdeps/unix/sysv/linux/i386/clone.S
index 7e02f76dfe..541ae10f6a 100644
--- a/sysdeps/unix/sysv/linux/i386/clone.S
+++ b/sysdeps/unix/sysv/linux/i386/clone.S
@@ -1,20 +1,21 @@
-/* Copyright (C) 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
Contributed by Richard Henderson (rth@tamu.edu)
-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. */
/* clone() is even more special than fork() as it mucks with stacks
and invokes a function in the right context after its all over. */
@@ -23,7 +24,7 @@ Cambridge, MA 02139, USA. */
#define _ERRNO_H 1
#include <errnos.h>
-/* int clone(int (*fn)(), void *child_stack, int flags, int nargs, ...) */
+/* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg); */
.text
ENTRY(__clone)
@@ -35,20 +36,12 @@ ENTRY(__clone)
movl 8(%esp),%ecx /* no NULL stack pointers */
testl %ecx,%ecx
jz syscall_error
- movl 16(%esp),%edx /* no negative argument counts */
- testl %edx,%edx
- js syscall_error
- /* Allocate space on the new stack and copy args over */
- movl %edx,%eax
- negl %eax
- lea -4(%ecx,%eax,4),%ecx
- jz 2f
-1: movl 16(%esp,%edx,4),%eax
- movl %eax,0(%ecx,%edx,4)
- dec %edx
- jnz 1b
-2:
+ /* Insert the argument onto the new stack. */
+ subl $-8,%ecx
+ movl 16(%esp),%eax /* no negative argument counts */
+ movl %eax,4(%ecx)
+
/* Save the function pointer as the zeroth argument.
It will be popped off in the child in the ebx frobbing below. */
movl 4(%esp),%eax
diff --git a/sysdeps/unix/sysv/linux/m68k/clone.S b/sysdeps/unix/sysv/linux/m68k/clone.S
index 4465dd8f68..ef9716d979 100644
--- a/sysdeps/unix/sysv/linux/m68k/clone.S
+++ b/sysdeps/unix/sysv/linux/m68k/clone.S
@@ -1,20 +1,20 @@
-/* Copyright (C) 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
Contributed by Andreas Schwab (schwab@issan.informatik.uni-dortmund.de)
-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. */
/* clone is even more special than fork as it mucks with stacks
and invokes a function in the right context after its all over. */
@@ -23,7 +23,7 @@ Cambridge, MA 02139, USA. */
#define _ERRNO_H 1
#include <errnos.h>
-/* int clone (int (*fn) (), void *child_stack, int flags, int nargs, ...) */
+/* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg); */
.text
ENTRY (__clone)
@@ -36,18 +36,9 @@ ENTRY (__clone)
movel 8(%sp), %a1 /* no NULL stack pointers */
tstl %a1
jeq syscall_error
- movel 16(%sp), %d1 /* no negative argument counts */
- jmi syscall_error
- /* Allocate space on the new stack and copy args over */
- movel %d1, %d0
- negl %d0
- lea (%a1,%d0.l*4), %a1
- jeq 2f
-1: movel 16(%sp,%d1.l*4), -4(%a1,%d1.l*4)
- subql #1, %d1
- jne 1b
-2:
+ /* Allocate space and copy the argument onto the new stack. */
+ movel 16(%sp), -(%a1)
/* Do the system call */
exg %d2, %a1 /* save %d2 and get stack pointer */
diff --git a/sysdeps/unix/sysv/linux/schedbits.h b/sysdeps/unix/sysv/linux/schedbits.h
index 97683cd3ef..fccb5d834f 100644
--- a/sysdeps/unix/sysv/linux/schedbits.h
+++ b/sysdeps/unix/sysv/linux/schedbits.h
@@ -1,6 +1,6 @@
/* Definitions of constants and data structure for POSIX 1003.1b-1993
scheduling interface.
- Copyright (C) 1996 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -19,7 +19,9 @@
Boston, MA 02111-1307, USA. */
#ifndef _SCHEDBITS_H
+
#define _SCHEDBITS_H 1
+#include <features.h>
/* Scheduling algorithms. */
#define SCHED_OTHER 0
@@ -28,9 +30,9 @@
/* Data structure to describe a process' schedulability. */
struct sched_param
-{
- int sched_priority;
-};
+ {
+ int sched_priority;
+ };
/* Cloning flags. */
#define CSIGNAL 0x000000ff /* Signal mask to be sent at exit. */
@@ -41,13 +43,13 @@ struct sched_param
#define CLONE_PID 0x00001000 /* Set if pid shared. */
-/* Clone current process. The parameter list of FN is not for true. Only
- dots is not allowed by ISO C and without argument the compiler would
- complain about a missing parameter list. */
-extern int __clone __P ((int (*__fn) (void *, ...), void *__child_stack,
- int __flags, int __nargs, ...));
-extern int clone __P ((int (*__fn) (void *, ...), void *__child_stack,
- int __flags, int __nargs, ...));
+/* Clone current process. */
+extern int __clone __P ((int (*__fn) (void *__arg), void *__child_stack,
+ int __flags, void *__arg));
+#ifdef __USE_MISC
+extern int clone __P ((int (*__fn) (void *__arg), void *__child_stack,
+ int __flags, void *__arg));
+#endif
#endif /* schedbits.h */
diff --git a/sysdeps/unix/sysv/linux/sigset.h b/sysdeps/unix/sysv/linux/sigset.h
index 69648b7e9c..752d13adff 100644
--- a/sysdeps/unix/sysv/linux/sigset.h
+++ b/sysdeps/unix/sysv/linux/sigset.h
@@ -22,13 +22,13 @@
typedef int __sig_atomic_t;
-/* A `sigset_t' has a bit for each signal. Having 32 * 4 * 8 bits gives
- us up to 1024 signals. */
-#define _SIGSET_NWORDS 32
+/* A `sigset_t' has a bit for each signal. */
+
+#define _SIGSET_NWORDS (1024 / (8 * sizeof (unsigned long int)))
typedef struct
-{
- unsigned int __val[_SIGSET_NWORDS];
-} __sigset_t;
+ {
+ unsigned long int __val[_SIGSET_NWORDS];
+ } __sigset_t;
#endif
@@ -47,20 +47,23 @@ typedef struct
#endif
/* Return a mask that includes the bit for SIG only. */
-#define __sigmask(sig) (((unsigned int) 1) << (((sig) - 1) \
- % (8 * sizeof (unsigned int))))
+#define __sigmask(sig) \
+ (((unsigned long) 1) << (((sig) - 1) % (8 * sizeof (unsigned long int))))
+
/* Return the word index for SIG. */
-#define __sigword(sig) (((sig) - 1) / (8 * sizeof (unsigned int)))
+#define __sigword(sig) (((sig) - 1) / (8 * sizeof (unsigned long int)))
#if defined __GNUC__ && __GNUC__ >= 2
#define __sigemptyset(set) \
- (__extension__ ({ unsigned int __cnt; \
- for (__cnt = 0; __cnt < _SIGSET_NWORDS; ++__cnt) \
- (set)->__val[__cnt] = 0; 0; }))
+ (__extension__ ({ int __cnt = _SIGSET_NWORDS; \
+ sigset_t *__set = (set); \
+ while (--__cnt >= 0) __set->__val[__cnt] = 0; \
+ 0; }))
#define __sigfillset(set) \
- (__extension__ ({ unsigned int __cnt; \
- for (__cnt = 0; __cnt < _SIGSET_NWORDS; ++__cnt) \
- (set)->__val[__cnt] = ~0; 0; }))
+ (__extension__ ({ int __cnt = _SIGSET_NWORDS; \
+ sigset_t *__set = (set); \
+ while (--__cnt >= 0) __set->__val[__cnt] = ~0UL; \
+ 0; }))
#endif
/* These functions needn't check for a bogus signal number -- error
@@ -74,8 +77,8 @@ extern int __sigdelset (__sigset_t *, int);
_EXTERN_INLINE int \
NAME (CONST __sigset_t *__set, int __sig) \
{ \
- unsigned int __mask = __sigmask (__sig); \
- unsigned int __word = __sigword (__sig); \
+ unsigned long int __mask = __sigmask (__sig); \
+ unsigned long int __word = __sigword (__sig); \
return BODY; \
}
diff --git a/sysdeps/unix/sysv/linux/sparc/clone.S b/sysdeps/unix/sysv/linux/sparc/clone.S
index 875dcba64a..9e1ba812b0 100644
--- a/sysdeps/unix/sysv/linux/sparc/clone.S
+++ b/sysdeps/unix/sysv/linux/sparc/clone.S
@@ -1,34 +1,29 @@
-/* Copyright (C) 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
Contributed by Miguel de Icaza (miguel@nuclecu.unam.mx)
+ Based on code written for the Intel by Richard Henderson (rth@tamu.edu).
- FIXME: Currently only 6 parameters can be passsed
- to the clone function.
-
- based on code written for the Intel by Richard
- Henderson (rth@tamu.edu)
-
-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. */
/* clone() is even more special than fork() as it mucks with stacks
and invokes a function in the right context after its all over. */
-
+
#include <asm/errno.h>
#include <asm/unistd.h>
-/* int clone(int (*fn)(), void *child_stack, int flags, int nargs, ...) */
+/* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg); */
.text
.align 4
@@ -37,31 +32,20 @@ Cambridge, MA 02139, USA. */
.weak clone
__clone = __libc_clone
clone = __libc_clone
-__libc_clone:
+
+__libc_clone:
save %sp,-96,%sp
+
/* sanity check arguments */
tst %i0
be __clone_syscall_error
tst %i1
be __clone_syscall_error
- cmp %i3,0
- bl __clone_syscall_error
- nop
-
- /* Flush the register windows */
- ta 3
+ nop
- /* Parameters for system call */
+ /* Do the system call */
mov %i1,%o1
mov %i2,%o0
-
- /* parameters that are on the stack for routine */
-#define P(x) 0x5c+(x*4)
- ld [%fp+P(0)],%o2
- ld [%fp+P(1)],%o3
- ld [%fp+P(2)],%o4
- ld [%fp+P(3)],%o5
- /* Do the system call */
set __NR_clone,%g1
ta 0x10
bcs __clone_syscall_error
@@ -71,7 +55,7 @@ __libc_clone:
mov %o0,%i0
ret
restore
-
+
__clone_syscall_error:
call __errno_location
set EINVAL,%i0
@@ -81,8 +65,7 @@ __clone_syscall_error:
restore
__thread_start:
- mov %i5,%o1
call %i0
- mov %i4,%o0
+ mov %i3,%o0
call _exit,0
nop
diff --git a/sysdeps/unix/sysv/linux/tcsetattr.c b/sysdeps/unix/sysv/linux/tcsetattr.c
index 7afaf1b986..3bb3e9f5ec 100644
--- a/sysdeps/unix/sysv/linux/tcsetattr.c
+++ b/sysdeps/unix/sysv/linux/tcsetattr.c
@@ -60,10 +60,10 @@ tcsetattr (fd, optional_actions, termios_p)
k_termios.c_lflag = termios_p->c_lflag;
k_termios.c_line = termios_p->c_line;
#ifdef _HAVE_C_ISPEED
- k_termios.c_ispeed = termios_p.c_ispeed;
+ k_termios.c_ispeed = termios_p->c_ispeed;
#endif
#ifdef _HAVE_C_OSPEED
- k_termios.c_ospeed = termios_p.c_ospeed;
+ k_termios.c_ospeed = termios_p->c_ospeed;
#endif
for (cnt = 0; cnt < KERNEL_NCCS; ++cnt)
k_termios.c_cc[cnt] = termios_p->c_cc[cnt];
diff --git a/sysdeps/unix/sysv/sco3.2/Makefile b/sysdeps/unix/sysv/sco3.2/Makefile
index 1be24e85e3..ff3a6fb4f1 100644
--- a/sysdeps/unix/sysv/sco3.2/Makefile
+++ b/sysdeps/unix/sysv/sco3.2/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1993 Free Software Foundation, Inc.
+# Copyright (C) 1993, 1997 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -12,12 +12,12 @@
# 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.
+# 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.
ifeq ($(subdir),misc)
-
+
sysdep_routines := $(sysdep_routines) __fltused
endif
diff --git a/sysdeps/unix/sysv/sysv4/Makefile b/sysdeps/unix/sysv/sysv4/Makefile
index 320e99bcf4..7507fbfc1c 100644
--- a/sysdeps/unix/sysv/sysv4/Makefile
+++ b/sysdeps/unix/sysv/sysv4/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1992, 1993, 1995, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1995, 1996, 1997 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -12,9 +12,9 @@
# 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.
+# 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.
ifeq ($(subdir),posix)
diff --git a/sysdeps/vax/Makefile b/sysdeps/vax/Makefile
index a6149a9524..b27d65d10c 100644
--- a/sysdeps/vax/Makefile
+++ b/sysdeps/vax/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 1994 Free Software Foundation, Inc.
+# Copyright (C) 1991, 1994, 1997 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -12,9 +12,9 @@
# 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.
+# 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.
ifeq ($(subdir),math)
ifndef math-twiddled
diff --git a/sysvipc/Makefile b/sysvipc/Makefile
index 2e9471bbc3..36a502a9b6 100644
--- a/sysvipc/Makefile
+++ b/sysvipc/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -12,9 +12,9 @@
# 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.
+# 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.
#
# Sub-makefile for sysvipc portion of the library.
diff --git a/time/strptime.c b/time/strptime.c
index f220313475..ce3f4e3877 100644
--- a/time/strptime.c
+++ b/time/strptime.c
@@ -179,6 +179,9 @@ static char const ab_month_name[][4] =
/* Status of lookup: do we use the locale data or the raw data? */
enum locale_status { not, loc, raw };
+static char *
+strptime_internal __P ((const char *buf, const char *format, struct tm *tm,
+ enum locale_status *decided));
static char *
strptime_internal (buf, format, tm, decided)
diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile
index 120f8690a9..c296944fdd 100644
--- a/wcsmbs/Makefile
+++ b/wcsmbs/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -12,9 +12,9 @@
# 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.
+# 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.
#
# Sub-makefile for wcsmbs portion of the library.
diff --git a/wctype/Makefile b/wctype/Makefile
index e0c84c39f1..0523e11e7c 100644
--- a/wctype/Makefile
+++ b/wctype/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1996 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -12,9 +12,9 @@
# 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.
+# 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.
#
# Sub-makefile for wctype portion of the library.