Browse Source

Now handles multiple hosts and targets.

gdb-4_18-branch
K. Richard Pixley 36 years ago
parent
commit
b5132a6b85
  1. 9
      bfd/Makefile.in
  2. 340
      bfd/configure
  3. 24
      binutils/Makefile.in
  4. 342
      binutils/configure
  5. 2
      gas/configure

9
bfd/Makefile.in

@ -31,7 +31,6 @@ CSEARCH = -I$(INCDIR)
#CDEFINES = # -DHOST_SYS=AIX_SYS # -DCOFF_TIMESTAMP -DANSI_LIBRARIES #CDEFINES = # -DHOST_SYS=AIX_SYS # -DCOFF_TIMESTAMP -DANSI_LIBRARIES
#### host and target dependent Makefile fragments come in here. #### host and target dependent Makefile fragments come in here.
### ###
TARG = libbfd.a TARG = libbfd.a
@ -135,9 +134,7 @@ roll:
.force: .force:
FORCE: FORCE:
# 'G960BASE' will be defined at invocation
install: install:
make ${TARG} OPT=-O
# Target to uncomment host-specific lines in this makefile. Such lines must # Target to uncomment host-specific lines in this makefile. Such lines must
# have the following string beginning in column 1: #__<hostname>__# # have the following string beginning in column 1: #__<hostname>__#
@ -163,5 +160,7 @@ make:
Makefile: $(srcdir)/Makefile.in $(srcdir)/configure Makefile: $(srcdir)/Makefile.in $(srcdir)/configure
(cd $(srcdir) ; \ (cd $(srcdir) ; \
./configure `if [ "$(srcdir)" != "." ] ; then echo +f; fi` -host=$(host) $(target)) ./configure +norecurse \
+destdir=$(destdir) \
`if [ "$(srcdir)" != "." ] ; then echo +f; fi` \
$(host) +target=$(target))

340
bfd/configure

@ -28,17 +28,13 @@ configdirs=
# #
# Shell script to create proper links to machine-dependent files in # Shell script to create proper links to machine-dependent files in
# preparation for compiling gcc. # preparation for compilation.
#
# Usage: configure [+srcdir=DIR] [+host=HOST] [+gas] [+nfp] TARGET
# #
# If configure succeeds, it leaves its status in config.status. # If configure succeeds, it leaves its status in config.status.
# If configure fails after disturbing the status quo, # If configure fails after disturbing the status quo,
# config.status is removed. # config.status is removed.
# #
progname=$0
remove=rm remove=rm
hard_link=ln hard_link=ln
symbolic_link='ln -s' symbolic_link='ln -s'
@ -50,15 +46,19 @@ symbolic_link='ln -s'
# clear some things potentially inherited from environment. # clear some things potentially inherited from environment.
ansi= ansi=
defaulttargets=
destdir= destdir=
fatal=
hostsubdir= hostsubdir=
norecurse= norecurse=
removing= removing=
srcdir= srcdir=
srctrigger= srctrigger=
target= target=
targets=
targetsubdir= targetsubdir=
template= template=
verbose=
for arg in $*; for arg in $*;
do do
@ -69,12 +69,9 @@ do
-destdir=* | +destdir=* | +destdi=* | +destd=* | +dest=* | +des=* | +de=* | +d=*) -destdir=* | +destdir=* | +destdi=* | +destd=* | +dest=* | +des=* | +de=* | +d=*)
destdir=`echo ${arg} | sed 's/[+-]d[a-z]*=//'` destdir=`echo ${arg} | sed 's/[+-]d[a-z]*=//'`
;; ;;
-forcesubdirs | +f*) -forcesubdirs | +forcesubdirs | +f)
forcesubdirs=${arg} forcesubdirs=${arg}
;; ;;
-host=* | +host=* | +hos=* | +ho=* | +h=*)
host=`echo ${arg} | sed 's/[+-]h[a-z]*=//'`
;;
-languages=* | +languages=* | +language=* | +languag=* \ -languages=* | +languages=* | +language=* | +languag=* \
| +langua=* | +langu=* | +lang=* | +lan=* | +la=* \ | +langua=* | +langu=* | +lang=* | +lan=* | +la=* \
| +l=*) | +l=*)
@ -83,6 +80,9 @@ do
-gas | +gas | +ga | +g) -gas | +gas | +ga | +g)
gas=yes gas=yes
;; ;;
-help | +h | +help)
fatal=true
;;
-nfp | +nfp | +nf | +n) -nfp | +nfp | +nf | +n)
nfp=yes nfp=yes
;; ;;
@ -92,44 +92,84 @@ do
-rm | +rm) -rm | +rm)
removing=${arg} removing=${arg}
;; ;;
-srcdir=* | +srcdir=* | +srcdi=* | +srcd=* | +src=* | +sr=* | +s=*) # -srcdir=* | +srcdir=* | +srcdi=* | +srcd=* | +src=* | +sr=* | +s=*)
srcdir=`echo ${arg} | sed 's/[+-]s[a-z]*=//'` # srcdir=`echo ${arg} | sed 's/[+-]s[a-z]*=//'`
# ;;
-target=* | +target=* | +targe=* | +targ=* | +tar=* | +ta=* | +t=*)
if [ -n "${targets}" ] ; then
forcesubdirs="+forcesubdirs"
fi
newtargets="${targets} `echo ${arg} | sed 's/[+-]t[a-z]*=//'`"
targets="${newtargets}"
;; ;;
-template=* | +template=*) -template=* | +template=*)
template=`echo ${arg} | sed 's/[+-]template=//'` template=`echo ${arg} | sed 's/[+-]template=//'`
;; ;;
+verbose | +verbos | +verbo | +verb | +ver | +ve | +v)
verbose=${arg}
;;
-* | +*)
(echo ;
echo "Unrecognized option: \"${arg}\"". ;
echo) 1>&2
fatal=true
;;
*) *)
# Allow configure HOST TARGET if [ -n "${hosts}" ] ; then
if [ -z "${host}" ] ; then host=${target} ; fi forcesubdirs="+forcesubdirs"
target=${arg} fi
newhosts="${hosts} ${arg}"
hosts=${newhosts}
;; ;;
esac esac
done done
if [ -n "${verbose}" ] ; then
echo `pwd`/configure $*
echo targets=\"${targets}\"
fi
# process host and target only if not rebuilding configure itself or removing. # process host and target only if not rebuilding configure itself or removing.
if [ -z "${template}" -a -z "${removing}" ] if [ -z "${template}" -a -z "${removing}" -a -z "${fatal}" ] ; then
then
# Complain if an arg is missing # Complain if an arg is missing
if [ -z "${target}" ] if [ -z "${hosts}" ] ; then
then (echo ;
echo "Usage: ${progname} [+srcdir=DIR] [+host=HOST] [+gas] [+nfp] TARGET" echo "configure: No HOST specified." ;
echo -n "Where HOST and TARGET are something like " echo) 2>&1
echo "\`vax', \`sun3', \`encore', etc." fatal=true
if [ -r config.status ] fi
then fi
if [ -n "${fatal}" -o "${hosts}" = "help" ] ; then
(echo "Usage: configure HOST" ;
echo ;
echo "Options: [defaults in brackets]" ;
echo " +ansi configure w/ANSI library. [no ansi lib]" ;
echo " +destdir=MYDIR configure for installation into MYDIR. [/usr/local]" ;
echo " +forcesubdirs configure in subdirectories. [in source directories]" ;
echo " +lang=LANG configure to build LANG. [gcc]" ;
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 " +rm remove this configuration. [build a configuration]" ;
echo " +target=TARGET configure for TARGET. [TARGET = HOST]" ;
echo " +template=TEM rebuild configure using TEM. [normal config]" ;
echo ;
echo "Where HOST and TARGET are something like \"vax\", \"sun3\", \"encore\", etc." ;
echo "Asking for more than one \"+target\" implies \"+forcesubdirs\". Any other" ;
echo "options given will apply to all targets.") 1>&2
if [ -r config.status ] ; then
cat config.status cat config.status
fi fi
exit 1
fi
fi
# Default other arg exit 1
if [ -z "${host}" ]
then
host=${target}
fi fi
#### configure.in files come in here. #### configure.in common parts come in here.
# This file is a shell script that supplies the information necessary # This file is a shell script that supplies the information necessary
# to tailor a template configure script into the configure script # to tailor a template configure script into the configure script
# appropriate for this directory. For more information, check any # appropriate for this directory. For more information, check any
@ -137,15 +177,17 @@ fi
srctrigger=libbfd.c srctrigger=libbfd.c
srcname="bfd" srcname="bfd"
# per-host:
files= files=
links= links=
### end of configure.in ## end of common part
# are we rebuilding config itself? # are we rebuilding config itself?
if [ -n "${template}" ] if [ -n "${template}" ] ; then
then if [ ! -r ${template} ] ; then
if [ ! -r ${template} ]
then
echo "Can't find template ${template}." echo "Can't find template ${template}."
exit 1 exit 1
fi fi
@ -157,9 +199,25 @@ then
echo "configdirs=" >> configure echo "configdirs=" >> configure
echo >> configure echo >> configure
if [ -r configure.in ] if [ -r configure.in ] ; then
then if [ -z "`grep '^# per\-host:' configure.in`" ] ; then
sed -e "/^####/ r configure.in" ${template} >> configure echo `pwd`/configure.in has no "per-host:" line.
exit 1
fi
if [ -z "`grep '^# per\-target:' configure.in`" ] ; then
echo `pwd`/configure.in has no "per-target:" line.
exit 1
fi
sed -e '/^# per\-target:/,$d' configure.in > configure.com
sed -e '1,/^# per\-target:/d' configure.in > configure.tgt
sed -e '/^#### configure.in common parts/ r configure.com' \
-e '/^#### / r configure.tgt' \
${template} >> configure
rm -f configure.com configure.tgt configure.hst
else else
echo Warning: no configure.in in `pwd` echo Warning: no configure.in in `pwd`
cat ${template} >> configure cat ${template} >> configure
@ -169,26 +227,21 @@ then
rm configure.old rm configure.old
echo Rebuilt configure in `pwd` echo Rebuilt configure in `pwd`
if [ -z "${norecurse}" ] if [ -z "${norecurse}" ] ; then
then while [ -n "${configdirs}" ] ; do
while [ -n "${configdirs}" ]
do
# set configdir to car of configdirs, configdirs to cdr of configdirs # set configdir to car of configdirs, configdirs to cdr of configdirs
set ${configdirs}; configdir=$1; shift; configdirs=$* set ${configdirs}; configdir=$1; shift; configdirs=$*
if [ "`echo ${configdir}.*`" != "${configdir}.*" ] if [ "`echo ${configdir}.*`" != "${configdir}.*" ] ; then
then
targetspecificdirs=${configdir}.* targetspecificdirs=${configdir}.*
else else
targetspecificdirs= targetspecificdirs=
fi fi
for i in ${configdir} ${targetspecificdirs} for i in ${configdir} ${targetspecificdirs} ; do
do if [ -r $i/configure ] ; then
if [ -r $i/configure ]
then
(cd $i ; (cd $i ;
configure +template=${template}) ./configure +template=${template} ${verbose})
else else
echo No configure script in `pwd`/$i echo No configure script in `pwd`/$i
fi fi
@ -200,35 +253,55 @@ then
fi fi
# some sanity checks on configure.in # some sanity checks on configure.in
if [ -z "${srctrigger}" ] if [ -z "${srctrigger}" ] ; then
then
echo srctrigger not set in configure.in. `pwd` not configured. echo srctrigger not set in configure.in. `pwd` not configured.
exit 1 exit 1
fi fi
for host in ${hosts} ; do
# Default other arg
if [ -z "${targets}" -o -n "${defaulttargets}" ] ; then
targets=${host}
defaulttargets=true
fi
#### configure.in per-host parts come in here.
files=
links=
## end of per-target part
for target in ${targets} ; do
if [ -n "${verbose}" ] ; then
echo " "target=\"${target}\"
fi
#### configure.in per-target parts come in here.
files=
links=
## end of per-target part
# Temporarily, we support only direct subdir builds. # Temporarily, we support only direct subdir builds.
hostsubdir=Host-${host} hostsubdir=Host-${host}
targetsubdir=Target-${target} targetsubdir=Target-${target}
if [ -n "${removing}" ] if [ -n "${removing}" ] ; then
then if [ -d "${hostsubdir}/${targetsubdir}" ] ; then
if [ -d "${hostsubdir}/${targetsubdir}" ]
then
rm -rf ${hostsubdir}/${targetsubdir} rm -rf ${hostsubdir}/${targetsubdir}
if [ -z "`(ls ${hostsubdir}) 2>&1 | grep Target-`" ] if [ -z "`(ls ${hostsubdir}) 2>&1 | grep Target-`" ] ; then
then
rm -rf ${hostsubdir} rm -rf ${hostsubdir}
fi fi
else else
rm -f .gdbinit Makefile config.status ${links} rm -f Makefile config.status ${links}
fi fi
else else
if [ -n "${forcesubdirs}" ] if [ -n "${forcesubdirs}" ] ; then
then
# check for existing status before allowing forced subdirs. # check for existing status before allowing forced subdirs.
if [ -f Makefile ] if [ -f Makefile ] ; then
then
echo "Makefile already exists in source directory. `pwd` not configured." echo "Makefile already exists in source directory. `pwd` not configured."
exit 1 exit 1
fi fi
@ -242,32 +315,28 @@ else
srcdir=../.. srcdir=../..
else else
# if not subdir builds, then make sure none exist. # if not subdir builds, then make sure none exist.
if [ -n "`(ls .) 2>&1 | grep Host-`" ] if [ -n "`(ls .) 2>&1 | grep Host-`" ] ; then
then
echo "Configured subdirs exist. `pwd` not configured." echo "Configured subdirs exist. `pwd` not configured."
exit 1 exit 1
fi fi
fi fi
# Find the source files, if location was not specified. # Find the source files, if location was not specified.
if [ -z "${srcdir}" ] if [ -z "${srcdir}" ] ; then
then
srcdirdefaulted=1 srcdirdefaulted=1
srcdir=. srcdir=.
if [ -n "${srctrigger}" -a ! -r ${srctrigger} ] if [ -n "${srctrigger}" -a ! -r ${srctrigger} ] ; then
then
srcdir=.. srcdir=..
fi fi
fi fi
if [ -n "${srctrigger}" -a ! -r ${srcdir}/${srctrigger} ] if [ -n "${srctrigger}" -a ! -r ${srcdir}/${srctrigger} ] ; then
then if [ -z "${srcdirdefaulted}" ] ; then
if [ -z "${srcdirdefaulted}" ]
then
echo "${progname}: Can't find ${srcname} sources in \`${srcdir}'." 1>&2 echo "${progname}: Can't find ${srcname} sources in \`${srcdir}'." 1>&2
else else
echo "${progname}: Can't find ${srcname} sources in \`.' or \`..'." 1>&2 echo "${progname}: Can't find ${srcname} sources in \`.' or \`..'." 1>&2
fi fi
exit 1 exit 1
fi fi
@ -275,14 +344,12 @@ else
# ${links} is the list of link names, and ${files} is the list of names to link to. # ${links} is the list of link names, and ${files} is the list of names to link to.
# Make the links. # Make the links.
while [ -n "${files}" ] while [ -n "${files}" ] ; do
do
# set file to car of files, files to cdr of files # set file to car of files, files to cdr of files
set ${files}; file=$1; shift; files=$* set ${files}; file=$1; shift; files=$*
set ${links}; link=$1; shift; links=$* set ${links}; link=$1; shift; links=$*
if [ ! -r ${srcdir}/${file} ] if [ ! -r ${srcdir}/${file} ] ; then
then
echo "${progname}: cannot create a link \"${link}\"," 1>&2 echo "${progname}: cannot create a link \"${link}\"," 1>&2
echo "since the file \"${file}\" does not exist." 1>&2 echo "since the file \"${file}\" does not exist." 1>&2
exit 1 exit 1
@ -293,8 +360,7 @@ else
# Make a symlink if possible, otherwise try a hard link # Make a symlink if possible, otherwise try a hard link
${symbolic_link} ${srcdir}/${file} ${link} 2>/dev/null || ${hard_link} ${srcdir}/${file} ${link} ${symbolic_link} ${srcdir}/${file} ${link} 2>/dev/null || ${hard_link} ${srcdir}/${file} ${link}
if [ ! -r ${link} ] if [ ! -r ${link} ] ; then
then
echo "${progname}: unable to link \"${link}\" to \"${srcdir}/${file}\"." 1>&2 echo "${progname}: unable to link \"${link}\" to \"${srcdir}/${file}\"." 1>&2
exit 1 exit 1
fi fi
@ -323,8 +389,7 @@ else
# template is stable, these should be optimized. xoxorich. # template is stable, these should be optimized. xoxorich.
# Define macro CROSS_COMPILE in compilation if this is a cross-compiler. # Define macro CROSS_COMPILE in compilation if this is a cross-compiler.
if [ "${host}" != "${target}" ] if [ "${host}" != "${target}" ] ; then
then
echo "CROSS=-DCROSS_COMPILE" > Makefile echo "CROSS=-DCROSS_COMPILE" > Makefile
echo "ALL=start.encap" >> Makefile echo "ALL=start.encap" >> Makefile
else else
@ -335,8 +400,7 @@ else
echo "host = ${host}" >> Makefile echo "host = ${host}" >> Makefile
echo "target = ${target}" >> Makefile echo "target = ${target}" >> Makefile
if [ -n "${forcesubdirs}" ] if [ -n "${forcesubdirs}" ] ; then
then
echo "subdir = /${hostsubdir}/${targetsubdir}" >> Makefile echo "subdir = /${hostsubdir}/${targetsubdir}" >> Makefile
else else
echo "subdir =" >> Makefile echo "subdir =" >> Makefile
@ -353,15 +417,13 @@ else
target_var_file=tmake-${target} target_var_file=tmake-${target}
# Conditionalize the makefile for this host. # Conditionalize the makefile for this host.
if [ -f ${srcdir}/config/${host_var_file} ] if [ -f ${srcdir}/config/${host_var_file} ] ; then
then
sed -e "/^####/ r ${srcdir}/config/${host_var_file}" Makefile > Makefile.tem sed -e "/^####/ r ${srcdir}/config/${host_var_file}" Makefile > Makefile.tem
mv Makefile.tem Makefile mv Makefile.tem Makefile
fi fi
# Conditionalize the makefile for this target. # Conditionalize the makefile for this target.
if [ -f ${srcdir}/config/${target_var_file} ] if [ -f ${srcdir}/config/${target_var_file} ] ; then
then
sed -e "/^####/ r ${srcdir}/config/${target_var_file}" Makefile > Makefile.tem sed -e "/^####/ r ${srcdir}/config/${target_var_file}" Makefile > Makefile.tem
mv Makefile.tem Makefile mv Makefile.tem Makefile
fi fi
@ -371,8 +433,7 @@ else
mv Makefile.tem Makefile mv Makefile.tem Makefile
# set destdir # set destdir
if [ -n "${destdir}" ] if [ -n "${destdir}" ] ; then
then
sed "s:^destdir =.*$:destdir = ${destdir}:" Makefile > Makefile.tem sed "s:^destdir =.*$:destdir = ${destdir}:" Makefile > Makefile.tem
mv Makefile.tem Makefile mv Makefile.tem Makefile
fi fi
@ -390,15 +451,12 @@ else
mv Makefile.tem Makefile mv Makefile.tem Makefile
using= using=
if [ -f ${srcdir}/config/${host_var_file} ] if [ -f ${srcdir}/config/${host_var_file} ] ; then
then
using=" using \"${host_var_file}\"" using=" using \"${host_var_file}\""
fi fi
if [ -f ${srcdir}/config/${target_var_file} ] if [ -f ${srcdir}/config/${target_var_file} ] ; then
then if [ -z "${using}" ] ; then
if [ -z "${using}" ]
then
andusing=" using \"${target_var_file}\"" andusing=" using \"${target_var_file}\""
else else
andusing="${using} and \"${target_var_file}\"" andusing="${using} and \"${target_var_file}\""
@ -407,10 +465,9 @@ else
andusing=${using} andusing=${using}
fi fi
echo "Created \"Makefile\""${andusing}. echo "Created \"Makefile\"" in `pwd`${andusing}.
if [ "${host}" = "${target}" ] if [ "${host}" = "${target}" ] ; then
then
echo "Links are now set up for use with a ${target}." \ echo "Links are now set up for use with a ${target}." \
> config.status > config.status
# | tee ${srcdir}/config.status # | tee ${srcdir}/config.status
@ -423,34 +480,90 @@ else
originaldir=`pwd` originaldir=`pwd`
cd ${srcdir} cd ${srcdir}
fi fi
done
done
# If there are subdirectories, then recurse. # If there are subdirectories, then recurse.
if [ -n "${norecurse}" ] ; then exit 0 ; fi if [ -n "${norecurse}" -o -z "${configdirs}" ] ; then exit 0 ; fi
while [ -n "${configdirs}" ] # configdirs is not null
do for configdir in ${configdirs} ; do
# set configdir to car of configdirs, configdirs to cdr of configdirs echo Configuring ${configdir}...
set ${configdirs}; configdir=$1; shift; configdirs=$* specifics=
commons=
if [ -n "${defaulttargets}" ] ; then
for host in ${hosts} ; do
if [ -d ${configdir}.${host} ] ; then
newspecifics="${specifics} ${host}"
specifics=${newspecifics}
else
newcommons="${commons} ${host}"
commons=${newcommons}
fi # if target specific
done # for each host
# check for target override if [ -n "${commons}" ] ; then
targetspecificdir=${configdir}.${target} (cd ${configdir} ;
if [ -d ${targetspecificdir} ] ./configure ${commons} ${verbose} ${forcesubdirs} ${removing}) \
then | sed 's/^/ /'
configdir=${targetspecificdir} fi # if any common hosts
if [ -n "${specifics}" ] ; then
for host in ${specifics} ; do
echo Configuring target specific directory ${configdir}.${host}...
(cd ${configdir}.${host} ;
./configure ${host} ${verbose} ${forcesubdirs} ${removing}) \
| sed 's/^/ /'
done # for host in specifics
fi # if there are any specifics
else
for target in ${targets} ; do
if [ -d ${configdir}.${target} ] ; then
newspecifics="${specifics} ${target}"
specifics=${newspecifics}
else
newcommons="${commons} +target=${target}"
commons=${newcommons}
fi fi
echo Configuring ${configdir}... done # check for target specific dir override
if [ -n "${verbose}" ] ; then
echo " "commons=\"${commons}\"
echo " "specifics=\"${specifics}\"
fi # if verbose
if [ -n "${commons}" ] ; then
(cd ${configdir} ; (cd ${configdir} ;
./configure ${forcesubdirs} ${removing} +host=${host} ${target}) \ ./configure ${hosts} ${verbose} ${forcesubdirs} ${removing} ${commons}) \
| sed 's/^/ /'
fi # if any commons
if [ -n "${specifics}" ] ; then
for target in ${specifics} ; do
echo Configuring target specific directory ${configdir}.${target}...
(cd ${configdir}.${target} ;
./configure ${hosts} ${verbose} ${forcesubdirs} ${removing} "+target=${target}") \
| sed 's/^/ /' | sed 's/^/ /'
done done
fi # if any specifics
fi # not default targets
done
exit 0 exit 0
# #
# $Log$ # $Log$
# Revision 1.4 1991/04/13 02:12:45 rich # Revision 1.6 1991/04/16 00:04:34 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. # Config cut 3. We now almost install a29k.
# #
# Revision 1.3 1991/04/11 02:41:54 rich # Revision 1.3 1991/04/11 02:41:54 rich
@ -459,5 +572,10 @@ exit 0
# #
# #
#
# Local Variables:
# fill-column: 131
# End:
#
# end of configure.template # end of configure.template

24
binutils/Makefile.in

@ -3,6 +3,17 @@
#$Id$ #$Id$
srcdir = . srcdir = .
destdir = /usr/local
version=`$(srcdir)/../gcc$(subdir)/gcc -dumpversion`
prefix = $(destdir)
bindir = $(prefix)/bin
libdir = $(prefix)/lib
libsubdir = $(libdir)/gcc/$(target)/$(version)
INSTALL = install -c
INSTALL_PROGRAM = $(INSTALL)
INSTALL_FILE = $(INSTALL)
## Configuration options ## Configuration options
# These should be all you need set before compiling # These should be all you need set before compiling
@ -27,7 +38,7 @@ PROGS = $(SIZE_PROG) $(COPY_PROG) $(OBJDUMP_PROG) $(NM_PROG) $(AR_PROG) $(STRIP_
#CC=gcc #CC=gcc
BASEDIR = $(srcdir)/.. BASEDIR = $(srcdir)/..
# Let rich do this for now: # Let rich do this for now:
LIBDIR = $(srcdir)/../bfd LIBDIR = $(srcdir)/../bfd$(subdir)
#__dgux__#DEFINES=-DHOST_SYS=DGUX_SYS #__dgux__#DEFINES=-DHOST_SYS=DGUX_SYS
@ -129,11 +140,10 @@ realclean: clean
-rm -f $(PROGS) TAGS -rm -f $(PROGS) TAGS
install: $(PROGS) install: $(PROGS)
for prog in $(PROGS); do \ for i in $(PROGS) ; do \
rm -f $G960BASE/bin/$$prog-new; cp $$prog $$G960BASE/bin/$$prog-new ; \ $(INSTALL_PROGRAM) $$i $(destdir)/bin/$$i ; \
done done
bucomm.o: bucomm.c bucomm.o: bucomm.c
version.o: version.c version.o: version.c
size.o: size.c size.o: size.c
@ -190,7 +200,11 @@ make:
# #
Makefile: $(srcdir)/Makefile.in $(srcdir)/configure Makefile: $(srcdir)/Makefile.in $(srcdir)/configure
(cd $(srcdir) ; ./configure -host=$(host) $(target)) (cd $(srcdir) ; \
./configure +norecurse \
+destdir=$(destdir) \
`if [ "$(srcdir)" != "." ] ; then echo +f; fi` \
$(host) +target=$(target))
### Local Variables: *** ### Local Variables: ***
### mode:fundamental *** ### mode:fundamental ***

342
binutils/configure

@ -28,17 +28,13 @@ configdirs=
# #
# Shell script to create proper links to machine-dependent files in # Shell script to create proper links to machine-dependent files in
# preparation for compiling gcc. # preparation for compilation.
#
# Usage: configure [+srcdir=DIR] [+host=HOST] [+gas] [+nfp] TARGET
# #
# If configure succeeds, it leaves its status in config.status. # If configure succeeds, it leaves its status in config.status.
# If configure fails after disturbing the status quo, # If configure fails after disturbing the status quo,
# config.status is removed. # config.status is removed.
# #
progname=$0
remove=rm remove=rm
hard_link=ln hard_link=ln
symbolic_link='ln -s' symbolic_link='ln -s'
@ -50,15 +46,19 @@ symbolic_link='ln -s'
# clear some things potentially inherited from environment. # clear some things potentially inherited from environment.
ansi= ansi=
defaulttargets=
destdir= destdir=
fatal=
hostsubdir= hostsubdir=
norecurse= norecurse=
removing= removing=
srcdir= srcdir=
srctrigger= srctrigger=
target= target=
targets=
targetsubdir= targetsubdir=
template= template=
verbose=
for arg in $*; for arg in $*;
do do
@ -69,12 +69,9 @@ do
-destdir=* | +destdir=* | +destdi=* | +destd=* | +dest=* | +des=* | +de=* | +d=*) -destdir=* | +destdir=* | +destdi=* | +destd=* | +dest=* | +des=* | +de=* | +d=*)
destdir=`echo ${arg} | sed 's/[+-]d[a-z]*=//'` destdir=`echo ${arg} | sed 's/[+-]d[a-z]*=//'`
;; ;;
-forcesubdirs | +f*) -forcesubdirs | +forcesubdirs | +f)
forcesubdirs=${arg} forcesubdirs=${arg}
;; ;;
-host=* | +host=* | +hos=* | +ho=* | +h=*)
host=`echo ${arg} | sed 's/[+-]h[a-z]*=//'`
;;
-languages=* | +languages=* | +language=* | +languag=* \ -languages=* | +languages=* | +language=* | +languag=* \
| +langua=* | +langu=* | +lang=* | +lan=* | +la=* \ | +langua=* | +langu=* | +lang=* | +lan=* | +la=* \
| +l=*) | +l=*)
@ -83,6 +80,9 @@ do
-gas | +gas | +ga | +g) -gas | +gas | +ga | +g)
gas=yes gas=yes
;; ;;
-help | +h | +help)
fatal=true
;;
-nfp | +nfp | +nf | +n) -nfp | +nfp | +nf | +n)
nfp=yes nfp=yes
;; ;;
@ -92,44 +92,84 @@ do
-rm | +rm) -rm | +rm)
removing=${arg} removing=${arg}
;; ;;
-srcdir=* | +srcdir=* | +srcdi=* | +srcd=* | +src=* | +sr=* | +s=*) # -srcdir=* | +srcdir=* | +srcdi=* | +srcd=* | +src=* | +sr=* | +s=*)
srcdir=`echo ${arg} | sed 's/[+-]s[a-z]*=//'` # srcdir=`echo ${arg} | sed 's/[+-]s[a-z]*=//'`
# ;;
-target=* | +target=* | +targe=* | +targ=* | +tar=* | +ta=* | +t=*)
if [ -n "${targets}" ] ; then
forcesubdirs="+forcesubdirs"
fi
newtargets="${targets} `echo ${arg} | sed 's/[+-]t[a-z]*=//'`"
targets="${newtargets}"
;; ;;
-template=* | +template=*) -template=* | +template=*)
template=`echo ${arg} | sed 's/[+-]template=//'` template=`echo ${arg} | sed 's/[+-]template=//'`
;; ;;
+verbose | +verbos | +verbo | +verb | +ver | +ve | +v)
verbose=${arg}
;;
-* | +*)
(echo ;
echo "Unrecognized option: \"${arg}\"". ;
echo) 1>&2
fatal=true
;;
*) *)
# Allow configure HOST TARGET if [ -n "${hosts}" ] ; then
if [ -z "${host}" ] ; then host=${target} ; fi forcesubdirs="+forcesubdirs"
target=${arg} fi
newhosts="${hosts} ${arg}"
hosts=${newhosts}
;; ;;
esac esac
done done
if [ -n "${verbose}" ] ; then
echo `pwd`/configure $*
echo targets=\"${targets}\"
fi
# process host and target only if not rebuilding configure itself or removing. # process host and target only if not rebuilding configure itself or removing.
if [ -z "${template}" -a -z "${removing}" ] if [ -z "${template}" -a -z "${removing}" -a -z "${fatal}" ] ; then
then
# Complain if an arg is missing # Complain if an arg is missing
if [ -z "${target}" ] if [ -z "${hosts}" ] ; then
then (echo ;
echo "Usage: ${progname} [+srcdir=DIR] [+host=HOST] [+gas] [+nfp] TARGET" echo "configure: No HOST specified." ;
echo -n "Where HOST and TARGET are something like " echo) 2>&1
echo "\`vax', \`sun3', \`encore', etc." fatal=true
if [ -r config.status ] fi
then fi
if [ -n "${fatal}" -o "${hosts}" = "help" ] ; then
(echo "Usage: configure HOST" ;
echo ;
echo "Options: [defaults in brackets]" ;
echo " +ansi configure w/ANSI library. [no ansi lib]" ;
echo " +destdir=MYDIR configure for installation into MYDIR. [/usr/local]" ;
echo " +forcesubdirs configure in subdirectories. [in source directories]" ;
echo " +lang=LANG configure to build LANG. [gcc]" ;
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 " +rm remove this configuration. [build a configuration]" ;
echo " +target=TARGET configure for TARGET. [TARGET = HOST]" ;
echo " +template=TEM rebuild configure using TEM. [normal config]" ;
echo ;
echo "Where HOST and TARGET are something like \"vax\", \"sun3\", \"encore\", etc." ;
echo "Asking for more than one \"+target\" implies \"+forcesubdirs\". Any other" ;
echo "options given will apply to all targets.") 1>&2
if [ -r config.status ] ; then
cat config.status cat config.status
fi fi
exit 1
fi
fi
# Default other arg exit 1
if [ -z "${host}" ]
then
host=${target}
fi fi
#### configure.in files come in here. #### configure.in common parts come in here.
# This file is a shell script that supplies the information necessary # This file is a shell script that supplies the information necessary
# to tailor a template configure script into the configure script # to tailor a template configure script into the configure script
# appropriate for this directory. For more information, check any # appropriate for this directory. For more information, check any
@ -137,16 +177,18 @@ fi
srctrigger=ar.c srctrigger=ar.c
srcname="binutils" srcname="binutils"
# per-host:
files= files=
links= links=
### end of configure.in ## end of common part
# are we rebuilding config itself? # are we rebuilding config itself?
if [ -n "${template}" ] if [ -n "${template}" ] ; then
then if [ ! -r ${template} ] ; then
if [ ! -r ${template} ]
then
echo "Can't find template ${template}." echo "Can't find template ${template}."
exit 1 exit 1
fi fi
@ -158,9 +200,25 @@ then
echo "configdirs=" >> configure echo "configdirs=" >> configure
echo >> configure echo >> configure
if [ -r configure.in ] if [ -r configure.in ] ; then
then if [ -z "`grep '^# per\-host:' configure.in`" ] ; then
sed -e "/^####/ r configure.in" ${template} >> configure echo `pwd`/configure.in has no "per-host:" line.
exit 1
fi
if [ -z "`grep '^# per\-target:' configure.in`" ] ; then
echo `pwd`/configure.in has no "per-target:" line.
exit 1
fi
sed -e '/^# per\-target:/,$d' configure.in > configure.com
sed -e '1,/^# per\-target:/d' configure.in > configure.tgt
sed -e '/^#### configure.in common parts/ r configure.com' \
-e '/^#### / r configure.tgt' \
${template} >> configure
rm -f configure.com configure.tgt configure.hst
else else
echo Warning: no configure.in in `pwd` echo Warning: no configure.in in `pwd`
cat ${template} >> configure cat ${template} >> configure
@ -170,26 +228,21 @@ then
rm configure.old rm configure.old
echo Rebuilt configure in `pwd` echo Rebuilt configure in `pwd`
if [ -z "${norecurse}" ] if [ -z "${norecurse}" ] ; then
then while [ -n "${configdirs}" ] ; do
while [ -n "${configdirs}" ]
do
# set configdir to car of configdirs, configdirs to cdr of configdirs # set configdir to car of configdirs, configdirs to cdr of configdirs
set ${configdirs}; configdir=$1; shift; configdirs=$* set ${configdirs}; configdir=$1; shift; configdirs=$*
if [ "`echo ${configdir}.*`" != "${configdir}.*" ] if [ "`echo ${configdir}.*`" != "${configdir}.*" ] ; then
then
targetspecificdirs=${configdir}.* targetspecificdirs=${configdir}.*
else else
targetspecificdirs= targetspecificdirs=
fi fi
for i in ${configdir} ${targetspecificdirs} for i in ${configdir} ${targetspecificdirs} ; do
do if [ -r $i/configure ] ; then
if [ -r $i/configure ]
then
(cd $i ; (cd $i ;
configure +template=${template}) ./configure +template=${template} ${verbose})
else else
echo No configure script in `pwd`/$i echo No configure script in `pwd`/$i
fi fi
@ -201,35 +254,57 @@ then
fi fi
# some sanity checks on configure.in # some sanity checks on configure.in
if [ -z "${srctrigger}" ] if [ -z "${srctrigger}" ] ; then
then
echo srctrigger not set in configure.in. `pwd` not configured. echo srctrigger not set in configure.in. `pwd` not configured.
exit 1 exit 1
fi fi
for host in ${hosts} ; do
# Default other arg
if [ -z "${targets}" -o -n "${defaulttargets}" ] ; then
targets=${host}
defaulttargets=true
fi
#### configure.in per-host parts come in here.
files=
links=
## end of per-target part
for target in ${targets} ; do
if [ -n "${verbose}" ] ; then
echo " "target=\"${target}\"
fi
#### configure.in per-target parts come in here.
files=
links=
## end of per-target part
# Temporarily, we support only direct subdir builds. # Temporarily, we support only direct subdir builds.
hostsubdir=Host-${host} hostsubdir=Host-${host}
targetsubdir=Target-${target} targetsubdir=Target-${target}
if [ -n "${removing}" ] if [ -n "${removing}" ] ; then
then if [ -d "${hostsubdir}/${targetsubdir}" ] ; then
if [ -d "${hostsubdir}/${targetsubdir}" ]
then
rm -rf ${hostsubdir}/${targetsubdir} rm -rf ${hostsubdir}/${targetsubdir}
if [ -z "`(ls ${hostsubdir}) 2>&1 | grep Target-`" ] if [ -z "`(ls ${hostsubdir}) 2>&1 | grep Target-`" ] ; then
then
rm -rf ${hostsubdir} rm -rf ${hostsubdir}
fi fi
else else
rm -f .gdbinit Makefile config.status ${links} rm -f Makefile config.status ${links}
fi fi
else else
if [ -n "${forcesubdirs}" ] if [ -n "${forcesubdirs}" ] ; then
then
# check for existing status before allowing forced subdirs. # check for existing status before allowing forced subdirs.
if [ -f Makefile ] if [ -f Makefile ] ; then
then
echo "Makefile already exists in source directory. `pwd` not configured." echo "Makefile already exists in source directory. `pwd` not configured."
exit 1 exit 1
fi fi
@ -243,32 +318,28 @@ else
srcdir=../.. srcdir=../..
else else
# if not subdir builds, then make sure none exist. # if not subdir builds, then make sure none exist.
if [ -n "`(ls .) 2>&1 | grep Host-`" ] if [ -n "`(ls .) 2>&1 | grep Host-`" ] ; then
then
echo "Configured subdirs exist. `pwd` not configured." echo "Configured subdirs exist. `pwd` not configured."
exit 1 exit 1
fi fi
fi fi
# Find the source files, if location was not specified. # Find the source files, if location was not specified.
if [ -z "${srcdir}" ] if [ -z "${srcdir}" ] ; then
then
srcdirdefaulted=1 srcdirdefaulted=1
srcdir=. srcdir=.
if [ -n "${srctrigger}" -a ! -r ${srctrigger} ] if [ -n "${srctrigger}" -a ! -r ${srctrigger} ] ; then
then
srcdir=.. srcdir=..
fi fi
fi fi
if [ -n "${srctrigger}" -a ! -r ${srcdir}/${srctrigger} ] if [ -n "${srctrigger}" -a ! -r ${srcdir}/${srctrigger} ] ; then
then if [ -z "${srcdirdefaulted}" ] ; then
if [ -z "${srcdirdefaulted}" ]
then
echo "${progname}: Can't find ${srcname} sources in \`${srcdir}'." 1>&2 echo "${progname}: Can't find ${srcname} sources in \`${srcdir}'." 1>&2
else else
echo "${progname}: Can't find ${srcname} sources in \`.' or \`..'." 1>&2 echo "${progname}: Can't find ${srcname} sources in \`.' or \`..'." 1>&2
fi fi
exit 1 exit 1
fi fi
@ -276,14 +347,12 @@ else
# ${links} is the list of link names, and ${files} is the list of names to link to. # ${links} is the list of link names, and ${files} is the list of names to link to.
# Make the links. # Make the links.
while [ -n "${files}" ] while [ -n "${files}" ] ; do
do
# set file to car of files, files to cdr of files # set file to car of files, files to cdr of files
set ${files}; file=$1; shift; files=$* set ${files}; file=$1; shift; files=$*
set ${links}; link=$1; shift; links=$* set ${links}; link=$1; shift; links=$*
if [ ! -r ${srcdir}/${file} ] if [ ! -r ${srcdir}/${file} ] ; then
then
echo "${progname}: cannot create a link \"${link}\"," 1>&2 echo "${progname}: cannot create a link \"${link}\"," 1>&2
echo "since the file \"${file}\" does not exist." 1>&2 echo "since the file \"${file}\" does not exist." 1>&2
exit 1 exit 1
@ -294,8 +363,7 @@ else
# Make a symlink if possible, otherwise try a hard link # Make a symlink if possible, otherwise try a hard link
${symbolic_link} ${srcdir}/${file} ${link} 2>/dev/null || ${hard_link} ${srcdir}/${file} ${link} ${symbolic_link} ${srcdir}/${file} ${link} 2>/dev/null || ${hard_link} ${srcdir}/${file} ${link}
if [ ! -r ${link} ] if [ ! -r ${link} ] ; then
then
echo "${progname}: unable to link \"${link}\" to \"${srcdir}/${file}\"." 1>&2 echo "${progname}: unable to link \"${link}\" to \"${srcdir}/${file}\"." 1>&2
exit 1 exit 1
fi fi
@ -324,8 +392,7 @@ else
# template is stable, these should be optimized. xoxorich. # template is stable, these should be optimized. xoxorich.
# Define macro CROSS_COMPILE in compilation if this is a cross-compiler. # Define macro CROSS_COMPILE in compilation if this is a cross-compiler.
if [ "${host}" != "${target}" ] if [ "${host}" != "${target}" ] ; then
then
echo "CROSS=-DCROSS_COMPILE" > Makefile echo "CROSS=-DCROSS_COMPILE" > Makefile
echo "ALL=start.encap" >> Makefile echo "ALL=start.encap" >> Makefile
else else
@ -336,8 +403,7 @@ else
echo "host = ${host}" >> Makefile echo "host = ${host}" >> Makefile
echo "target = ${target}" >> Makefile echo "target = ${target}" >> Makefile
if [ -n "${forcesubdirs}" ] if [ -n "${forcesubdirs}" ] ; then
then
echo "subdir = /${hostsubdir}/${targetsubdir}" >> Makefile echo "subdir = /${hostsubdir}/${targetsubdir}" >> Makefile
else else
echo "subdir =" >> Makefile echo "subdir =" >> Makefile
@ -354,15 +420,13 @@ else
target_var_file=tmake-${target} target_var_file=tmake-${target}
# Conditionalize the makefile for this host. # Conditionalize the makefile for this host.
if [ -f ${srcdir}/config/${host_var_file} ] if [ -f ${srcdir}/config/${host_var_file} ] ; then
then
sed -e "/^####/ r ${srcdir}/config/${host_var_file}" Makefile > Makefile.tem sed -e "/^####/ r ${srcdir}/config/${host_var_file}" Makefile > Makefile.tem
mv Makefile.tem Makefile mv Makefile.tem Makefile
fi fi
# Conditionalize the makefile for this target. # Conditionalize the makefile for this target.
if [ -f ${srcdir}/config/${target_var_file} ] if [ -f ${srcdir}/config/${target_var_file} ] ; then
then
sed -e "/^####/ r ${srcdir}/config/${target_var_file}" Makefile > Makefile.tem sed -e "/^####/ r ${srcdir}/config/${target_var_file}" Makefile > Makefile.tem
mv Makefile.tem Makefile mv Makefile.tem Makefile
fi fi
@ -372,8 +436,7 @@ else
mv Makefile.tem Makefile mv Makefile.tem Makefile
# set destdir # set destdir
if [ -n "${destdir}" ] if [ -n "${destdir}" ] ; then
then
sed "s:^destdir =.*$:destdir = ${destdir}:" Makefile > Makefile.tem sed "s:^destdir =.*$:destdir = ${destdir}:" Makefile > Makefile.tem
mv Makefile.tem Makefile mv Makefile.tem Makefile
fi fi
@ -391,15 +454,12 @@ else
mv Makefile.tem Makefile mv Makefile.tem Makefile
using= using=
if [ -f ${srcdir}/config/${host_var_file} ] if [ -f ${srcdir}/config/${host_var_file} ] ; then
then
using=" using \"${host_var_file}\"" using=" using \"${host_var_file}\""
fi fi
if [ -f ${srcdir}/config/${target_var_file} ] if [ -f ${srcdir}/config/${target_var_file} ] ; then
then if [ -z "${using}" ] ; then
if [ -z "${using}" ]
then
andusing=" using \"${target_var_file}\"" andusing=" using \"${target_var_file}\""
else else
andusing="${using} and \"${target_var_file}\"" andusing="${using} and \"${target_var_file}\""
@ -408,10 +468,9 @@ else
andusing=${using} andusing=${using}
fi fi
echo "Created \"Makefile\""${andusing}. echo "Created \"Makefile\"" in `pwd`${andusing}.
if [ "${host}" = "${target}" ] if [ "${host}" = "${target}" ] ; then
then
echo "Links are now set up for use with a ${target}." \ echo "Links are now set up for use with a ${target}." \
> config.status > config.status
# | tee ${srcdir}/config.status # | tee ${srcdir}/config.status
@ -424,34 +483,90 @@ else
originaldir=`pwd` originaldir=`pwd`
cd ${srcdir} cd ${srcdir}
fi fi
done
done
# If there are subdirectories, then recurse. # If there are subdirectories, then recurse.
if [ -n "${norecurse}" ] ; then exit 0 ; fi if [ -n "${norecurse}" -o -z "${configdirs}" ] ; then exit 0 ; fi
while [ -n "${configdirs}" ] # configdirs is not null
do for configdir in ${configdirs} ; do
# set configdir to car of configdirs, configdirs to cdr of configdirs echo Configuring ${configdir}...
set ${configdirs}; configdir=$1; shift; configdirs=$* specifics=
commons=
if [ -n "${defaulttargets}" ] ; then
for host in ${hosts} ; do
if [ -d ${configdir}.${host} ] ; then
newspecifics="${specifics} ${host}"
specifics=${newspecifics}
else
newcommons="${commons} ${host}"
commons=${newcommons}
fi # if target specific
done # for each host
# check for target override if [ -n "${commons}" ] ; then
targetspecificdir=${configdir}.${target} (cd ${configdir} ;
if [ -d ${targetspecificdir} ] ./configure ${commons} ${verbose} ${forcesubdirs} ${removing}) \
then | sed 's/^/ /'
configdir=${targetspecificdir} fi # if any common hosts
if [ -n "${specifics}" ] ; then
for host in ${specifics} ; do
echo Configuring target specific directory ${configdir}.${host}...
(cd ${configdir}.${host} ;
./configure ${host} ${verbose} ${forcesubdirs} ${removing}) \
| sed 's/^/ /'
done # for host in specifics
fi # if there are any specifics
else
for target in ${targets} ; do
if [ -d ${configdir}.${target} ] ; then
newspecifics="${specifics} ${target}"
specifics=${newspecifics}
else
newcommons="${commons} +target=${target}"
commons=${newcommons}
fi fi
echo Configuring ${configdir}... done # check for target specific dir override
if [ -n "${verbose}" ] ; then
echo " "commons=\"${commons}\"
echo " "specifics=\"${specifics}\"
fi # if verbose
if [ -n "${commons}" ] ; then
(cd ${configdir} ; (cd ${configdir} ;
./configure ${forcesubdirs} ${removing} +host=${host} ${target}) \ ./configure ${hosts} ${verbose} ${forcesubdirs} ${removing} ${commons}) \
| sed 's/^/ /' | sed 's/^/ /'
fi # if any commons
if [ -n "${specifics}" ] ; then
for target in ${specifics} ; do
echo Configuring target specific directory ${configdir}.${target}...
(cd ${configdir}.${target} ;
./configure ${hosts} ${verbose} ${forcesubdirs} ${removing} "+target=${target}") \
| sed 's/^/ /'
done
fi # if any specifics
fi # not default targets
done done
exit 0 exit 0
# #
# $Log$ # $Log$
# Revision 1.4 1991/04/13 02:12:20 rich # Revision 1.6 1991/04/16 00:04:50 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. # Config cut 3. We now almost install a29k.
# #
# Revision 1.3 1991/04/11 02:41:54 rich # Revision 1.3 1991/04/11 02:41:54 rich
@ -460,5 +575,10 @@ exit 0
# #
# #
#
# Local Variables:
# fill-column: 131
# End:
#
# end of configure.template # end of configure.template

2
gas/configure

@ -713,7 +713,7 @@ exit 0
# #
# $Log$ # $Log$
# Revision 1.6 1991/04/15 23:55:43 rich # Revision 1.7 1991/04/16 00:04:08 rich
# Now handles multiple hosts and targets. # Now handles multiple hosts and targets.
# #
# Revision 1.5 1991/04/15 23:43:44 rich # Revision 1.5 1991/04/15 23:43:44 rich

Loading…
Cancel
Save