Update.

2001-04-25  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/unix/sysv/linux/sparc/sparc64/bits/time.h: Move to...
	* sysdeps/unix/sysv/linux/sparc/bits/time.h: ...here.
	* sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/bits/time.h: Remove.
	* sysdeps/unix/sysv/linux/sparc/sparc64/bits/socket.h: Move to...
	* sysdeps/unix/sysv/linux/sparc/bits/socket.h: ...here.  Adjust
	struct msghdr for __WORDSIZE == 32.
	* sysdeps/unix/sysv/linux/sparc/sparc64/bits/statvfs.h: Move to...
	* sysdeps/unix/sysv/linux/sparc/bits/statvfs.h: ...here. Adjust
	for __WORDSIZE == 32.
	* sysdeps/unix/sysv/linux/sparc/sparc64/bits/siginfo.h: Remove.
	* sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/get_clockfreq.c: New
	file.
	* sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S (__libc_siglongjmp):
	Rename from longjmp, make longjmp weak alias to it.

2001-04-24  David S. Miller  <davem@redhat.com>

	* sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c: New file.

ChangeLog

@@ -1,3 +1,24 @@
+2001-04-25  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/unix/sysv/linux/sparc/sparc64/bits/time.h: Move to...
+	* sysdeps/unix/sysv/linux/sparc/bits/time.h: ...here.
+	* sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/bits/time.h: Remove.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/bits/socket.h: Move to...
+	* sysdeps/unix/sysv/linux/sparc/bits/socket.h: ...here.  Adjust
+	struct msghdr for __WORDSIZE == 32.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/bits/statvfs.h: Move to...
+	* sysdeps/unix/sysv/linux/sparc/bits/statvfs.h: ...here. Adjust
+	for __WORDSIZE == 32.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/bits/siginfo.h: Remove.
+	* sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/get_clockfreq.c: New
+	file.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S (__libc_siglongjmp):
+	Rename from longjmp, make longjmp weak alias to it.
+
+2001-04-24  David S. Miller  <davem@redhat.com>
+
+	* sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c: New file.
+
 2001-04-25  Matthew Wilcox  <willy@ldl.fc.hp.com>
 
 	* sysdeps/hppa/stackinfo.h: New file.

manual/charset.texi

@@ -1821,12 +1821,12 @@ file2wcs (int fd, const char *charset, wchar_t *outbuf, size_t avail)
   int result = 0;
   iconv_t cd;
 
-  cd = iconv_open ("UCS-4", charset);
+  cd = iconv_open ("WCHAR_T", charset);
   if (cd == (iconv_t) -1)
     @{
       /* @r{Something went wrong.}  */
       if (errno == EINVAL)
-        error (0, 0, "conversion from '%s' to 'UCS-4' not available",
+        error (0, 0, "conversion from '%s' to wchar_t not available",
                charset);
       else
         perror ("iconv_open");

sysdeps/unix/sysv/linux/sparc/sparc64/bits/socket.h → sysdeps/unix/sysv/linux/sparc/bits/socket.h

@@ -1,4 +1,4 @@
-/* System-specific socket constants and types.  Linux/SPARC64 version.
+/* System-specific socket constants and types.  Linux/SPARC version.
    Copyright (C) 1991,1992,1994-1999,2000,2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -212,11 +212,17 @@ struct msghdr
     socklen_t msg_namelen;	/* Length of address data.  */
 
     struct iovec *msg_iov;	/* Vector of data to send/receive into.  */
+#if __WORDSIZE == 32
+    int msg_iovlen;		/* Number of elements in the vector.  */
+
+    void *msg_control;		/* Ancillary data (eg BSD filedesc passing). */
+    socklen_t msg_controllen;	/* Ancillary data buffer length.  */
+#else
     size_t msg_iovlen;		/* Number of elements in the vector.  */
 
     void *msg_control;		/* Ancillary data (eg BSD filedesc passing). */
     size_t msg_controllen;	/* Ancillary data buffer length.  */
-
+#endif
     int msg_flags;		/* Flags on received message.  */
   };
 

sysdeps/unix/sysv/linux/sparc/sparc64/bits/statvfs.h → sysdeps/unix/sysv/linux/sparc/bits/statvfs.h

@@ -22,6 +22,10 @@
 
 #include <bits/types.h>  /* For __fsblkcnt_t and __fsfilcnt_t.  */
 
+#if __WORDSIZE == 32
+#define _STATVFSBUF_F_UNUSED
+#endif
+
 struct statvfs
   {
     unsigned long int f_bsize;
@@ -42,6 +46,9 @@ struct statvfs
     __fsfilcnt64_t f_favail;
 #endif
     unsigned long int f_fsid;
+#ifdef _STATVFSBUF_F_UNUSED
+    int __f_unused;
+#endif
     unsigned long int f_flag;
     unsigned long int f_namemax;
     int __f_spare[6];
@@ -59,6 +66,9 @@ struct statvfs64
     __fsfilcnt64_t f_ffree;
     __fsfilcnt64_t f_favail;
     unsigned long int f_fsid;
+#ifdef _STATVFSBUF_F_UNUSED
+    int __f_unused;
+#endif
     unsigned long int f_flag;
     unsigned long int f_namemax;
     int __f_spare[6];

sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/bits/time.h → sysdeps/unix/sysv/linux/sparc/bits/time.h

@@ -1,4 +1,4 @@
-/* System-dependent timing definitions.  Linux/SPARCv9 version.
+/* System-dependent timing definitions.  Linux/SPARC version.
    Copyright (C) 1996, 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 

sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9/get_clockfreq.c

@@ -0,0 +1 @@
+#include <sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c>