resync

1 files changed, 75 insertions, 244 deletions

diff --git a/bfd/configure b/bfd/configure
index 2922578..e7e05e8 100755
--- a/bfd/configure
+++ b/bfd/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]" ;
@@ -267,8 +264,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
@@ -318,6 +315,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/'`
@@ -347,9 +346,14 @@ else
 			;;
 		esac
 		;;
-
 	m68k)
 		case "${host_vendor}" in
+		cbm)
+			case ${host_os} in
+			amigados)	bfd_host=amigados ;;
+			svr4)		bfd_host=amix ;;
+			esac
+			;;
 		hp)	
 			case "${host_os}" in
 			hpux)	bfd_host=hp9000 ;;
@@ -383,9 +387,15 @@ else
 	a29k)	bfd_host=ultra3
 		;;
 
-	tahoe | vax)
+	tahoe)
 		bfd_host=${host_cpu}
 		;;
+        vax)
+		case "${host_os}" in
+		ultrix) bfd_host=vaxult ;;
+		*) bfd_host=vax ;;
+		esac
+		;;
 	esac
 fi
 
@@ -400,6 +410,7 @@ host_makefile_frag=config/h-${bfd_host}
 
 	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/'`
@@ -410,9 +421,19 @@ host_makefile_frag=config/h-${bfd_host}
 #### configure.in per-target parts come in here.
 
 case "${target_vendor}" in
-aout | coff | bout) bfd_target=${target_cpu}-${target_vendor} ;;
+aout | coff | bout | elf) bfd_target=${target_cpu}-${target_vendor} ;;
 sony)	bfd_target=news ;;
 intel)	bfd_target=${target_cpu}-coff ;;	
+cbm)	bfd_target=${target_cpu}-elf ;;
+
+hitachi)
+	case "${target_cpu}" in
+	h8300) bfd_target=h8300-ieee ;;
+	*) echo "bad hitachi cpu" ;;
+	esac
+	;;
+
+
 wrs)
 	case "${target_cpu}" in
 	i960) bfd_target=i960-bout ;;
@@ -428,6 +449,7 @@ sun)
 dec)
 	case "${target_cpu}" in
 	mips) bfd_target=dec3100 ;;
+	vax) bfd_target=vax ;;
 	esac
 	;;
 hp)
@@ -446,15 +468,6 @@ sgi)
 		bfd_target=irix3 ;;
 	esac
 	;;
-
-hitachi)
-	case "${target_cpu}" in
-	h8300) bfd_target=h8300-ieee ;;
-	*) echo "bad hitachi cpu" ;;
-	esac
-	;;
-
-
 none|nyu)
 	case "${target_cpu}" in
 	i386) bfd_target=i386-coff ;;
@@ -464,6 +477,7 @@ none|nyu)
 		sym1) bfd_target=a29k-coff ;;
 	       esac
 	       ;;
+	tahoe | vax) bfd_target=${target_cpu} ;;
 	esac
 	;;
 *)
@@ -485,8 +499,8 @@ links=
 ## 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
@@ -616,8 +630,15 @@ links=
 			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}
@@ -633,13 +654,15 @@ links=
 
 			# 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
 
@@ -666,6 +689,10 @@ links=
 				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}\""
@@ -676,7 +703,7 @@ links=
 				andusing=${using}
 			fi
 
-			if [ -n "${verbose}" -o -z "${recursing}" ] ; then
+			if [ -n "${verbose}" -o -z "${recurring}" ] ; then
 				echo "Created \"${Makefile}\"" in `pwd`${andusing}.
 			fi
 
@@ -684,22 +711,22 @@ links=
 
 ## 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}...
@@ -707,7 +734,7 @@ links=
 
 				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
@@ -723,7 +750,7 @@ links=
 	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-*)
 
@@ -739,205 +766,9 @@ done # for each host
 exit 0
 
 #
-# $Log$
-# Revision 1.28  1991/10/01 03:55:37  steve
-# Insert the incidentals and things I forgot to ci last time, same log message:
-#
-# Mon Sep 30 15:13:46 1991  Steve Chamberlain  (steve at cygnus.com)
-#
-# 	* cpu-a29k.c, cpu-i386.c, cpu-m68k.c, cpu-mips.c, cpu-vax.c,
-# 	cpu-h8300.c, cpu-i960.c, cpu-m88k.c, cpu-sparc.c: added. These
-# 	files will eventually contain processor specific bits for bfd,
-# 	like strange relocation information and dis/assembly.  So far only
-# 	the H8 has been even partially done.  This work also ties in with
-# 	the change in handling architectures.
-#
-# 	* amdcoff.c: (a29k_reloc) fix error message.
-#
-# 	* aout-f1.h: (choose_reloc_size) now calls bfd_get_arch to
-# 	discover the architecture of the bfd. (sunos4_callback) calls the
-# 	function bfd_set_arch_mach rather than stuffing stuff directly
-# 	into the bfd. (sunos4_write_object_contents), changed names of
-# 	accessor functions.
-#
-# 	* aoutx.h: (set_arch_mach) now calls bfd_default_set_arch_mach to
-# 	setup the environment.
-#
-# 	* archive.c: (bfd_slurp_coff_armap) coff archives always have the
-# 	headers in big endian format, regardless of the endianess of the
-# 	host or target.
-#
-# 	* archures.c: totally changed. Now an architecture is represented
-# 	with a pointer to an info structure rather than an enumerated type
-# 	and a long. The old info is available as two elements in the
-# 	structure.  Future enhancements to architecure support will
-# 	involve pointers to methods being placed into the info structure.
-#
-# 	* bfd.c: changed the definition of the bfd structure for the new
-# 	architecture stuff.
-#
-# 	* bout.c: (b_out_set_arch_mach) changed to use the new
-# 	architecture mechanism.
-#
-# 	* coffcode.h: (coff_set_arch_mach, coff_set_flags) changed to use
-# 	the new architecture mechanism.
-#
-# 	* configure.in: added h8 stuff.
-#
-# 	* ieee.c: too many changes to note.  Now ieee files written with
-# 	bfd gas and ld can be read by gld and ieee only linkers and
-# 	simulators.
-#
-# 	* libbfd.c, libbfd.h: changed prototype of bfd_write.
-#
-# 	* newsos3.c: (newos3_callback) now calls bfd_set_arch_mach rather
-# 	than fixing the structure directly.
-#
-# 	* oasys.c: (oasys_object_p) now calls bfd_default_set_arch_mach rather
-# 	than fixing the structure directly.
-#
-# 	* opncls.c: (new_bfd) makes sure that bfd_init has been called
-# 	before opening a bfd.
-#
-# 	* srec.c: (srec_set_arch_mach) now calls bfd_default_set_arch_mach
-# 	rather than fixing the structure directly.
-#
-# 	* targets.c: (target_vector) now by defining SELECT_VECS (perhaps
-# 	in the t/hmake file) a user can select which backends they want
-# 	linked with bfd without changing the source.
-#
-# 	* init.c: new, looks after initializing modules.
-#
-# 	* howto.c: for future use, will allow an application to work out
-# 	what cookie to use as a handle on a relcoatio howto.
-#
-# Revision 1.27  1991/09/17  00:36:44  rich
-# Updated from configure.in.
-#
-# Revision 1.26  1991/09/13  02:19:42  gnu
-# Propagate
-#
-# Revision 1.37  1991/09/12  00:33:18  rich
-# Add gdbm.
-#
-# Revision 1.36  1991/08/31  03:54:36  rich
-# Welcome emacs to the mess.
-#
-# 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