xm-a29k.h, [...]: Delete HOST_BITS_PER_* definitions which match the defaults provided in hwint.h.

	* config/a29k/xm-a29k.h, config/a29k/xm-unix.h,
	config/alpha/xm-alpha.h, config/arc/xm-arc.h, config/arm/xm-arm.h,
	config/c4x/xm-c4x.h, config/clipper/xm-clix.h,
	config/convex/xm-convex.h, config/d30v/xm-d30v.h,
	config/dsp16xx/xm-dsp16xx.h, config/elxsi/xm-elxsi.h,
	config/h8300/xm-h8300.h, config/i370/xm-i370.h,
	config/i370/xm-linux.h, config/i370/xm-mvs.h, config/i370/xm-oe.h,
	config/i386/xm-i386.h, config/i860/xm-i860.h,
	config/i960/xm-i960.h, config/ia64/xm-ia64.h,
	config/m32r/xm-m32r.h, config/m68k/xm-m68k.h,
	config/m88k/xm-m88k.h, config/mcore/xm-mcore.h,
	config/mips/xm-mips.h, config/mn10200/xm-mn10200.h,
	config/mn10300/xm-mn10300.h, config/ns32k/xm-ns32k.h,
	config/pa/xm-linux.h, config/pa/xm-pa.h, config/pa/xm-pa64hpux.h,
	config/pa/xm-pahpux.h, config/pa/xm-papro.h, config/pj/xm-pj.h,
	config/romp/xm-romp.h, config/rs6000/xm-beos.h,
	config/rs6000/xm-lynx.h, config/rs6000/xm-rs6000.h,
	config/rs6000/xm-sysv4.h, config/sh/xm-sh.h,
	config/sparc/xm-sparc.h, config/sparc/xm-sysv4.h,
	config/v850/xm-v850.h, config/vax/xm-vax.h, config/vax/xm-vms.h,
	config/we32k/xm-we32k.h: Delete HOST_BITS_PER_* definitions which
	match the defaults provided in hwint.h.

	* config/i386/xm-lynx.h, config/m68k/xm-lynx.h,
	config/sparc/xm-lynx.h, config/xm-std32.h: Delete files.

	* config.gcc (xm_file): Don't set to files which are deleted.

	* hwint.h: Provide default values for HOST_BITS_PER_*.  No longer
	guard this file against these macros being undefined.

From-SVN: r40262

53 files changed, 52 insertions, 388 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1b1b3d092cc..a76bdbcf875 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,36 @@
+2001-03-06  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* config/a29k/xm-a29k.h, config/a29k/xm-unix.h,
+	config/alpha/xm-alpha.h, config/arc/xm-arc.h, config/arm/xm-arm.h,
+	config/c4x/xm-c4x.h, config/clipper/xm-clix.h,
+	config/convex/xm-convex.h, config/d30v/xm-d30v.h,
+	config/dsp16xx/xm-dsp16xx.h, config/elxsi/xm-elxsi.h,
+	config/h8300/xm-h8300.h, config/i370/xm-i370.h,
+	config/i370/xm-linux.h, config/i370/xm-mvs.h, config/i370/xm-oe.h,
+	config/i386/xm-i386.h, config/i860/xm-i860.h,
+	config/i960/xm-i960.h, config/ia64/xm-ia64.h,
+	config/m32r/xm-m32r.h, config/m68k/xm-m68k.h,
+	config/m88k/xm-m88k.h, config/mcore/xm-mcore.h,
+	config/mips/xm-mips.h, config/mn10200/xm-mn10200.h,
+	config/mn10300/xm-mn10300.h, config/ns32k/xm-ns32k.h,
+	config/pa/xm-linux.h, config/pa/xm-pa.h, config/pa/xm-pa64hpux.h,
+	config/pa/xm-pahpux.h, config/pa/xm-papro.h, config/pj/xm-pj.h,
+	config/romp/xm-romp.h, config/rs6000/xm-beos.h,
+	config/rs6000/xm-lynx.h, config/rs6000/xm-rs6000.h,
+	config/rs6000/xm-sysv4.h, config/sh/xm-sh.h,
+	config/sparc/xm-sparc.h, config/sparc/xm-sysv4.h,
+	config/v850/xm-v850.h, config/vax/xm-vax.h, config/vax/xm-vms.h,
+	config/we32k/xm-we32k.h: Delete HOST_BITS_PER_* definitions which
+	match the defaults provided in hwint.h.
+
+	* config/i386/xm-lynx.h, config/m68k/xm-lynx.h,
+	config/sparc/xm-lynx.h, config/xm-std32.h: Delete files.
+
+	* config.gcc (xm_file): Don't set to files which are deleted.
+
+	* hwint.h: Provide default values for HOST_BITS_PER_*.  No longer
+	guard this file against these macros being undefined.
+
 2001-03-06  Zack Weinberg  <zackw@stanford.edu>
 
 	* objc/objc-act.c (objc_add_static_instance): Set DECL_INITIAL
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 0128d33b66e..61106b60c3c 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1198,7 +1198,6 @@ i[34567]86-*-lynxos*)
 	else
 		tm_file=i386/lynx-ng.h
 	fi
-	xm_file=i386/xm-lynx.h
 	tmake_file=i386/t-i386bare
 	xmake_file=x-lynx
 	;;
@@ -1925,7 +1924,6 @@ m68k-*-lynxos*)
 	else
 		tm_file=m68k/lynx-ng.h
 	fi
-	xm_file=m68k/xm-lynx.h
 	xmake_file=x-lynx
 	tmake_file=m68k/t-lynx
 	extra_headers=math-68881.h
@@ -2962,7 +2960,6 @@ sparc-*-lynxos*)
 	else
 		tm_file=sparc/lynx-ng.h
 	fi
-	xm_file=sparc/xm-lynx.h
 	tmake_file=sparc/t-sunos41
 	xmake_file=x-lynx
 	;;
diff --git a/gcc/config/a29k/xm-a29k.h b/gcc/config/a29k/xm-a29k.h
index 4b728e0e762..db93e56f40b 100644
--- a/gcc/config/a29k/xm-a29k.h
+++ b/gcc/config/a29k/xm-a29k.h
@@ -19,10 +19,4 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 /* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
-
 #define HOST_WORDS_BIG_ENDIAN
diff --git a/gcc/config/a29k/xm-unix.h b/gcc/config/a29k/xm-unix.h
index c964e1bafa2..0317d086c55 100644
--- a/gcc/config/a29k/xm-unix.h
+++ b/gcc/config/a29k/xm-unix.h
@@ -19,12 +19,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 /* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
-
 #define HOST_WORDS_BIG_ENDIAN
 
 /* Ultra is V7, which is closest to USG.  */
diff --git a/gcc/config/alpha/xm-alpha.h b/gcc/config/alpha/xm-alpha.h
index 1531a8e2682..ec4680d546c 100644
--- a/gcc/config/alpha/xm-alpha.h
+++ b/gcc/config/alpha/xm-alpha.h
@@ -21,11 +21,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 /* This describes the machine the compiler is hosted on.  */
-#define	HOST_BITS_PER_CHAR	8
-#define	HOST_BITS_PER_SHORT	16
-#define	HOST_BITS_PER_INT	32
 #define	HOST_BITS_PER_LONG	64
-#define HOST_BITS_PER_LONGLONG  64
 
 /* The host compiler has problems with enum bitfields since it makes
    them signed so we can't fit all our codes in.  */
diff --git a/gcc/config/arc/xm-arc.h b/gcc/config/arc/xm-arc.h
index a98d9c3fc69..2fc91311f23 100644
--- a/gcc/config/arc/xm-arc.h
+++ b/gcc/config/arc/xm-arc.h
@@ -19,12 +19,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 /* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
-
 /* Doubles are stored in memory with the high order word first.  This
    matters when cross-compiling.  */
 #define HOST_WORDS_BIG_ENDIAN 1
diff --git a/gcc/config/arm/xm-arm.h b/gcc/config/arm/xm-arm.h
index ff16b71b692..89f39d1f1a9 100644
--- a/gcc/config/arm/xm-arm.h
+++ b/gcc/config/arm/xm-arm.h
@@ -22,11 +22,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 /* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
 
 /* A code distinguishing the floating point format of the host
    machine.  There are three defined values: IEEE_FLOAT_FORMAT,
diff --git a/gcc/config/c4x/xm-c4x.h b/gcc/config/c4x/xm-c4x.h
index 5f75da923e5..ee179cb5558 100644
--- a/gcc/config/c4x/xm-c4x.h
+++ b/gcc/config/c4x/xm-c4x.h
@@ -1,8 +1,5 @@
 /* This describes the machine the compiler is hosted on.  */
 #define HOST_BITS_PER_CHAR 32
 #define HOST_BITS_PER_SHORT 32
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
 
 #define HOST_WORDS_BIG_ENDIAN
diff --git a/gcc/config/clipper/xm-clix.h b/gcc/config/clipper/xm-clix.h
index 4b4a3a013c0..0a4eec0e03c 100644
--- a/gcc/config/clipper/xm-clix.h
+++ b/gcc/config/clipper/xm-clix.h
@@ -1,10 +1,3 @@
 /* Config file for Clipper running Clix, system V. 3.2 clone  */
 
-/* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
-
 #define USG
diff --git a/gcc/config/convex/xm-convex.h b/gcc/config/convex/xm-convex.h
index 1d464bdabb0..9ea77577232 100644
--- a/gcc/config/convex/xm-convex.h
+++ b/gcc/config/convex/xm-convex.h
@@ -19,11 +19,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 /* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
 
 /* Convex uses Vax or IEEE floats.
    Both formats have Vax semantics. */
diff --git a/gcc/config/d30v/xm-d30v.h b/gcc/config/d30v/xm-d30v.h
index b4ba49fd8f8..a933b3b6893 100644
--- a/gcc/config/d30v/xm-d30v.h
+++ b/gcc/config/d30v/xm-d30v.h
@@ -22,15 +22,3 @@
 /* Defined if the host machine stores words of multi-word values in big-endian
    order.  (GNU CC does not depend on the host byte ordering within a word.)  */
 #define HOST_WORDS_BIG_ENDIAN
-
-/* A C expression for the number of bits in `char' on the host machine.  */
-#define HOST_BITS_PER_CHAR 8
-
-/* A C expression for the number of bits in `short' on the host machine.  */
-#define HOST_BITS_PER_SHORT 16
-
-/* A C expression for the number of bits in `int' on the host machine.  */
-#define HOST_BITS_PER_INT 32
-
-/* A C expression for the number of bits in `long' on the host machine.  */
-#define HOST_BITS_PER_LONG 32
diff --git a/gcc/config/dsp16xx/xm-dsp16xx.h b/gcc/config/dsp16xx/xm-dsp16xx.h
index c02c8a9b2c0..80786e4146b 100644
--- a/gcc/config/dsp16xx/xm-dsp16xx.h
+++ b/gcc/config/dsp16xx/xm-dsp16xx.h
@@ -20,8 +20,4 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 /* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
 #define HOST_BITS_PER_INT 16
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
diff --git a/gcc/config/elxsi/xm-elxsi.h b/gcc/config/elxsi/xm-elxsi.h
index 47845d0bc94..14bef92667e 100644
--- a/gcc/config/elxsi/xm-elxsi.h
+++ b/gcc/config/elxsi/xm-elxsi.h
@@ -18,8 +18,3 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
diff --git a/gcc/config/h8300/xm-h8300.h b/gcc/config/h8300/xm-h8300.h
index 10a1269e5c9..95a094fde9d 100644
--- a/gcc/config/h8300/xm-h8300.h
+++ b/gcc/config/h8300/xm-h8300.h
@@ -19,8 +19,4 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 /* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
 #define HOST_BITS_PER_INT 16
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
diff --git a/gcc/config/i370/xm-i370.h b/gcc/config/i370/xm-i370.h
index 187f762286f..d36d754a084 100644
--- a/gcc/config/i370/xm-i370.h
+++ b/gcc/config/i370/xm-i370.h
@@ -22,11 +22,6 @@ Boston, MA 02111-1307, USA.  */
 
 /* This describes the machine the compiler is hosted on.  */
 
-#define HOST_BITS_PER_CHAR	8
-#define HOST_BITS_PER_SHORT	16
-#define HOST_BITS_PER_INT	32
-#define HOST_BITS_PER_LONG	32
-#define HOST_BITS_PER_LONGLONG	64
 #define HOST_FLOAT_FORMAT	IBM_FLOAT_FORMAT
 #define HOST_EBCDIC		1
 
diff --git a/gcc/config/i370/xm-linux.h b/gcc/config/i370/xm-linux.h
index 7a8170168ea..639a03bf1cd 100644
--- a/gcc/config/i370/xm-linux.h
+++ b/gcc/config/i370/xm-linux.h
@@ -22,11 +22,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 /* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR	8
-#define HOST_BITS_PER_SHORT	16
-#define HOST_BITS_PER_INT	32
-#define HOST_BITS_PER_LONG	32
-#define HOST_BITS_PER_LONGLONG	64
 #define HOST_FLOAT_FORMAT	IEEE_FLOAT_FORMAT
 
 #define HOST_WORDS_BIG_ENDIAN    
diff --git a/gcc/config/i370/xm-mvs.h b/gcc/config/i370/xm-mvs.h
index 040f86677d6..7fb979406b1 100644
--- a/gcc/config/i370/xm-mvs.h
+++ b/gcc/config/i370/xm-mvs.h
@@ -22,11 +22,6 @@ Boston, MA 02111-1307, USA.  */
 
 /* This describes the machine the compiler is hosted on.  */
 
-#define HOST_BITS_PER_CHAR	8
-#define HOST_BITS_PER_SHORT	16
-#define HOST_BITS_PER_INT	32
-#define HOST_BITS_PER_LONG	32
-#define HOST_BITS_PER_LONGLONG	64
 #define HOST_FLOAT_FORMAT	IBM_FLOAT_FORMAT
 #define HOST_EBCDIC		1
 
diff --git a/gcc/config/i370/xm-oe.h b/gcc/config/i370/xm-oe.h
index ddd90899c0b..b705ba65604 100644
--- a/gcc/config/i370/xm-oe.h
+++ b/gcc/config/i370/xm-oe.h
@@ -22,10 +22,7 @@ Boston, MA 02111-1307, USA.  */
 
 /* This describes the machine the compiler is hosted on.  */
 
-#define HOST_BITS_PER_CHAR	8
-#define HOST_BITS_PER_SHORT	16
-#define HOST_BITS_PER_INT	32
-#define HOST_BITS_PER_LONG	32
+/* ??? Is this a typo?  */
 #define HOST_BITS_PER_LONGLONG	32
 #define HOST_FLOAT_FORMAT	IBM_FLOAT_FORMAT
 #define HOST_EBCDIC		1
diff --git a/gcc/config/i386/xm-i386.h b/gcc/config/i386/xm-i386.h
index c0ab0cdaf73..9f5b5500fc7 100644
--- a/gcc/config/i386/xm-i386.h
+++ b/gcc/config/i386/xm-i386.h
@@ -21,10 +21,3 @@ Boston, MA 02111-1307, USA.  */
 #ifndef __i386__
 #define __i386__ 1
 #endif
-
-/* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
diff --git a/gcc/config/i386/xm-lynx.h b/gcc/config/i386/xm-lynx.h
deleted file mode 100644
index 487c43bfa8b..00000000000
--- a/gcc/config/i386/xm-lynx.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Configuration for GNU C-compiler for i386 platforms running LynxOS.
-   Copyright (C) 1995 Free Software Foundation, Inc.
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
diff --git a/gcc/config/i860/xm-i860.h b/gcc/config/i860/xm-i860.h
index 96e5124beb1..789d541e9d1 100644
--- a/gcc/config/i860/xm-i860.h
+++ b/gcc/config/i860/xm-i860.h
@@ -18,9 +18,3 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
diff --git a/gcc/config/i960/xm-i960.h b/gcc/config/i960/xm-i960.h
index 3617cae11b6..95645b3ebe8 100644
--- a/gcc/config/i960/xm-i960.h
+++ b/gcc/config/i960/xm-i960.h
@@ -18,9 +18,3 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
diff --git a/gcc/config/ia64/xm-ia64.h b/gcc/config/ia64/xm-ia64.h
index b85ccab5182..829d54a4f51 100644
--- a/gcc/config/ia64/xm-ia64.h
+++ b/gcc/config/ia64/xm-ia64.h
@@ -24,20 +24,7 @@ Boston, MA 02111-1307, USA.  */
 #define HOST_WORDS_BIG_ENDIAN
 #endif
 
-/* A C expression for the number of bits in `char' on the host machine.  */
-#define HOST_BITS_PER_CHAR 8
-
-/* A C expression for the number of bits in `short' on the host machine.  */
-#define HOST_BITS_PER_SHORT 16
-
-/* A C expression for the number of bits in `int' on the host machine.  */
-#define HOST_BITS_PER_INT 32
-
 /* ??? This depends on the as yet unimplemented ILP32 option.  */
 
 /* A C expression for the number of bits in `long' on the host machine.  */
 #define HOST_BITS_PER_LONG 64
-
-/* A C expression for the number of bits in `long long' on the host
-   machine.  */
-#define HOST_BITS_PER_LONGLONG 64
diff --git a/gcc/config/m32r/xm-m32r.h b/gcc/config/m32r/xm-m32r.h
index c99240ad71d..05098f81752 100644
--- a/gcc/config/m32r/xm-m32r.h
+++ b/gcc/config/m32r/xm-m32r.h
@@ -18,13 +18,6 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
-
 /* Doubles are stored in memory with the high order word first.  This
    matters when cross-compiling.  */
 #define HOST_WORDS_BIG_ENDIAN 1
diff --git a/gcc/config/m68k/xm-lynx.h b/gcc/config/m68k/xm-lynx.h
deleted file mode 100644
index 5fc1596868a..00000000000
--- a/gcc/config/m68k/xm-lynx.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Configuration for GNU C-compiler for all platforms running LynxOS.
-   Copyright (C) 1993, 1995 Free Software Foundation, Inc.
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
-
-#define HOST_WORDS_BIG_ENDIAN 1
diff --git a/gcc/config/m68k/xm-m68k.h b/gcc/config/m68k/xm-m68k.h
index 38aa49d4acf..79ec739124b 100644
--- a/gcc/config/m68k/xm-m68k.h
+++ b/gcc/config/m68k/xm-m68k.h
@@ -19,10 +19,4 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 /* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
-
 #define HOST_WORDS_BIG_ENDIAN
diff --git a/gcc/config/m88k/xm-m88k.h b/gcc/config/m88k/xm-m88k.h
index 38140f45041..fb49699ee06 100644
--- a/gcc/config/m88k/xm-m88k.h
+++ b/gcc/config/m88k/xm-m88k.h
@@ -21,12 +21,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 /* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
-
 #define HOST_WORDS_BIG_ENDIAN
 
 /* The 88open BCS (and ABI) environment doesn't support BSD features
diff --git a/gcc/config/mcore/xm-mcore.h b/gcc/config/mcore/xm-mcore.h
index bdbe862e2ec..88b6139a625 100644
--- a/gcc/config/mcore/xm-mcore.h
+++ b/gcc/config/mcore/xm-mcore.h
@@ -17,8 +17,3 @@ You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-/* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR   8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT   32
-#define HOST_BITS_PER_LONG  32
diff --git a/gcc/config/mips/xm-mips.h b/gcc/config/mips/xm-mips.h
index eabe3a5940b..22dc142302c 100644
--- a/gcc/config/mips/xm-mips.h
+++ b/gcc/config/mips/xm-mips.h
@@ -20,12 +20,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 /* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
-
 #if !defined(MIPSEL) && !defined(__MIPSEL__)
 #define HOST_WORDS_BIG_ENDIAN
 #endif
diff --git a/gcc/config/mn10200/xm-mn10200.h b/gcc/config/mn10200/xm-mn10200.h
index 1a96a4d9aa4..18c5af22bcb 100644
--- a/gcc/config/mn10200/xm-mn10200.h
+++ b/gcc/config/mn10200/xm-mn10200.h
@@ -20,8 +20,4 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 /* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
 #define HOST_BITS_PER_INT 16
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
diff --git a/gcc/config/mn10300/xm-mn10300.h b/gcc/config/mn10300/xm-mn10300.h
index 7e46bd1db8f..013fe4badf4 100644
--- a/gcc/config/mn10300/xm-mn10300.h
+++ b/gcc/config/mn10300/xm-mn10300.h
@@ -18,10 +18,3 @@ You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
-
-/* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
diff --git a/gcc/config/ns32k/xm-ns32k.h b/gcc/config/ns32k/xm-ns32k.h
index 6bb66d22d25..9ab49fbc905 100644
--- a/gcc/config/ns32k/xm-ns32k.h
+++ b/gcc/config/ns32k/xm-ns32k.h
@@ -17,10 +17,3 @@ You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
-
-/* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
diff --git a/gcc/config/pa/xm-linux.h b/gcc/config/pa/xm-linux.h
index 57527414fa6..9f8881a2f5d 100644
--- a/gcc/config/pa/xm-linux.h
+++ b/gcc/config/pa/xm-linux.h
@@ -19,12 +19,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 /* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
-
 /* Doubles are stored in memory with the high order word first.  This
    matters when cross-compiling.  */
 #define HOST_WORDS_BIG_ENDIAN 1
diff --git a/gcc/config/pa/xm-pa.h b/gcc/config/pa/xm-pa.h
index 231df9e031f..8f0fd8d3e15 100644
--- a/gcc/config/pa/xm-pa.h
+++ b/gcc/config/pa/xm-pa.h
@@ -20,12 +20,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 /* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
-
 /* Doubles are stored in memory with the high order word first.  This
    matters when cross-compiling.  */
 #define HOST_WORDS_BIG_ENDIAN 1
diff --git a/gcc/config/pa/xm-pa64hpux.h b/gcc/config/pa/xm-pa64hpux.h
index 34396971c3f..030084f03ea 100644
--- a/gcc/config/pa/xm-pa64hpux.h
+++ b/gcc/config/pa/xm-pa64hpux.h
@@ -22,11 +22,7 @@ Boston, MA 02111-1307, USA.  */
 #define USG
 
 /* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
 #define HOST_BITS_PER_LONG 64
-#define HOST_BITS_PER_LONGLONG 64
 
 /* Doubles are stored in memory with the high order word first.  This
    matters when cross-compiling.  */
diff --git a/gcc/config/pa/xm-pahpux.h b/gcc/config/pa/xm-pahpux.h
index 9d0d455d873..7e84b657d79 100644
--- a/gcc/config/pa/xm-pahpux.h
+++ b/gcc/config/pa/xm-pahpux.h
@@ -23,12 +23,6 @@ Boston, MA 02111-1307, USA.  */
 #define USG
 
 /* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
-
 /* Doubles are stored in memory with the high order word first.  This
    matters when cross-compiling.  */
 #define HOST_WORDS_BIG_ENDIAN 1
diff --git a/gcc/config/pa/xm-papro.h b/gcc/config/pa/xm-papro.h
index 534d0378c43..6cc53b07a73 100644
--- a/gcc/config/pa/xm-papro.h
+++ b/gcc/config/pa/xm-papro.h
@@ -20,12 +20,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 /* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
-
 /* Doubles are stored in memory with the high order word first.  This
    matters when cross-compiling.  */
 #define HOST_WORDS_BIG_ENDIAN 1
diff --git a/gcc/config/pj/xm-pj.h b/gcc/config/pj/xm-pj.h
index 892bcf8c282..f39238fc354 100644
--- a/gcc/config/pj/xm-pj.h
+++ b/gcc/config/pj/xm-pj.h
@@ -18,9 +18,3 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
diff --git a/gcc/config/romp/xm-romp.h b/gcc/config/romp/xm-romp.h
index c12fd3dd697..392f1368f75 100644
--- a/gcc/config/romp/xm-romp.h
+++ b/gcc/config/romp/xm-romp.h
@@ -19,12 +19,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 /* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
-
 #define HOST_WORDS_BIG_ENDIAN
 
 /* If compiled with hc, use the built-in memcpy.
diff --git a/gcc/config/rs6000/xm-beos.h b/gcc/config/rs6000/xm-beos.h
index caebbcb9b61..d0b68298a91 100644
--- a/gcc/config/rs6000/xm-beos.h
+++ b/gcc/config/rs6000/xm-beos.h
@@ -22,13 +22,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 /* This describes the machine the compiler is hosted on.  */
-
-#define	HOST_BITS_PER_CHAR	8
-#define	HOST_BITS_PER_SHORT	16
-#define	HOST_BITS_PER_INT	32
-#define	HOST_BITS_PER_LONG	32
-#define HOST_BITS_PER_LONGLONG	64
-
 #define	HOST_WORDS_BIG_ENDIAN
 
 /* Use only int bitfields.  */
diff --git a/gcc/config/rs6000/xm-lynx.h b/gcc/config/rs6000/xm-lynx.h
index 90700355c7b..fdbff636c2d 100644
--- a/gcc/config/rs6000/xm-lynx.h
+++ b/gcc/config/rs6000/xm-lynx.h
@@ -19,10 +19,4 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 /* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
-
 #define HOST_WORDS_BIG_ENDIAN 1
diff --git a/gcc/config/rs6000/xm-rs6000.h b/gcc/config/rs6000/xm-rs6000.h
index a815a9d9445..29e1f630567 100644
--- a/gcc/config/rs6000/xm-rs6000.h
+++ b/gcc/config/rs6000/xm-rs6000.h
@@ -20,12 +20,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 /* This describes the machine the compiler is hosted on.  */
-#define	HOST_BITS_PER_CHAR	8
-#define	HOST_BITS_PER_SHORT	16
-#define	HOST_BITS_PER_INT	32
-#define	HOST_BITS_PER_LONG	32
-#define	HOST_BITS_PER_LONGLONG	64
-
 #define	HOST_WORDS_BIG_ENDIAN
 
 /* If not compiled with GNU C, use only int bitfields.  */
diff --git a/gcc/config/rs6000/xm-sysv4.h b/gcc/config/rs6000/xm-sysv4.h
index 25aecfe4e5b..9eb1cd51fd4 100644
--- a/gcc/config/rs6000/xm-sysv4.h
+++ b/gcc/config/rs6000/xm-sysv4.h
@@ -20,12 +20,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 /* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
-
 /* Doubles are stored in memory with the high order word first.  This
    matters when cross-compiling.  */
 #define HOST_WORDS_BIG_ENDIAN 1
diff --git a/gcc/config/sh/xm-sh.h b/gcc/config/sh/xm-sh.h
index 9c7bdfd491c..2d6e4cddb63 100644
--- a/gcc/config/sh/xm-sh.h
+++ b/gcc/config/sh/xm-sh.h
@@ -18,8 +18,3 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
diff --git a/gcc/config/sparc/xm-lynx.h b/gcc/config/sparc/xm-lynx.h
deleted file mode 100644
index d6a4740be9f..00000000000
--- a/gcc/config/sparc/xm-lynx.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Configuration for GNU C-compiler for sparc platforms running LynxOS.
-   Copyright (C) 1995 Free Software Foundation, Inc.
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
-
-#define HOST_WORDS_BIG_ENDIAN 1
diff --git a/gcc/config/sparc/xm-sparc.h b/gcc/config/sparc/xm-sparc.h
index 23cafdc3250..eab6c74cda6 100644
--- a/gcc/config/sparc/xm-sparc.h
+++ b/gcc/config/sparc/xm-sparc.h
@@ -20,12 +20,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 /* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
-
 /* Doubles are stored in memory with the high order word first.  This
    matters when cross-compiling.  */
 #define HOST_WORDS_BIG_ENDIAN 1
diff --git a/gcc/config/sparc/xm-sysv4.h b/gcc/config/sparc/xm-sysv4.h
index 0465079ea7b..06d8bb2f656 100644
--- a/gcc/config/sparc/xm-sysv4.h
+++ b/gcc/config/sparc/xm-sysv4.h
@@ -20,12 +20,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 /* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
-
 /* Doubles are stored in memory with the high order word first.  This
    matters when cross-compiling.  */
 #define HOST_WORDS_BIG_ENDIAN 1
diff --git a/gcc/config/v850/xm-v850.h b/gcc/config/v850/xm-v850.h
index decd33939d2..add710b2a20 100644
--- a/gcc/config/v850/xm-v850.h
+++ b/gcc/config/v850/xm-v850.h
@@ -19,9 +19,3 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
diff --git a/gcc/config/vax/xm-vax.h b/gcc/config/vax/xm-vax.h
index a029787b8c3..8163a82d512 100644
--- a/gcc/config/vax/xm-vax.h
+++ b/gcc/config/vax/xm-vax.h
@@ -19,11 +19,5 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 /* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
-
 /* This machine doesn't use IEEE floats.  */
 #define HOST_FLOAT_FORMAT VAX_FLOAT_FORMAT
diff --git a/gcc/config/vax/xm-vms.h b/gcc/config/vax/xm-vms.h
index bdba6285dc1..4be0d39b2ee 100644
--- a/gcc/config/vax/xm-vms.h
+++ b/gcc/config/vax/xm-vms.h
@@ -41,12 +41,6 @@ Boston, MA 02111-1307, USA.  */
 #endif
 
 /* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
-
 #define HOST_FLOAT_FORMAT VAX_FLOAT_FORMAT
 
 #define SUCCESS_EXIT_CODE 1
diff --git a/gcc/config/we32k/xm-we32k.h b/gcc/config/we32k/xm-we32k.h
index 4440f3de80b..5377140bade 100644
--- a/gcc/config/we32k/xm-we32k.h
+++ b/gcc/config/we32k/xm-we32k.h
@@ -20,12 +20,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 /* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
-
 #define HOST_WORDS_BIG_ENDIAN
 
 #ifndef MAXPATHLEN
diff --git a/gcc/config/xm-std32.h b/gcc/config/xm-std32.h
deleted file mode 100644
index 1f8ed6879be..00000000000
--- a/gcc/config/xm-std32.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Configuration for GNU C-compiler for standard 32-bit host machine.
-   Copyright (C) 1997, 2001 Free Software Foundation, Inc.
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC 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 General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* This describes the machine the compiler is hosted on.  */
-#define HOST_BITS_PER_CHAR 8
-#define HOST_BITS_PER_SHORT 16
-#define HOST_BITS_PER_INT 32
-#define HOST_BITS_PER_LONG 32
-#define HOST_BITS_PER_LONGLONG 64
diff --git a/gcc/hwint.h b/gcc/hwint.h
index 91973b8187a..28614d5ee5b 100644
--- a/gcc/hwint.h
+++ b/gcc/hwint.h
@@ -9,9 +9,24 @@
 #ifndef __HWINT_H__
 #define __HWINT_H__
 
-/* Only do all of this if both of these macros are defined, otherwise
-   they'll evaluate to zero, which is not what you want. */
-#if defined (HOST_BITS_PER_LONG) && defined (HOST_BITS_PER_INT)
+/* This describes the machine the compiler is hosted on.  The defaults
+   we provide describe the standard 32 bit host since that is the most
+   common type supported in gcc.  */
+#ifndef HOST_BITS_PER_CHAR
+# define HOST_BITS_PER_CHAR 8
+#endif
+#ifndef HOST_BITS_PER_SHORT
+# define HOST_BITS_PER_SHORT 16
+#endif
+#ifndef HOST_BITS_PER_INT
+# define HOST_BITS_PER_INT 32
+#endif
+#ifndef HOST_BITS_PER_LONG
+# define HOST_BITS_PER_LONG 32
+#endif
+#ifndef HOST_BITS_PER_LONGLONG
+# define HOST_BITS_PER_LONGLONG 64
+#endif
 
 /* Find the largest host integer type and set its size and type.  */
 
@@ -91,6 +106,4 @@
 # endif
 #endif /* ! HOST_WIDE_INT_PRINT_DOUBLE_HEX */
 
-#endif /* HOST_BITS_PER_LONG && HOST_BITS_PER_INT */
-
 #endif /* __HWINT_H__ */