* libio/ftello.c (ftello): Use _IO_off64_t for type of POS.

	Check for the result overflowing off_t and fail with EOVERFLOW.
	* libio/ioftell.c (_IO_ftell): Likewise.
	* libio/iofgetpos.c (_IO_new_fgetpos): Likewise.

	* login/logwtmp.c (logwtmp): If sizeof ut_tv != sizeof struct timeval,
	use a temporary timeval on the stack for gettimeofday and copy it.
	* login/logout.c (logout): Likewise.
	Reported by Steven Munroe <sjmunroe@us.ibm.com>.

	* sysdeps/unix/sysv/linux/bits/statfs.h (struct statfs):
	Use __SWORD_TYPE instead of int for member types.
	(struct statfs64): Likewise.
	* sysdeps/unix/sysv/linux/alpha/bits/statfs.h: New file.
	* sysdeps/unix/sysv/linux/s390/bits/statfs.h: New file.
	* sysdeps/unix/sysv/linux/ia64/bits/statfs.h: File removed.
	* sysdeps/unix/sysv/linux/sparc/bits/statfs.h: File removed.
	* sysdeps/unix/sysv/linux/x86_64/bits/statfs.h: File removed.

	* sysdeps/unix/sysv/linux/sparc/bits/statvfs.h: Moved to ...
	* sysdeps/unix/sysv/linux/bits/statvfs.h: ... here.
	(ST_NODIRATIME): Restore fixed value of 2048.
	* sysdeps/unix/sysv/linux/alpha/bits/statvfs.h: File removed.
	* sysdeps/unix/sysv/linux/ia64/bits/statvfs.h: File removed.

	Rearranged <bits/types.h> definitions to reduce duplication.
	* sysdeps/generic/bits/types.h: Rewritten, using macros from
	<bits/wordsize.h> and new header <bits/typesizes.h>.
	* posix/Makefile (headers): Add bits/typesizes.h here.
	* sysdeps/generic/bits/typesizes.h: New file.
	* sysdeps/unix/sysv/linux/alpha/bits/typesizes.h: New file.
	* sysdeps/unix/sysv/linux/sparc/bits/typesizes.h: New file.
	* sysdeps/mach/hurd/bits/typesizes.h: New file.
	* sysdeps/unix/sysv/linux/alpha/bits/types.h: File removed.
	* sysdeps/unix/sysv/linux/bits/types.h: File removed.
	* sysdeps/unix/sysv/linux/ia64/bits/types.h: File removed.
	* sysdeps/unix/sysv/linux/mips/bits/types.h: File removed.
	* sysdeps/unix/sysv/linux/s390/bits/types.h: File removed.
	* sysdeps/unix/sysv/linux/sparc/bits/types.h: File removed.
	* sysdeps/unix/sysv/linux/x86_64/bits/types.h: File removed.
	* posix/sys/types.h [__USE_POSIX199506 || __USE_UNIX98]: Include
	<bits/pthreadtypes.h> here, not in <bits/types.h>.
	* signal/signal.h: Likewise.

	* streams/stropts.h: Include <bits/xtitypes.h>.
	* streams/Makefile (headers): Add bits/xtitypes.h here.
	* sysdeps/generic/bits/xtitypes.h: New file.
	* sysdeps/s390/bits/xtitypes.h: New file.
	* sysdeps/ia64/bits/xtitypes.h: New file.
	* sysdeps/x86_64/bits/xtitypes.h: New file.

	* sysvipc/Makefile (headers): Add bits/ipctypes.h here.
	* sysdeps/generic/bits/ipctypes.h: New file.
	* sysdeps/mips/bits/ipctypes.h: New file.
	* sysdeps/gnu/bits/shm.h: Include <bits/ipctypes.h>.
	* sysdeps/gnu/bits/msq.h: Likewise.
	* sysvipc/sys/ipc.h: Likewise.

2002-10-22  Roland McGrath  <roland@redhat.com>

	* sysdeps/generic/libc-tls.c (_dl_tls_static_used): New variable.
	* sysdeps/generic/ldsodefs.h (struct rtld_global): New member
	`_dl_tls_static_used'.
	(TLS_STATIC_MIN): New macro.
	* elf/dl-reloc.c [USE_TLS] (allocate_static_tls): New function.
	(CHECK_STATIC_TLS): Use it.

3 files changed, 232 insertions, 69 deletions

diff --git a/bits/ipctypes.h b/bits/ipctypes.h
new file mode 100644
index 0000000..b88ca1d
--- /dev/null
+++ b/bits/ipctypes.h
@@ -0,0 +1,37 @@
+/* bits/ipctypes.h -- Define some types used by SysV IPC/MSG/SHM.  Generic.
+   Copyright (C) 2002 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 Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+/*
+ * Never include <bits/ipctypes.h> directly.
+ */
+
+#ifndef _BITS_IPCTYPES_H
+#define _BITS_IPCTYPES_H	1
+
+#include <bits/types.h>
+
+/* Used in `struct shmid_ds'.  */
+# if __WORDSIZE == 32
+typedef unsigned short int __ipc_pid_t;
+# else
+typedef int __ipc_pid_t;
+# endif
+
+
+#endif /* bits/ipctypes.h */
diff --git a/bits/types.h b/bits/types.h
index f63a0f8..cb2802e 100644
--- a/bits/types.h
+++ b/bits/types.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991,1992,94-1999,2000,2001 Free Software Foundation, Inc.
+/* bits/types.h -- definitions of __*_t types underlying *_t types.
+   Copyright (C) 2002 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
@@ -24,18 +25,40 @@
 #define	_BITS_TYPES_H	1
 
 #include <features.h>
+#include <bits/wordsize.h>
 
 #define __need_size_t
 #include <stddef.h>
 
 /* Convenience types.  */
 typedef unsigned char __u_char;
-typedef unsigned short __u_short;
+typedef unsigned short int __u_short;
 typedef unsigned int __u_int;
-typedef unsigned long __u_long;
-#ifdef __GNUC__
-typedef unsigned long long int __u_quad_t;
-typedef long long int __quad_t;
+typedef unsigned long int __u_long;
+
+/* Fixed-size types, underlying types depend on word size and compiler.  */
+typedef signed char __int8_t;
+typedef unsigned char __uint8_t;
+typedef signed short int __int16_t;
+typedef unsigned short int __uint16_t;
+typedef signed int __int32_t;
+typedef unsigned int __uint32_t;
+#if __WORDSIZE == 64
+typedef signed long int __int64_t;
+typedef unsigned long int __uint64_t;
+#elif defined __GLIBC_HAVE_LONG_LONG
+__extension__ typedef signed long long int __int64_t;
+__extension__ typedef unsigned long long int __uint64_t;
+#endif
+
+/* quad_t is also 64 bits, but is traditionally defined as `long long'
+   even when `long' is also 64 bits.  */
+#ifdef __GLIBC_HAVE_LONG_LONG
+__extension__ typedef long long int __quad_t;
+__extension__ typedef unsigned long long int __u_quad_t;
+#elif __WORDSIZE == 64
+typedef long int __quad_t;
+typedef unsigned long int __u_quad_t;
 #else
 typedef struct
 {
@@ -46,86 +69,124 @@ typedef struct
   __u_long __val[2];
 } __u_quad_t;
 #endif
-typedef signed char __int8_t;
-typedef unsigned char __uint8_t;
-typedef signed short int __int16_t;
-typedef unsigned short int __uint16_t;
-typedef signed int __int32_t;
-typedef unsigned int __uint32_t;
-#ifdef __GNUC__
-typedef signed long long int __int64_t;
-typedef unsigned long long int __uint64_t;
-#endif
-typedef __quad_t *__qaddr_t;
 
-typedef int __dev_t;		/* Type of device numbers.  */
-typedef unsigned int __uid_t;	/* Type of user identifications.  */
-typedef unsigned int __gid_t;	/* Type of group identifications.  */
-typedef unsigned int __ino_t;	/* Type of file serial numbers.  */
-typedef __quad_t __ino64_t;	/* Type of file serial numbers (LFS).  */
-typedef unsigned int __mode_t;	/* Type of file attribute bitmasks.  */
-typedef unsigned short int __nlink_t; /* Type of file link counts.  */
-typedef long int __off_t;	/* Type of file sizes and offsets.  */
-typedef __quad_t __loff_t;	/* Type of file sizes and offsets.  */
-typedef __loff_t __off64_t;	/* Type of file sizes and offsets (LFS).  */
-typedef int __pid_t;		/* Type of process identifications.  */
-typedef int __ssize_t;		/* Type of a byte count, or error.  */
-typedef __u_quad_t __fsid_t;	/* Type of file system IDs.  */
-typedef long int __clock_t;	/* Type of CPU usage counts.  */
-typedef long int __rlim_t;	/* Type for resource measurement.  */
-typedef __quad_t __rlim64_t;	/* Type for resource measurement (LFS).  */
-typedef unsigned int __id_t;	/* General type for IDs.  */
-
-/* Everythin' else.  */
-typedef long int __daddr_t;	/* The type of a disk address.  */
-typedef char *__caddr_t;
-typedef long int __time_t;
-typedef unsigned int __useconds_t;
-typedef long int __suseconds_t;
-typedef long int __swblk_t;	/* Type of a swap block maybe?  */
-typedef long int __key_t;	/* Type of an IPC key */
-
+
+/* The machine-dependent file <bits/typesizes.h> defines __*_T_TYPE
+   macros for each of the OS types we define below.  The definitions
+   of those macros must use the following macros for underlying types.
+   We define __S<SIZE>_TYPE and __U<SIZE>_TYPE for the signed and unsigned
+   variants of each of the following integer types on this machine.
+
+	16		-- "natural" 16-bit type (always short)
+	32		-- "natural" 32-bit type (always int)
+	64		-- "natural" 64-bit type (long or long long)
+	LONG32		-- 32-bit type, traditionally long
+	QUAD		-- 64-bit type, always long long
+	WORD		-- natural type of __WORDSIZE bits (int or long)
+	LONGWORD	-- type of __WORDSIZE bits, traditionally long
+
+   We distinguish WORD/LONGWORD, 32/LONG32, and 64/QUAD so that the
+   conventional uses of `long' or `long long' type modifiers match the
+   types we define, even when a less-adorned type would be the same size.
+   This matters for (somewhat) portably writing printf/scanf formats for
+   these types, where using the appropriate l or ll format modifiers can
+   make the typedefs and the formats match up across all GNU platforms.  If
+   we used `long' when it's 64 bits where `long long' is expected, then the
+   compiler would warn about the formats not matching the argument types,
+   and the programmer changing them to shut up the compiler would break the
+   program's portability.
+
+   Here we assume what is presently the case in all the GCC configurations
+   we support: long long is always 64 bits, long is always word/address size,
+   and int is always 32 bits.  */
+
+#define	__S16_TYPE		short int
+#define __U16_TYPE		unsigned short int
+#define	__S32_TYPE		int
+#define __U32_TYPE		unsigned int
+#define __SLONGWORD_TYPE	long int
+#define __ULONGWORD_TYPE	unsigned long int
+#define	__SQUAD_TYPE		long long int
+#define	__UQUAD_TYPE		unsigned long long int
+#if __WORDSIZE == 32
+# define __SWORD_TYPE		int
+# define __UWORD_TYPE		unsigned int
+# define __SLONG32_TYPE		long int
+# define __ULONG32_TYPE		unsigned long int
+# define __S64_TYPE		__quad_t
+# define __U64_TYPE		__u_quad_t
+#elif __WORDSIZE == 64
+# define __SWORD_TYPE		long int
+# define __UWORD_TYPE		unsigned long int
+# define __SLONG32_TYPE		int
+# define __ULONG32_TYPE		unsigned int
+# define __S64_TYPE		long int
+# define __U64_TYPE		unsigned long int
+#else
+# error
+#endif
+#include <bits/typesizes.h>	/* Defines __*_T_TYPE macros.  */
+
+
+typedef __DEV_T_TYPE __dev_t;	/* Type of device numbers.  */
+typedef __UID_T_TYPE __uid_t;	/* Type of user identifications.  */
+typedef __GID_T_TYPE __gid_t;	/* Type of group identifications.  */
+typedef __INO_T_TYPE __ino_t;	/* Type of file serial numbers.  */
+typedef __INO64_T_TYPE __ino64_t; /* Type of file serial numbers (LFS).  */
+typedef __MODE_T_TYPE __mode_t;	/* Type of file attribute bitmasks.  */
+typedef __NLINK_T_TYPE __nlink_t; /* Type of file link counts.  */
+typedef __OFF_T_TYPE __off_t;	/* Type of file sizes and offsets.  */
+typedef __OFF64_T_TYPE __off64_t; /* Type of file sizes and offsets (LFS).  */
+typedef __PID_T_TYPE __pid_t;	/* Type of process identifications.  */
+typedef __FSID_T_TYPE __fsid_t;	/* Type of file system IDs.  */
+typedef __CLOCK_T_TYPE __clock_t; /* Type of CPU usage counts.  */
+typedef __RLIM_T_TYPE __rlim_t;	/* Type for resource measurement.  */
+typedef __RLIM64_T_TYPE __rlim64_t; /* Type for resource measurement (LFS).  */
+typedef __ID_T_TYPE __id_t;	/* General type for IDs.  */
+typedef __TIME_T_TYPE __time_t;	/* Seconds since the Epoch.  */
+typedef __USECONDS_T_TYPE __useconds_t; /* Count of microseconds.  */
+typedef __SUSECONDS_T_TYPE __suseconds_t; /* Signed count of microseconds.  */
+
+typedef __DADDR_T_TYPE __daddr_t; /* The type of a disk address.  */
+typedef __SWBLK_T_TYPE __swblk_t; /* Type of a swap block maybe?  */
+typedef __KEY_T_TYPE __key_t;	/* Type of an IPC key */
 
 /* Clock ID used in clock and timer functions.  */
-typedef int __clockid_t;
+typedef __CLOCKID_T_TYPE __clockid_t;
 
 /* Timer ID returned by `timer_create'.  */
-typedef int __timer_t;
-
-
-/* Number of descriptors that can fit in an `fd_set'.  */
-#define	__FD_SETSIZE	256
-
-
-/* XXX Used in `struct shmid_ds'.  */
-typedef unsigned short int __ipc_pid_t;
-
+typedef __TIMER_T_TYPE __timer_t;
 
 /* Type to represent block size.  */
-typedef unsigned int __blksize_t;
+typedef __BLKSIZE_T_TYPE __blksize_t;
 
 /* Types from the Large File Support interface.  */
 
-/* Type to count number os disk blocks.  */
-typedef long int __blkcnt_t;
-typedef __quad_t __blkcnt64_t;
+/* Type to count number of disk blocks.  */
+typedef __BLKCNT_T_TYPE __blkcnt_t;
+typedef __BLKCNT64_T_TYPE __blkcnt64_t;
 
 /* Type to count file system blocks.  */
-typedef unsigned int __fsblkcnt_t;
-typedef __u_quad_t __fsblkcnt64_t;
+typedef __FSBLKCNT_T_TYPE __fsblkcnt_t;
+typedef __FSBLKCNT64_T_TYPE __fsblkcnt64_t;
 
-/* Type to count file system inodes.  */
-typedef unsigned long int __fsfilcnt_t;
-typedef __u_quad_t __fsfilcnt64_t;
+/* Type to count file system nodes.  */
+typedef __FSFILCNT_T_TYPE __fsfilcnt_t;
+typedef __FSFILCNT64_T_TYPE __fsfilcnt64_t;
 
-/* Used in XTI.  */
-typedef int __t_scalar_t;
-typedef unsigned int __t_uscalar_t;
+
+/* These few don't really vary by system, they always correspond
+   to one of the other defined types.  */
+typedef __SWORD_TYPE __ssize_t; /* Type of a byte count, or error.  */
+typedef __off64_t __loff_t;	/* Type of file sizes and offsets (LFS).  */
+typedef __quad_t *__qaddr_t;
+typedef char *__caddr_t;
 
 /* Duplicates info from stdint.h but this is used in unistd.h.  */
-typedef long int __intptr_t;
+typedef __SWORD_TYPE __intptr_t;
 
 /* Duplicate info from sys/socket.h.  */
-typedef unsigned int __socklen_t;
+typedef __U32_TYPE __socklen_t;
+
 
 #endif /* bits/types.h */
diff --git a/bits/typesizes.h b/bits/typesizes.h
new file mode 100644
index 0000000..6d6de21
--- /dev/null
+++ b/bits/typesizes.h
@@ -0,0 +1,65 @@
+/* bits/typesizes.h -- underlying types for *_t.  Generic version.
+   Copyright (C) 2002 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 Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#ifndef _BITS_TYPES_H
+# error "Never include <bits/typesizes.h> directly; use <sys/types.h> instead."
+#endif
+
+#ifndef	_BITS_TYPESIZES_H
+#define	_BITS_TYPESIZES_H	1
+
+/* See <bits/types.h> for the meaning of these macros.  This file exists so
+   that <bits/types.h> need not vary across different GNU platforms.  */
+
+#define __DEV_T_TYPE		__UQUAD_TYPE
+#define __UID_T_TYPE		__U32_TYPE
+#define __GID_T_TYPE		__U32_TYPE
+#define __INO_T_TYPE		__ULONGWORD_TYPE
+#define __INO64_T_TYPE		__UQUAD_TYPE
+#define __MODE_T_TYPE		__U32_TYPE
+#define __NLINK_T_TYPE		__UWORD_TYPE
+#define __OFF_T_TYPE		__SLONGWORD_TYPE
+#define __OFF64_T_TYPE		__SQUAD_TYPE
+#define __PID_T_TYPE		__S32_TYPE
+#define __RLIM_T_TYPE		__ULONGWORD_TYPE
+#define __RLIM64_T_TYPE		__UQUAD_TYPE
+#define	__BLKCNT_T_TYPE		__SLONGWORD_TYPE
+#define	__BLKCNT64_T_TYPE	__SQUAD_TYPE
+#define	__FSBLKCNT_T_TYPE	__ULONGWORD_TYPE
+#define	__FSBLKCNT64_T_TYPE	__UQUAD_TYPE
+#define	__FSFILCNT_T_TYPE	__ULONGWORD_TYPE
+#define	__FSFILCNT64_T_TYPE	__UQUAD_TYPE
+#define	__ID_T_TYPE		__U32_TYPE
+#define __CLOCK_T_TYPE		__SLONGWORD_TYPE
+#define __TIME_T_TYPE		__SLONGWORD_TYPE
+#define __USECONDS_T_TYPE	__U32_TYPE
+#define __SUSECONDS_T_TYPE	__SLONGWORD_TYPE
+#define __DADDR_T_TYPE		__S32_TYPE
+#define __SWBLK_T_TYPE		__SLONGWORD_TYPE
+#define __KEY_T_TYPE		__S32_TYPE
+#define __CLOCKID_T_TYPE	__S32_TYPE
+#define __TIMER_T_TYPE		__S32_TYPE
+#define __BLKSIZE_T_TYPE	__SLONGWORD_TYPE
+#define __FSID_T_TYPE		struct { int __val[2]; }
+
+/* Number of descriptors that can fit in an `fd_set'.  */
+#define	__FD_SETSIZE		1024
+
+
+#endif /* bits/typesizes.h */