--- gcc/configure	2018/04/24 17:51:25	1.1.1.1
+++ gcc/configure	2018/04/24 17:52:36	1.1.1.2
@@ -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.
 
@@ -42,6 +42,7 @@ fi
 remove=rm
 hard_link=ln
 symbolic_link='ln -s'
+copy=cp
 
 # Record all the arguments, to write them in config.status.
 arguments=$*
@@ -56,8 +57,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 +70,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
 	;;
@@ -95,6 +88,7 @@ do
      -nfp | --nfp | --nf | --n)
 	nfp=yes
 	;;
+     -x | --x) ;; # ignored
      *)
 # Allow configure HOST TARGET
 	if [ x$host = x ]
@@ -104,7 +98,7 @@ do
 	target=$arg
 	;;
     esac
-  fi; fi; fi; fi
+  fi; fi; fi
 done
 
 # Find the source files, if location was not specified.
@@ -122,34 +116,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
@@ -219,7 +208,17 @@ for machine in $host $target; do
 		;;
 	i386-sequent-bsd*) 		# 80386 from Sequent
 		xm_file=xm-i386.h
-		tm_file=seq386.h
+		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
 		;;
 	i386-*-mach*)
 		xm_file=xm-i386.h
@@ -227,15 +226,16 @@ for machine in $host $target; do
 		tmake_file=t-libc-ok
 		;;
 	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
@@ -296,7 +296,7 @@ for machine in $host $target; do
 			tm_file=i860b.h
 		fi
 		;;
-	sparc-unicom-*)
+	sparc-tti-*)
 		tm_file=pbd.h
 		xm_file=xm-pbd.h
 		;;
@@ -307,19 +307,11 @@ for machine in $host $target; do
 		tm_file=sun4o3.h
 		;;
 	sparc-*-sysv4*)
-		tm_file=sparc.h
+		xm_file=xm-sparcv4.h
+		tm_file=sparcv4.h
 		tmake_file=t-svr4
+		xmake_file=x-sparcv4
 		;;
-	m68k-tti-*)
-		tm_file=tti68k.h
-		;;
-# 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
@@ -336,7 +328,7 @@ for machine in $host $target; do
 		tm_file=next.h
 		out_file=next.c
 		xm_file=xm-next.h
-		tmake_file=t-libc-ok
+		tmake_file=t-next
 		;;
 	m68k-sun-sunos3*)
 		if [ x$nfp = xyes ]
@@ -346,10 +338,7 @@ for machine in $host $target; do
 			tm_file=sun3o3.h
 		fi
 		;;
-	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
@@ -357,6 +346,13 @@ for machine in $host $target; do
 			tm_file=sun3.h
 		fi
 		;;
+	m68k-sun-mach*)
+		tm_file=sun3mach.h
+		;;
+	m68k-tti-*)
+		tm_file=pbb.h
+		xm_file=xm-m68kv.h
+		;;
 	m68k-hp-hpux*)	# HP 9000 series 300
 		xm_file=xm-hp320.h
 		if [ x$gas = xyes ]
@@ -475,6 +471,13 @@ for machine in $host $target; do
 	ns32k-merlin-*)
 		tm_file=merlin.h
 		;;
+	ns32k-pc532-mach*)
+		tm_file=pc532-mach.h
+		;;
+	ns32k-pc532-minix*)
+		tm_file=pc532-min.h
+		xm_file=xm-pc532-min.h
+		;;
 	m88k-*-luna*)
 		tm_file=m88kluna.h
 		xmake_file=x-m88kluna
@@ -490,14 +493,15 @@ for machine in $host $target; do
 		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
-		;;
 # This hasn't been upgraded to GCC 2.
 #	fx80-alliant-*)			# Alliant FX/80
 #		tm_file=fx80.h
@@ -529,15 +533,23 @@ for machine in $host $target; do
 		tm_file=iris.h
 		xm_file=xm-irix4.h
 		install_with_cp=yes
+		xmake_file=x-iris
 		;;
-	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
+		xmake_file=x-iris
+		;;
+	mips-*-sysv4*)			# MIPS System V.4.
+		tm_file=mips-svr4.h
+		xm_file=xm-umips.h
+		xmake_file=x-mipsv
 		;;
-	mips-*-sysv)			# MIPS System V.
+	mips-*-sysv*)			# MIPS System V.
 		tm_file=mips-sysv.h
 		xm_file=xm-umips.h
+		xmake_file=x-mipsv
 		;;
 	mips-mips-*)			# Default MIPS environment.
 		tm_file=mips.h
@@ -545,19 +557,27 @@ for machine in $host $target; do
 	mips-dec-ultrix*)		# Decstation.
 		tm_file=decstatn.h
 		tmake_file=t-decstatn
+		xmake_file=x-decstatn
 	        ;;
-	mips-dec-osf*)			# Decstation with OSF/1.
+	mips-dec-osf*)			# Decstation running OSF/1 reference port with OSF/rose.
 		tm_file=decrose.h
 		xmake_file=x-decrose
 		tmake_file=t-decrose
 		;;
-	mips-sony-bsd*)	# Sony NEWS 3600 or risc/news.
+	mips-sony-bsd*)			# Sony NEWS 3600 or risc/news.
 		tm_file=mips-news.h
 		;;
-	mips-*-bsd*)	# BSD 4.3 variant of MIPS system.
+	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-news5.h
+		xm_file=xm-mipsnews.h
+		;;
+	mips-*-bsd*)			# BSD 4.3 variant of MIPS system.
 		tm_file=mips-bsd.h
 	        ;;
-# This hasn't been upgraded to GCC 2.
+# This port has been upgraded and is almost working.
+# Turn it back on if you would like to help debug it.
 #	pyramid | pyramid-* | pyramid-*)
 #		cpu_type=pyr
 #		tm_file=pyr.h
@@ -572,7 +592,7 @@ for machine in $host $target; do
 		xm_file=xm-a29kunix.h
 		xmake_file=x-a29kunix
 		;;
-	romp-*-bsd*)
+	romp-*-aos*)
 		xm_file=xm-romp.h
 		tm_file=romp.h
 		;;
@@ -584,16 +604,28 @@ for machine in $host $target; do
 	rs6000-*-mach* | rs6000-mach*)
 		xm_file=xm-rs6k-m.h
 		tm_file=rs6000-mach.h
+		tmake_file=t-rs6000
 		;;
 	rs6000-*)
 		xm_file=xm-rs6000.h
 		tm_file=rs6000.h
+		tmake_file=t-rs6000
 		;;
-	hp800-*-* | hp700-*-*)
+	hp800-*-bsd* | hp700-*-bsd*)
 		cpu_type=hp800
 		xm_file=xm-hp800.h
 		tm_file=hp800.h
 		;;
+	hp800-*-hpux* | hp700-*-hpux*)
+		cpu_type=hp800
+		xm_file=xm-hp800.h
+		tm_file=hp800hpux.h
+		xmake_file=x-hp800hpux
+		;;
+	*)
+		echo "Configuration $machine not recognized" 1>&2
+		exit 1
+		;;
 	esac
 
 	case $machine in
@@ -658,21 +690,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.