resync

1 files changed, 53 insertions, 152 deletions

diff --git a/gas/configure b/gas/configure
index e20b1ac..3cdccfe 100755
--- a/gas/configure
+++ b/gas/configure
@@ -1,11 +1,6 @@
 #!/bin/sh
-# Please do not edit this file.  It is generated automatically from
-# configure.in and a configure template.
-configdirs=
-
-#!/bin/sh
 
-# Configuration script template
+# Configuration script
 #   Copyright (C) 1988, 1990, 1991 Free Software Foundation, Inc.
 
 #This file is part of GNU.
@@ -48,20 +43,22 @@ progname=$0
 
 # clear some things potentially inherited from environment.
 ansi=
+arguments=$*
 defaulttargets=
 destdir=
 fatal=
 hostsubdir=
 Makefile=Makefile
 Makefile_in=Makefile.in
-norecurse=
-recursing=
+norecursion=
+recurring=
 removing=
 srcdir=
 srctrigger=
 target=
 targets=
 commontargets=
+configdirs=
 targetsubdir=
 template=
 verbose=
@@ -90,13 +87,13 @@ do
 	-nfp | +nf*)
 		nfp=yes
 		;;
-	-norecurse | +no*)
-		norecurse=true
+	-norecursion | +no*)
+		norecursion=true
 		;;
-	-recursing)
-		recursing=true
+	-recurring | +recurring | +recurrin | +recurri | +recurr | +recur | +recu | +rec | +re)
+		recurring=true
 		;;
-	-rm | +r*)
+	-rm | +rm)
 		removing=${arg}
 		;;
 #	-srcdir=* | +srcdir=* | +srcdi=* | +srcd=* | +src=* | +sr=* | +s=*)
@@ -162,7 +159,7 @@ if [ -n "${fatal}" -o "${hosts}" = "help" ] ; then
 	echo " +help		print this message. [normal config]" ;
 	echo " +gas		configure the compilers for use with gas. [native as]" ;
 	echo " +nfp		configure the compilers default to soft floating point. [hard float]" ;
-	echo " +norecurse	configure this directory only. [recurse]" ;
+	echo " +norecursion	configure this directory only. [recurse]" ;
 	echo " +rm		remove this configuration. [build a configuration]" ;
 	echo " +target=TARGET	configure for TARGET.  [TARGET = HOST]" ;
 	echo " +template=TEM	rebuild configure using TEM. [normal config]" ;
@@ -268,8 +265,8 @@ if [ -n "${template}" ] ; then
 		fi
 	fi
 
-	if [ -z "${norecurse}" ] ; then
-		# If template is relative path, make it absolute for recursing.
+	if [ -z "${norecursion}" ] ; then
+		# If template is relative path, make it absolute for recurring.
 		if echo "${template}" | grep -s '^/' ; then
 		   true
 		else
@@ -319,6 +316,8 @@ for host in ${hosts} ; do
 		defaulttargets=true
 	fi
 
+	host_alias=${host}
+
 	result=`/bin/sh ./config.sub ${host}`
 	host_cpu=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
 	host_vendor=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
@@ -359,6 +358,7 @@ esac
 
 	for target in ${targets} ; do
 
+		target_alias=${target}
 		result=`/bin/sh ./config.sub ${target}`
 		target_cpu=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
 		target_vendor=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
@@ -399,6 +399,10 @@ vax)
 	;;
 esac
 
+# and target makefile frag
+
+target_makefile_frag=config/tmake-${target_cpu}
+
 files="config/ho-${gas_host}.h config/tc-${cpu_type}.c \
 	config/tc-${cpu_type}.h config/te-${emulation}.h \
 	config/obj-${obj_format}.h config/obj-${obj_format}.c \
@@ -408,8 +412,8 @@ links="host.h targ-cpu.c targ-cpu.h targ-env.h obj-format.h obj-format.c atof-ta
 ## end of per-target part.
 
 		# Temporarily, we support only direct subdir builds.
-		hostsubdir=Host-${host}
-		targetsubdir=Target-${target}
+		hostsubdir=H-${host_alias}
+		targetsubdir=T-${target_alias}
 
 		if [ -n "${removing}" ] ; then
 			if [ -n "${subdirs}" ] ; then
@@ -539,8 +543,15 @@ links="host.h targ-cpu.c targ-cpu.h targ-env.h obj-format.h obj-format.c atof-ta
 			fi
 
 			# set target, host, VPATH
-			echo "host = ${host}" >> ${Makefile}
-			echo "target = ${target}" >> ${Makefile}
+			echo "host_alias = ${host_alias}" >> ${Makefile}
+			echo "host_cpu = ${host_cpu}" >> ${Makefile}
+			echo "host_vendor = ${host_vendor}" >> ${Makefile}
+			echo "host_os = ${host_os}" >> ${Makefile}
+
+			echo "target_alias = ${target_alias}" >> ${Makefile}
+			echo "target_cpu = ${target_cpu}" >> ${Makefile}
+			echo "target_vendor = ${target_vendor}" >> ${Makefile}
+			echo "target_os = ${target_os}" >> ${Makefile}
 
 			if [ -n "${subdirs}" ] ; then
 				echo "subdir = /${hostsubdir}/${targetsubdir}" >> ${Makefile}
@@ -556,13 +567,15 @@ links="host.h targ-cpu.c targ-cpu.h targ-env.h obj-format.h obj-format.c atof-ta
 
 			# Conditionalize the makefile for this host.
 			if [ -f ${srcdir}/${host_makefile_frag} ] ; then
-				sed -e "/^####/  r ${srcdir}/${host_makefile_frag}" ${Makefile} > Makefile.tem
+				(echo "host_makefile_frag = ${srcdir}/${host_makefile_frag}" ; 
+					sed -e "/^####/  r ${srcdir}/${host_makefile_frag}" ${Makefile}) > Makefile.tem
 				mv Makefile.tem ${Makefile}
 			fi
 
 			# Conditionalize the makefile for this target.
 			if [ -f ${srcdir}/${target_makefile_frag} ] ; then
-				sed -e "/^####/  r ${srcdir}/${target_makefile_frag}" ${Makefile} > Makefile.tem
+				(echo "target_makefile_frag = ${srcdir}/${target_makefile_frag}" ; 
+					sed -e "/^####/  r ${srcdir}/${target_makefile_frag}" ${Makefile}) > Makefile.tem
 				mv Makefile.tem ${Makefile}
 			fi
 
@@ -589,6 +602,10 @@ links="host.h targ-cpu.c targ-cpu.h targ-env.h obj-format.h obj-format.c atof-ta
 				using=" using \"${host_makefile_frag}\""
 			fi
 
+			# remove any form feeds.
+			sed -e "s///" ${Makefile} > Makefile.tem
+			mv Makefile.tem ${Makefile}
+
 			if [ -f ${srcdir}/${target_makefile_frag} ] ; then
 				if [ -z "${using}" ] ; then
 					andusing=" using \"${target_makefile_frag}\""
@@ -599,7 +616,7 @@ links="host.h targ-cpu.c targ-cpu.h targ-env.h obj-format.h obj-format.c atof-ta
 				andusing=${using}
 			fi
 
-			if [ -n "${verbose}" -o -z "${recursing}" ] ; then
+			if [ -n "${verbose}" -o -z "${recurring}" ] ; then
 				echo "Created \"${Makefile}\"" in `pwd`${andusing}.
 			fi
 
@@ -607,22 +624,22 @@ links="host.h targ-cpu.c targ-cpu.h targ-env.h obj-format.h obj-format.c atof-ta
 
 ## end of post-target part.
 
-			if [ "${host}" = "${target}" ] ; then
-				echo "Links are now set up for use with a ${target}." \
-					> config.status
-		#			| tee ${srcdir}/config.status
-			else
-				echo "Links are now set up for host ${host} and target ${target}." \
-					> config.status
-		#			| tee ${srcdir}/config.status
-			fi
+			# describe the chosen configuration in config.status.
+			# Make that file a shellscript which will reestablish
+			# the same configuration.  Used in Makefiles to rebuild
+			# Makefiles.
+
+			echo "#!/bin/sh
+# ${srcname} was configured as follows:
+${srcdir}/configure" ${arguments} `if [ -z "${norecursion}" ] ; then echo +norecursion ; else true ; fi` > config.status
+			chmod a+x config.status
 
 			originaldir=`pwd`
 			cd ${srcdir}
 		fi
 
 		# If there are subdirectories, then recurse. 
-		if [ -z "${norecurse}" -a -n "${configdirs}" ] ; then 
+		if [ -z "${norecursion}" -a -n "${configdirs}" ] ; then 
 			for configdir in ${configdirs} ; do
 				if [ -n "${verbose}" ] ; then
 					echo Configuring ${configdir}...
@@ -630,7 +647,7 @@ links="host.h targ-cpu.c targ-cpu.h targ-env.h obj-format.h obj-format.c atof-ta
 
 				if [ -d ${configdir} ] ; then
 					(cd ${configdir} ;
-						./configure -recursing ${host} +target=${target} \
+						./configure +recurring ${host_alias} +target=${target_alias} \
 							${verbose} ${subdirs} ${removing} +destdir=${destdir}) \
 						| sed 's/^/	/'
 				else
@@ -646,7 +663,7 @@ links="host.h targ-cpu.c targ-cpu.h targ-env.h obj-format.h obj-format.c atof-ta
 	if [ -n "${subdirs}" -a ! -n "${removing}" ] ; then
 		cd ${hostsubdir}
 		cat > GNUmakefile << E!O!F
-# Makefile generated by configure for host ${host}.
+# Makefile generated by configure for host ${host_alias}.
 
 ALL := $(shell ls -d Target-*)
 
@@ -662,125 +679,9 @@ done # for each host
 exit 0
 
 #
-# $Log$
-# Revision 1.23  1991/08/28 21:49:10  rich
-# Update to current standards.
-#
-# Revision 1.35  1991/08/26  04:29:31  rich
-# Welcome cvs to the big time.
-#
-# Revision 1.34  1991/08/25  23:40:23  rich
-# rcs enters the soup.
-#
-# Revision 1.33  1991/08/25  21:48:38  rich
-# Adding diff to the fray.
-#
-# Revision 1.32  1991/08/25  20:18:20  rich
-# Adding grep to the fray.
-#
-# Revision 1.31  1991/08/23  04:50:57  rich
-# Minor config polish.
-#
-# Revision 1.22  1991/08/23  03:31:43  rich
-# Minor polish & config mapping.
-#
-# Revision 1.30  1991/08/22  07:15:51  rich
-# Three part names, etc.
-#
-# Revision 1.29  1991/08/20  04:56:51  rich
-# revisiting error messages
-#
-# Revision 1.28  1991/08/16  19:22:17  rich
-# This is the commontargets change and should be considered
-# experimental.
-#
-# Revision 1.27  1991/08/08  01:14:13  rich
-# allow +f to stand in for +subdirs
-#
-# Revision 1.26  1991/08/07  19:21:32  rich
-# +forcesubdirs -> +subdirs
-#
-# Revision 1.25  1991/08/07  07:05:30  rich
-# Added make.
-#
-# Revision 1.24  1991/08/06  19:26:01  rich
-# revised option parsing.
-#
-# Revision 1.23  1991/08/06  19:12:32  rich
-# Host-level GNUmakefiles.
-#
-# Revision 1.22  1991/07/20  01:22:30  rich
-# propogate gdb changes and destdir fix
-#
-# Revision 1.21  1991/07/20  00:55:20  gnu
-# Roll in new configure that handles GDB.  Make sure that the "configure"
-# that is checked-in reflects the latest "configure.in", which includes gdb.
-#
-# Revision 1.9  1991/07/06  04:35:51  gnu
-# Fix bug in configure when iterating targets.
-# Depend on alldeps.mak, not ${srcdir}/alldeps.mak, so it can be found
-# in either spot.
-#
-# Revision 1.8  1991/07/05  00:04:58  gnu
-# Thu Jul  4 14:47:06 1991  John Gilmore  (gnu at cygint.cygnus.com)
-#
-#         * configure.in, Makefile.in:  Avoid rebuilding "depend" as much.
-#         Avoid declaring Makefile dependencies, because GNU Make stupidly
-#         tries to update it if we do.
-#
-#         * coffread.c:  Revise for minor changes to bfd internal coff
-#         indexes.
-#
-#         * configure:  If -template= is given a relative path, make it
-#         absolute before recurring in subdirectories.
-#
-# Revision 1.7  1991/07/04  15:59:46  gnu
-# Make gdb work with configure.  Only thing that doesn't work is the -list
-# option (as far as I know).
-#
-# Revision 1.6  1991/06/04  07:28:16  gnu
-# Change GDB over to GNU General Public License version 2.
-#
-# Revision 1.5  1991/05/19  07:26:54  rich
-# configure changes and -opcode.h movement.
-#
-# Revision 1.4  1991/05/19  00:16:45  rich
-# Configure for gdb.
-#
-# Revision 1.10  1991/05/04  00:58:38  rich
-# Fix program name bug.
-#
-# Revision 1.9  1991/05/03  19:14:18  rich
-# Changed getopt to libiberty, commented out an aborted attempt at host
-# level Makefiles because it caused errors on +rm, add a warning for
-# directories expected to be removed on +rm but that don't exist.
-#
-# Revision 1.8  1991/04/24  16:50:59  rich
-# Three staging checkpoint.
-#
-# Revision 1.7  1991/04/17  01:34:47  rich
-# Added getopt for binutils, fixed problem with host dependancies in
-# configure.template.
-#
-# Revision 1.6  1991/04/16  00:18:44  rich
-# Now handles multiple hosts and targets.
-#
-# Revision 1.5  1991/04/15  23:43:44  rich
-# Now handles multiple hosts and targets.
-#
-# Revision 1.4  1991/04/13  02:11:03  rich
-# Config cut 3.  We now almost install a29k.
-#
-# Revision 1.3  1991/04/11  02:41:54  rich
-# Cut 2 config.  Subdirs.
-#
-#
-#
-
-#
 # Local Variables:
 # fill-column: 131
 # End:
 #
 
-# end of configure.template
+# end of configure