configure.in: Prune nonexistent files from build_xm_file, xm_file, and host_xm_file lists.

	* configure.in: Prune nonexistent files from build_xm_file,
	xm_file, and host_xm_file lists.  Warn unless they're
	$cpu/xm-$cpu.h.
	Don't generate *config.h here.
	AC_SUBST all variables needed to generate *config.h.
	* configure: Regenerate.
	* mkconfig.sh: New helper script, from code removed from
	configure.in.
	* Makefile.in: Zap all MALLOC variables - no longer used
	anywhere, and malloc.c doesn't exist.
	Substitute in variables needed to generate *config.h.
	Stop lying about the dependencies contained in CONFIG_H and
	GCONFIG_H.
	(HCONFIG_H, TCONFIG_H, TM_P_H): New variables.
	(config.h, hconfig.h, tconfig.h, tm_p.h, cs-config.h,
	cs-hconfig.h, cs-tconfig.h, cs-tm_p.h): New rules.
	(all .o): Add dependencies on $(HCONFIG_H), $(TCONFIG_H),
	$(TM_P_H), etc. as appropriate.

	* config.gcc: Zap references to deleted files.
	* ggc-none.c: Don't include rtl.h or tm_p.h.

	* config/i386/xm-beos.h, config/i386/xm-dgux.h,
	config/i386/xm-djgpp.h, config/i386/xm-dos.h,
	config/i386/xm-gnu.h, config/i386/xm-i386-interix.h,
	config/i386/xm-linux.h, config/i386/xm-linux.h,
	config/i386/xm-next.h, config/i386/xm-openbsd.h,
	config/i386/xm-sun.h, config/i386/xm-sysv3.h:
	Don't include i386/xm-i386.h.

	* config/elxsi/xm-elxsi.h, config/i386/xm-bsd386.h,
	config/i386/xm-i386.h, config/i860/xm-i860.h,
	config/i960/xm-i960.h, config/mcore/xm-mcore.h,
	config/mn10300/xm-mn10300.h, config/ns32k/xm-ns32k.h,
	config/pj/xm-pj.h, config/sh/xm-sh.h, config/v850/xm-v850.h:
	Delete (empty except comments, #includes of other deleted
	files, and macros used nowhere).
cp:
	* Make-lang.in: Add dependencies on $(TM_P_H) as appropriate.

From-SVN: r40350

gcc/ChangeLog

+2001-03-09  Zack Weinberg  <zackw@stanford.edu>
+
+	* configure.in: Prune nonexistent files from build_xm_file,
+	xm_file, and host_xm_file lists.  Warn unless they're
+	$cpu/xm-$cpu.h.
+	Don't generate *config.h here.
+	AC_SUBST all variables needed to generate *config.h.
+	* configure: Regenerate.
+	* mkconfig.sh: New helper script, from code removed from
+	configure.in.
+	* Makefile.in: Zap all MALLOC variables - no longer used
+	anywhere, and malloc.c doesn't exist.
+	Substitute in variables needed to generate *config.h.
+	Stop lying about the dependencies contained in CONFIG_H and
+	GCONFIG_H.
+	(HCONFIG_H, TCONFIG_H, TM_P_H): New variables.
+	(config.h, hconfig.h, tconfig.h, tm_p.h, cs-config.h,
+	cs-hconfig.h, cs-tconfig.h, cs-tm_p.h): New rules.
+	(all .o): Add dependencies on $(HCONFIG_H), $(TCONFIG_H),
+	$(TM_P_H), etc. as appropriate.
+
+	* config.gcc: Zap references to deleted files.
+	* ggc-none.c: Don't include rtl.h or tm_p.h.
+
+	* config/i386/xm-beos.h, config/i386/xm-dgux.h,
+	config/i386/xm-djgpp.h, config/i386/xm-dos.h,
+	config/i386/xm-gnu.h, config/i386/xm-i386-interix.h,
+	config/i386/xm-linux.h, config/i386/xm-linux.h,
+	config/i386/xm-next.h, config/i386/xm-openbsd.h,
+	config/i386/xm-sun.h, config/i386/xm-sysv3.h:
+	Don't include i386/xm-i386.h.
+
+	* config/elxsi/xm-elxsi.h, config/i386/xm-bsd386.h,
+	config/i386/xm-i386.h, config/i860/xm-i860.h,
+	config/i960/xm-i960.h, config/mcore/xm-mcore.h,
+	config/mn10300/xm-mn10300.h, config/ns32k/xm-ns32k.h,
+	config/pj/xm-pj.h, config/sh/xm-sh.h, config/v850/xm-v850.h:
+	Delete (empty except comments, #includes of other deleted
+	files, and macros used nowhere).
+
 Fri Mar  9 20:05:27 CET 2001  Jan Hubicka  <jh@suse.cz>
 
 	* i386.h (MAX_WCHAR_TYPE_SIZE): New constant to keep tradcpp
@@ -6,17 +46,20 @@ Fri Mar  9 20:05:27 CET 2001  Jan Hubicka  <jh@suse.cz>
 Fri Mar  9 19:52:52 CET 2001  Jan Hubicka  <jh@suse.cz>
 
 	* i386.h (FIRST_PSEUDO_REGISTER): Set to 53.
-	(FIXED_REGISTERS, CALL_USED_REGISTERS, REG_ALLOC_ONES): Add extended ones.
-	(CONDITIONAL_REGISTER_USAGE): Set proper values according to TARGET_64BIT.
-	(FIRST_REX_INT_REG, LAST_REX_INT_REG, FIRST_REX_SSE_REG, LAST_REX_SSE_REG):
-	define.
+
+	(FIXED_REGISTERS, CALL_USED_REGISTERS, REG_ALLOC_ONES): Add
+	extended ones.
+	(CONDITIONAL_REGISTER_USAGE): Set proper values according to
+	TARGET_64BIT.
+	(FIRST_REX_INT_REG, LAST_REX_INT_REG, FIRST_REX_SSE_REG,
+	LAST_REX_SSE_REG): define.
 	(enum reg_class): Add 'LEGACY_REGS'
 	(REG_CLASS_CONTENTS): Likewise; add extended registers.
 	(SSE_REGNO_P): Recognize extended registers.
 	(ANY_QI_REG_P, REX_INT_REGNO_P, REX_INT_REG_P): New.
 	(REG_CLASS_FROM_LETTER): Add 'R' and 'Q'.
-	(REGNO_OK_FOR_INDEX_P, REGNO_OK_FOR_BASE_P, REG_OK_FOR_BASE_NONSTRICT_P):
-	 Recognize REX registers.
+	(REGNO_OK_FOR_INDEX_P, REGNO_OK_FOR_BASE_P,
+	REG_OK_FOR_BASE_NONSTRICT_P): Recognize REX registers.
 	(REG_OK_FOR_STRREG_NONSTRICT_P, REG_OK_FOR_STRREG_STRICT_P,
 	 REG_OK_FOR_STRREG_P): Remove.
 	(HI_REGISTER_NAMES): Add extended registers.
@@ -79,7 +122,7 @@ Thu Mar  8 23:29:37 2001  John Wehle  (john@feith.com)
 2001-03-08  Bruce Korb  <bkorb@gnu.org>
 
 	gcc.c(main): ensure SIGCHLD handling is set to SIG_DFL so that
-	wiat4() can receive the signal.
+	wait4() can receive the signal.
 
 Thu Mar  8 21:09:10 2001  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
 

gcc/config.gcc

@@ -3248,7 +3248,6 @@ thumb*-*-*)
 v850-*-rtems*)
 	cpu_type=v850
 	tm_file="v850/rtems.h"
-	xm_file="v850/xm-v850.h"
 	tmake_file="v850/t-v850 t-rtems"
 	if test x$stabs = xyes
 	then
@@ -3262,7 +3261,6 @@ v850-*-*)
 	target_cpu_default="TARGET_CPU_generic"
 	cpu_type=v850
 	tm_file="v850/v850.h"
-	xm_file="v850/xm-v850.h"
 	tmake_file=v850/t-v850
 	if test x$stabs = xyes
 	then

gcc/config/i386/xm-beos.h

@@ -20,8 +20,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 <i386/xm-i386.h>
-
 /* Include <sys/wait.h> to define the exit status access macros.  */
 #ifndef inhibit_libc
 #include <sys/wait.h>

gcc/config/i386/xm-bsd386.h

-/* Configuration for GCC for Intel i386 running BSDI's BSD/386 as host.  */
-
-#include "i386/xm-i386.h"

gcc/config/i386/xm-dgux.h

+/* Configuration for GCC for Intel i386 running DG/ux */
+
+/* looks just like sysv4 for now */
+#include "xm-svr4.h"

gcc/config/i386/xm-djgpp.h

@@ -20,8 +20,6 @@ Boston, MA 02111-1307, USA.  */
 
 #define __MSDOS__ 1
 
-#include "i386/xm-i386.h"
-
 /* Use semicolons to separate elements of a path.  */
 #define PATH_SEPARATOR ';'
 

gcc/config/i386/xm-dos.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 "i386/xm-i386.h"
-
 /* Use semicolons to separate elements of a path.  */
 #define PATH_SEPARATOR ';'
 

gcc/config/i386/xm-gnu.h

+/* Configuration for GCC for Intel i386 running GNU as host.  */
+#include <xm-gnu.h>

gcc/config/i386/xm-i386-interix.h

@@ -21,8 +21,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 <i386/xm-i386.h>
-
 #define HOST_BITS_PER_WIDEST_INT HOST_BITS_PER_LONGLONG
 #ifdef __GNUC__
 #   define HOST_WIDEST_INT long long

gcc/config/i386/xm-i386.h

-/* Configuration for GNU C-compiler for Intel 80386.
-   Copyright (C) 1988, 1993, 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.  */
-
-#ifndef __i386__
-#define __i386__ 1
-#endif

gcc/config/i386/xm-linux.h

@@ -19,5 +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 <i386/xm-i386.h>
 #include <xm-linux.h>

gcc/config/i386/xm-next.h

-#include "i386/xm-i386.h"
-
 /* malloc does better with chunks the size of a page.  */ 
 
 #define OBSTACK_CHUNK_SIZE (getpagesize ())

gcc/config/elxsi/xm-elxsi.h → gcc/config/i386/xm-openbsd.h

-/* Configuration for GNU C-compiler for Elxsi.
-   Copyright (C) 1987, 1993, 2001 Free Software Foundation, Inc.
+/* Configuration file for i386 hosts running OpenBSD.
+   Copyright (C) 1999 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -18,3 +18,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 <xm-openbsd.h>

gcc/config/i860/xm-i860.h → gcc/config/i386/xm-sun.h

-/* Configuration for GNU C-compiler for Intel i860.
-   Copyright (C) 1988, 1993, 2001 Free Software Foundation, Inc.
+/* Configuration for GNU C-compiler for Intel 80386 running SunOS 4.0.
+   Copyright (C) 1988, 1997 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -18,3 +18,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.  */
 
+#define USG

gcc/config/i386/xm-sysv3.h

+/* Configuration for GCC for Intel i386 running System V Release 3.  */
+
+#include "xm-svr3.h"

gcc/config/i960/xm-i960.h

-/* Configuration for GNU C-compiler for Intel 960 family
-   Copyright (C) 1987, 1993, 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.  */
-

gcc/config/mcore/xm-mcore.h

-/* Configuration for GNU C-compiler for the Motorola M*Core.
-   Copyright (C) 1993, 1999, 2000, 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, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-

gcc/config/mn10300/xm-mn10300.h

-/* Configuration for Matsushita MN10300. 
-   Copyright (C) 1996, 1998, 1999, 2001 Free Software Foundation, Inc.
-   Contributed by Cygnus Support.
-
-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/config/ns32k/xm-ns32k.h

-/* Configuration for GNU C-compiler for Vax.
-   Copyright (C) 1987, 1993, 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.  */

gcc/config/pj/xm-pj.h

-/* Configuration for GNU C-compiler for picoJava.
-   Copyright (C) 2000, 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.  */
-

gcc/config/sh/xm-sh.h

-/* Configuration for GNU C-compiler for Hitachi SH.
-   Copyright (C) 1993, 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.  */
-

gcc/config/v850/xm-v850.h

-/* Configuration for NEC V850. 
-   Copyright (C) 1996, 1998, 1999, 2001 Free Software Foundation, Inc.
-   Contributed by Cygnus Support.
-
-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/configure.in

@@ -673,9 +673,46 @@ then
 fi
 
 # Say what files are being used for the output code and MD file.
-echo "Using \`$srcdir/config/$out_file' to output insns."
+echo "Using \`$srcdir/config/$out_file' for machine-specific logic."
 echo "Using \`$srcdir/config/$md_file' as machine description file."
 
+# If any of the xm_file variables contain nonexistent files, warn
+# about them and drop them.  But $cpu/xm-$cpu.h is allowed not to
+# exist, if we have nothing for it to do.
+
+bx=
+for x in $build_xm_file; do
+  if    test -f $srcdir/config/$x
+  then      bx="$bx $x"
+  elif  echo $x | grep '\([a-z0-9][a-z0-9]*\)/xm-\1\.h' >/dev/null
+  then      :
+  else      AC_MSG_WARN($srcdir/config/$x does not exist.)
+  fi
+done
+build_xm_file="$bx"
+
+hx=
+for x in $host_xm_file; do
+  if    test -f $srcdir/config/$x
+  then      hx="$hx $x"
+  elif  echo $x | grep '\([a-z0-9][a-z0-9]*\)/xm-\1\.h' >/dev/null
+  then      :
+  else      AC_MSG_WARN($srcdir/config/$x does not exist.)
+  fi
+done
+host_xm_file="$hx"
+
+tx=
+for x in $xm_file; do
+  if    test -f $srcdir/config/$x
+  then      tx="$tx $x"
+  elif  echo $x | grep '\([a-z0-9][a-z0-9]*\)/xm-\1\.h' >/dev/null
+  then      :
+  else      AC_MSG_WARN($srcdir/config/$x does not exist.)
+  fi
+done
+xm_file="$tx"
+
 count=a
 for f in $tm_file; do
 	count=${count}x
@@ -693,7 +730,9 @@ count=a
 for f in $host_xm_file; do
 	count=${count}x
 done
-if test $count = ax; then
+if test $count = a; then
+	:
+elif test $count = ax; then
 	echo "Using \`$srcdir/config/$host_xm_file' as host machine macro file."
 else
 	echo "Using the following host machine macro files:"
@@ -707,7 +746,9 @@ if test "$host_xm_file" != "$build_xm_file"; then
 	for f in $build_xm_file; do
 		count=${count}x
 	done
-	if test $count = ax; then
+	if test $count = a; then
+		:
+	elif test $count = ax; then
 		echo "Using \`$srcdir/config/$build_xm_file' as build machine macro file."
 	else
 		echo "Using the following build machine macro files:"
@@ -725,15 +766,11 @@ if test x$thread_file = x; then
 	fi
 fi
 
-# Set up the header files.
-# $links is the list of header files to create.
-# $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.
 # 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_auto=auto-host.h
@@ -761,68 +798,11 @@ else
 	build_auto=auto-build.h
 fi
 
-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_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
-
-# Make the links.
-while test -n "$vars"
-do
-	set $vars; var=$1; shift; vars=$*
-	set $links; link=$1; shift; links=$*
-	set $defines; define=$1; shift; defines=$*
-
-	rm -f $link
-	# Make sure the file is created, even if it is empty.
-	echo >$link
-
-	# Define TARGET_CPU_DEFAULT if the system wants one.
-	# This substitutes for lots of *.h files.
-	if test "$target_cpu_default" != ""
-	then
-		echo "#define TARGET_CPU_DEFAULT ($target_cpu_default)" >>$link
-	fi
-
-	for file in `eval echo '$'$var`; do
-		case $file in
-		auto-host.h | auto-build.h )
-			;;
-		*)
-			echo '#ifdef IN_GCC' >>$link
-			;;
-		esac
-		echo "#include \"$file\"" >>$link
-		case $file in
-		auto-host.h | auto-build.h )
-			;;
-		*)
-			echo '#endif' >>$link
-			;;
-		esac
-	done
-
-	for def in `eval echo '$'$define`; do
-		echo "#ifndef $def" >>$link
-		echo "#define $def" >>$link
-		echo "#endif" >>$link
-	done
-
-	# 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
 if test x$host_truncate_target != x; then
 	target=`echo $target | sed -e 's/\(..............\).*/\1/'`
@@ -998,6 +978,11 @@ for f in $tm_file; do
   esac
 done
 
+tm_p_file_list=
+for f in $tm_p_file; do
+    tm_p_file_list="${tm_p_file_list} \$(srcdir)/config/$f"
+done
+
 host_xm_file_list=
 for f in $host_xm_file; do
   case $f in
@@ -1885,6 +1870,8 @@ AC_SUBST(all_stagestuff)
 AC_SUBST(build_exeext)
 AC_SUBST(build_install_headers_dir)
 AC_SUBST(build_xm_file_list)
+AC_SUBST(build_xm_file)
+AC_SUBST(build_xm_defines)
 AC_SUBST(check_languages)
 AC_SUBST(cc_set_by_configure)
 AC_SUBST(quoted_cc_set_by_configure)
@@ -1907,6 +1894,8 @@ AC_SUBST(gcc_version_trigger)
 AC_SUBST(host_exeext)
 AC_SUBST(host_extra_gcc_objs)
 AC_SUBST(host_xm_file_list)
+AC_SUBST(host_xm_file)
+AC_SUBST(host_xm_defines)
 AC_SUBST(install)
 AC_SUBST(lang_options_files)
 AC_SUBST(lang_specs_files)
@@ -1921,10 +1910,14 @@ AC_SUBST(stage_prefix_set_by_configure)
 AC_SUBST(symbolic_link)
 AC_SUBST(thread_file)
 AC_SUBST(tm_file_list)
+AC_SUBST(tm_file)
+AC_SUBST(tm_p_file_list)
+AC_SUBST(tm_p_file)
+AC_SUBST(xm_file)
 AC_SUBST(will_use_collect2)
 AC_SUBST(c_target_objs)
 AC_SUBST(cxx_target_objs)
-
+AC_SUBST(target_cpu_default)
 
 AC_SUBST_FILE(target_overrides)
 AC_SUBST_FILE(host_overrides)

gcc/cp/ChangeLog

+2001-03-09  Zack Weinberg  <zackw@stanford.edu>
+
+	* Make-lang.in: Add dependencies on $(TM_P_H) as appropriate.
+
 2001-03-08  Stan Shebs  <shebs@apple.com>
 
 	* cp-tree.h (set_identifier_local_value): Remove unused decl.

gcc/cp/Make-lang.in

@@ -261,19 +261,22 @@ CXX_TREE_H = $(TREE_H) cp/cp-tree.h c-common.h cp/cp-tree.def c-common.def \
 
 cp/spew.o: cp/spew.c $(CXX_TREE_H) cp/parse.h flags.h cp/lex.h toplev.h
 cp/lex.o: cp/lex.c $(CXX_TREE_H) cp/parse.h flags.h cp/lex.h c-pragma.h \
-  toplev.h output.h mbchar.h $(GGC_H) input.h diagnostic.h cp/operators.def
+  toplev.h output.h mbchar.h $(GGC_H) input.h diagnostic.h cp/operators.def \
+  $(TM_P_H)
 cp/decl.o: cp/decl.c $(CXX_TREE_H) flags.h cp/lex.h cp/decl.h stack.h \
-  output.h $(EXPR_H) except.h toplev.h hash.h $(GGC_H) $(RTL_H) cp/operators.def
+  output.h $(EXPR_H) except.h toplev.h hash.h $(GGC_H) $(RTL_H) \
+  cp/operators.def $(TM_P_H)
 cp/decl2.o: cp/decl2.c $(CXX_TREE_H) flags.h cp/lex.h cp/decl.h $(EXPR_H) \
   output.h except.h toplev.h dwarf2out.h dwarfout.h $(GGC_H) $(RTL_H)
-cp/typeck2.o: cp/typeck2.c $(CXX_TREE_H) flags.h toplev.h output.h
+cp/typeck2.o: cp/typeck2.c $(CXX_TREE_H) flags.h toplev.h output.h $(TM_P_H)
 cp/typeck.o: cp/typeck.c $(CXX_TREE_H) flags.h $(RTL_H) $(EXPR_H) toplev.h 
 cp/class.o: cp/class.c $(CXX_TREE_H) flags.h toplev.h $(RTL_H)
 cp/call.o: cp/call.c $(CXX_TREE_H) flags.h toplev.h $(RTL_H) $(EXPR_H) $(GGC_H)
 cp/friend.o: cp/friend.c $(CXX_TREE_H) flags.h $(RTL_H) toplev.h $(EXPR_H)
 cp/init.o: cp/init.c $(CXX_TREE_H) flags.h $(RTL_H) $(EXPR_H) toplev.h \
   $(GGC_H) except.h
-cp/method.o: cp/method.c $(CXX_TREE_H) toplev.h $(GGC_H) $(RTL_H) $(EXPR_H)
+cp/method.o: cp/method.c $(CXX_TREE_H) toplev.h $(GGC_H) $(RTL_H) $(EXPR_H) \
+  $(TM_P_H)
 cp/cvt.o: cp/cvt.c $(CXX_TREE_H) cp/decl.h flags.h toplev.h convert.h
 cp/search.o: cp/search.c $(CXX_TREE_H) stack.h flags.h toplev.h $(RTL_H)
 cp/tree.o: cp/tree.c $(CXX_TREE_H) flags.h toplev.h $(GGC_H) $(RTL_H) \
@@ -282,7 +285,8 @@ cp/ptree.o: cp/ptree.c $(CXX_TREE_H) system.h
 cp/rtti.o: cp/rtti.c $(CXX_TREE_H) flags.h toplev.h
 cp/except.o: cp/except.c $(CXX_TREE_H) flags.h $(RTL_H) except.h toplev.h \
   cp/cfns.h $(EXPR_H) insn-flags.h cp/decl.h $(OBSTACK_H)
-cp/expr.o: cp/expr.c $(CXX_TREE_H) $(RTL_H) flags.h $(EXPR_H) toplev.h except.h
+cp/expr.o: cp/expr.c $(CXX_TREE_H) $(RTL_H) flags.h $(EXPR_H) toplev.h \
+  except.h $(TM_P_H)
 cp/xref.o: cp/xref.c $(CXX_TREE_H) input.h toplev.h
 cp/pt.o: cp/pt.c $(CXX_TREE_H) cp/decl.h cp/parse.h cp/lex.h toplev.h \
   $(GGC_H) $(RTL_H) except.h

gcc/ggc-none.c

@@ -22,14 +22,8 @@
    need GC at all.  This prevents problems with pulling in all the
    tree stuff.  */
 
-/* We are used by gengenrtl, before genrtl.h exists.  But we don't 
-   need it either.  */
-#define NO_GENRTL_H
-
 #include "config.h"
 #include "system.h"
-#include "rtl.h"
-#include "tm_p.h"
 #include "ggc.h"
 
 void *

gcc/mkconfig.sh

+#! /bin/sh
+
+# Generate gcc's config.h, which is not your normal autoconf-generated
+# config.h (that's auto-(host|build).h).  $1 is the file to generate.
+# HEADERS, DEFINES, and possibly TARGET_CPU_DEFAULT are expected to be
+# set in the environment.
+
+if [ -z "$1" ]; then
+    echo "Usage: HEADERS='list' DEFINES='list' mkconfig.sh FILE" >&2
+    exit 1
+fi
+
+output=$1
+rm -f $output.T
+exec > $output.T
+
+# Define TARGET_CPU_DEFAULT if the system wants one.
+# This substitutes for lots of *.h files.
+if [ "$TARGET_CPU_DEFAULT" != "" ]; then
+    echo "#define TARGET_CPU_DEFAULT ($TARGET_CPU_DEFAULT)"
+fi
+
+# The first entry in HEADERS may be auto-host.h or auto-build.h;
+# it wants to be included even when not -DIN_GCC.
+if [ -n "$HEADERS" ]; then
+    set $HEADERS; first=$1
+    case $first in auto-* )
+	echo "#include \"$first\""
+	shift
+	HEADERS=$*
+	;;
+    esac
+fi
+
+if [ -n "$HEADERS" ]; then
+    echo '#ifdef IN_GCC'
+    for file in $HEADERS; do
+	echo "# include \"$file\""
+    done
+    echo '#endif'
+fi
+
+for def in $DEFINES; do
+    echo "#ifndef $def"
+    echo "# define $def"
+    echo "#endif"
+done
+
+# 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"
+echo "#include \"insn-codes.h\""
+echo "#endif"
+
+exec >&-
+
+# Avoid changing the actual file if possible.
+if [ -f $output ] && cmp $output.T $output; then
+    echo $output is unchanged >&2
+    rm -f $output.T
+else
+    mv -f $output.T $output
+fi
+
+# Touch a stamp file for Make's benefit.
+rm -f cs-$output
+echo timestamp > cs-$output