--- gcc/configure	2018/04/24 17:51:25	1.1
+++ gcc/configure	2018/04/24 17:56:48	1.1.1.3
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Configuration script for GNU CC
-#   Copyright (C) 1988, 1990, 1991 Free Software Foundation, Inc.
+#   Copyright (C) 1988, 1990, 1991, 1992 Free Software Foundation, Inc.
 
 #This file is part of GNU CC.
 
@@ -33,15 +33,19 @@ progname=$0
 
 # Default --srcdir to the directory where the script is found, 
 # if a directory was specified.
-srcdir=`echo $0 | sed 's|/[^/]*$||'`
+# The second sed call is to convert `.//configure' to `./configure'.
+srcdir=`echo $0 | sed 's|//|/|' | sed 's|/[^/]*$||'`
 if [ x$srcdir = x$0 ]
 then
 srcdir=
 fi
 
+host=
+
 remove=rm
 hard_link=ln
 symbolic_link='ln -s'
+copy=cp
 
 # Record all the arguments, to write them in config.status.
 arguments=$*
@@ -56,8 +60,6 @@ do
 # Handle -srcdir, etc, with space between it and argument.
   if [ x$next_srcdir = xyes ]
   then srcdir=$arg; next_srcdir=;
-  else if [ x$next_objdir = xyes ]
-  then objdir=$arg; next_objdir=;
 # Handle -host, etc, with space between it and argument.
   else if [ x$next_host = xyes ]
   then host=$arg; next_host=;
@@ -71,12 +73,6 @@ do
      -srcdir | --srcdir | --srcdi | --srcd | --src | --sr | --s)
 	next_srcdir=yes
 	;;
-     -objdir=* | --objdir=* | --objdi=* | --objd=* | --obj=* | --ob=* | --o=*)
-	objdir=`echo $arg | sed 's/-*o[a-z]*=//'`
-	;;
-     -objdir | --objdir | --objdi | --objd | --obj | --ob | --o)
-	next_objdir=yes
-	;;
      -host | --host | --hos | --ho | --h)
 	next_host=yes
 	;;
@@ -89,12 +85,21 @@ do
      -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
 	target=`echo $arg | sed 's/-*t[a-z]*=//'`
 	;; 
-     -gas | --gas | --ga | --g)
+     -with-gnu-ld | --with-gnu-ld | --with-gnu-l)
+	gnu_ld=yes
+	;;
+     -gas | --gas | --ga | --g | -with-gnu-as | --with-gnu-as | -with-gnu-a)
         gas=yes
 	;;
      -nfp | --nfp | --nf | --n)
 	nfp=yes
 	;;
+     -with-* | --with-*) ;; #ignored
+     -x | --x) ;; # ignored
+     -*)
+	echo "Invalid option \`$arg'" 1>&2
+	exit 1
+	;;
      *)
 # Allow configure HOST TARGET
 	if [ x$host = x ]
@@ -104,7 +109,7 @@ do
 	target=$arg
 	;;
     esac
-  fi; fi; fi; fi
+  fi; fi; fi
 done
 
 # Find the source files, if location was not specified.
@@ -122,34 +127,29 @@ if [ ! -r ${srcdir}/tree.c ]
 then
 	if [ x$srcdirdefaulted = x ]
 	then
-	  echo "$progname: Can't find compiler sources in \`${srcdir}'." 1>&2
+	  echo "$progname: Can't find compiler sources in \`${srcdir}'" 1>&2
 	else
-	  echo "$progname: Can't find compiler sources in \`.' or \`..'." 1>&2
+	  echo "$progname: Can't find compiler sources in \`.' or \`..'" 1>&2
 	fi
 	exit 1
 fi
 
-# If the directory for object files was specified, 
-# go to that directory and do the configuring there.
-# Replace srcdir with an absolute file name
-# so that changing working directory does not invalidate it.
-if [ x$objdir = x ]
-then true
-else
-	srcdir=`(cd $srcdir; pwd)`
-	cd $objdir
+if [ -r ${srcdir}/config.status ] && [ x$srcdir != x. ]
+then
+	echo "$progname: \`configure' has been run in \`${srcdir}'" 1>&2
+	exit 1
 fi
 
 # Complain if an arg is missing
 if [ x$target = x ]
 then
-	echo "No target specified."
-	echo "Usage: $progname [--srcdir=DIR] [--host=HOST] [--gas] [--nfp] TARGET"
-	echo -n "Where HOST and TARGET are something like "
-	echo "\`vax', \`sun3', \`encore', etc."
+	echo "No target specified." 1>&2
+	echo "Usage: $progname [--srcdir=DIR] [--host=HOST] [--gas] [--nfp] TARGET" 1>&2
+	echo -n "Where HOST and TARGET are something like " 1>&2
+	echo "\`vax', \`sun3', \`encore', etc." 1>&2
 	if [ -r config.status ]
 	then
-		cat config.status
+		cat config.status 1>&2
 	fi
 	exit 1
 fi
@@ -160,6 +160,10 @@ then
 	host=$target
 fi
 
+host_xm_file=
+host_xmake_file=
+host_broken_install=
+
 # Decode the host machine, then the target machine.
 # For the host machine, we save the xm_file variable as host_xm_file;
 # then we decode the target machine and forget everything else
@@ -172,8 +176,14 @@ for machine in $host $target; do
 	cpu_type=
 	xm_file=
 	tm_file=
+	out_file=
 	xmake_file=
 	tmake_file=
+	header_files=
+	# Set this to force installation and use of collect2.
+	use_collect2=
+	# Set this to force use of install.sh.
+	broken_install=
 
 	case $machine in
 	# Support site-specific machine types.
@@ -192,9 +202,11 @@ for machine in $host $target; do
 		;;
 	vax-*-bsd*)			# vaxen running BSD
 		tm_file=vax.h
+		use_collect2=yes
 		;;
 	vax-*-ultrix*)			# vaxen running ultrix
 		tm_file=ultrix.h
+		use_collect2=yes
 		;;
 	vax-*-vms*)			# vaxen running VMS
 		xm_file=xm-vms.h
@@ -212,39 +224,62 @@ for machine in $host $target; do
 #		xm_file=xm-tahoe.h
 #		tm_file=tahoe.h
 #		;;
-	i386-osfrose*)			# 386 using OSF/rose
+	i386-*-osfrose*)		# 386 using OSF/rose
 		tm_file=i386rose.h
 		xmake_file=x-i386rose
 		tmake_file=t-i386rose
+		use_collect2=yes
 		;;
 	i386-sequent-bsd*) 		# 80386 from Sequent
 		xm_file=xm-i386.h
-		tm_file=seq386.h
+		use_collect2=yes
+		if [ x$gas = xyes ]
+		then
+			tm_file=seq386gas.h
+		else
+			tm_file=seq386.h
+		fi
+		;;
+	i386-*-bsd*)
+		xm_file=xm-i386.h
+		tm_file=i386bsd.h
+		tmake_file=t-libc-ok
+		use_collect2=yes
 		;;
 	i386-*-mach*)
 		xm_file=xm-i386.h
 		tm_file=i386mach.h
 		tmake_file=t-libc-ok
+		use_collect2=yes
+		;;
+	i386-*-sco3.2v4*)	 	# 80386 running SCO 3.2v4 system
+		xm_file=xm-i386sco.h
+		tm_file=i386sco4.h
+		xmake_file=x-i386sco
+		tmake_file=t-i386sco
 		;;
 	i386-*-sco*)		 	# 80386 running SCO system
-		xm_file=xm-i386v.h
+		xm_file=xm-i386sco.h
 		tm_file=i386sco.h
 		xmake_file=x-i386sco
 		tmake_file=t-i386sco
 		;;
 	i386-*-isc*)			# 80386 running ISC system
-		xm_file=xm-i386v.h
+		xm_file=xm-i386isc.h
 		tm_file=i386isc.h
 		xmake_file=x-i386isc
+		tmake_file=t-i386isc
 		;;
 	i386-ibm-aix*)			# IBM PS/2 running AIX
 		tm_file=aix386.h
 		xm_file=xm-aix386.h
 		xmake_file=x-aix386
+		broken_install=yes
 		;;
 	i386-sun-sunos*)		# Sun i386 roadrunner
-		xm_file=xm-i386sun.h
+		xm_file=xm-sun386.h
 		tm_file=i386sun.h
+		use_collect2=yes
 		;;
 	i386-*-sysv4*)			# Intel 80386's running system V.4
 		xm_file=xm-i38v4.h
@@ -263,6 +298,13 @@ for machine in $host $target; do
 			tm_file=i386v.h
 		fi
 		;;
+	i486-ncr-sysv4*)		# NCR 3000 - i486 running system V.4
+		cpu_type=i386
+		xm_file=xm-i38v4.h
+		xmake_file=x-ncr3000
+		tm_file=i486v4.h
+		tmake_file=t-svr4
+		;;
 	i486-*-sysv4*)			# Intel 80486's running system V.4
 		cpu_type=i386
 		xm_file=xm-i38v4.h
@@ -283,10 +325,10 @@ for machine in $host $target; do
 		tmake_file=t-svr4
 		;;
 	i860-alliant-*)		# Alliant FX/2800
-		xm_file=xm-i86v4.h
-		xmake_file=x-i860v4
+		xm_file=xm-fx2800.h
+		xmake_file=x-fx2800
 		tm_file=fx2800.h
-		tmake_file=t-svr4
+		tmake_file=t-fx2800
 		;;
 	i860-*-bsd*)
 		if [ x$gas = xyes ]
@@ -295,48 +337,72 @@ for machine in $host $target; do
 		else
 			tm_file=i860b.h
 		fi
+		use_collect2=yes
 		;;
-	sparc-unicom-*)
+	sparc-tti-*)
 		tm_file=pbd.h
 		xm_file=xm-pbd.h
+		use_collect2=yes
 		;;
 	sparc-*-sunos4*)
 		tm_file=sparc.h
+		use_collect2=yes
 		;;
 	sparc-*-sunos3*)
 		tm_file=sun4o3.h
+		use_collect2=yes
 		;;
 	sparc-*-sysv4*)
-		tm_file=sparc.h
+		xm_file=xm-spcv4.h
+		tm_file=sparcv4.h
 		tmake_file=t-svr4
+		xmake_file=x-sparcv4
 		;;
-	m68k-tti-*)
-		tm_file=tti68k.h
+	sparc-*-solaris2*)
+		xm_file=xm-spcv4.h
+		tm_file=spc-sol2.h
+		tmake_file=t-svr4
+		xmake_file=x-sparcv4
 		;;
-# This has not been updated in a while.  I don't think it will be.
-# mab@tticda.tti.com might be able to say more.  If it does not get
-# updated, the newpbb.h file can be yanked, as it is not for a
-# general machine.  Mike Stump <mrs@csun.edu>.
-#	m68k-tti2-*)
-#		tm_file=newpbb.h
-#		;;
 	m68k-*-amix*)		# Commodore variant of V.4.
 		tm_file=amix.h
 		xm_file=xm-amix.h
 		xmake_file=x-amix
 		tmake_file=t-svr4
+		header_files=math-68881.h
 		;;
 	m68k-*-sysv4*)			# Motorola m68k's running system V.4
 		tm_file=m68kv4.h
 		xm_file=xm-m68kv4.h
 		xmake_file=x-m68kv4
 		tmake_file=t-svr4
+		header_files=math-68881.h
+		;;
+	m68k-bull-sysv*)		# Bull DPX/2
+		if [ x$gas = xyes ]
+		then
+			tm_file=dpx2g.h
+		else
+			tm_file=dpx2.h
+		fi
+		xm_file=xm-m68kv.h
+		# is this cool ?
+		if [ -d /makesys/kernel/cf/ncl_mr ]; then
+			xmake_file=x-dpx2300
+		elif [ -d /makesys/kernel/cf/ncl_el ]; then
+			xmake_file=x-dpx2200
+		fi
+		xmake_file=${xmake_file:-x-dpx2300}
+		use_collect2=yes
+		header_files=math-68881.h
 		;;
 	m68k-next-*)
 		tm_file=next.h
 		out_file=next.c
 		xm_file=xm-next.h
-		tmake_file=t-libc-ok
+		tmake_file=t-next
+		use_collect2=yes
+		header_files=math-68881.h
 		;;
 	m68k-sun-sunos3*)
 		if [ x$nfp = xyes ]
@@ -345,17 +411,29 @@ for machine in $host $target; do
 		else
 			tm_file=sun3o3.h
 		fi
+		use_collect2=yes
+		header_files=math-68881.h
 		;;
-	m68k-sun-mach*)
-		tm_file=sun3mach.h
-		;;
-	m68k-sun-sunos4*)
+	m68k-sun-sunos*)		# For Sunos 4 (the default).
 		if [ x$nfp = xyes ]
 		then
 			tm_file=sun3n.h
 		else
 			tm_file=sun3.h
 		fi
+		use_collect2=yes
+		header_files=math-68881.h
+		;;
+	m68k-sun-mach*)
+		tm_file=sun3mach.h
+		use_collect2=yes
+		header_files=math-68881.h
+		;;
+	m68k-tti-*)
+		tm_file=pbb.h
+		xm_file=xm-m68kv.h
+		use_collect2=yes
+		header_files=math-68881.h
 		;;
 	m68k-hp-hpux*)	# HP 9000 series 300
 		xm_file=xm-hp320.h
@@ -367,9 +445,14 @@ for machine in $host $target; do
 			xmake_file=x-hp320
 			tm_file=hp320.h
 		fi
+		broken_install=yes
+		use_collect2=yes
+		header_files=math-68881.h
 		;;
 	m68k-hp-bsd*)			# HP 9000/3xx running Berkeley Unix
 		tm_file=hp3bsd.h
+		use_collect2=yes
+		header_files=math-68881.h
 		;;
 	m68k-isi-bsd*)
 		if [ x$nfp = xyes ]
@@ -378,6 +461,8 @@ for machine in $host $target; do
 		else
 			tm_file=isi.h
 		fi
+		use_collect2=yes
+		header_files=math-68881.h
 		;;
 	m68k-sony-bsd*)
 	        xm_file=xm-m68k.h
@@ -387,6 +472,8 @@ for machine in $host $target; do
 		else
 			tm_file=news.h
 		fi
+		use_collect2=yes
+		header_files=math-68881.h
 		;;
 	m68k-altos-sysv*)		   # Altos 3068
 		if [ x$gas = xyes ]
@@ -397,32 +484,52 @@ for machine in $host $target; do
 			echo "The Altos is supported only with the GNU assembler" 1>&2
 			exit 1
 		fi
+		header_files=math-68881.h
 	        ;;
 	m68k-motorola-sysv*)
 		tm_file=mot3300.h
 		xm_file=xm-mot3300.h
+		header_files=math-68881.h
 		;;
-	m68k-crds-unos)
+	m68k-crds-unos*)
 		xm_file=xm-crds.h
 		xmake_file=x-crds
 		tm_file=crds.h
-		install_with_cp=yes
+		broken_install=yes
+		use_collect2=yes
+		header_files=math-68881.h
 		;;
 	m68k-apollo-*)
 		xmake_file=x-apollo68
 		tm_file=apollo68.h
+		use_collect2=yes
+		header_files=math-68881.h
 		;;
 	m68k-ncr-sysv*)			# NCR Tower 32 SVR3
 		tm_file=tower-as.h
 		xm_file=xm-tower.h
+		xmake_file=x-tower
+		tmake_file=t-svr3
+		header_files=math-68881.h
+		;;
+	m68k-*-sysv3*)			# Motorola m68k's running system V.3
+		tm_file=m68k.h
+		xm_file=xm-m68kv.h
+		xmake_file=x-m68kv
+		tmake_file=t-svr3
+		header_files=math-68881.h
 		;;
 	m68000-sun-sunos3*)
 		cpu_type=m68k
 		tm_file=sun2.h
+		use_collect2=yes
+		header_files=math-68881.h
 		;;
 	m68000-sun-sunos4*)
 		cpu_type=m68k
 		tm_file=sun2o4.h
+		use_collect2=yes
+		header_files=math-68881.h
 		;;
 	m68000-hp-hpux*)		# HP 9000 series 300
 		cpu_type=m68k
@@ -435,11 +542,16 @@ for machine in $host $target; do
 			xmake_file=x-hp320
 			tm_file=hp310.h
 		fi
+		broken_install=yes
+		use_collect2=yes
+		header_files=math-68881.h
 		;;
 	m68000-hp-bsd*)			# HP 9000/200 running BSD
 		cpu_type=m68k
 		tm_file=hp2bsd.h
 		xmake_file=x-hp2bsd
+		use_collect2=yes
+		header_files=math-68881.h
 		;;
 	m68000-att-sysv*)
 		cpu_type=m68k
@@ -450,53 +562,72 @@ for machine in $host $target; do
 		else
 			tm_file=3b1.h
 		fi
+		use_collect2=yes
+		header_files=math-68881.h
 		;;
 	m68000-convergent-sysv*)
 		cpu_type=m68k
 		xm_file=xm-3b1.h
 		tm_file=ctix.h
+		use_collect2=yes
+		header_files=math-68881.h
 		;;
 	ns32k-encore-osf*)		# Encore with OSF/rose
 		tm_file=encrose.h
 		xmake_file=x-encrose
 		tmake_file=t-encrose
+		use_collect2=yes
 		;;
 	ns32k-sequent-bsd*)
 		tm_file=sequent.h
+		use_collect2=yes
 		;;
 	ns32k-encore-bsd*)
 		tm_file=encore.h
+		use_collect2=yes
 		;;
-	ns32k-ns-genix*)
-		xm_file=xm-genix.h
-		xmake_file=x-genix
-		tm_file=genix.h
-		;;
+# This has not been updated to GCC 2.
+#	ns32k-ns-genix*)
+#		xm_file=xm-genix.h
+#		xmake_file=x-genix
+#		tm_file=genix.h
+#		use_collect2=yes
+#		;;
 	ns32k-merlin-*)
 		tm_file=merlin.h
+		use_collect2=yes
+		;;
+	ns32k-pc532-mach*)
+		tm_file=pc532-mach.h
+		use_collect2=yes
+		;;
+	ns32k-pc532-minix*)
+		tm_file=pc532-min.h
+		xm_file=xm-pc532-min.h
+		use_collect2=yes
 		;;
 	m88k-*-luna*)
 		tm_file=m88kluna.h
-		xmake_file=x-m88kluna
 		tmake_file=t-m88kluna
 		;;
 	m88k-dg-dgux*)
-		xmake_file=x-m88kdgux
-		tmake_file=t-m88k
 		tm_file=m88kdgux.h
+		xmake_file=x-m88kdgux
 		;;
 	m88k-*-sysv4*)
+		tm_file=m88kv4.h
 		xmake_file=x-m88kv4
 		tmake_file=t-m88kv4
-		tm_file=m88kv4.h
+		;;
+	m88k-dolphin-sysv3*)
+		tm_file=m88kdolph.h
+		xm_file=xm-m88kv3.h
+		xmake_file=x-m88kdolph
 		;;
 	m88k-*-sysv3*)
 		tm_file=m88kv3.h
 		xm_file=xm-m88kv3.h
-		;;
-	m88k-*)
-		tm_file=m88k.h
-		xm_file=xm-m88k.h
+		xmake_file=x-m88kv3
 		;;
 # This hasn't been upgraded to GCC 2.
 #	fx80-alliant-*)			# Alliant FX/80
@@ -508,101 +639,198 @@ for machine in $host $target; do
 	c1-convex-*)			# Convex C1
 		tm_file=convex1.h
 		cpu_type=convex
+		use_collect2=yes
 		;;
 	c2-convex-*)			# Convex C2
 		tm_file=convex2.h
 		cpu_type=convex
+		use_collect2=yes
 		;;
 	c32-convex-*)
 		tm_file=convex32.h	# Convex C32xx
 		cpu_type=convex
+		use_collect2=yes
 		;;
 	c34-convex-*)
 		tm_file=convex34.h	# Convex C34xx
 		cpu_type=convex
+		use_collect2=yes
 		;;
 	c38-convex-*)
 		tm_file=convex38.h	# Convex C38xx
 		cpu_type=convex
+		use_collect2=yes
 		;;
 	mips-sgi-irix4*)		# Mostly like a MIPS.
-		tm_file=iris.h
+		tm_file=iris4.h
 		xm_file=xm-irix4.h
-		install_with_cp=yes
+		broken_install=yes
+		xmake_file=x-iris
+		use_collect2=yes
 		;;
-	mips-sgi-irix*)			# Mostly like a MIPS.
+	mips-sgi-*)			# Mostly like a MIPS.
 		tm_file=iris.h
 		xm_file=xm-iris.h
-		install_with_cp=yes
-		;;
-	mips-*-sysv)			# MIPS System V.
-		tm_file=mips-sysv.h
-		xm_file=xm-umips.h
-		;;
-	mips-mips-*)			# Default MIPS environment.
-		tm_file=mips.h
+		broken_install=yes
+		xmake_file=x-iris
+		use_collect2=yes
 		;;
 	mips-dec-ultrix*)		# Decstation.
 		tm_file=decstatn.h
 		tmake_file=t-decstatn
+		xmake_file=x-decstatn
+		use_collect2=yes
 	        ;;
-	mips-dec-osf*)			# Decstation with OSF/1.
+	mips-dec-osfrose*)		# Decstation running OSF/1 reference port with OSF/rose.
 		tm_file=decrose.h
 		xmake_file=x-decrose
 		tmake_file=t-decrose
+		use_collect2=yes
 		;;
-	mips-sony-bsd*)	# Sony NEWS 3600 or risc/news.
+	mips-dec-osf*)			# Decstation running OSF/1 as shipped by DIGITAL
+		tm_file=dec-osf1.h
+		xmake_file=x-mips
+		tmake_file=t-decstatn
+		use_collect2=yes
+		;;
+	mips-sony-bsd*)			# Sony NEWS 3600 or risc/news.
 		tm_file=mips-news.h
+		xm_file=xm-mipsbsdn.h
+		use_collect2=yes
+		;;
+	mips-sony-sysv*)		# Sony NEWS 3800 with NEWSOS5.0.
+					# That is based on svr4.
+		# t-svr4 is not right because this system doesn't use ELF.
+		tm_file=mips-n5.h
+		xm_file=xm-mipsnews.h
+		use_collect2=yes
 		;;
-	mips-*-bsd*)	# BSD 4.3 variant of MIPS system.
+	mips-*-bsd*)			# BSD 4.3 variant of MIPS system.
 		tm_file=mips-bsd.h
+		use_collect2=yes
 	        ;;
+	mips-*-sysv4*)			# MIPS System V.4.
+		tm_file=mips-svr4.h
+		xm_file=xm-umips.h
+		xmake_file=x-mipsv
+		use_collect2=yes
+		;;
+	mips-*-sysv*)			# MIPS System V.
+		tm_file=mips-sysv.h
+		xm_file=xm-umips.h
+		xmake_file=x-mipsv
+		use_collect2=yes
+		;;
+	mips-mips-*)			# Default MIPS environment.
+		tm_file=mips.h
+		use_collect2=yes
+		;;
+	pyramid-*-*)
+		cpu_type=pyr
+		tm_file=pyr.h
+		use_collect2=yes
+		;;
 # This hasn't been upgraded to GCC 2.
-#	pyramid | pyramid-* | pyramid-*)
-#		cpu_type=pyr
-#		tm_file=pyr.h
-#		;;
-# This hasn't been upgraded to GCC 2.
-#	tron | tron-*)
+#	tron-*-*)
 #		cpu_type=gmicro
 #		tm_file=gmicro.h
+#		use_collect2=yes
 #		;;
 	a29k-*-bsd*)
 		tm_file=a29kunix.h
 		xm_file=xm-a29kunix.h
 		xmake_file=x-a29kunix
+		use_collect2=yes
+		;;
+	a29k-*-*)			# Default a29k environment.
+		use_collect2=yes
 		;;
-	romp-*-bsd*)
+	romp-*-aos*)
 		xm_file=xm-romp.h
 		tm_file=romp.h
+		use_collect2=yes
 		;;
 	romp-*-mach*)
 		xm_file=xm-romp.h
 		tm_file=romp.h
 		xmake_file=x-romp-mach
+		use_collect2=yes
 		;;
-	rs6000-*-mach* | rs6000-mach*)
+	rs6000-*-mach*)
 		xm_file=xm-rs6k-m.h
 		tm_file=rs6000-mach.h
+		xmake_file=x-rs6k-mach
+		use_collect2=yes
 		;;
 	rs6000-*)
 		xm_file=xm-rs6000.h
 		tm_file=rs6000.h
+		use_collect2=yes
 		;;
-	hp800-*-* | hp700-*-*)
-		cpu_type=hp800
-		xm_file=xm-hp800.h
-		tm_file=hp800.h
+	hppa1.1-*-bsd*)
+		cpu_type=pa
+		xm_file=xm-pa.h
+		tm_file=pa1.h
+		use_collect2=yes
+		;;
+	hppa1.0-*-bsd*)
+		cpu_type=pa
+		xm_file=xm-pa.h
+		tm_file=pa.h
+		use_collect2=yes
+		;;
+	hppa1.1-*-hpux*)
+		cpu_type=pa
+		xm_file=xm-pa.h
+		xmake_file=x-pa-hpux
+		if [ x$gas = xyes ]
+		then
+			tm_file=pa1-ghpux.h
+		else
+			tm_file=pa1-hpux.h
+		fi
+		broken_install=yes
+		use_collect2=yes
+		;;
+	hppa1.0-*-hpux*)
+		cpu_type=pa
+		xm_file=xm-pa.h
+		xmake_file=x-pa-hpux
+		if [ x$gas = xyes ]
+		then
+			tm_file=pa-ghpux.h
+		else
+			tm_file=pa-hpux.h
+		fi
+		broken_install=yes
+		use_collect2=yes
+		;;
+	we32k-att-sysv*)
+		cpu_type=we32k
+		use_collect2=yes
+		;;
+	i960-*-*)			# Default i960 environment.
+		use_collect2=yes
+		;;
+	*)
+		echo "Configuration $machine not recognized" 1>&2
+		exit 1
 		;;
 	esac
 
 	case $machine in
 	*-*-sysv4*)
-		
 		xmake_try_sysv=x-sysv
 		;;
 	*-*-sysv*)
-		install_with_cp=yes
+		broken_install=yes
+		;;
+	esac
+
+	# No need for collect2 if we have the GNU linker.
+	case x$gnu_ld in 
+	xyes)
+		use_collect2=
 		;;
 	esac
 
@@ -621,14 +849,17 @@ for machine in $host $target; do
 		then xmake_file=x-$cpu_type
 		fi
 		host_xmake_file=$xmake_file
-		host_install_with_cp=$install_with_cp
+		host_broken_install=$broken_install
 		pass1done=yes
 	fi
 done
 
 # Default the target-machine variables that were not explicitly set.
 if [ x$tm_file = x ]
-then tm_file=$target.h; fi
+then tm_file=$cpu_type.h; fi
+
+if [ x$header_files = x ]
+then header_files=; fi
 
 if [ x$xm_file = x ]
 then xm_file=xm-$cpu_type.h; fi
@@ -658,21 +889,21 @@ do
 	if [ ! -r ${srcdir}/config/$file ]
 	then
 		echo "$progname: cannot create a link \`$link'," 1>&2
-		echo "since the file \`config/$file' does not exist." 1>&2
+		echo "since the file \`config/$file' does not exist" 1>&2
 		exit 1
 	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
+	$symbolic_link ${srcdir}/config/$file $link 2>/dev/null || $hard_link ${srcdir}/config/$file $link || $copy ${srcdir}/config/$file $link
 
 	if [ ! -r $link ]
 	then
-		echo "$progname: unable to link \`$link' to \`${srcdir}/config/$file'." 1>&2
+		echo "$progname: unable to link \`$link' to \`${srcdir}/config/$file'" 1>&2
 		exit 1
 	fi
-	echo "Linked \`$link' to \`${srcdir}/config/$file'."
+	echo "Linked \`$link' to \`${srcdir}/config/$file'"
 done
 
 # Create Makefile.tem from Makefile.in.
@@ -715,11 +946,35 @@ fi
 
 # Add a definition for INSTALL if system wants one.
 # This substitutes for lots of x-* files.
-if [ x$install_with_cp = x ]
+if [ x$host_broken_install = x ]
+then true
+else
+	rm -f Makefile.xx
+	sed 's|^INSTALL = .*|INSTALL = $(srcdir)/install.sh -c|' Makefile.tem > Makefile.xx
+	rm -f Makefile.tem
+	mv Makefile.xx Makefile.tem
+fi
+
+# Set EXTRA_HEADERS according to header_files.
+# This substitutes for lots of t-* files.
+if [ x$header_files = x ]
+then true
+else
+	rm -f Makefile.xx
+	sed "s/^EXTRA_HEADERS =/EXTRA_HEADERS = $header_files/" 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.
+if [ x$use_collect2 = x ]
 then true
 else
 	rm -f Makefile.xx
-	echo "INSTALL=cp" | cat - Makefile.tem > Makefile.xx
+	(echo "USE_COLLECT2 = ld"; echo "MAYBE_USE_COLLECT2 = -DUSE_COLLECT2")\
+ 	   | cat - Makefile.tem > Makefile.xx
 	rm -f Makefile.tem
 	mv Makefile.xx Makefile.tem
 fi