--- gcc/configure	2018/04/24 18:08:15	1.1.1.5
+++ gcc/configure	2018/04/24 18:11:58	1.1.1.6
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Configuration script for GNU CC
-#   Copyright (C) 1988, 1990, 1991, 1992 Free Software Foundation, Inc.
+#   Copyright (C) 1988, 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
 
 #This file is part of GNU CC.
 
@@ -33,6 +33,7 @@
 #	   --with-gnu-ld	arrange to work with GNU ld.
 #	   --with-gnu-as	arrange to work with GAS.
 #	   --with-stabs		arrange to use stabs instead of host debug format.
+#	   --with-elf		arrange to use elf instead of host debug format.
 #	   --nfp		assume system has no FPU.
 #
 # If configure succeeds, it leaves its status in config.status.
@@ -179,8 +180,16 @@ do
 	| --stabs | --stab | --sta | --st)
 	stabs=yes
 	;;
+     -with-elf | -with-el | -with-se \
+	| --with-elf | --with-el | --with-e \
+	| -elf | -el | -e \
+	|--elf | --el | --e)
+	elf=yes
+	;;
      -with-* | --with-*) ;; #ignored
+     -enable-* | --enable-*) ;; #ignored
      -x | --x) ;; # ignored
+     --verbose) ;; # ignored for now
      -*)
 	echo "Invalid option \`$arg'" 1>&2
 	exit 1
@@ -228,18 +237,23 @@ fi
 # Complain if an arg is missing
 if [ x$target = x ]
 then
-	echo "No target specified." 1>&2
-
-	echo "\
+	# This way of testing the result of a command substitution is
+	# defined by Posix.2 (section 3.9.1) as well as traditional shells.
+	if target=`${srcdir}/config.guess` ; then
+		echo "Configuring for a ${target} host." 1>&2
+	else
+		echo 'Config.guess failed to determine the host type.  You need to specify one.' 1>&2
+		echo "\
 Usage: `basename $progname` [--host=HOST] [--build=BUILD]
        [--prefix=DIR] [--local-pref=DIR] [--exec-pref=DIR]
-       [--with-gnu-as] [--with-gnu-ld] [--with-stabs] [--nfp] TARGET" 1>&2
+       [--with-gnu-as] [--with-gnu-ld] [--with-stabs] [--with-elf] [--nfp] TARGET" 1>&2
 	echo "Where HOST, TARGET and BUILD are three-part configuration names " 1>&2
-	if [ -r config.status ]
-	then
-		tail +2 config.status 1>&2
+		if [ -r config.status ]
+		then
+			tail +2 config.status 1>&2
+		fi
+		exit 1
 	fi
-	exit 1
 fi
 
 # Default other arg
@@ -258,6 +272,7 @@ host_xm_file=
 host_xmake_file=
 host_broken_install=
 host_install_headers_dir=install-headers-tar
+host_truncate_target=
 
 # Validate the specs, and canonicalize them.
 canon_build=`/bin/sh $srcdir/config.sub $build` || exit 1
@@ -277,6 +292,7 @@ for machine in $canon_build $canon_host
 	xmake_file=
 	tmake_file=
 	header_files=
+	extra_passes=
 	# Set this to force installation and use of collect2.
 	use_collect2=
 	# Set this to override the default target model.
@@ -287,6 +303,11 @@ for machine in $canon_build $canon_host
 	fixincludes=fixincludes
 	# Set this to control how the header file directory is installed.
 	install_headers_dir=install-headers-tar
+	# Set this to a non-empty list of args to pass to cpp if the target
+	# wants its .md file passed through cpp.
+	cpp_md_flags=
+	# Set this if directory names should be truncated to 14 characters.
+	truncate_target=
 
 	case $machine in
 	# Support site-specific machine types.
@@ -325,21 +346,26 @@ for machine in $canon_build $canon_host
 #		;;
 #	tahoe-*-bsd*)			# tahoe running BSD
 #		;;
+	i370-*-mvs*)
+		cpu_type=i370
+		tm_file=i370/mvs.h
+		xm_file=i370/xm-mvs.h
+		out_file=i370/mvs370.c
+		;;
 	i[34]86-*-osfrose*)		# 386 using OSF/rose
 # The following line (and similar below) is not redundant since this can
 # be used for i486 or i386.
 		cpu_type=i386
-		tm_file=i386/osfrose.h
-		xmake_file=i386/x-osfrose
-		tmake_file=i386/t-osfrose
-		use_collect2=yes
-		;;
-	i[34]86-*-osfelf*)		# 386 using OSF/1 with Elf objects
-		cpu_type=i386
-		tm_file=i386/osfelf.h
+                if [ x$elf = xyes ]
+		then
+			tm_file=i386/osfelf.h
+			use_collect2=
+		else
+			tm_file=i386/osfrose.h
+			use_collect2=yes
+		fi
 		xmake_file=i386/x-osfrose
 		tmake_file=i386/t-osfrose
-		use_collect2=no
 		;;
 	i[34]86-sequent-bsd*) 		# 80386 from Sequent
 		cpu_type=i386
@@ -402,6 +428,7 @@ for machine in $canon_build $canon_host
 			tm_file=i386/sco.h
 			tmake_file=i386/t-sco
 		fi
+		truncate_target=yes
 		;;
 	i[34]86-*-isc*)			# 80386 running ISC system
 		cpu_type=i386
@@ -457,7 +484,12 @@ for machine in $canon_build $canon_host
 		cpu_type=i386
 		xm_file=i386/xm-linux.h
 		xmake_file=i386/x-linux
-		tm_file=i386/linux.h
+                if [ x$elf = xyes ]
+		then
+			tm_file=i386/linuxelf.h
+		else
+			tm_file=i386/linux.h
+		fi
 		fixincludes=Makefile.in #On Linux, the headers are ok already.
 		broken_install=yes
 		;;
@@ -475,6 +507,15 @@ for machine in $canon_build $canon_host
 		tmake_file=t-svr4
 		xmake_file=x-svr4
 		;;
+	i[34]86-sequent-sysv*)		# Sequent 80386's running system V
+		cpu_type=i386
+		xm_file=i386/xm-sysv3.h
+		xmake_file=i386/x-sysv3
+		tm_file=i386/seq-sysv3.h
+		tmake_file=t-svr3
+		fixincludes=fixinc.svr4
+		broken_install=yes
+		;;
 	i[34]86-*-sysv*)		# Intel 80386's running system V
 		cpu_type=i386
 		xm_file=i386/xm-sysv3.h
@@ -503,6 +544,24 @@ for machine in $canon_build $canon_host
 		fixincludes=fixinc.svr4
 		broken_install=yes
 		;;
+	i[34]86-*-lynxos)
+		cpu_type=i386
+		tm_file=i386/lynx.h
+		xm_file=xm-lynx.h
+		xmake_file=x-lynx
+		# ??? Due to bugs in /bin/sh, it is too much trouble to get
+		# the fixincludes script to run correctly, so just don't do it.
+		# There are only a very few very minor things that need fixing
+		# anyways.  Also, a number of headers files do not have final
+		# newlines, which causes them to be incorrectly editted by sed.
+		fixincludes=Makefile.in
+		;;
+	i860-*-osf*)			# Intel Paragon XP/S, OSF/1AD
+		xm_file=i860/xm-paragon.h
+		tm_file=i860/paragon.h
+		tmake_file=t-osf
+		broken_install=yes
+		;;
 	i860-*-mach*)
 		xm_file=i860/xm-i860.h
 		tm_file=i860/mach.h
@@ -550,6 +609,9 @@ for machine in $canon_build $canon_host
 		tm_file=sparc/sun4o3.h
 		use_collect2=yes
 		;;
+	sparc-*-bsd*)
+		tm_file=sparc/bsd.h
+		;;
 	sparc-*-sysv4*)
 		xm_file=sparc/xm-sysv4.h
 		tm_file=sparc/sysv4.h
@@ -564,6 +626,17 @@ for machine in $canon_build $canon_host
 		fixincludes=fixinc.svr4
 		broken_install=yes
 		;;
+	sparc-*-lynxos)
+		tm_file=sparc/lynx.h
+		xm_file=xm-lynx.h
+		xmake_file=x-lynx
+		# ??? Due to bugs in /bin/sh, it is too much trouble to get
+		# the fixincludes script to run correctly, so just don't do it.
+		# There are only a very few very minor things that need fixing
+		# anyways.  Also, a number of headers files do not have final
+		# newlines, which causes them to be incorrectly editted by sed.
+		fixincludes=Makefile.in
+		;;
 	sparclite-*-*)
 		cpu_type=sparc
 		tm_file=sparc/lite.h
@@ -585,10 +658,13 @@ for machine in $canon_build $canon_host
 	m68k-bull-sysv*)		# Bull DPX/2
 		if [ x$gas = xyes ]
 		then
-			tm_file=m68k/dpx2g.h
+			if [ x$stabs = xyes ]
+			then
+				tm_file=m68k/dpx2cdbx.h
+			else
+				tm_file=m68k/dpx2g.h
+			fi
 		else
-			echo dpx2 supported only with GAS 1>&2
-			exit 1
 			tm_file=m68k/dpx2.h
 		fi
 		xm_file=m68k/xm-m68kv.h
@@ -634,7 +710,7 @@ for machine in $canon_build $canon_host
 		xm_file=m68k/xm-m68kv.h
 		header_files=math-68881.h
 		;;
-	m68k-hp-hpux*)	# HP 9000 series 300
+	m68k-hp-hpux7*)	# HP 9000 series 300 running HPUX version 7.
 		xm_file=m68k/xm-hp320.h
 		if [ x$gas = xyes ]
 		then
@@ -643,24 +719,40 @@ for machine in $canon_build $canon_host
 			tm_file=m68k/hp320g.h
 		else
 			xmake_file=m68k/x-hp320
-			tm_file=m68k/hp320.h
+			tm_file=m68k/hpux7.h
 		fi
 		broken_install=yes
 		install_headers_dir=install-headers-cpio
 		use_collect2=yes
 		header_files=math-68881.h
 		;;
-	m68k-hp-bsd*)			# HP 9000/3xx running Berkeley Unix
-		tm_file=m68k/hp3bsd.h
+	m68k-hp-hpux*)	# HP 9000 series 300
+		xm_file=m68k/xm-hp320.h
+		if [ x$gas = xyes ]
+		then
+			xmake_file=m68k/x-hp320g
+			tmake_file=m68k/t-hp320g
+			tm_file=m68k/hp320g.h
+		else
+			xmake_file=m68k/x-hp320
+			tm_file=m68k/hp320.h
+		fi
+		broken_install=yes
+		install_headers_dir=install-headers-cpio
 		use_collect2=yes
 		header_files=math-68881.h
 		;;
-	m68k-hp-bsd4.4)			# HP 9000/3xx running 4.4bsd
+	m68k-hp-bsd4.4*)		# HP 9000/3xx running 4.4bsd
 		tm_file=m68k/hp3bsd44.h
 		xmake_file=m68k/x-hp3bsd44
 		use_collect2=yes
 		header_files=math-68881.h
 		;;
+	m68k-hp-bsd*)			# HP 9000/3xx running Berkeley Unix
+		tm_file=m68k/hp3bsd.h
+		use_collect2=yes
+		header_files=math-68881.h
+		;;
 	m68k-isi-bsd*)
 		if [ x$nfp = xyes ]
 		then
@@ -789,6 +881,18 @@ for machine in $canon_build $canon_host
 		use_collect2=yes
 		header_files=math-68881.h
 		;;
+	m68k-*-lynxos)
+		tm_file=m68k/lynx.h
+		xm_file=xm-lynx.h
+		xmake_file=x-lynx
+		# ??? Due to bugs in /bin/sh, it is too much trouble to get
+		# the fixincludes script to run correctly, so just don't do it.
+		# There are only a very few very minor things that need fixing
+		# anyways.  Also, a number of headers files do not have final
+		# newlines, which causes them to be incorrectly editted by sed.
+		fixincludes=Makefile.in
+		header_files=math-68881.h
+		;;
 	m68000-convergent-sysv*)
 		cpu_type=m68k
 		xm_file=m68k/xm-3b1.h
@@ -854,7 +958,13 @@ for machine in $canon_build $canon_host
 		else
 		  tmake_file=m88k/t-dgux
 		fi
+		fixincludes=fixinc.dgux
 		;;
+	m88k-mot*-sysv4*)	#added by kev for Motorola delta machines
+		tm_file=m88k/mot-sysv4.h	#added by kev
+		xmake_file=m88k/x-sysv4		#added by kev
+		tmake_file=m88k/t-sysv4		#added by kev
+		;;				#added by kev
 	m88k-*-sysv4*)
 		tm_file=m88k/sysv4.h
 		xmake_file=m88k/x-sysv4
@@ -883,6 +993,7 @@ for machine in $canon_build $canon_host
 	m88k-*-sysv3*)
 		tm_file=m88k/sysv3.h
 		xm_file=m88k/xm-sysv3.h
+		xmake_file=m88k/x-sysv3
 		if [ x$gas = xyes ]
 		then
 		  tmake_file=m88k/t-m88k-gas
@@ -891,7 +1002,20 @@ for machine in $canon_build $canon_host
 # This hasn't been upgraded to GCC 2.
 #	fx80-alliant-*)			# Alliant FX/80
 #		;;
-	arm-*-*)			# Acorn RISC machine
+	arm-*-riscix1.[01]*)		# Acorn RISC machine (early versions)
+		tm_file=arm/riscix1-1.h
+		use_collect2=yes
+		;;
+	arm-*-riscix*)			# Acorn RISC machine
+		if [ x$gas = xyes ]
+		then
+		    tm_file=arm/rix-gas.h
+		else
+		    tm_file=arm/riscix.h
+		fi
+		use_collect2=yes
+		;;
+	arm-*-*)			# generic version
 		;;
 	c1-convex-*)			# Convex C1
 		cpu_type=convex
@@ -918,76 +1042,92 @@ for machine in $canon_build $canon_host
 		tm_file=convex/convex38.h	# Convex C38xx
 		use_collect2=yes
 		;;
+	mips-sgi-irix5*)		# SGI System V.4., IRIX 5
+		tm_file=mips/iris5.h
+		xm_file=mips/xm-iris5.h
+		broken_install=yes
+		fixincludes=Makefile.in
+		xmake_file=mips/x-iris
+		# mips-tfile doesn't work yet
+		tmake_file=mips/t-mips-gas
+		;;
 	mips-sgi-irix4loser*)		# Mostly like a MIPS.
 		if [ x$stabs = xyes ]; then
-		    tm_file=mips/iris4gl.h
+			tm_file=mips/iris4gl.h
 		else
-		    tm_file=mips/iris4loser.h
+			tm_file=mips/iris4loser.h
 		fi
 		xm_file=mips/xm-iris4.h
 		broken_install=yes
 		xmake_file=mips/x-iris
 		if [ x$gas = xyes ]
 		then
-		     tmake_file=mips/t-mips-gas
+			tmake_file=mips/t-mips-gas
+		else
+			extra_passes="mips-tfile mips-tdump"
 		fi
 		if [ x$gnu_ld != xyes ]
 		then
-		     use_collect2=yes
+			use_collect2=yes
 		fi
 		;;
 	mips-sgi-irix4*)		# Mostly like a MIPS.
 		if [ x$stabs = xyes ]; then
-		    tm_file=mips/iris4-gdb.h
+			tm_file=mips/iris4-gdb.h
 		else
-		    tm_file=mips/iris4.h
+			tm_file=mips/iris4.h
 		fi
 		xm_file=mips/xm-iris4.h
 		broken_install=yes
 		xmake_file=mips/x-iris
 		if [ x$gas = xyes ]
 		then
-		     tmake_file=mips/t-mips-gas
+			tmake_file=mips/t-mips-gas
+		else
+			extra_passes="mips-tfile mips-tdump"
 		fi
 		if [ x$gnu_ld != xyes ]
 		then
-		     use_collect2=yes
+			use_collect2=yes
 		fi
 		;;
 	mips-sgi-*)			# Mostly like a MIPS.
 		if [ x$stabs = xyes ]; then
-		    tm_file=mips/iris3-gdb.h
+			tm_file=mips/iris3-gdb.h
 		else
-		    tm_file=mips/iris3.h
+			tm_file=mips/iris3.h
 		fi
 		xm_file=mips/xm-iris3.h
 		broken_install=yes
-		xmake_file=mips/x-iris
+		xmake_file=mips/x-iris3
 		if [ x$gas = xyes ]
 		then
-		     tmake_file=mips/t-mips-gas
+			tmake_file=mips/t-mips-gas
+		else
+			extra_passes="mips-tfile mips-tdump"
 		fi
 		if [ x$gnu_ld != xyes ]
 		then
-		     use_collect2=yes
+			use_collect2=yes
 		fi
 		;;
 	mips-*-ultrix*)		# Decstation.
 		if [ x$stabs = xyes ]; then
-		    tm_file=mips/ultrix-gdb.h
+			tm_file=mips/ultrix-gdb.h
 		else
-		    tm_file=mips/ultrix.h
+			tm_file=mips/ultrix.h
 		fi
 		xmake_file=mips/x-ultrix
 		if [ x$gas = xyes ]
 		then
-		     tmake_file=mips/t-mips-gas
+			tmake_file=mips/t-mips-gas
 		else
-		     tmake_file=mips/t-ultrix
+			tmake_file=mips/t-ultrix
+			extra_passes="mips-tfile mips-tdump"
 		fi
 		if [ x$gnu_ld != xyes ]
 		then
-		     use_collect2=yes
+			use_collect2=yes
 		fi
 	        ;;
 	mips-dec-osfrose*)		# Decstation running OSF/1 reference port with OSF/rose.
@@ -998,35 +1138,55 @@ for machine in $canon_build $canon_host
 		;;
 	mips-dec-osf*)			# Decstation running OSF/1 as shipped by DIGITAL
 		if [ x$stabs = xyes ]; then
-		    tm_file=mips/dec-gosf1.h
+			tm_file=mips/dec-gosf1.h
 		else
-		    tm_file=mips/dec-osf1.h
+			tm_file=mips/dec-osf1.h
 		fi
 		xmake_file=mips/x-dec-osf1
 		if [ x$gas = xyes ]
 		then
-		     tmake_file=mips/t-mips-gas
+			tmake_file=mips/t-mips-gas
 		else
-		     tmake_file=mips/t-ultrix
+			tmake_file=mips/t-ultrix
+			extra_passes="mips-tfile mips-tdump"
 		fi
 		if [ x$gnu_ld != xyes ]
 		then
-		     use_collect2=yes
+			use_collect2=yes
 		fi
 		;;
+      mips-dec-bsd*)                  # Decstation running 4.4 BSD
+              tm_file=mips/dec-bsd.h
+              xmake_file=
+              tmake_file=
+              fixincludes=
+	      if [ x$gas = xyes ]
+	      then
+		   	tmake_file=mips/t-mips-gas
+	      else
+			tmake_file=mips/t-ultrix
+			extra_passes="mips-tfile mips-tdump"
+	      fi
+	      if [ x$gnu_ld != xyes ]
+	      then
+			use_collect2=yes
+	      fi
+	      ;;
 	mips-sony-bsd* | mips-sony-newsos*)	# Sony NEWS 3600 or risc/news.
 		if [ x$stabs = xyes ]; then
-		    tm_file=mips/news4-gdb.h
+			tm_file=mips/news4-gdb.h
 		else
-		    tm_file=mips/news4.h
+			tm_file=mips/news4.h
 		fi
 		if [ x$gas = xyes ]
 		then
-		     tmake_file=mips/t-mips-gas
+			tmake_file=mips/t-mips-gas
+		else
+			extra_passes="mips-tfile mips-tdump"
 		fi
 		if [ x$gnu_ld != xyes ]
 		then
-		     use_collect2=yes
+			use_collect2=yes
 		fi
 		xmake_file=mips/x-sony
 		;;
@@ -1034,152 +1194,183 @@ for machine in $canon_build $canon_host
 					# That is based on svr4.
 		# t-svr4 is not right because this system doesn't use ELF.
 		if [ x$stabs = xyes ]; then
-		    tm_file=mips/news5-gdb.h
+			tm_file=mips/news5-gdb.h
 		else
-		    tm_file=mips/news5.h
+			tm_file=mips/news5.h
 		fi
 		xm_file=mips/xm-news.h
 		if [ x$gas = xyes ]
 		then
-		     tmake_file=mips/t-mips-gas
+			tmake_file=mips/t-mips-gas
+		else
+			extra_passes="mips-tfile mips-tdump"
 		fi
 		if [ x$gnu_ld != xyes ]
 		then
-		     use_collect2=yes
+			use_collect2=yes
 		fi
 		;;
 	mips-*-riscos[56789]bsd* | mips-*-riscos[56789]-bsd*)
 		if [ x$stabs = xyes ]; then	# MIPS BSD 4.3, RISC-OS 5.0
-		    tm_file=mips/bsd-5-gdb.h
+			tm_file=mips/bsd-5-gdb.h
 		else
-		    tm_file=mips/bsd-5.h
+			tm_file=mips/bsd-5.h
 		fi
 		if [ x$gas = xyes ]
 		then
-		     tmake_file=mips/t-mips-gas
+			tmake_file=mips/t-bsd-gas
+		else
+			tmake_file=mips/t-bsd
+			extra_passes="mips-tfile mips-tdump"
 		fi
 		if [ x$gnu_ld != xyes ]
 		then
-		     use_collect2=yes
+			use_collect2=yes
 		fi
 		fixincludes=fixinc.mips
+		broken_install=yes
 	        ;;
 	mips-*-bsd* | mips-*-riscosbsd* | mips-*-riscos[1234]bsd* \
 		| mips-*-riscos-bsd* | mips-*-riscos[1234]-bsd*)
 		if [ x$stabs = xyes ]; then	# MIPS BSD 4.3, RISC-OS 4.0
-		    tm_file=mips/bsd-4-gdb.h
+			tm_file=mips/bsd-4-gdb.h
 		else
-		    tm_file=mips/bsd-4.h
+			tm_file=mips/bsd-4.h
 		fi
 		if [ x$gas = xyes ]
 		then
-		     tmake_file=mips/t-mips-gas
+			tmake_file=mips/t-bsd-gas
+		else
+			tmake_file=mips/t-bsd
+			extra_passes="mips-tfile mips-tdump"
 		fi
 		if [ x$gnu_ld != xyes ]
 		then
-		     use_collect2=yes
+			use_collect2=yes
 		fi
+		broken_install=yes
 	        ;;
 	mips-*-riscos[56789]sysv4* | mips-*-riscos[56789]-sysv4*)
 		if [ x$stabs = xyes ]; then	# MIPS System V.4., RISC-OS 5.0
-		    tm_file=mips/svr4-5-gdb.h
+			tm_file=mips/svr4-5-gdb.h
 		else
-		    tm_file=mips/svr4-5.h
+			tm_file=mips/svr4-5.h
 		fi
-		xm_file=mips/xm-sysv.h
+		xm_file=mips/xm-sysv4.h
 		xmake_file=mips/x-sysv
 		if [ x$gas = xyes ]
 		then
-		     tmake_file=mips/t-mips-gas
+			tmake_file=mips/t-svr4-gas
+		else
+			tmake_file=mips/t-svr4
+			extra_passes="mips-tfile mips-tdump"
 		fi
 		if [ x$gnu_ld != xyes ]
 		then
-		     use_collect2=yes
+			use_collect2=yes
 		fi
 		fixincludes=fixinc.mips
+		broken_install=yes
 		;;
 	mips-*-sysv4* | mips-*-riscos[1234]sysv4* | mips-*-riscossysv4* \
 		| mips-*-riscos[1234]-sysv4* | mips-*-riscos-sysv4*)
 		if [ x$stabs = xyes ]; then	# MIPS System V.4. RISC-OS 4.0
-		    tm_file=mips/svr4-4-gdb.h
+			tm_file=mips/svr4-4-gdb.h
 		else
-		    tm_file=mips/svr4-4.h
+			tm_file=mips/svr4-4.h
 		fi
 		xm_file=mips/xm-sysv.h
 		xmake_file=mips/x-sysv
 		if [ x$gas = xyes ]
 		then
-		     tmake_file=mips/t-mips-gas
+			tmake_file=mips/t-svr4-gas
+		else
+			tmake_file=mips/t-svr4
+			extra_passes="mips-tfile mips-tdump"
 		fi
 		if [ x$gnu_ld != xyes ]
 		then
-		     use_collect2=yes
+			use_collect2=yes
 		fi
+		broken_install=yes
 		;;
 	mips-*-riscos[56789]sysv* | mips-*-riscos[56788]-sysv*)
 		if [ x$stabs = xyes ]; then	# MIPS System V.3, RISC-OS 5.0
-		    tm_file=mips/svr3-5-gdb.h
+			tm_file=mips/svr3-5-gdb.h
 		else
-		    tm_file=mips/svr3-5.h
+			tm_file=mips/svr3-5.h
 		fi
 		xm_file=mips/xm-sysv.h
 		xmake_file=mips/x-sysv
 		if [ x$gas = xyes ]
 		then
-		     tmake_file=mips/t-mips-gas
+			tmake_file=mips/t-svr3-gas
+		else
+			tmake_file=mips/t-svr3
+			extra_passes="mips-tfile mips-tdump"
 		fi
 		if [ x$gnu_ld != xyes ]
 		then
-		     use_collect2=yes
+			use_collect2=yes
 		fi
 		fixincludes=fixinc.mips
+		broken_install=yes
 		;;
 	mips-*-sysv* | mips-*riscos*sysv*)
 		if [ x$stabs = xyes ]; then	# MIPS System V.3, RISC-OS 4.0
-		    tm_file=mips/svr3-4-gdb.h
+			tm_file=mips/svr3-4-gdb.h
 		else
-		    tm_file=mips/svr3-4.h
+			tm_file=mips/svr3-4.h
 		fi
 		xm_file=mips/xm-sysv.h
 		xmake_file=mips/x-sysv
 		if [ x$gas = xyes ]
 		then
-		     tmake_file=mips/t-mips-gas
+			tmake_file=mips/t-svr3-gas
+		else
+			tmake_file=mips/t-svr3
+			extra_passes="mips-tfile mips-tdump"
 		fi
 		if [ x$gnu_ld != xyes ]
 		then
-		     use_collect2=yes
+			use_collect2=yes
 		fi
+		broken_install=yes
 		;;
 	mips-*riscos[56789]*)			# Default MIPS RISC-OS 5.0.
 		if [ x$stabs = xyes ]; then
-		    tm_file=mips/mips-5-gdb.h
+			tm_file=mips/mips-5-gdb.h
 		else
-		    tm_file=mips/mips-5.h
+			tm_file=mips/mips-5.h
 		fi
 		if [ x$gas = xyes ]
 		then
-		     tmake_file=mips/t-mips-gas
+			tmake_file=mips/t-mips-gas
+		else
+			extra_passes="mips-tfile mips-tdump"
 		fi
 		if [ x$gnu_ld != xyes ]
 		then
-		     use_collect2=yes
+			use_collect2=yes
 		fi
 		fixincludes=fixinc.mips
+		broken_install=yes
 		;;
 	mips-*-*)				# Default MIPS RISC-OS 4.0.
 		if [ x$stabs = xyes ]; then
-		    tm_file=mips/mips-4-gdb.h
+			tm_file=mips/mips-4-gdb.h
 		else
-		    tm_file=mips/mips.h
+			tm_file=mips/mips.h
 		fi
 		if [ x$gas = xyes ]
 		then
-		     tmake_file=mips/t-mips-gas
+			tmake_file=mips/t-mips-gas
+		else
+			extra_passes="mips-tfile mips-tdump"
 		fi
 		if [ x$gnu_ld != xyes ]
 		then
-		     use_collect2=yes
+			use_collect2=yes
 		fi
 		;;
 	pyramid-*-*)
@@ -1215,21 +1406,27 @@ for machine in $canon_build $canon_host
 		use_collect2=yes
 		;;
 	rs6000-ibm-aix3.[01]*)
+		tm_file=rs6000/aix31.h
+		xmake_file=rs6000/x-aix31
 		use_collect2=yes
 		;;
 	rs6000-ibm-aix*)
-		tm_file=rs6000/aix32.h
+		use_collect2=yes
+		;;
+	powerpc-ibm-aix*)
+		cpu_type=rs6000
+		tm_file=rs6000/powerpc.h
 		use_collect2=yes
 		;;
 	hppa1.1-*-mach*)
 		cpu_type=pa
 		tm_file=pa/pa1-utahmach.h
-		use_collect2=no
+		use_collect2=yes
 		;;
 	hppa1.0-*-mach*)
 		cpu_type=pa
 		tm_file=pa/pa-utahmach.h
-		use_collect2=no
+		use_collect2=yes
 		;;
 	hppa1.1-*-bsd*)
 		cpu_type=pa
@@ -1255,15 +1452,29 @@ for machine in $canon_build $canon_host
 		install_headers_dir=install-headers-cpio
 		use_collect2=yes
 		;;
-	hppa1.1-*-hpux8.02*)
+	hppa1.0-*-hpux8.0[0-2]*)
 		cpu_type=pa
 		xm_file=pa/xm-pahpux.h
 		xmake_file=pa/x-pa-hpux
 		tmake_file=t-libc-ok
 		if [ x$gas = xyes ]
 		then
-			echo "GAS accepts new syntax only."
-			exit 1
+			tm_file=pa/pa-ghpux.h
+		else
+			tm_file=pa/pa-oldas.h
+		fi
+		broken_install=yes
+		install_headers_dir=install-headers-cpio
+		use_collect2=yes
+		;;
+	hppa1.1-*-hpux8.0[0-2]*)
+		cpu_type=pa
+		xm_file=pa/xm-pahpux.h
+		xmake_file=pa/x-pa-hpux
+		tmake_file=t-libc-ok
+		if [ x$gas = xyes ]
+		then
+			tm_file=pa/pa1-ghpux.h
 		else
 			tm_file=pa/pa1-oldas.h
 		fi
@@ -1301,6 +1512,36 @@ for machine in $canon_build $canon_host
 		install_headers_dir=install-headers-cpio
 		use_collect2=yes
 		;;
+	hppa1.1-*-hiux*)
+		cpu_type=pa
+		xm_file=pa/xm-pahiux.h
+		xmake_file=pa/x-pa-hiux
+		tmake_file=t-libc-ok
+		if [ x$gas = xyes ]
+		then
+			tm_file=pa/pa1-ghiux.h
+		else
+			tm_file=pa/pa1-hiux.h
+		fi
+		broken_install=yes
+		install_headers_dir=install-headers-cpio
+		use_collect2=yes
+		;;
+	hppa1.0-*-hiux*)
+		cpu_type=pa
+		xm_file=pa/xm-pahiux.h
+		xmake_file=pa/x-pa-hiux
+		tmake_file=t-libc-ok
+		if [ x$gas = xyes ]
+		then
+			tm_file=pa/pa-ghiux.h
+		else
+			tm_file=pa/pa-hiux.h
+		fi
+		broken_install=yes
+		install_headers_dir=install-headers-cpio
+		use_collect2=yes
+		;;
 	we32k-att-sysv*)
 		cpu_type=we32k
 		use_collect2=yes
@@ -1311,7 +1552,21 @@ for machine in $canon_build $canon_host
 	sh-*-*)
 		cpu_type=sh
 		;;
+	alpha-dec-osf1.2)
+		extra_passes="mips-tfile mips-tdump"
+		tm_file=alpha/osf12.h
+		broken_install=yes
+		use_collect2=yes
+		;;
 	alpha-*-osf*)
+		if [ x$stabs = xyes ]
+		then
+			tm_file=alpha/alpha-gdb.h
+		fi
+		if [ x$gas != xyes ]
+		then
+			extra_passes="mips-tfile mips-tdump"
+		fi
 		broken_install=yes
 		use_collect2=yes
 		;;
@@ -1394,6 +1649,7 @@ for machine in $canon_build $canon_host
 			host_xmake_file=$xmake_file
 			host_broken_install=$broken_install
 			host_install_headers_dir=$install_headers_dir
+			host_truncate_target=$truncate_target
 			pass2done=yes
 		fi
 	fi
@@ -1420,8 +1676,17 @@ fi
 
 # Set up the list of links to be made.
 # $links is the list of link names, and $files is the list of names to link to.
-files="$host_xm_file $tm_file $md_file $out_file $xm_file $build_xm_file"
-links="config.h tm.h md aux-output.c tconfig.h hconfig.h"
+files="$host_xm_file $tm_file $out_file $xm_file $build_xm_file $md_file"
+links="config.h tm.h aux-output.c tconfig.h hconfig.h"
+
+if [ -n "${cpp_md_flags}" ] ; then
+	links="$links md.pre-cpp"
+else
+	links="$links md"
+fi
+
+rm -f config.bak
+if [ -f config.status ]; then mv -f config.status config.bak; fi
 
 # Make the links.
 while [ -n "$files" ]
@@ -1438,7 +1703,6 @@ do
 	fi
 
 	$remove -f $link
-	rm -f config.status
 	# Make a symlink if possible, otherwise try a hard link
 	$symbolic_link ${srcdir}/config/$file $link 2>/dev/null || $hard_link ${srcdir}/config/$file $link || $copy ${srcdir}/config/$file $link
 
@@ -1450,6 +1714,11 @@ do
 	echo "Linked \`$link' to \`${srcdir}/config/$file'"
 done
 
+# Truncate the target if necessary
+if [ x$host_truncate_target != x ]; then
+	target=`echo $target | sed -e 's/\(..............\).*/\1/'`
+fi
+
 # Create Makefile.tem from Makefile.in.
 # Make it set VPATH if necessary so that the sources are found.
 # Also change its value of srcdir.
@@ -1502,7 +1771,7 @@ fi
 
 # Set EXTRA_HEADERS according to header_files.
 # This substitutes for lots of t-* files.
-if [ x$header_files = x ]
+if [ "x$header_files" = x ]
 then true
 else
 	rm -f Makefile.xx
@@ -1511,6 +1780,17 @@ else
 	mv Makefile.xx Makefile.tem
 fi
 
+# Set EXTRA_PASSES according to extra_passes.
+# This substitutes for lots of t-* files.
+if [ "x$extra_passes" = x ]
+then true
+else
+	rm -f Makefile.xx
+	sed "s/^EXTRA_PASSES =/EXTRA_PASSES = $extra_passes/" Makefile.tem > Makefile.xx
+	rm -f Makefile.tem
+	mv Makefile.xx Makefile.tem
+fi
+
 # Add a definition of USE_COLLECT2 if system wants one.
 # Also tell toplev.c what to do.
 # This substitutes for lots of t-* files.
@@ -1530,8 +1810,19 @@ if [ x$target_cpu_default = x ]
 then true
 else
 	rm -f Makefile.xx
-	(echo "MAYBE_TARGET_DEFAULT = -DTARGET_CPU_DEFAULT=$target_cpu_default")\
- 	   | cat - Makefile.tem > Makefile.xx
+# This used cat, but rfg@netcom.com said that ran into NFS bugs.
+	sed -e "/^# Makefile for GNU C compiler./c\\
+MAYBE_TARGET_DEFAULT = -DTARGET_CPU_DEFAULT=$target_cpu_default\\
+\# Makefile for GNU C compiler." Makefile.tem > Makefile.xx
+	rm -f Makefile.tem
+	mv Makefile.xx Makefile.tem
+fi
+
+# Add a CPP_MD dependence if the real md file is in md.pre-cpp.
+if [ -n "${cpp_md_flags}" ] ; then
+	rm -f Makefile.xx
+	(echo "CPP_MD = md.pre-cpp cpp" ; echo "CPP_MD_FLAGS = $cpp_md_flags" ; echo "MD_FILE = md") \
+	  | cat - Makefile.tem > Makefile.xx
 	rm -f Makefile.tem
 	mv Makefile.xx Makefile.tem
 fi
@@ -1607,9 +1898,17 @@ fi
 # Make that file a shellscript which will reestablish the same configuration.
 echo "#!/bin/sh
 # GCC was configured as follows:
-${srcdir}/configure" $arguments > config.status
-echo echo host=$canon_host target=$canon_target build=$canon_build >> config.status
-chmod a+x config.status
+${srcdir}/configure" $arguments > config.new
+echo echo host=$canon_host target=$canon_target build=$canon_build >> config.new
+chmod a+x config.new
+if [ -f config.bak ] && cmp config.bak config.new >/dev/null 2>/dev/null;
+then
+	mv -f config.bak config.status
+	rm -f config.new
+else
+	mv -f config.new config.status
+	rm -f config.bak
+fi
 
 if [ x$canon_host = x$canon_target ]
 then