From eaf4e6183e957581cc1a01378a88f7ca571e7db7 Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zack@gcc.gnu.org>
Date: Sat, 3 Mar 2001 03:32:55 +0000
Subject: [PATCH] configure.in: Kill tm.h.

	* configure.in: Kill tm.h.  Include the files in the $tm_file
	list in all three of config.h, hconfig.h, tconfig.h, after the
	relevant set of xm_files.  Put TARGET_CPU_DEFAULT in all
	three, include insn-codes.h in all three (#ifndef GENERATOR_FILE).
	* configure: Regenerate.
	* Makefile.in (clean): Don't delete tm.h.

	* system.h: If SUCCESS_EXIT_CODE and FATAL_EXIT_CODE are not
	defined, set them from EXIT_SUCCESS and EXIT_FAILURE.  If
	those are not defined, set SEC and FEC to 0 and 1.
	* gcc.texi: Update to match.

	* crtstuff.c: Include tconfig.h, not auto-host.h and tm.h.
	* config/fp-bit.c, config/m68k/aux-crt2.asm,
	config/m68k/aux-crtn.asm, config/m68k/aux-mcount.c:
	Include tconfig.h, not tm.h.

	* config/xm-lynx.h, config/xm-std32.h,
	config/a29k/xm-a29k.h, config/a29k/xm-unix.h,
	config/alpha/xm-alpha.h, config/arc/xm-arc.h,
	config/avr/xm-avr.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/fr30/xm-fr30.h,
	config/h8300/xm-h8300.h, config/i370/xm-linux.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/m68hc11/xm-m68hc11.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/pdp11/xm-pdp11.h,
	config/pj/xm-pj.h, config/romp/xm-romp.h,
	config/rs6000/xm-beos.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/we32k/xm-we32k.h:
	Don't include tm.h.
	Don't define SUCCESS_EXIT_CODE or FATAL_EXIT_CODE.

	* config/i370/xm-i370.h, config/i370/xm-mvs.h,
	config/i370/xm-oe.h: Don't include tm.h.  Don't define
	SUCCESS_EXIT_CODE.
	* config/vax/xm-vms.h: Don't include tm.h.

	* config/xm-lynx.h, config/avr/xm-avr.h,
	config/fr30/xm-fr30.h, config/pdp11/xm-pdp11.h,
	Delete; made empty by above changes.
	* config/i386/xm-lynx.h, config/m68k/xm-lynx.h,
	config/rs6000/xm-lynx.h, config/sparc/xm-lynx.h:
	Don't include config/xm-lynx.h or tm.h.

	* config/xm-gnu.h: Don't include fcntl.h.
	* config/sparc/xm-lynx.h: Don't include sys/types.h and
	sys/wait.h.
	* config/clipper/xm-clix.h, config/vax/xm-vax.h: Don't define isinf.

From-SVN: r40199
---
 gcc/ChangeLog                   | 102 ++++++++++++---
 gcc/Makefile.in                 |   4 +-
 gcc/config/a29k/xm-a29k.h       |   8 --
 gcc/config/a29k/xm-unix.h       |   8 --
 gcc/config/alpha/xm-alpha.h     |   8 --
 gcc/config/arc/xm-arc.h         |   8 --
 gcc/config/arm/xm-arm.h         |  10 --
 gcc/config/avr/xm-avr.h         |   1 -
 gcc/config/c4x/xm-c4x.h         |   8 --
 gcc/config/clipper/xm-clix.h    |  12 --
 gcc/config/convex/xm-convex.h   |   8 --
 gcc/config/d30v/xm-d30v.h       |  12 --
 gcc/config/dsp16xx/xm-dsp16xx.h |   8 --
 gcc/config/elxsi/xm-elxsi.h     |   8 --
 gcc/config/fp-bit.c             |   2 +-
 gcc/config/fr30/xm-fr30.h       |  34 -----
 gcc/config/h8300/xm-h8300.h     |   8 --
 gcc/config/i370/xm-i370.h       |   7 -
 gcc/config/i370/xm-linux.h      |   9 --
 gcc/config/i370/xm-mvs.h        |   7 -
 gcc/config/i370/xm-oe.h         |   7 -
 gcc/config/i386/xm-beos.h       |   5 -
 gcc/config/i386/xm-i386.h       |   9 --
 gcc/config/i386/xm-lynx.h       |   7 -
 gcc/config/i860/xm-i860.h       |   9 --
 gcc/config/i960/xm-i960.h       |   8 --
 gcc/config/ia64/xm-ia64.h       |  14 --
 gcc/config/m32r/xm-m32r.h       |   8 --
 gcc/config/m68hc11/xm-m68hc11.h |   4 +-
 gcc/config/m68k/aux-crt2.asm    |   2 +-
 gcc/config/m68k/aux-crtn.asm    |   2 +-
 gcc/config/m68k/aux-mcount.c    |   5 +-
 gcc/config/m68k/xm-lynx.h       |   7 -
 gcc/config/m68k/xm-m68k.h       |   8 --
 gcc/config/m88k/xm-m88k.h       |   8 --
 gcc/config/mcore/xm-mcore.h     |   8 --
 gcc/config/mips/xm-mips.h       |   8 --
 gcc/config/mn10200/xm-mn10200.h |   9 --
 gcc/config/mn10300/xm-mn10300.h |   9 --
 gcc/config/ns32k/xm-ns32k.h     |   8 --
 gcc/config/pa/xm-linux.h        |   8 --
 gcc/config/pa/xm-pa.h           |   8 --
 gcc/config/pa/xm-pa64hpux.h     |  11 --
 gcc/config/pa/xm-pahpux.h       |  11 --
 gcc/config/pa/xm-papro.h        |  11 --
 gcc/config/pdp11/xm-pdp11.h     |  27 ----
 gcc/config/pj/xm-pj.h           |   9 --
 gcc/config/romp/xm-romp.h       |   8 --
 gcc/config/rs6000/xm-beos.h     |  10 --
 gcc/config/rs6000/xm-lynx.h     |   7 -
 gcc/config/rs6000/xm-rs6000.h   |   8 --
 gcc/config/rs6000/xm-sysv4.h    |   8 --
 gcc/config/sh/xm-sh.h           |   8 --
 gcc/config/sparc/xm-lynx.h      |  11 --
 gcc/config/sparc/xm-sparc.h     |   8 --
 gcc/config/sparc/xm-sysv4.h     |   8 --
 gcc/config/v850/xm-v850.h       |   9 --
 gcc/config/vax/xm-vax.h         |  11 --
 gcc/config/vax/xm-vms.h         |   4 -
 gcc/config/we32k/xm-we32k.h     |   8 --
 gcc/config/xm-gnu.h             |   6 -
 gcc/config/xm-lynx.h            |  27 ----
 gcc/config/xm-std32.h           |   4 -
 gcc/configure                   | 220 ++++++++++++++++----------------
 gcc/configure.in                |  36 +++---
 gcc/crtstuff.c                  |   4 +-
 gcc/gcc.texi                    |   9 +-
 gcc/system.h                    |  19 +++
 68 files changed, 242 insertions(+), 693 deletions(-)
 delete mode 100644 gcc/config/avr/xm-avr.h
 delete mode 100644 gcc/config/fr30/xm-fr30.h
 delete mode 100644 gcc/config/pdp11/xm-pdp11.h
 delete mode 100644 gcc/config/xm-lynx.h

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1f166e079e9a..3dc3f1965246 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,65 @@
+2001-03-02  Zack Weinberg  <zackw@stanford.edu>
+
+	* configure.in: Kill tm.h.  Include the files in the $tm_file
+	list in all three of config.h, hconfig.h, tconfig.h, after the
+	relevant set of xm_files.  Put TARGET_CPU_DEFAULT in all
+	three, include insn-codes.h in all three (#ifndef GENERATOR_FILE).
+	* configure: Regenerate.
+	* Makefile.in (clean): Don't delete tm.h.
+
+	* system.h: If SUCCESS_EXIT_CODE and FATAL_EXIT_CODE are not
+	defined, set them from EXIT_SUCCESS and EXIT_FAILURE.  If
+	those are not defined, set SEC and FEC to 0 and 1.
+	* gcc.texi: Update to match.
+
+	* crtstuff.c: Include tconfig.h, not auto-host.h and tm.h.
+	* config/fp-bit.c, config/m68k/aux-crt2.asm,
+	config/m68k/aux-crtn.asm, config/m68k/aux-mcount.c:
+	Include tconfig.h, not tm.h.
+
+	* config/xm-lynx.h, config/xm-std32.h,
+	config/a29k/xm-a29k.h, config/a29k/xm-unix.h,
+	config/alpha/xm-alpha.h, config/arc/xm-arc.h,
+	config/avr/xm-avr.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/fr30/xm-fr30.h,
+	config/h8300/xm-h8300.h, config/i370/xm-linux.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/m68hc11/xm-m68hc11.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/pdp11/xm-pdp11.h,
+	config/pj/xm-pj.h, config/romp/xm-romp.h,
+	config/rs6000/xm-beos.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/we32k/xm-we32k.h:
+	Don't include tm.h.
+	Don't define SUCCESS_EXIT_CODE or FATAL_EXIT_CODE.
+
+	* config/i370/xm-i370.h, config/i370/xm-mvs.h,
+	config/i370/xm-oe.h: Don't include tm.h.  Don't define
+	SUCCESS_EXIT_CODE.
+	* config/vax/xm-vms.h: Don't include tm.h.
+
+	* config/xm-lynx.h, config/avr/xm-avr.h,
+	config/fr30/xm-fr30.h, config/pdp11/xm-pdp11.h,
+	Delete; made empty by above changes.
+	* config/i386/xm-lynx.h, config/m68k/xm-lynx.h,
+	config/rs6000/xm-lynx.h, config/sparc/xm-lynx.h:
+	Don't include config/xm-lynx.h or tm.h.
+
+	* config/xm-gnu.h: Don't include fcntl.h.
+	* config/sparc/xm-lynx.h: Don't include sys/types.h and
+	sys/wait.h.
+	* config/clipper/xm-clix.h, config/vax/xm-vax.h: Don't define isinf.
+
 2001-03-02  Richard Henderson  <rth@redhat.com>
 
 	* tm.texi (File Framework): Document UNALIGNED_SHORT_ASM_OP,
@@ -80,7 +142,7 @@
 	(GET_NOTE_INSN_NAME): Cast enum to int.
 	* tree.h (TREE_CODE): Cast to enum tree_code.
 	(TREE_SET_CODE): Cast VALUE to ENUM_BITFIELD(tree_code).
-        * timevar.c (timevar_print): Change loop variable id from enum to
+	* timevar.c (timevar_print): Change loop variable id from enum to
 	unsigned int.
 	* fixinc/fixincl.c (VLEVEL): Cast enums in comparison to unsigned int.
 	* config/i386/i386.md: Use PUT_MODE for mode assignment.
@@ -99,24 +161,24 @@ Fri Mar  2 11:59:43 CET 2001  Jan Hubicka  <jh@suse.cz>
 
 2001-03-02  Neil Booth  <neil@daikokuya.demon.co.uk>
 
-        * cppfiles.c (struct include_file): Update.
-        (stack_include_file): Use search_from.
-        (cpp_included, find_include_file): Update.
-        (cpp_execute_include): Update.  ptr->name may not be
-        null terminated.  Use the new search_from member variable
-        of cpp_buffer.
-        (_cpp_compare_file_date): Similarly.
-        (search_from): New function, similiar to actual_directory.
-        (actual_directory): Delete.
-        (remap_filename): Update.  loc->name may not be null terminated.
-        (struct file_name_list): Rename search_path.  Update.
-        * cpphash.h (struct cpp_buffer): Delete actual_dir.  New members
-        search_from and dir.
-        (struct cpp_reader): Remove actual_dirs.
-        * cppinit.c (struct cpp_pending): Update for renamed objects.
-        (append_include_chain, remove_dup_dir, remove_dup_dirs,
-        merge_include_chains, cpp_destroy, cpp_start_read): Similarly.
-        * cpplib.h (struct cpp_options): Similarly.
+	* cppfiles.c (struct include_file): Update.
+	(stack_include_file): Use search_from.
+	(cpp_included, find_include_file): Update.
+	(cpp_execute_include): Update.  ptr->name may not be
+	null terminated.  Use the new search_from member variable
+	of cpp_buffer.
+	(_cpp_compare_file_date): Similarly.
+	(search_from): New function, similiar to actual_directory.
+	(actual_directory): Delete.
+	(remap_filename): Update.  loc->name may not be null terminated.
+	(struct file_name_list): Rename search_path.  Update.
+	* cpphash.h (struct cpp_buffer): Delete actual_dir.  New members
+	search_from and dir.
+	(struct cpp_reader): Remove actual_dirs.
+	* cppinit.c (struct cpp_pending): Update for renamed objects.
+	(append_include_chain, remove_dup_dir, remove_dup_dirs,
+	merge_include_chains, cpp_destroy, cpp_start_read): Similarly.
+	* cpplib.h (struct cpp_options): Similarly.
 
 2001-03-01  Zack Weinberg  <zackw@stanford.edu>
 
@@ -152,7 +214,7 @@ Fri Mar  2 11:59:43 CET 2001  Jan Hubicka  <jh@suse.cz>
 
 	* configure.in: Detect stdbool.h.
 	* configure, config.in: Regenerate.
-	* system.h: Include stddef.h here if available.  
+	* system.h: Include stddef.h here if available.
 	Set HAVE__BOOL based on GCC_VERSION and __STDC_VERSION__.
 	Then set up a sensible boolean type at the very end.
 
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 9f3bb5248be8..9f48da4034d6 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -641,7 +641,7 @@ HOST_ERRORS = $(HOST_PREFIX)errors.o
 
 # Specify the directories to be searched for header files.
 # Both . and srcdir are used, in that order,
-# so that tm.h and config.h will be found in the compilation
+# so that *config.h will be found in the compilation
 # subdirectory rather than in the source directory.
 # -I$(@D) and -I$(srcdir)/$(@D) cause the subdirectory of the file
 # currently being compiled, in both source trees, to be examined as well.
@@ -2349,7 +2349,7 @@ clean: mostlyclean $(INTL_CLEAN) lang.clean
 # while building and installing GCC.
 INTL_DISTCLEAN = intl.distclean
 distclean: clean $(INTL_DISTCLEAN) lang.distclean
-	-rm -f tm.h tm_p.h config.h auto-host.h auto-build.h tconfig.h hconfig.h
+	-rm -f tm_p.h config.h auto-host.h auto-build.h tconfig.h hconfig.h
 	-rm -f cstamp-h
 	-rm -f config.status config.run config.cache config.bak
 	-rm -f Make-lang Make-hooks Make-host Make-target
diff --git a/gcc/config/a29k/xm-a29k.h b/gcc/config/a29k/xm-a29k.h
index 63b9acc128a6..4b728e0e7625 100644
--- a/gcc/config/a29k/xm-a29k.h
+++ b/gcc/config/a29k/xm-a29k.h
@@ -26,11 +26,3 @@ Boston, MA 02111-1307, USA.  */
 #define HOST_BITS_PER_LONGLONG 64
 
 #define HOST_WORDS_BIG_ENDIAN
-
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-#include "tm.h"
-
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
diff --git a/gcc/config/a29k/xm-unix.h b/gcc/config/a29k/xm-unix.h
index 4dd6c3251252..c964e1bafa2b 100644
--- a/gcc/config/a29k/xm-unix.h
+++ b/gcc/config/a29k/xm-unix.h
@@ -27,13 +27,5 @@ Boston, MA 02111-1307, USA.  */
 
 #define HOST_WORDS_BIG_ENDIAN
 
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-#include "tm.h"
-
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
-
 /* Ultra is V7, which is closest to USG.  */
 #define USG
diff --git a/gcc/config/alpha/xm-alpha.h b/gcc/config/alpha/xm-alpha.h
index 25a9d0f59d87..f68b4ed36428 100644
--- a/gcc/config/alpha/xm-alpha.h
+++ b/gcc/config/alpha/xm-alpha.h
@@ -27,14 +27,6 @@ Boston, MA 02111-1307, USA.  */
 #define	HOST_BITS_PER_LONG	64
 #define HOST_BITS_PER_LONGLONG  64
 
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-#include "tm.h"
-
-/* Arguments to use with `exit'.  */
-#define	SUCCESS_EXIT_CODE	0
-#define	FATAL_EXIT_CODE		33
-
 /* If compiled with GNU C, use the builtin alloca.  */
 #ifndef alloca
 #if defined(__GNUC__) && !defined(USE_C_ALLOCA)
diff --git a/gcc/config/arc/xm-arc.h b/gcc/config/arc/xm-arc.h
index f0fadbacf5e4..1742ed2bc87b 100644
--- a/gcc/config/arc/xm-arc.h
+++ b/gcc/config/arc/xm-arc.h
@@ -29,14 +29,6 @@ Boston, MA 02111-1307, USA.  */
    matters when cross-compiling.  */
 #define HOST_WORDS_BIG_ENDIAN 1
 
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-#include "tm.h"
-
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
-
 /* If compiled with Sun CC, the use of alloca requires this #include.  */
 #ifndef __GNUC__
 #include "alloca.h"
diff --git a/gcc/config/arm/xm-arm.h b/gcc/config/arm/xm-arm.h
index 2a1686286d74..efb1ecfe4618 100644
--- a/gcc/config/arm/xm-arm.h
+++ b/gcc/config/arm/xm-arm.h
@@ -41,18 +41,8 @@ Boston, MA 02111-1307, USA.  */
 #define USE_C_ALLOCA
 #endif
 
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.  */
-#include "tm.h"
-
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
-
 /* If we have defined POSIX, but are compiling in the BSD environment, then
    we need to define getcwd in terms of getwd.  */
 #if defined (POSIX) && defined (_BSD_C)
 #define HAVE_GETWD 1
 #endif
-
-/* EOF xm-arm.h */
diff --git a/gcc/config/avr/xm-avr.h b/gcc/config/avr/xm-avr.h
deleted file mode 100644
index af51cd3e6e83..000000000000
--- a/gcc/config/avr/xm-avr.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "tm.h"
diff --git a/gcc/config/c4x/xm-c4x.h b/gcc/config/c4x/xm-c4x.h
index 491032477d15..5f75da923e58 100644
--- a/gcc/config/c4x/xm-c4x.h
+++ b/gcc/config/c4x/xm-c4x.h
@@ -6,11 +6,3 @@
 #define HOST_BITS_PER_LONGLONG 64
 
 #define HOST_WORDS_BIG_ENDIAN
-
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-#include "tm.h"
-
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
diff --git a/gcc/config/clipper/xm-clix.h b/gcc/config/clipper/xm-clix.h
index adb84117c3ac..4b4a3a013c00 100644
--- a/gcc/config/clipper/xm-clix.h
+++ b/gcc/config/clipper/xm-clix.h
@@ -1,10 +1,5 @@
 /* Config file for Clipper running Clix, system V. 3.2 clone  */
 
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-
-#include "tm.h"
-
 /* This describes the machine the compiler is hosted on.  */
 #define HOST_BITS_PER_CHAR 8
 #define HOST_BITS_PER_SHORT 16
@@ -12,11 +7,4 @@
 #define HOST_BITS_PER_LONG 32
 #define HOST_BITS_PER_LONGLONG 64
 
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
-
-/* isinf isn't there, but finite is. */
-#define isinf(x) (!finite(x))
-
 #define USG
diff --git a/gcc/config/convex/xm-convex.h b/gcc/config/convex/xm-convex.h
index 8a905df4251c..1d464bdabb08 100644
--- a/gcc/config/convex/xm-convex.h
+++ b/gcc/config/convex/xm-convex.h
@@ -18,10 +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.  */
 
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-#include "tm.h"
-
 /* This describes the machine the compiler is hosted on.  */
 #define HOST_BITS_PER_CHAR 8
 #define HOST_BITS_PER_SHORT 16
@@ -29,10 +25,6 @@ Boston, MA 02111-1307, USA.  */
 #define HOST_BITS_PER_LONG 32
 #define HOST_BITS_PER_LONGLONG 64
 
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
-
 /* 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 549ecbe02361..9423cae97f36 100644
--- a/gcc/config/d30v/xm-d30v.h
+++ b/gcc/config/d30v/xm-d30v.h
@@ -19,14 +19,6 @@
    the Free Software Foundation, 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-/* A C expression for the status code to be returned when the compiler exits
-   after serious errors.  */
-#define FATAL_EXIT_CODE 33
-
-/* A C expression for the status code to be returned when the compiler exits
-   without serious errors.  */
-#define SUCCESS_EXIT_CODE 0
-
 /* 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
@@ -50,7 +42,3 @@
 #else
 #define alloca __builtin_alloca
 #endif
-
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-#include "tm.h"
diff --git a/gcc/config/dsp16xx/xm-dsp16xx.h b/gcc/config/dsp16xx/xm-dsp16xx.h
index ac40dac66780..31c225dabb5f 100644
--- a/gcc/config/dsp16xx/xm-dsp16xx.h
+++ b/gcc/config/dsp16xx/xm-dsp16xx.h
@@ -26,17 +26,9 @@ Boston, MA 02111-1307, USA.  */
 #define HOST_BITS_PER_LONG 32
 #define HOST_BITS_PER_LONGLONG 64
 
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
-
 /* If compiled with GNU C, use the built-in alloca */
 #ifdef __GNUC__
 #define alloca __builtin_alloca
 #else
 #define USE_C_ALLOCA
 #endif
-
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-#include "tm.h"
diff --git a/gcc/config/elxsi/xm-elxsi.h b/gcc/config/elxsi/xm-elxsi.h
index ed47bdeb0a00..47845d0bc940 100644
--- a/gcc/config/elxsi/xm-elxsi.h
+++ b/gcc/config/elxsi/xm-elxsi.h
@@ -18,16 +18,8 @@ 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.  */
 
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-#include "tm.h"
-
 /* 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
-
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
diff --git a/gcc/config/fp-bit.c b/gcc/config/fp-bit.c
index f94259eebcb5..ff41d81343d3 100644
--- a/gcc/config/fp-bit.c
+++ b/gcc/config/fp-bit.c
@@ -44,8 +44,8 @@ Boston, MA 02111-1307, USA.  */
 /* The intended way to use this file is to make two copies, add `#define FLOAT'
    to one copy, then compile both copies and add them to libgcc.a.  */
 
+#include "tconfig.h"
 #include "fp-bit.h"
-#include "tm.h"
 
 /* The following macros can be defined to change the behaviour of this file:
    FLOAT: Implement a `float', aka SFmode, fp library.  If this is not
diff --git a/gcc/config/fr30/xm-fr30.h b/gcc/config/fr30/xm-fr30.h
deleted file mode 100644
index 82030f5c0b12..000000000000
--- a/gcc/config/fr30/xm-fr30.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Definitions of FR30 target.
-   Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc.
-   Contributed by Cygnus Solutions.
-
-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.  */
-
-/* A C expression for the status code to be returned when the compiler exits
-   after serious errors.  */
-#define FATAL_EXIT_CODE 33
-
-/* A C expression for the status code to be returned when the compiler exits
-   without serious errors.  */
-#define SUCCESS_EXIT_CODE 0
-
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-#include "tm.h"
-
-/* end of xm-fr30.h */
diff --git a/gcc/config/h8300/xm-h8300.h b/gcc/config/h8300/xm-h8300.h
index 88592098ae25..171faaba5c75 100644
--- a/gcc/config/h8300/xm-h8300.h
+++ b/gcc/config/h8300/xm-h8300.h
@@ -25,17 +25,9 @@ Boston, MA 02111-1307, USA.  */
 #define HOST_BITS_PER_LONG 32
 #define HOST_BITS_PER_LONGLONG 64
 
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
-
 /* If compiled with GNU C, use the built-in alloca */
 #ifdef __GNUC__
 #define alloca __builtin_alloca
 #else
 #define USE_C_ALLOCA
 #endif
-
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-#include "tm.h"
diff --git a/gcc/config/i370/xm-i370.h b/gcc/config/i370/xm-i370.h
index bb6634287988..187f762286f8 100644
--- a/gcc/config/i370/xm-i370.h
+++ b/gcc/config/i370/xm-i370.h
@@ -32,12 +32,5 @@ Boston, MA 02111-1307, USA.  */
 
 #define USG
 
-/* Target machine dependencies.  tm.h is a symbolic link to the actual
-   target specific file.  */
-
-#include "tm.h"
-
 /* Arguments to use with `exit'.  */
-
-#define SUCCESS_EXIT_CODE	0
 #define FATAL_EXIT_CODE		12
diff --git a/gcc/config/i370/xm-linux.h b/gcc/config/i370/xm-linux.h
index ccdf64f3cf4b..22564df3e28d 100644
--- a/gcc/config/i370/xm-linux.h
+++ b/gcc/config/i370/xm-linux.h
@@ -41,12 +41,3 @@ extern char *alloca ();
 #endif
 #define ONLY_INT_FIELDS
 #endif
-
-/* Target machine dependencies.  tm.h is a symbolic link to the actual
-   target specific file.  */
-
-#include "tm.h"
-
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE	0
-#define FATAL_EXIT_CODE		12
diff --git a/gcc/config/i370/xm-mvs.h b/gcc/config/i370/xm-mvs.h
index 0535662c0410..040f86677d6c 100644
--- a/gcc/config/i370/xm-mvs.h
+++ b/gcc/config/i370/xm-mvs.h
@@ -32,12 +32,5 @@ Boston, MA 02111-1307, USA.  */
 
 #define USG
 
-/* Target machine dependencies.  tm.h is a symbolic link to the actual
-   target specific file.  */
-
-#include "tm.h"
-
 /* Arguments to use with `exit'.  */
-
-#define SUCCESS_EXIT_CODE	0
 #define FATAL_EXIT_CODE		12
diff --git a/gcc/config/i370/xm-oe.h b/gcc/config/i370/xm-oe.h
index baacdf2b1ea2..ddd90899c0b2 100644
--- a/gcc/config/i370/xm-oe.h
+++ b/gcc/config/i370/xm-oe.h
@@ -34,12 +34,5 @@ Boston, MA 02111-1307, USA.  */
 
 #define USG
 
-/* Target machine dependencies.  tm.h is a symbolic link to the actual
-   target specific file.  */
-
-#include "tm.h"
-
 /* Arguments to use with `exit'.  */
-
-#define SUCCESS_EXIT_CODE	0
 #define FATAL_EXIT_CODE		12
diff --git a/gcc/config/i386/xm-beos.h b/gcc/config/i386/xm-beos.h
index e386878228a8..b133ba98e600 100644
--- a/gcc/config/i386/xm-beos.h
+++ b/gcc/config/i386/xm-beos.h
@@ -22,11 +22,6 @@ Boston, MA 02111-1307, USA.  */
 
 #include <i386/xm-i386.h>
 
-/* Arguments to use with `exit'.  */
-
-#define	SUCCESS_EXIT_CODE	0
-#define	FATAL_EXIT_CODE		33
-
 /* Include <sys/wait.h> to define the exit status access macros.  */
 #ifndef inhibit_libc
 #include <sys/wait.h>
diff --git a/gcc/config/i386/xm-i386.h b/gcc/config/i386/xm-i386.h
index 5eaf8e431a05..c0ab0cdaf733 100644
--- a/gcc/config/i386/xm-i386.h
+++ b/gcc/config/i386/xm-i386.h
@@ -28,12 +28,3 @@ Boston, MA 02111-1307, USA.  */
 #define HOST_BITS_PER_INT 32
 #define HOST_BITS_PER_LONG 32
 #define HOST_BITS_PER_LONGLONG 64
-
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
-
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-
-#include "tm.h"
diff --git a/gcc/config/i386/xm-lynx.h b/gcc/config/i386/xm-lynx.h
index 359e41bbe242..487c43bfa8b7 100644
--- a/gcc/config/i386/xm-lynx.h
+++ b/gcc/config/i386/xm-lynx.h
@@ -18,16 +18,9 @@ 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.  */
 
-#include <xm-lynx.h>
-
 /* 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
-
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-
-#include "tm.h"
diff --git a/gcc/config/i860/xm-i860.h b/gcc/config/i860/xm-i860.h
index ad5f0ed6b5c4..96e5124beb16 100644
--- a/gcc/config/i860/xm-i860.h
+++ b/gcc/config/i860/xm-i860.h
@@ -24,12 +24,3 @@ Boston, MA 02111-1307, USA.  */
 #define HOST_BITS_PER_INT 32
 #define HOST_BITS_PER_LONG 32
 #define HOST_BITS_PER_LONGLONG 64
-
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
-
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-
-#include "tm.h"
diff --git a/gcc/config/i960/xm-i960.h b/gcc/config/i960/xm-i960.h
index 06df5b19e165..991b73670c75 100644
--- a/gcc/config/i960/xm-i960.h
+++ b/gcc/config/i960/xm-i960.h
@@ -25,15 +25,7 @@ Boston, MA 02111-1307, USA.  */
 #define HOST_BITS_PER_LONG 32
 #define HOST_BITS_PER_LONGLONG 64
 
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
-
 /* If not compiled with GNU C, use the C alloca */
 #ifndef __GNUC__
 #define USE_C_ALLOCA
 #endif
-
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-#include "tm.h"
diff --git a/gcc/config/ia64/xm-ia64.h b/gcc/config/ia64/xm-ia64.h
index f3ca011dffcd..b85ccab51824 100644
--- a/gcc/config/ia64/xm-ia64.h
+++ b/gcc/config/ia64/xm-ia64.h
@@ -18,14 +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.  */
 
-/* A C expression for the status code to be returned when the compiler exits
-   after serious errors.  */
-#define FATAL_EXIT_CODE 33
-
-/* A C expression for the status code to be returned when the compiler exits
-   without serious errors.  */
-#define SUCCESS_EXIT_CODE 0
-
 /* 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.)  */
 #ifdef __BIG_ENDIAN__
@@ -49,9 +41,3 @@ Boston, MA 02111-1307, USA.  */
 /* A C expression for the number of bits in `long long' on the host
    machine.  */
 #define HOST_BITS_PER_LONGLONG 64
-
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-#include "tm.h"
-
-/* end of xm-ia64.h */
diff --git a/gcc/config/m32r/xm-m32r.h b/gcc/config/m32r/xm-m32r.h
index 82c2b8420462..948b1306d902 100644
--- a/gcc/config/m32r/xm-m32r.h
+++ b/gcc/config/m32r/xm-m32r.h
@@ -29,14 +29,6 @@ Boston, MA 02111-1307, USA.  */
    matters when cross-compiling.  */
 #define HOST_WORDS_BIG_ENDIAN 1
 
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-#include "tm.h"
-
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
-
 /* If compiled with Sun CC, the use of alloca requires this #include.  */
 #ifndef __GNUC__
 #include "alloca.h"
diff --git a/gcc/config/m68hc11/xm-m68hc11.h b/gcc/config/m68hc11/xm-m68hc11.h
index bd471f0a311a..9a21e5d72984 100644
--- a/gcc/config/m68hc11/xm-m68hc11.h
+++ b/gcc/config/m68hc11/xm-m68hc11.h
@@ -1,5 +1,5 @@
 /* Configuration for GNU C-compiler for Motorola 68HC11 and 68HC12.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
    Contributed by Stephane Carrez (stcarrez@worldnet.fr)
 
 This file is part of GNU CC.
@@ -19,6 +19,4 @@ 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.  */
 
-#include "tm.h"
-
 #define inhibit_libc
diff --git a/gcc/config/m68k/aux-crt2.asm b/gcc/config/m68k/aux-crt2.asm
index 062c16ae8c2d..c5a0b1c4d0c7 100644
--- a/gcc/config/m68k/aux-crt2.asm
+++ b/gcc/config/m68k/aux-crt2.asm
@@ -1,6 +1,6 @@
 /* More startup code for A/UX */
 
-#include "tm.h"
+#include "tconfig.h"
 
 #ifdef USE_BIN_AS
 	file "crt2.s"
diff --git a/gcc/config/m68k/aux-crtn.asm b/gcc/config/m68k/aux-crtn.asm
index ce63d7fead70..b7948101ef9b 100644
--- a/gcc/config/m68k/aux-crtn.asm
+++ b/gcc/config/m68k/aux-crtn.asm
@@ -1,6 +1,6 @@
 /* More startup code for A/UX */
 
-#include "tm.h"
+#include "tconfig.h"
 
 #ifdef USE_BIN_AS
 	file	"crtn.s"
diff --git a/gcc/config/m68k/aux-mcount.c b/gcc/config/m68k/aux-mcount.c
index 478a16aa7849..c0b0e4a8c9b0 100644
--- a/gcc/config/m68k/aux-mcount.c
+++ b/gcc/config/m68k/aux-mcount.c
@@ -37,12 +37,9 @@ Boston, MA 02111-1307, USA.  */
 #error This file uses GNU C extensions
 #endif
 
+#include "tconfig.h"
 #include <mon.h>
 
-#ifdef IN_GCC
-#include "tm.h"
-#endif
-
 struct cnt *_countbase;
 
 #ifdef FUNCTION_PROFILER_SYMBOL
diff --git a/gcc/config/m68k/xm-lynx.h b/gcc/config/m68k/xm-lynx.h
index 78762b3afe45..5fc1596868ac 100644
--- a/gcc/config/m68k/xm-lynx.h
+++ b/gcc/config/m68k/xm-lynx.h
@@ -18,8 +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.  */
 
-#include <xm-lynx.h>
-
 /* This describes the machine the compiler is hosted on.  */
 #define HOST_BITS_PER_CHAR 8
 #define HOST_BITS_PER_SHORT 16
@@ -28,8 +26,3 @@ Boston, MA 02111-1307, USA.  */
 #define HOST_BITS_PER_LONGLONG 64
 
 #define HOST_WORDS_BIG_ENDIAN 1
-
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-
-#include "tm.h"
diff --git a/gcc/config/m68k/xm-m68k.h b/gcc/config/m68k/xm-m68k.h
index f3b337b6e738..38aa49d4acff 100644
--- a/gcc/config/m68k/xm-m68k.h
+++ b/gcc/config/m68k/xm-m68k.h
@@ -26,11 +26,3 @@ Boston, MA 02111-1307, USA.  */
 #define HOST_BITS_PER_LONGLONG 64
 
 #define HOST_WORDS_BIG_ENDIAN
-
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-#include "tm.h"
-
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
diff --git a/gcc/config/m88k/xm-m88k.h b/gcc/config/m88k/xm-m88k.h
index 1ddcca93af85..afb68f86d3cd 100644
--- a/gcc/config/m88k/xm-m88k.h
+++ b/gcc/config/m88k/xm-m88k.h
@@ -29,10 +29,6 @@ Boston, MA 02111-1307, USA.  */
 
 #define HOST_WORDS_BIG_ENDIAN
 
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
-
 /* The 88open BCS (and ABI) environment doesn't support BSD features
    (vfork, getrusage), so use USG.  The Omron Luna/88k is BSD though.  */
 #ifndef luna88k
@@ -50,7 +46,3 @@ Boston, MA 02111-1307, USA.  */
 #ifdef __DGUX__
 #define OBSTACK_CHUNK_SIZE (8192-16)
 #endif
-
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-#include "tm.h"
diff --git a/gcc/config/mcore/xm-mcore.h b/gcc/config/mcore/xm-mcore.h
index ac729159fad4..6ec012983f2d 100644
--- a/gcc/config/mcore/xm-mcore.h
+++ b/gcc/config/mcore/xm-mcore.h
@@ -27,11 +27,3 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #ifdef __GNUC__
 #define alloca __builtin_alloca
 #endif
-
-/* Target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.  */
-#include "tm.h"
-
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
diff --git a/gcc/config/mips/xm-mips.h b/gcc/config/mips/xm-mips.h
index 3c52ac0fec86..71af928f3b69 100644
--- a/gcc/config/mips/xm-mips.h
+++ b/gcc/config/mips/xm-mips.h
@@ -36,14 +36,6 @@ Boston, MA 02111-1307, USA.  */
 
 #define HOST_FLOAT_FORMAT IEEE_FLOAT_FORMAT
 
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-#include "tm.h"
-
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
-
 #ifndef __GNUC__
 /* The MIPS compiler gets it wrong, and treats enumerated bitfields
    as signed quantities, making it impossible to use an 8-bit enum
diff --git a/gcc/config/mn10200/xm-mn10200.h b/gcc/config/mn10200/xm-mn10200.h
index c8b3130ef131..1a96a4d9aa49 100644
--- a/gcc/config/mn10200/xm-mn10200.h
+++ b/gcc/config/mn10200/xm-mn10200.h
@@ -25,12 +25,3 @@ Boston, MA 02111-1307, USA.  */
 #define HOST_BITS_PER_INT 16
 #define HOST_BITS_PER_LONG 32
 #define HOST_BITS_PER_LONGLONG 64
-
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
-
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-
-#include "tm.h"
diff --git a/gcc/config/mn10300/xm-mn10300.h b/gcc/config/mn10300/xm-mn10300.h
index 59b625b4b265..7e46bd1db8f8 100644
--- a/gcc/config/mn10300/xm-mn10300.h
+++ b/gcc/config/mn10300/xm-mn10300.h
@@ -25,12 +25,3 @@ Boston, MA 02111-1307, USA.  */
 #define HOST_BITS_PER_INT 32
 #define HOST_BITS_PER_LONG 32
 #define HOST_BITS_PER_LONGLONG 64
-
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
-
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-
-#include "tm.h"
diff --git a/gcc/config/ns32k/xm-ns32k.h b/gcc/config/ns32k/xm-ns32k.h
index 46d373fdcdee..6bb66d22d255 100644
--- a/gcc/config/ns32k/xm-ns32k.h
+++ b/gcc/config/ns32k/xm-ns32k.h
@@ -18,17 +18,9 @@ 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.  */
 
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-#include "tm.h"
-
 /* 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
-
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
diff --git a/gcc/config/pa/xm-linux.h b/gcc/config/pa/xm-linux.h
index d5cb80bb5506..57527414fa60 100644
--- a/gcc/config/pa/xm-linux.h
+++ b/gcc/config/pa/xm-linux.h
@@ -29,12 +29,4 @@ Boston, MA 02111-1307, USA.  */
    matters when cross-compiling.  */
 #define HOST_WORDS_BIG_ENDIAN 1
 
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-#include "tm.h"
-
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
-
 #include <xm-linux.h>
diff --git a/gcc/config/pa/xm-pa.h b/gcc/config/pa/xm-pa.h
index 7c992ff7d274..d7c7d48f3071 100644
--- a/gcc/config/pa/xm-pa.h
+++ b/gcc/config/pa/xm-pa.h
@@ -33,14 +33,6 @@ Boston, MA 02111-1307, USA.  */
 /* Place any machine-dependent include files here, in case we
    are bootstrapping.  */
 
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-#include "tm.h"
-
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
-
 /* 4.3BSD, OSF1 and Lites on the PA are all derived from NET2 or
    later code from Berkeley.  */
 #define __BSD_NET2__
diff --git a/gcc/config/pa/xm-pa64hpux.h b/gcc/config/pa/xm-pa64hpux.h
index 157abe0d4fb4..68c80af15f9d 100644
--- a/gcc/config/pa/xm-pa64hpux.h
+++ b/gcc/config/pa/xm-pa64hpux.h
@@ -33,17 +33,6 @@ Boston, MA 02111-1307, USA.  */
    matters when cross-compiling.  */
 #define HOST_WORDS_BIG_ENDIAN 1
 
-/* Place any machine-dependent include files here, in case we
-   are bootstrapping.  */
-
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-#include "tm.h"
-
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
-
 /* HP's compiler has problems with enum bitfields.  */
 #define ONLY_INT_FIELDS
 
diff --git a/gcc/config/pa/xm-pahpux.h b/gcc/config/pa/xm-pahpux.h
index e7a4f75c33c0..651a0edcf193 100644
--- a/gcc/config/pa/xm-pahpux.h
+++ b/gcc/config/pa/xm-pahpux.h
@@ -33,17 +33,6 @@ Boston, MA 02111-1307, USA.  */
    matters when cross-compiling.  */
 #define HOST_WORDS_BIG_ENDIAN 1
 
-/* Place any machine-dependent include files here, in case we
-   are bootstrapping.  */
-
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-#include "tm.h"
-
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
-
 /* HP's compiler has problems with enum bitfields.  */
 #define ONLY_INT_FIELDS
 
diff --git a/gcc/config/pa/xm-papro.h b/gcc/config/pa/xm-papro.h
index f987a56a1400..2f72d299e941 100644
--- a/gcc/config/pa/xm-papro.h
+++ b/gcc/config/pa/xm-papro.h
@@ -30,17 +30,6 @@ Boston, MA 02111-1307, USA.  */
    matters when cross-compiling.  */
 #define HOST_WORDS_BIG_ENDIAN 1
 
-/* Place any machine-dependent include files here, in case we
-   are bootstrapping.  */
-
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-#include "tm.h"
-
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
-
 /* HP's compiler has problems with enum bitfields.  */
 #define ONLY_INT_FIELDS
 
diff --git a/gcc/config/pdp11/xm-pdp11.h b/gcc/config/pdp11/xm-pdp11.h
deleted file mode 100644
index f6a5467ea4cc..000000000000
--- a/gcc/config/pdp11/xm-pdp11.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Configuration for GNU C-compiler for pdp-11 family.
-   Copyright (C) 1994, 1995 Free Software Foundation, Inc.
-   Contributed by Michael K. Gschwind (mike@vlsivie.tuwien.ac.at).
-
-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.  */
-
-/* gcc can never run on a PDP, since it needs too much memory */
-/* but we need the xm-pdp.h file to compile libgcc2           */
-
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-#include "tm.h"
diff --git a/gcc/config/pj/xm-pj.h b/gcc/config/pj/xm-pj.h
index 694ef3ac17a7..892bcf8c2826 100644
--- a/gcc/config/pj/xm-pj.h
+++ b/gcc/config/pj/xm-pj.h
@@ -24,12 +24,3 @@ Boston, MA 02111-1307, USA.  */
 #define HOST_BITS_PER_INT 32
 #define HOST_BITS_PER_LONG 32
 #define HOST_BITS_PER_LONGLONG 64
-
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
-
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-
-#include "tm.h"
diff --git a/gcc/config/romp/xm-romp.h b/gcc/config/romp/xm-romp.h
index 237982517b0e..822ad23abcc8 100644
--- a/gcc/config/romp/xm-romp.h
+++ b/gcc/config/romp/xm-romp.h
@@ -27,14 +27,6 @@ Boston, MA 02111-1307, USA.  */
 
 #define HOST_WORDS_BIG_ENDIAN
 
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-#include "tm.h"
-
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
-
 /* If compiled with hc, use the built-in alloca and memcpy.
    These definitions assume hc version 2.  */
 #ifdef __HIGHC__
diff --git a/gcc/config/rs6000/xm-beos.h b/gcc/config/rs6000/xm-beos.h
index c5ee876560c1..d96a9aa96e43 100644
--- a/gcc/config/rs6000/xm-beos.h
+++ b/gcc/config/rs6000/xm-beos.h
@@ -31,16 +31,6 @@ Boston, MA 02111-1307, USA.  */
 
 #define	HOST_WORDS_BIG_ENDIAN
 
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-
-#include "tm.h"
-
-/* Arguments to use with `exit'.  */
-
-#define	SUCCESS_EXIT_CODE	0
-#define	FATAL_EXIT_CODE		33
-
 /* Use the C alloca and use only int bitfields.  */
 
 #define USE_C_ALLOCA
diff --git a/gcc/config/rs6000/xm-lynx.h b/gcc/config/rs6000/xm-lynx.h
index 1c093c203a22..90700355c7b6 100644
--- a/gcc/config/rs6000/xm-lynx.h
+++ b/gcc/config/rs6000/xm-lynx.h
@@ -18,8 +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.  */
 
-#include <xm-lynx.h>
-
 /* This describes the machine the compiler is hosted on.  */
 #define HOST_BITS_PER_CHAR 8
 #define HOST_BITS_PER_SHORT 16
@@ -28,8 +26,3 @@ Boston, MA 02111-1307, USA.  */
 #define HOST_BITS_PER_LONGLONG 64
 
 #define HOST_WORDS_BIG_ENDIAN 1
-
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-
-#include "tm.h"
diff --git a/gcc/config/rs6000/xm-rs6000.h b/gcc/config/rs6000/xm-rs6000.h
index d68965b3bcdd..d14ffaf4344b 100644
--- a/gcc/config/rs6000/xm-rs6000.h
+++ b/gcc/config/rs6000/xm-rs6000.h
@@ -28,14 +28,6 @@ Boston, MA 02111-1307, USA.  */
 
 #define	HOST_WORDS_BIG_ENDIAN
 
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-#include "tm.h"
-
-/* Arguments to use with `exit'.  */
-#define	SUCCESS_EXIT_CODE	0
-#define	FATAL_EXIT_CODE		33
-
 /* If not compiled with GNU C, use the C alloca and use only int bitfields.  */
 #ifndef __GNUC__
 #define USE_C_ALLOCA
diff --git a/gcc/config/rs6000/xm-sysv4.h b/gcc/config/rs6000/xm-sysv4.h
index 6e7b1270f5d9..d35afedba5a0 100644
--- a/gcc/config/rs6000/xm-sysv4.h
+++ b/gcc/config/rs6000/xm-sysv4.h
@@ -30,14 +30,6 @@ Boston, MA 02111-1307, USA.  */
    matters when cross-compiling.  */
 #define HOST_WORDS_BIG_ENDIAN 1
 
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-#include "tm.h"
-
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
-
 #ifdef __linux__
 #include "xm-linux.h"
 #endif
diff --git a/gcc/config/sh/xm-sh.h b/gcc/config/sh/xm-sh.h
index e6e183b3ca49..680255357dc1 100644
--- a/gcc/config/sh/xm-sh.h
+++ b/gcc/config/sh/xm-sh.h
@@ -28,11 +28,3 @@ Boston, MA 02111-1307, USA.  */
 #ifdef __GNUC__
 #define alloca __builtin_alloca
 #endif
-
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.  */
-#include "tm.h"
-
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
diff --git a/gcc/config/sparc/xm-lynx.h b/gcc/config/sparc/xm-lynx.h
index 90fef8543b91..d6a4740be9fb 100644
--- a/gcc/config/sparc/xm-lynx.h
+++ b/gcc/config/sparc/xm-lynx.h
@@ -18,8 +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.  */
 
-#include <xm-lynx.h>
-
 /* This describes the machine the compiler is hosted on.  */
 #define HOST_BITS_PER_CHAR 8
 #define HOST_BITS_PER_SHORT 16
@@ -28,12 +26,3 @@ Boston, MA 02111-1307, USA.  */
 #define HOST_BITS_PER_LONGLONG 64
 
 #define HOST_WORDS_BIG_ENDIAN 1
-
-/* Include <sys/wait.h> to define the exit status access macros.  */
-#include <sys/types.h>
-#include <sys/wait.h>
-
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-
-#include "tm.h"
diff --git a/gcc/config/sparc/xm-sparc.h b/gcc/config/sparc/xm-sparc.h
index 096fad6797cb..643245718312 100644
--- a/gcc/config/sparc/xm-sparc.h
+++ b/gcc/config/sparc/xm-sparc.h
@@ -30,14 +30,6 @@ Boston, MA 02111-1307, USA.  */
    matters when cross-compiling.  */
 #define HOST_WORDS_BIG_ENDIAN 1
 
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-#include "tm.h"
-
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
-
 /* If compiled with Sun CC, the use of alloca requires this #include.  */
 #ifndef __GNUC__
 #include "alloca.h"
diff --git a/gcc/config/sparc/xm-sysv4.h b/gcc/config/sparc/xm-sysv4.h
index 5e0d15d2dc7a..0465079ea7b1 100644
--- a/gcc/config/sparc/xm-sysv4.h
+++ b/gcc/config/sparc/xm-sysv4.h
@@ -30,14 +30,6 @@ Boston, MA 02111-1307, USA.  */
    matters when cross-compiling.  */
 #define HOST_WORDS_BIG_ENDIAN 1
 
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-#include "tm.h"
-
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
-
 #ifndef __GNUC__
 #define ONLY_INT_FIELDS
 #endif
diff --git a/gcc/config/v850/xm-v850.h b/gcc/config/v850/xm-v850.h
index e7257e4c363f..decd33939d2a 100644
--- a/gcc/config/v850/xm-v850.h
+++ b/gcc/config/v850/xm-v850.h
@@ -25,12 +25,3 @@ Boston, MA 02111-1307, USA.  */
 #define HOST_BITS_PER_INT 32
 #define HOST_BITS_PER_LONG 32
 #define HOST_BITS_PER_LONGLONG 64
-
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
-
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-
-#include "tm.h"
diff --git a/gcc/config/vax/xm-vax.h b/gcc/config/vax/xm-vax.h
index d19157fb552e..a029787b8c30 100644
--- a/gcc/config/vax/xm-vax.h
+++ b/gcc/config/vax/xm-vax.h
@@ -18,10 +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.  */
 
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-#include "tm.h"
-
 /* This describes the machine the compiler is hosted on.  */
 #define HOST_BITS_PER_CHAR 8
 #define HOST_BITS_PER_SHORT 16
@@ -31,10 +27,3 @@ Boston, MA 02111-1307, USA.  */
 
 /* This machine doesn't use IEEE floats.  */
 #define HOST_FLOAT_FORMAT VAX_FLOAT_FORMAT
-
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
-
-/* isinf isn't there, but finite is. */
-#define isinf(x) (!finite(x))
diff --git a/gcc/config/vax/xm-vms.h b/gcc/config/vax/xm-vms.h
index 2fc644746f29..d5af89fbc83c 100644
--- a/gcc/config/vax/xm-vms.h
+++ b/gcc/config/vax/xm-vms.h
@@ -40,10 +40,6 @@ Boston, MA 02111-1307, USA.  */
 #undef FILE_TYPE
 #endif
 
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-#include "tm.h"
-
 /* This describes the machine the compiler is hosted on.  */
 #define HOST_BITS_PER_CHAR 8
 #define HOST_BITS_PER_SHORT 16
diff --git a/gcc/config/we32k/xm-we32k.h b/gcc/config/we32k/xm-we32k.h
index 0bc5514d6ef1..4440f3de80b6 100644
--- a/gcc/config/we32k/xm-we32k.h
+++ b/gcc/config/we32k/xm-we32k.h
@@ -28,14 +28,6 @@ Boston, MA 02111-1307, USA.  */
 
 #define HOST_WORDS_BIG_ENDIAN
 
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
-
-/* target machine dependencies.
-   tm.h is a symbolic link to the actual target specific file.   */
-#include "tm.h"
-
 #ifndef MAXPATHLEN
 #define MAXPATHLEN 512
 #endif
diff --git a/gcc/config/xm-gnu.h b/gcc/config/xm-gnu.h
index 64e8e2fa8171..67beb556e686 100644
--- a/gcc/config/xm-gnu.h
+++ b/gcc/config/xm-gnu.h
@@ -24,9 +24,3 @@ Boston, MA 02111-1307, USA.  */
    CPU/xm-CPU.h and this file xm-gnu.h.  */
 
 #define POSIX			/* GNU complies to POSIX.1.  */
-
-#ifndef inhibit_libc
-/* Get a definition of O_RDONLY; some of the GCC files don't include this
-   properly and will define it themselves to be zero. */
-#include <fcntl.h>
-#endif
diff --git a/gcc/config/xm-lynx.h b/gcc/config/xm-lynx.h
deleted file mode 100644
index edc5ca96a8d5..000000000000
--- a/gcc/config/xm-lynx.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Configuration for GNU C-compiler for Lynx.
-   Copyright (C) 1993, 1995, 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 file defines machine-independent things specific to a host
-   running Lynx.  This file should not be specified as $xm_file itself;
-   instead $xm_file should be CPU/xm-lynx.h, which should include this one.  */
-
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
diff --git a/gcc/config/xm-std32.h b/gcc/config/xm-std32.h
index cad11efc0bd9..1f8ed6879be2 100644
--- a/gcc/config/xm-std32.h
+++ b/gcc/config/xm-std32.h
@@ -24,7 +24,3 @@ Boston, MA 02111-1307, USA.  */
 #define HOST_BITS_PER_INT 32
 #define HOST_BITS_PER_LONG 32
 #define HOST_BITS_PER_LONGLONG 64
-
-/* Arguments to use with `exit'.  */
-#define SUCCESS_EXIT_CODE 0
-#define FATAL_EXIT_CODE 33
diff --git a/gcc/configure b/gcc/configure
index f3fc8b65cb02..43c077b98b9c 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -4053,15 +4053,13 @@ fi
 # $vars is the list of shell variables with file names to include.
 # auto-host.h is the file containing items generated by autoconf and is
 # the first file included by config.h.
-null_defines=
-host_xm_file="auto-host.h gansidecl.h ${host_xm_file} defaults.h hwint.h"
-
 # If host=build, it is correct to have hconfig include auto-host.h
 # as well.  If host!=build, we are in error and need to do more 
 # work to find out the build config parameters.
+# FIXME: hconfig.h should be bconfig.h.
 if test x$host = x$build
 then
-	build_xm_file="auto-host.h gansidecl.h ${build_xm_file} defaults.h hwint.h"
+	build_auto=auto-host.h
 else
 	# We create a subdir, then run autoconf in the subdir.
 	# To prevent recursion we set host and build for the new
@@ -4083,15 +4081,18 @@ else
 	mv auto-host.h ../auto-build.h
 	cd ..
 	rm -rf $tempdir
-	build_xm_file="auto-build.h gansidecl.h ${build_xm_file} defaults.h hwint.h"
+	build_auto=auto-build.h
 fi
 
-xm_file="gansidecl.h ${xm_file} defaults.h"
-tm_file="gansidecl.h ${tm_file} defaults.h"
+null_defines=
+tm_file="${tm_file} defaults.h"
+host_xm_file="auto-host.h gansidecl.h ${host_xm_file} ${tm_file} hwint.h"
+build_xm_file="${build_auto} gansidecl.h ${build_xm_file} ${tm_file} hwint.h"
+xm_file="gansidecl.h ${xm_file} ${tm_file}"
 
-vars="host_xm_file tm_file tm_p_file xm_file build_xm_file"
-links="config.h tm.h tm_p.h tconfig.h hconfig.h"
-defines="host_xm_defines null_defines null_defines xm_defines build_xm_defines"
+vars="host_xm_file tm_p_file xm_file build_xm_file"
+links="config.h tm_p.h tconfig.h hconfig.h"
+defines="host_xm_defines null_defines xm_defines build_xm_defines"
 
 rm -f config.bak
 if test -f config.status; then mv -f config.status config.bak; fi
@@ -4109,7 +4110,7 @@ do
 
 	# Define TARGET_CPU_DEFAULT if the system wants one.
 	# This substitutes for lots of *.h files.
-	if test "$target_cpu_default" != "" -a $link = tm.h
+	if test "$target_cpu_default" != ""
 	then
 		echo "#define TARGET_CPU_DEFAULT ($target_cpu_default)" >>$link
 	fi
@@ -4138,14 +4139,11 @@ do
 		echo "#endif" >>$link
 	done
 
-	if test $link = tm.h
-	then
-		# Include insn-codes.h last, because it includes machmode.h,
-		# and we want EXTRA_CC_MODES to be taken into account.
-		echo "#ifndef GENERATOR_FILE" >>$link
-		echo "#include \"insn-codes.h\"" >>$link
-		echo "#endif" >>$link
-	fi
+	# Include insn-codes.h last, because it includes machmode.h,
+	# and we want EXTRA_CC_MODES to be taken into account.
+	echo "#ifndef GENERATOR_FILE" >>$link
+	echo "#include \"insn-codes.h\"" >>$link
+	echo "#endif" >>$link
 done
 
 # Truncate the target if necessary
@@ -4220,7 +4218,7 @@ fi
 
 
         echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6
-echo "configure:4224: checking for strerror in -lcposix" >&5
+echo "configure:4222: checking for strerror in -lcposix" >&5
 ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4228,7 +4226,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4232 "configure"
+#line 4230 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4239,7 +4237,7 @@ int main() {
 strerror()
 ; return 0; }
 EOF
-if { (eval echo configure:4243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4262,12 +4260,12 @@ fi
   
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:4266: checking for working const" >&5
+echo "configure:4264: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4271 "configure"
+#line 4269 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -4316,7 +4314,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:4320: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4318: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -4337,12 +4335,12 @@ EOF
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:4341: checking for off_t" >&5
+echo "configure:4339: checking for off_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4346 "configure"
+#line 4344 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4370,12 +4368,12 @@ EOF
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:4374: checking for size_t" >&5
+echo "configure:4372: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4379 "configure"
+#line 4377 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4405,19 +4403,19 @@ fi
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:4409: checking for working alloca.h" >&5
+echo "configure:4407: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4414 "configure"
+#line 4412 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:4421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -4438,12 +4436,12 @@ EOF
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:4442: checking for alloca" >&5
+echo "configure:4440: checking for alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4447 "configure"
+#line 4445 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -4471,7 +4469,7 @@ int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:4475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -4503,12 +4501,12 @@ EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:4507: checking whether alloca needs Cray hooks" >&5
+echo "configure:4505: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4512 "configure"
+#line 4510 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -4533,12 +4531,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4537: checking for $ac_func" >&5
+echo "configure:4535: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4542 "configure"
+#line 4540 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4561,7 +4559,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4588,7 +4586,7 @@ done
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:4592: checking stack direction for C alloca" >&5
+echo "configure:4590: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4596,7 +4594,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 4600 "configure"
+#line 4598 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -4615,7 +4613,7 @@ main ()
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:4619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -4642,17 +4640,17 @@ unistd.h sys/param.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4646: checking for $ac_hdr" >&5
+echo "configure:4644: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4651 "configure"
+#line 4649 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4656: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4654: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4682,12 +4680,12 @@ done
 strdup __argz_count __argz_stringify __argz_next
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4686: checking for $ac_func" >&5
+echo "configure:4684: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4691 "configure"
+#line 4689 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4710,7 +4708,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4739,12 +4737,12 @@ done
      for ac_func in stpcpy
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4743: checking for $ac_func" >&5
+echo "configure:4741: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4748 "configure"
+#line 4746 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4767,7 +4765,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4801,19 +4799,19 @@ EOF
 
    if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:4805: checking for LC_MESSAGES" >&5
+echo "configure:4803: checking for LC_MESSAGES" >&5
 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4810 "configure"
+#line 4808 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:4817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_val_LC_MESSAGES=yes
 else
@@ -4834,7 +4832,7 @@ EOF
     fi
   fi
    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:4838: checking whether NLS is requested" >&5
+echo "configure:4836: checking whether NLS is requested" >&5
         # Check whether --enable-nls or --disable-nls was given.
 if test "${enable_nls+set}" = set; then
   enableval="$enable_nls"
@@ -4854,7 +4852,7 @@ fi
 EOF
 
       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:4858: checking whether included gettext is requested" >&5
+echo "configure:4856: checking whether included gettext is requested" >&5
       # Check whether --with-included-gettext or --without-included-gettext was given.
 if test "${with_included_gettext+set}" = set; then
   withval="$with_included_gettext"
@@ -4873,17 +4871,17 @@ fi
 
 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:4877: checking for libintl.h" >&5
+echo "configure:4875: checking for libintl.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4882 "configure"
+#line 4880 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4887: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4885: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4900,19 +4898,19 @@ fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6
-echo "configure:4904: checking for gettext in libc" >&5
+echo "configure:4902: checking for gettext in libc" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4909 "configure"
+#line 4907 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 int main() {
 return (int) gettext ("")
 ; return 0; }
 EOF
-if { (eval echo configure:4916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gt_cv_func_gettext_libc=yes
 else
@@ -4928,7 +4926,7 @@ echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6
 
 	   if test "$gt_cv_func_gettext_libc" != "yes"; then
 	     echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
-echo "configure:4932: checking for bindtextdomain in -lintl" >&5
+echo "configure:4930: checking for bindtextdomain in -lintl" >&5
 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4936,7 +4934,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4940 "configure"
+#line 4938 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4947,7 +4945,7 @@ int main() {
 bindtextdomain()
 ; return 0; }
 EOF
-if { (eval echo configure:4951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4963,12 +4961,12 @@ fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6
-echo "configure:4967: checking for gettext in libintl" >&5
+echo "configure:4965: checking for gettext in libintl" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
-echo "configure:4972: checking for gettext in -lintl" >&5
+echo "configure:4970: checking for gettext in -lintl" >&5
 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4976,7 +4974,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4980 "configure"
+#line 4978 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4987,7 +4985,7 @@ int main() {
 gettext()
 ; return 0; }
 EOF
-if { (eval echo configure:4991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5030,7 +5028,7 @@ EOF
 	      # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5034: checking for $ac_word" >&5
+echo "configure:5032: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'gcc_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5064,12 +5062,12 @@ fi
 		for ac_func in dcgettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5068: checking for $ac_func" >&5
+echo "configure:5066: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5073 "configure"
+#line 5071 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5092,7 +5090,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5119,7 +5117,7 @@ done
 		# Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5123: checking for $ac_word" >&5
+echo "configure:5121: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'gcc_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5155,7 +5153,7 @@ fi
 		# Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5159: checking for $ac_word" >&5
+echo "configure:5157: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'gcc_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5187,7 +5185,7 @@ else
 fi
 
 		cat > conftest.$ac_ext <<EOF
-#line 5191 "configure"
+#line 5189 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -5195,7 +5193,7 @@ extern int _nl_msg_cat_cntr;
 			       return _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:5199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   CATOBJEXT=.gmo
 		   DATADIRNAME=share
@@ -5220,7 +5218,7 @@ fi
 
         if test "$CATOBJEXT" = "NONE"; then
 	  echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6
-echo "configure:5224: checking whether catgets can be used" >&5
+echo "configure:5222: checking whether catgets can be used" >&5
 	  # Check whether --with-catgets or --without-catgets was given.
 if test "${with_catgets+set}" = set; then
   withval="$with_catgets"
@@ -5233,7 +5231,7 @@ fi
 
 	  if test "$nls_cv_use_catgets" = "yes"; then
 	    	    echo $ac_n "checking for main in -li""... $ac_c" 1>&6
-echo "configure:5237: checking for main in -li" >&5
+echo "configure:5235: checking for main in -li" >&5
 ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5241,14 +5239,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-li  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5245 "configure"
+#line 5243 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5276,12 +5274,12 @@ else
 fi
 
 	    echo $ac_n "checking for catgets""... $ac_c" 1>&6
-echo "configure:5280: checking for catgets" >&5
+echo "configure:5278: checking for catgets" >&5
 if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5285 "configure"
+#line 5283 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char catgets(); below.  */
@@ -5304,7 +5302,7 @@ catgets();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_catgets=yes"
 else
@@ -5326,7 +5324,7 @@ EOF
 	       # Extract the first word of "gencat", so it can be a program name with args.
 set dummy gencat; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5330: checking for $ac_word" >&5
+echo "configure:5328: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'gcc_cv_path_GENCAT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5362,7 +5360,7 @@ fi
 		 # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5366: checking for $ac_word" >&5
+echo "configure:5364: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'gcc_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5399,7 +5397,7 @@ fi
 		   # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5403: checking for $ac_word" >&5
+echo "configure:5401: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'gcc_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5437,7 +5435,7 @@ fi
 		 # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5441: checking for $ac_word" >&5
+echo "configure:5439: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'gcc_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5495,7 +5493,7 @@ fi
         # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5499: checking for $ac_word" >&5
+echo "configure:5497: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'gcc_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5529,7 +5527,7 @@ fi
         # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5533: checking for $ac_word" >&5
+echo "configure:5531: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'gcc_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5568,7 +5566,7 @@ fi
         # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5572: checking for $ac_word" >&5
+echo "configure:5570: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'gcc_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5667,7 +5665,7 @@ fi
        LINGUAS=
      else
        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:5671: checking for catalogs to be installed" >&5
+echo "configure:5669: checking for catalogs to be installed" >&5
        if test "x$LINGUAS" = "x"; then
 	 LINGUAS=$ALL_LINGUAS
        else
@@ -5699,17 +5697,17 @@ echo "configure:5671: checking for catalogs to be installed" >&5
    if test "$CATOBJEXT" = ".cat"; then
      ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
-echo "configure:5703: checking for linux/version.h" >&5
+echo "configure:5701: checking for linux/version.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5708 "configure"
+#line 5706 "configure"
 #include "confdefs.h"
 #include <linux/version.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5713: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5711: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5784,7 +5782,7 @@ fi
 
 
 echo $ac_n "checking whether windows registry support is requested""... $ac_c" 1>&6
-echo "configure:5788: checking whether windows registry support is requested" >&5
+echo "configure:5786: checking whether windows registry support is requested" >&5
 if test x$enable_win32_registry != xno; then
   cat >> confdefs.h <<\EOF
 #define ENABLE_WIN32_REGISTRY 1
@@ -5813,7 +5811,7 @@ esac
 
 if test x$enable_win32_registry != xno; then
   echo $ac_n "checking registry key on windows hosts""... $ac_c" 1>&6
-echo "configure:5817: checking registry key on windows hosts" >&5
+echo "configure:5815: checking registry key on windows hosts" >&5
   cat >> confdefs.h <<EOF
 #define WIN32_REGISTRY_KEY "$gcc_cv_win32_registry_key"
 EOF
@@ -5993,7 +5991,7 @@ fi
 
 # Figure out what assembler we will be using.
 echo $ac_n "checking what assembler to use""... $ac_c" 1>&6
-echo "configure:5997: checking what assembler to use" >&5
+echo "configure:5995: checking what assembler to use" >&5
 gcc_cv_as=
 gcc_cv_gas_major_version=
 gcc_cv_gas_minor_version=
@@ -6078,7 +6076,7 @@ fi
 
 # Figure out what nm we will be using.
 echo $ac_n "checking what nm to use""... $ac_c" 1>&6
-echo "configure:6082: checking what nm to use" >&5
+echo "configure:6080: checking what nm to use" >&5
 if test -x nm$host_exeext; then
 	gcc_cv_nm=./nm$host_exeext
 elif test x$host = x$target; then
@@ -6089,7 +6087,7 @@ echo "$ac_t""$gcc_cv_nm" 1>&6
 
 # Figure out what assembler alignment features are present.
 echo $ac_n "checking assembler alignment features""... $ac_c" 1>&6
-echo "configure:6093: checking assembler alignment features" >&5
+echo "configure:6091: checking assembler alignment features" >&5
 gcc_cv_as_alignment_features=none
 if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
 	# Gas version 2.6 and later support for .balign and .p2align.
@@ -6137,7 +6135,7 @@ fi
 echo "$ac_t""$gcc_cv_as_alignment_features" 1>&6
 
 echo $ac_n "checking assembler subsection support""... $ac_c" 1>&6
-echo "configure:6141: checking assembler subsection support" >&5
+echo "configure:6139: checking assembler subsection support" >&5
 gcc_cv_as_subsections=no
 if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
   if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 9 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then
@@ -6177,7 +6175,7 @@ fi
 echo "$ac_t""$gcc_cv_as_subsections" 1>&6
 
 echo $ac_n "checking assembler weak support""... $ac_c" 1>&6
-echo "configure:6181: checking assembler weak support" >&5
+echo "configure:6179: checking assembler weak support" >&5
 gcc_cv_as_weak=no
 if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
   if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 2 -o "$gcc_cv_gas_major_version" -gt 2; then
@@ -6200,7 +6198,7 @@ fi
 echo "$ac_t""$gcc_cv_as_weak" 1>&6
 
 echo $ac_n "checking assembler hidden support""... $ac_c" 1>&6
-echo "configure:6204: checking assembler hidden support" >&5
+echo "configure:6202: checking assembler hidden support" >&5
 gcc_cv_as_hidden=no
 if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
   if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 10 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then
@@ -6226,7 +6224,7 @@ echo "$ac_t""$gcc_cv_as_hidden" 1>&6
 case "$target" in 
   sparc*-*-*)
     echo $ac_n "checking assembler .register pseudo-op support""... $ac_c" 1>&6
-echo "configure:6230: checking assembler .register pseudo-op support" >&5
+echo "configure:6228: checking assembler .register pseudo-op support" >&5
 if eval "test \"`echo '$''{'gcc_cv_as_register_pseudo_op'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6254,7 +6252,7 @@ EOF
     fi
 
     echo $ac_n "checking assembler supports -relax""... $ac_c" 1>&6
-echo "configure:6258: checking assembler supports -relax" >&5
+echo "configure:6256: checking assembler supports -relax" >&5
 if eval "test \"`echo '$''{'gcc_cv_as_relax_opt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6284,7 +6282,7 @@ EOF
     case "$tm_file" in
     *64*)
 	echo $ac_n "checking for 64 bit support in assembler ($gcc_cv_as)""... $ac_c" 1>&6
-echo "configure:6288: checking for 64 bit support in assembler ($gcc_cv_as)" >&5
+echo "configure:6286: checking for 64 bit support in assembler ($gcc_cv_as)" >&5
 if eval "test \"`echo '$''{'gcc_cv_as_flags64'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6329,7 +6327,7 @@ EOF
 
     if test "x$gcc_cv_as_flags64" != xno; then
 	echo $ac_n "checking for assembler offsetable %lo() support""... $ac_c" 1>&6
-echo "configure:6333: checking for assembler offsetable %lo() support" >&5
+echo "configure:6331: checking for assembler offsetable %lo() support" >&5
 if eval "test \"`echo '$''{'gcc_cv_as_offsetable_lo10'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6368,7 +6366,7 @@ EOF
 
   i[34567]86-*-*)
     echo $ac_n "checking assembler instructions""... $ac_c" 1>&6
-echo "configure:6372: checking assembler instructions" >&5
+echo "configure:6370: checking assembler instructions" >&5
     gcc_cv_as_instructions=
     if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
       if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 9 -o "$gcc_cv_gas_major_version" -gt 2; then
@@ -6397,7 +6395,7 @@ EOF
 esac
 
 echo $ac_n "checking assembler dwarf2 debug_line support""... $ac_c" 1>&6
-echo "configure:6401: checking assembler dwarf2 debug_line support" >&5
+echo "configure:6399: checking assembler dwarf2 debug_line support" >&5
 gcc_cv_as_dwarf2_debug_line=no
 # ??? Not all targets support dwarf2 debug_line, even within a version
 # of gas.  Moreover, we need to emit a valid instruction to trigger any
@@ -6543,7 +6541,7 @@ EOF
 
 
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:6547: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:6545: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
diff --git a/gcc/configure.in b/gcc/configure.in
index 3a9b5dee3888..23973687d854 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -716,15 +716,13 @@ fi
 # $vars is the list of shell variables with file names to include.
 # auto-host.h is the file containing items generated by autoconf and is
 # the first file included by config.h.
-null_defines=
-host_xm_file="auto-host.h gansidecl.h ${host_xm_file} defaults.h hwint.h"
-
 # If host=build, it is correct to have hconfig include auto-host.h
 # as well.  If host!=build, we are in error and need to do more 
 # work to find out the build config parameters.
+# FIXME: hconfig.h should be bconfig.h.
 if test x$host = x$build
 then
-	build_xm_file="auto-host.h gansidecl.h ${build_xm_file} defaults.h hwint.h"
+	build_auto=auto-host.h
 else
 	# We create a subdir, then run autoconf in the subdir.
 	# To prevent recursion we set host and build for the new
@@ -746,15 +744,18 @@ else
 	mv auto-host.h ../auto-build.h
 	cd ..
 	rm -rf $tempdir
-	build_xm_file="auto-build.h gansidecl.h ${build_xm_file} defaults.h hwint.h"
+	build_auto=auto-build.h
 fi
 
-xm_file="gansidecl.h ${xm_file} defaults.h"
-tm_file="gansidecl.h ${tm_file} defaults.h"
+null_defines=
+tm_file="${tm_file} defaults.h"
+host_xm_file="auto-host.h gansidecl.h ${host_xm_file} ${tm_file} hwint.h"
+build_xm_file="${build_auto} gansidecl.h ${build_xm_file} ${tm_file} hwint.h"
+xm_file="gansidecl.h ${xm_file} ${tm_file}"
 
-vars="host_xm_file tm_file tm_p_file xm_file build_xm_file"
-links="config.h tm.h tm_p.h tconfig.h hconfig.h"
-defines="host_xm_defines null_defines null_defines xm_defines build_xm_defines"
+vars="host_xm_file tm_p_file xm_file build_xm_file"
+links="config.h tm_p.h tconfig.h hconfig.h"
+defines="host_xm_defines null_defines xm_defines build_xm_defines"
 
 rm -f config.bak
 if test -f config.status; then mv -f config.status config.bak; fi
@@ -772,7 +773,7 @@ do
 
 	# Define TARGET_CPU_DEFAULT if the system wants one.
 	# This substitutes for lots of *.h files.
-	if test "$target_cpu_default" != "" -a $link = tm.h
+	if test "$target_cpu_default" != ""
 	then
 		echo "#define TARGET_CPU_DEFAULT ($target_cpu_default)" >>$link
 	fi
@@ -801,14 +802,11 @@ do
 		echo "#endif" >>$link
 	done
 
-	if test $link = tm.h
-	then
-		# Include insn-codes.h last, because it includes machmode.h,
-		# and we want EXTRA_CC_MODES to be taken into account.
-		echo "#ifndef GENERATOR_FILE" >>$link
-		echo "#include \"insn-codes.h\"" >>$link
-		echo "#endif" >>$link
-	fi
+	# Include insn-codes.h last, because it includes machmode.h,
+	# and we want EXTRA_CC_MODES to be taken into account.
+	echo "#ifndef GENERATOR_FILE" >>$link
+	echo "#include \"insn-codes.h\"" >>$link
+	echo "#endif" >>$link
 done
 
 # Truncate the target if necessary
diff --git a/gcc/crtstuff.c b/gcc/crtstuff.c
index f51cf16da03b..765171948488 100644
--- a/gcc/crtstuff.c
+++ b/gcc/crtstuff.c
@@ -55,10 +55,8 @@ Boston, MA 02111-1307, USA.  */
    compiled for the target, and hence definitions concerning only the host
    do not apply.  */
 
-#include "auto-host.h"
-#include "tm.h"
+#include "tconfig.h"
 #include "tsystem.h"
-
 #include "frame.h"
 
 #ifndef CRT_CALL_STATIC_FUNCTION
diff --git a/gcc/gcc.texi b/gcc/gcc.texi
index 08dd6e2b6550..c1b21b2188c2 100644
--- a/gcc/gcc.texi
+++ b/gcc/gcc.texi
@@ -4085,12 +4085,17 @@ Define this macro if the host system is VMS.
 @findex FATAL_EXIT_CODE
 @item FATAL_EXIT_CODE
 A C expression for the status code to be returned when the compiler
-exits after serious errors.
+exits after serious errors.  The default is the system-provided macro
+@samp{EXIT_FAILURE}, or @samp{1} if the system doesn't define that
+macro.  Define this macro only if these defaults are incorrect.
 
 @findex SUCCESS_EXIT_CODE
 @item SUCCESS_EXIT_CODE
 A C expression for the status code to be returned when the compiler
-exits without serious errors.
+exits without serious errors.  (Warnings are not serious errors.)  The
+default is the system-provided macro @samp{EXIT_SUCCESS}, or @samp{0} if
+the system doesn't define that macro.  Define this macro only if these
+defaults are incorrect.
 
 @findex HOST_WORDS_BIG_ENDIAN
 @item HOST_WORDS_BIG_ENDIAN
diff --git a/gcc/system.h b/gcc/system.h
index e73524e56dab..589e3440036c 100644
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -119,6 +119,25 @@ extern int errno;
 #endif
 #endif
 
+/* If we don't have an overriding definition, set SUCCESS_EXIT_CODE and
+   FATAL_EXIT_CODE to EXIT_SUCCESS and EXIT_FAILURE respectively,
+   or 0 and 1 if those macros are not defined.  */
+#ifndef SUCCESS_EXIT_CODE
+# ifdef EXIT_SUCCESS
+#  define SUCCESS_EXIT_CODE EXIT_SUCCESS
+# else
+#  define SUCCESS_EXIT_CODE 0
+# endif
+#endif
+
+#ifndef FATAL_EXIT_CODE
+# ifdef EXIT_FAILURE
+#  define FATAL_EXIT_CODE EXIT_FAILURE
+# else
+#  define FATAL_EXIT_CODE 1
+# endif
+#endif
+
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
-- 
GitLab