* sysdeps/generic/gmp-mparam.h: Include <bits/wordsize.h>.

	(BITS_PER_MP_LIMB, BYTES_PER_MP_LIMB, BITS_PER_LONGINT): Define in
	terms of __WORDSIZE.
	* sysdeps/x86_64/gmp-mparam.h: File removed.
	* sysdeps/sparc/gmp-mparam.h: File removed.
	* sysdeps/mips/mips64/gmp-mparam.h: File removed.
	* sysdeps/ia64/gmp-mparam.h: File removed.
	* sysdeps/alpha/gmp-mparam.h: File removed.

ChangeLog

@@ -1,3 +1,14 @@
+2002-09-20  Roland McGrath  <roland@redhat.com>
+
+	* sysdeps/generic/gmp-mparam.h: Include <bits/wordsize.h>.
+	(BITS_PER_MP_LIMB, BYTES_PER_MP_LIMB, BITS_PER_LONGINT): Define in
+	terms of __WORDSIZE.
+	* sysdeps/x86_64/gmp-mparam.h: File removed.
+	* sysdeps/sparc/gmp-mparam.h: File removed.
+	* sysdeps/mips/mips64/gmp-mparam.h: File removed.
+	* sysdeps/ia64/gmp-mparam.h: File removed.
+	* sysdeps/alpha/gmp-mparam.h: File removed.
+
 2002-09-20  Steven Munroe  <sjmunroe@us.ibm.com>
 
 	* sysdeps/powerpc/elf/libc-start.c: Use long in place of int for argc

sysdeps/generic/gmp-mparam.h

@@ -1,6 +1,5 @@
 /* gmp-mparam.h -- Compiler/machine parameter header file.
-
-Copyright (C) 1991, 1993, 1994 Free Software Foundation, Inc.
+Copyright (C) 1991,93,94,2002 Free Software Foundation, Inc.
 
 This file is part of the GNU MP Library.
 
@@ -19,9 +18,11 @@ along with the GNU MP 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. */
 
-#define BITS_PER_MP_LIMB 32
-#define BYTES_PER_MP_LIMB 4
-#define BITS_PER_LONGINT 32
-#define BITS_PER_INT 32
-#define BITS_PER_SHORTINT 16
-#define BITS_PER_CHAR 8
+#include <bits/wordsize.h>
+
+#define BITS_PER_MP_LIMB	__WORDSIZE
+#define BYTES_PER_MP_LIMB	(__WORDSIZE / 8)
+#define BITS_PER_LONGINT	__WORDSIZE
+#define BITS_PER_INT		32
+#define BITS_PER_SHORTINT	16
+#define BITS_PER_CHAR		8