Update. glibc-2.1.96 cvs/glibc-2_1_96

	* inet/getipnodebyad.c: Removed.
	* inet/getipnodebynm.c: Removed.
	* inet/tst-ipnode.c: Removed.
	* inet/freehostent.c: Removed.

	* sysdeps/unix/bsd/osf/=dirstream.h: Removed.

	* sysdeps/unix/sysv/linux/Dist: Add bits/initspin.h.

	* elf/Makefile (distribute): Add neededobj4.c.

	* iconvdata/Makefile (distribute): Add BIG5HKSCS.irreversible.

	* sysdeps/hppa/Dist: New file.
	* sysdeps/unix/sysv/linux/hppa/Dist: New file.

14 files changed, 32 insertions, 445 deletions

diff --git a/ChangeLog b/ChangeLog
index d55310e05e..2cb9e74a43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,22 @@
 
 	* version.h (VERSION): Bump to 2.1.96.
 
+	* inet/getipnodebyad.c: Removed.
+	* inet/getipnodebynm.c: Removed.
+	* inet/tst-ipnode.c: Removed.
+	* inet/freehostent.c: Removed.
+
+	* sysdeps/unix/bsd/osf/=dirstream.h: Removed.
+
+	* sysdeps/unix/sysv/linux/Dist: Add bits/initspin.h.
+
+	* elf/Makefile (distribute): Add neededobj4.c.
+
+	* iconvdata/Makefile (distribute): Add BIG5HKSCS.irreversible.
+
+	* sysdeps/hppa/Dist: New file.
+	* sysdeps/unix/sysv/linux/hppa/Dist: New file.
+
 	* posix/tst-chmod.c (do_test): Account for people running the
 	tests as root.
 
diff --git a/README b/README
index fe86bbac3c..ed2cfd055f 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This directory contains the version 2.1.95 release of the GNU C Library.
+This directory contains the version 2.1.96 release of the GNU C Library.
 Many bugs have been fixed since the last release.
 Some bugs surely remain.
 
diff --git a/elf/Makefile b/elf/Makefile
index 119cfa5ba0..f35d3d418f 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -54,7 +54,7 @@ distribute	:= $(rtld-routines:=.c) dynamic-link.h do-rel.h dl-machine.h \
 		   nodelmod3.c nodelmod4.c nodlopen.c dl-osinfo.h \
 		   reldepmod1.c reldepmod2.c reldepmod3.c reldepmod4.c \
 		   nextmod1.c nextmod2.c \
-		   neededobj1.c neededobj2.c neededobj3.c \
+		   neededobj1.c neededobj2.c neededobj3.c neededobj4.c \
 		   unload2mod.c unload2dep.c ltglobmod1.c ltglobmod2.c
 
 include ../Makeconfig
diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index e203efcc06..a4a9616d51 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -98,7 +98,8 @@ distribute := gconv-modules extra-module.mk gap.awk gaptab.awk		    \
 	      run-iconv-test.sh tst-tables.sh tst-table.sh		    \
 	      tst-table-charmap.sh tst-table-from.c tst-table-to.c	    \
 	      EUC-JP.irreversible ISIRI-3342.irreversible SJIS.irreversible \
-	      EUC-KR.irreversible 8bit-generic.c 8bit-gap.c		    \
+	      EUC-KR.irreversible BIG5HKSCS.irreversible		    \
+	      8bit-generic.c 8bit-gap.c					    \
 	      ansi_x3.110.c asmo_449.c big5.c cp737.c cp737.h		    \
 	      cp775.c cp775.h ibm874.c cns11643.c cns11643.h		    \
 	      cns11643l1.c cns11643l1.h cp1250.c cp1251.c cp1252.c cp1253.c \
diff --git a/inet/freehostent.c b/inet/freehostent.c
deleted file mode 100644
index c2c1b25d6d..0000000000
--- a/inet/freehostent.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright (C) 1999 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 <netdb.h>
-#include <stdlib.h>
-
-
-void
-freehostent (struct hostent *ptr)
-{
-  free (ptr);
-}
diff --git a/inet/getipnodebyad.c b/inet/getipnodebyad.c
deleted file mode 100644
index 1128bcb30f..0000000000
--- a/inet/getipnodebyad.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright (C) 1999, 2000 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 <assert.h>
-#include <errno.h>
-#include <netdb.h>
-#include <stdlib.h>
-
-#include "nsswitch.h"
-
-/* We avoid using a too large buffer in case the user is accumulating the
-   results and there is lots of unused space in the allocated buffer.  */
-#define BUFLEN	512
-
-
-struct hostent *
-getipnodebyaddr (const void *addr, socklen_t len, int type, int *error_num)
-{
-  size_t buffer_size;
-  char *buffer;
-  struct hostent *result;
-
-  buffer_size = BUFLEN;
-  buffer = malloc (buffer_size);
-
-  while (buffer != NULL
-	 && __gethostbyaddr_r (addr, len, type, (struct hostent *) buffer,
-			       (char *) ((struct hostent *) buffer + 1),
-			       buffer_size - sizeof (struct hostent),
-			       &result, error_num) == ERANGE
-	 && *error_num == NETDB_INTERNAL)
-    {
-      buffer_size += BUFLEN;
-      buffer = realloc (buffer, buffer_size);
-      if (buffer == NULL)
-	{
-	  *error_num = TRY_AGAIN;
-	  assert (result == NULL);
-	  return NULL;
-	}
-    }
-
-  return buffer == NULL ? NULL : result;
-}
diff --git a/inet/getipnodebynm.c b/inet/getipnodebynm.c
deleted file mode 100644
index b0be882afb..0000000000
--- a/inet/getipnodebynm.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/* Copyright (C) 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   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 <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <netdb.h>
-#include <stdlib.h>
-#include <string.h>
-#include <arpa/inet.h>
-
-#include "nsswitch.h"
-
-
-/* We avoid using a too large buffer in case the user is accumulating the
-   results and there is lots of unused space in the allocated buffer.  */
-#define BUFLEN	512
-
-
-/* Internal function to test whether IPv4 and/or IPv6 are available.  */
-extern void __protocol_available (int *have_inet, int *have_inet6)
-     internal_function;
-
-
-/* Type of the lookup function we need here.  */
-typedef enum nss_status (*lookup_function) (const char *, int, int,
-					    struct hostent *, char *,
-					    size_t, int *, int *);
-
-/* The lookup function for the first entry of this service.  */
-extern int __nss_hosts_lookup (service_user **nip, const char *name,
-			       void **fctp);
-
-
-struct hostent *
-getipnodebyname (const char *name, int type, int flags, int *h_errnop)
-{
-  static service_user *startp;
-  static lookup_function start_fct;
-  service_user *nip;
-  lookup_function fct;
-  int no_more;
-  size_t buffer_size;
-  char *buffer;
-  struct hostent *result;
-  int save;
-  int have_inet = 1;
-  int have_inet6 = 1;
-
-  /* First determine whether we have the appropriate interfaces.
-     XXX I don't think we can cache the result since the system
-     can be reconfigured.  */
-  if ((flags & AI_ADDRCONFIG) != 0)
-    __protocol_available (&have_inet, &have_inet6);
-
-  /* Handle impossible requests first.  */
-  if ((type == AF_INET && have_inet == 0)
-      || (type == AF_INET6 && have_inet6 == 0 && ((flags & AI_V4MAPPED) == 0
-						  || have_inet == 0))
-      || (type != AF_INET && type != AF_INET6))
-    {
-      *h_errnop = NO_DATA;
-      return NULL;
-    }
-
-  buffer_size = BUFLEN;
-  buffer = (char *) malloc (buffer_size);
-
-  result = NULL;
-  if (buffer != NULL)
-    {
-#define HAVE_TYPE
-#define resbuf (*((struct hostent *) buffer))
-#include "../nss/digits_dots.c"
-    }
-
-  if (startp == NULL)
-    {
-      no_more = __nss_hosts_lookup (&nip, "getipnodebyname_r", (void **) &fct);
-      if (no_more)
-	startp = (service_user *) -1l;
-      else
-	{
-	  startp = nip;
-	  start_fct = fct;
-	}
-    }
-  else
-    {
-      fct = start_fct;
-      no_more = (nip = startp) == (service_user *) -1l;
-    }
-
-  /* First do a lookup with the original protocol type.  */
-  while (no_more == 0 && buffer != NULL)
-    {
-      enum nss_status status;
-
-      status = DL_CALL_FCT (fct, (name, type,
-				  ((flags & AI_ALL)
-				   ? flags : (flags & ~AI_V4MAPPED)),
-				  (struct hostent *) buffer,
-				  (char *) ((struct hostent *) buffer + 1),
-				  buffer_size - sizeof (struct hostent),
-				  &errno, h_errnop));
-
-      if (status == NSS_STATUS_SUCCESS)
-	{
-	  result = (struct hostent *) buffer;
-	  break;
-	}
-
-      if (status == NSS_STATUS_TRYAGAIN && *h_errnop == NETDB_INTERNAL
-	  && errno == ERANGE)
-	{
-	  /* Resize the buffer, it's too small.  */
-	  buffer_size += BUFLEN;
-	  buffer = (char *) realloc (buffer, buffer_size);
-	  continue;
-	}
-
-      no_more = __nss_next (&nip, "getipnodebyname_r",
-			    (void **) &fct, status, 0);
-    }
-
-  /* If we are looking for an IPv6 address but haven't found any and
-     do not have the AI_ALL but the AI_V4MAPPED flag set, now try
-     looking up an IPv4 address and map it.  */
-  if (buffer != NULL && result == NULL
-      && type == AF_INET6 && (flags & AI_V4MAPPED) != 0
-      && (no_more = (nip = startp) == (service_user *) -1l) == 0)
-    {
-      /* We have to use a new buffer if there is already a result.  */
-      fct = start_fct;
-
-      do
-	{
-	  enum nss_status status;
-
-	  status = DL_CALL_FCT (fct, (name, type, flags,
-				      (struct hostent *) buffer,
-				      (char *) ((struct hostent *) buffer + 1),
-				      buffer_size - sizeof (struct hostent),
-				      &errno, h_errnop));
-
-	  if (status == NSS_STATUS_SUCCESS)
-	    {
-	      result = (struct hostent *) buffer;
-	      break;
-	    }
-
-	  if (status == NSS_STATUS_TRYAGAIN && *h_errnop == NETDB_INTERNAL
-	      && errno == ERANGE)
-	    {
-	      /* Resize the buffer, it's too small.  */
-	      buffer_size += BUFLEN;
-	      buffer = (char *) realloc (buffer, buffer_size);
-	      continue;
-	    }
-
-	  no_more = __nss_next (&nip, "getipnodebyname_r",
-				(void **) &fct, status, 0);
-	}
-      while (no_more == 0 && buffer != NULL);
-    }
-
- done:
-  if (buffer == NULL)
-    {
-      /* We are out of memory.  */
-      *h_errnop = TRY_AGAIN;
-      assert (result == NULL);
-    }
-  else if (result == NULL && buffer != NULL)
-    free (buffer);
-
-  return result;
-}
diff --git a/inet/tst-ipnode.c b/inet/tst-ipnode.c
deleted file mode 100644
index b4b4dfa33d..0000000000
--- a/inet/tst-ipnode.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include <netdb.h>
-#include <stdio.h>
-#include <netinet/in.h>
-
-/* The unspecified IPv6 address.  */
-struct in6_addr anyv6 = IN6ADDR_ANY_INIT;
-
-int
-main (void)
-{
-  int errors = 0;
-  int errval;
-
-  /* Test the unspecifed IPv6 address.  */
-  errval = 0x3453456;
-  if (getipnodebyaddr ((char *) &anyv6, sizeof (anyv6), AF_INET6, &errval)
-      != NULL
-      || errval != HOST_NOT_FOUND)
-    {
-      puts ("getipnodenyaddr(in6addr_any,...) != NULL");
-      ++errors;
-    }
-
-  return errors != 0;
-}
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index d694e59365..bcd2678069 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-26  Ulrich Drepper  <drepper@redhat.com>
+
+	* fr_CA,2.13.in: Removed.
+
 2000-10-26  GOTO Masanori  <gotom@debian.or.jp>
 
 	* locales/POSIX: New support for date_fmt.
diff --git a/localedata/fr_CA,2.13.in b/localedata/fr_CA,2.13.in
deleted file mode 100644
index d1f9c3c2a8..0000000000
--- a/localedata/fr_CA,2.13.in
+++ /dev/null
@@ -1,93 +0,0 @@
-@@@@@
-0000
-9999
-Aalborg
-aide
-aïeul
-air
-@@@air
-air@@@
-Ålborg
-août
-bohème
-Bohême
-Bohémien
-caennais
-cæsium
-çà et là
-C.A.F.
-Canon
-cañon
-casanier
-cølibat
-colon
-côlon
-coop
-co-op
-COOP
-CO-OP
-Copenhagen
-cote
-COTE
-côte
-CÔTE
-coté
-COTÉ
-côté
-CÔTÉ
-du
-dû
-élève
-élevé
-gène
-gêne
-gêné
-Größe
-Grossist
-haie
-haïe
-île
-Île d'Orléans
-lame
-l'âme
-lamé
-les
-LÈS
-lèse
-lésé
-L'Haÿ-les-Roses
-MÂCON
-maçon
-McArthur
-Mc Arthur
-Mc Mahon
-MODÈLE
-modelé
-Noël
-NOËL
-notre
-nôtre
-ou
-OÙ
-pèche
-pêche
-péché
-PÉCHÉ
-pêché
-pécher
-pêcher
-pechère
-péchère
-relève
-relevé
-resume
-resumé
-résumé
-révèle
-révélé
-vice-president
-vice-président
-vice-president's offices
-vice-presidents' offices
-vice versa
-VICE-VERSA
diff --git a/sysdeps/hppa/Dist b/sysdeps/hppa/Dist
new file mode 100644
index 0000000000..9fc1de291a
--- /dev/null
+++ b/sysdeps/hppa/Dist
@@ -0,0 +1,2 @@
+dl-symaddr.c
+dl-fptr.c
diff --git a/sysdeps/unix/bsd/osf/=dirstream.h b/sysdeps/unix/bsd/osf/=dirstream.h
deleted file mode 100644
index c37610e258..0000000000
--- a/sysdeps/unix/bsd/osf/=dirstream.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright (C) 1993 Free Software Foundation, Inc.
-   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 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.  */
-
-#ifndef	_DIRSTREAM_H
-
-#define	_DIRSTREAM_H	1
-
-#define __need_size_t
-#include <stddef.h>
-
-/* Directory stream type.  */
-
-typedef struct
-  {
-    int __fd;			/* File descriptor.  */
-
-    size_t __offset;		/* Current offset into the block.  */
-    size_t __size;		/* Total valid data in the block.  */
-    char *__data;		/* Directory block.  */
-
-    int __allocation;		/* Space allocated for the block.  */
-
-    int __data_len;		/* Size of __data.  */
-    long __dd_seek;		/* OSF/1 magic cookie returned by getdents. */
-    void *dd_lock;		/* Used by OSF/1 for inter-thread locking.  */
-    
-  } DIR;
-
-#endif	/* dirstream.h */
diff --git a/sysdeps/unix/sysv/linux/Dist b/sysdeps/unix/sysv/linux/Dist
index 3d9a649025..22cf709bf5 100644
--- a/sysdeps/unix/sysv/linux/Dist
+++ b/sysdeps/unix/sysv/linux/Dist
@@ -1,3 +1,4 @@
+bits/initspin.h
 bits/pthreadtypes.h
 cmsg_nxthdr.c
 errlist.h
diff --git a/sysdeps/unix/sysv/linux/hppa/Dist b/sysdeps/unix/sysv/linux/hppa/Dist
new file mode 100644
index 0000000000..2954d3c4bf
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/hppa/Dist
@@ -0,0 +1,5 @@
+umount.c
+kernel_stat.h
+kernel_sigaction.h
+clone.S
+sys/procfs.h