diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rw-r--r-- | Makefile.tpl | 3 | ||||
| -rwxr-xr-x | configure | 149 | ||||
| -rw-r--r-- | configure.in | 18 |
5 files changed, 70 insertions, 116 deletions
@@ -1,3 +1,16 @@ +2002-09-29 Nathanael Nerode <neroden@gcc.gnu.org> + + * Makefile.tpl: Make more autoconf-friendly. + * Makefile.in: Regenerate. + * configure: Make substitution more autoconf-like. + +2002-09-28 Richard Earnshaw <rearnsha@arm.com> + + * configure.in (arm-*-coff, strongarm-*-coff, xscale-*-coff): Use a + single entry to handle all these. + (arm-*-elf, strongarm-*-elf, xscale-*-elf): Likewise. Also enable + libjava on arm-*-elf. + 2002-09-27 Geoffrey Keating <geoffk@apple.com> * configure.in (powerpc-*-darwin*): Don't configure BFD, TK, or the diff --git a/Makefile.in b/Makefile.in index d90547d..81c65f9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -181,8 +181,7 @@ RUNTEST = `if [ -f $$s/dejagnu/runtest ] ; \ CC_FOR_BUILD = $(CC) CXX_FOR_BUILD = $(CXX) -SUBDIRS = "this is set via configure, don't edit this" -OTHERS = +SUBDIRS = @configdirs@ # This is set by the configure script to the list of directories which # should be built using the target tools. diff --git a/Makefile.tpl b/Makefile.tpl index 350bde0..2a42350 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -184,8 +184,7 @@ RUNTEST = `if [ -f $$s/dejagnu/runtest ] ; \ CC_FOR_BUILD = $(CC) CXX_FOR_BUILD = $(CXX) -SUBDIRS = "this is set via configure, don't edit this" -OTHERS = +SUBDIRS = @configdirs@ # This is set by the configure script to the list of directories which # should be built using the target tools. @@ -85,7 +85,6 @@ site_makefile_frag= site_option= srcdir= srctrigger= -subdirs= target_alias=NOTARGET target_makefile_frag= undefs=NOUNDEFS @@ -1078,47 +1077,8 @@ then all_build_modules='$(ALL_BUILD_MODULES_LIST)' fi -for subdir in . ${subdirs} ; do - - # ${subdir} is relative path from . to the directory we're currently - # configuring. - # ${invsubdir} is inverse of ${subdir), *with* trailing /, if needed. - invsubdir=`echo ${subdir}/ | sed -e 's|\./||g' -e 's|[^/]*/|../|g'` - - ### figure out what to do with srcdir - case "${srcdir}" in - ".") # no -srcdir option. We're building in place. - makesrcdir=. ;; - /* | [A-Za-z]:[\\/]* ) # absolute path - makesrcdir=`echo ${srcdir}/${subdir} | sed -e 's|/\.$||'` - ;; - *) # otherwise relative - case "${subdir}" in - .) makesrcdir=${srcdir} ;; - *) makesrcdir=${invsubdir}${srcdir}/${subdir} ;; - esac - ;; - esac - - if [ "${subdir}/" != "./" ] ; then - Makefile=${subdir}/Makefile - fi - - if [ ! -d ${subdir} ] ; then - if mkdir ${subdir} ; then - true - else - echo '***' "${progname}: could not make ${PWD=`${PWDCMD-pwd}`}/${subdir}" 1>&2 - exit 1 - fi - fi - case "${removing}" in "") - case "${subdir}" in - .) ;; - *) eval echo Building in ${subdir} ${redirect} ;; - esac # FIXME Should this be done recursively ??? (Useful for e.g. gdbtest) # Set up the list of links to be made. @@ -1126,8 +1086,8 @@ for subdir in . ${subdirs} ; do # Make the links. configlinks="${links}" - if [ -r ${subdir}/config.status ] ; then - mv -f ${subdir}/config.status ${subdir}/config.back + if [ -r ./config.status ] ; then + mv -f ./config.status ./config.back fi while [ -n "${files}" ] ; do # set file to car of files, files to cdr of files @@ -1168,14 +1128,14 @@ for subdir in . ${subdirs} ; do # Create a .gdbinit file which runs the one in srcdir # and tells GDB to look there for source files. - if [ -r ${srcdir}/${subdir}/.gdbinit ] ; then + if [ -r ${srcdir}/.gdbinit ] ; then case ${srcdir} in .) ;; - *) cat > ${subdir}/.gdbinit <<EOF + *) cat > ./.gdbinit <<EOF # ${NO_EDIT} -dir ${makesrcdir} +dir ${srcdir} dir . -source ${makesrcdir}/.gdbinit +source ${srcdir}/.gdbinit EOF ;; esac @@ -1193,22 +1153,22 @@ EOF # the five makefile fragments MUST end up in the resulting Makefile in this order: # package macros, target, host, site, and package rules. - if [ -f ${srcdir}/${subdir}/${Makefile_in} ] ; then + if [ -f ${srcdir}/${Makefile_in} ] ; then # Conditionalize the makefile for this package from "Makefile.in" (or whatever it's called) into Makefile.tem. - rm -f ${subdir}/${Makefile}.tem + rm -f ./${Makefile}.tem case "${package_makefile_rules_frag}" in - "") cp ${srcdir}/${subdir}/${Makefile_in} ${subdir}/Makefile.tem ;; + "") cp ${srcdir}/${Makefile_in} ./Makefile.tem ;; *) if [ ! -f ${package_makefile_rules_frag} ] ; then package_makefile_rules_frag=${srcdir}/${package_makefile_rules_frag} fi if [ -f ${package_makefile_rules_frag} ] ; then - sed -e "/^####/ r ${package_makefile_rules_frag}" ${srcdir}/${subdir}/${Makefile_in} > ${Makefile}.tem + sed -e "/^####/ r ${package_makefile_rules_frag}" ${srcdir}/${Makefile_in} > ${Makefile}.tem else echo '***' Expected package makefile rules fragment \"${package_makefile_rules_frag}\" 1>&2 echo '***' is missing in ${PWD=`${PWDCMD-pwd}`}. 1>&2 - cp ${srcdir}/${subdir}/${Makefile_in} ${subdir}/Makefile.tem + cp ${srcdir}/${Makefile_in} ./Makefile.tem fi esac # working copy now in ${Makefile}.tem @@ -1216,15 +1176,15 @@ EOF # Conditionalize for this site. rm -f ${Makefile} case "${site}" in - "") mv ${subdir}/Makefile.tem ${Makefile} ;; + "") mv ./Makefile.tem ${Makefile} ;; *) site_makefile_frag=${srcdir}/config/ms-${site} if [ -f ${site_makefile_frag} ] ; then - sed -e "/^####/ r ${site_makefile_frag}" ${subdir}/Makefile.tem \ + sed -e "/^####/ r ${site_makefile_frag}" ./Makefile.tem \ > ${Makefile} else - mv ${subdir}/Makefile.tem ${Makefile} + mv ./Makefile.tem ${Makefile} site_makefile_frag= fi ;; @@ -1232,35 +1192,35 @@ EOF # working copy now in ${Makefile} # Conditionalize the makefile for this host. - rm -f ${subdir}/Makefile.tem + rm -f ./Makefile.tem case "${host_makefile_frag}" in - "") mv ${Makefile} ${subdir}/Makefile.tem ;; + "") mv ${Makefile} ./Makefile.tem ;; *) if [ ! -f ${host_makefile_frag} ] ; then host_makefile_frag=${srcdir}/${host_makefile_frag} fi if [ -f ${host_makefile_frag} ] ; then - sed -e "/^####/ r ${host_makefile_frag}" ${Makefile} > ${subdir}/Makefile.tem + sed -e "/^####/ r ${host_makefile_frag}" ${Makefile} > ./Makefile.tem else echo '***' Expected host makefile fragment \"${host_makefile_frag}\" 1>&2 echo '***' is missing in ${PWD=`${PWDCMD-pwd}`}. 1>&2 - mv ${Makefile} ${subdir}/Makefile.tem + mv ${Makefile} ./Makefile.tem fi esac - # working copy now in ${subdir)/Makefile.tem + # working copy now in ./Makefile.tem # Conditionalize the makefile for this target. rm -f ${Makefile} case "${target_makefile_frag}" in - "") mv ${subdir}/Makefile.tem ${Makefile} ;; + "") mv ./Makefile.tem ${Makefile} ;; *) if [ ! -f ${target_makefile_frag} ] ; then target_makefile_frag=${srcdir}/${target_makefile_frag} fi if [ -f ${target_makefile_frag} ] ; then - sed -e "/^####/ r ${target_makefile_frag}" ${subdir}/Makefile.tem > ${Makefile} + sed -e "/^####/ r ${target_makefile_frag}" ./Makefile.tem > ${Makefile} else - mv ${subdir}/Makefile.tem ${Makefile} + mv ./Makefile.tem ${Makefile} target_makefile_frag= fi ;; @@ -1268,28 +1228,28 @@ EOF # working copy now in ${Makefile} # Emit the default values of this package's macros. - rm -f ${subdir}/Makefile.tem + rm -f ./Makefile.tem case "${package_makefile_frag}" in - "") mv ${Makefile} ${subdir}/Makefile.tem ;; + "") mv ${Makefile} ./Makefile.tem ;; *) if [ ! -f ${package_makefile_frag} ] ; then package_makefile_frag=${srcdir}/${package_makefile_frag} fi if [ -f ${package_makefile_frag} ] ; then - sed -e "/^####/ r ${package_makefile_frag}" ${Makefile} > ${subdir}/Makefile.tem + sed -e "/^####/ r ${package_makefile_frag}" ${Makefile} > ./Makefile.tem else echo '***' Expected package makefile fragment \"${package_makefile_rules_frag}\" 1>&2 echo '***' is missing in ${PWD=`${PWDCMD-pwd}`}. 1>&2 - mv ${Makefile} ${subdir}/Makefile.tem + mv ${Makefile} ./Makefile.tem fi esac - # real copy now in ${subdir}/Makefile.tem + # real copy now in ./Makefile.tem # prepend warning about editing, and a bunch of variables. rm -f ${Makefile} cat > ${Makefile} <<EOF # ${NO_EDIT} -VPATH = ${makesrcdir} +VPATH = ${srcdir} links = ${configlinks} host_alias = ${host_alias} host_cpu = ${host_cpu} @@ -1316,23 +1276,23 @@ EOF case "${package_makefile_frag}" in "") ;; /* | [A-Za-z]:[\\/]* ) echo package_makefile_frag = ${package_makefile_frag} >>${Makefile} ;; - *) echo package_makefile_frag = ${invsubdir}${package_makefile_frag} >>${Makefile} ;; + *) echo package_makefile_frag = ${package_makefile_frag} >>${Makefile} ;; esac case "${target_makefile_frag}" in "") ;; /* | [A-Za-z]:[\\/]* ) echo target_makefile_frag = ${target_makefile_frag} >>${Makefile} ;; - *) echo target_makefile_frag = ${invsubdir}${target_makefile_frag} >>${Makefile} ;; + *) echo target_makefile_frag = ${target_makefile_frag} >>${Makefile} ;; esac case "${host_makefile_frag}" in "") ;; /* | [A-Za-z]:[\\/]* ) echo host_makefile_frag = ${host_makefile_frag} >>${Makefile} ;; - *) echo host_makefile_frag = ${invsubdir}${host_makefile_frag} >>${Makefile} ;; + *) echo host_makefile_frag = ${host_makefile_frag} >>${Makefile} ;; esac if [ "${site_makefile_frag}" != "" ] ; then - echo site_makefile_frag = ${invsubdir}${site_makefile_frag} >>${Makefile} + echo site_makefile_frag = ${site_makefile_frag} >>${Makefile} fi echo enable_shared = ${enable_shared} >> ${Makefile} @@ -1352,18 +1312,17 @@ EOF # reset prefix, exec_prefix, srcdir, SUBDIRS, NONSUBDIRS, # remove any form feeds. - if [ -z "${subdirs}" ]; then - rm -f ${subdir}/Makefile.tm2 + if [ -z "" ]; then + rm -f ./Makefile.tm2 sedtemp=sed.$$ cat >$sedtemp <<EOF -s:^SUBDIRS[ ]*=.*$:SUBDIRS = ${configdirs}: -s:^NONSUBDIRS[ ]*=.*$:NONSUBDIRS = ${noconfigdirs}: +s:@configdirs@:${configdirs}: EOF sed -f $sedtemp \ - ${subdir}/Makefile.tem > ${subdir}/Makefile.tm2 + ./Makefile.tem > ./Makefile.tm2 rm -f $sedtemp - rm -f ${subdir}/Makefile.tem - mv ${subdir}/Makefile.tm2 ${subdir}/Makefile.tem + rm -f ./Makefile.tem + mv ./Makefile.tm2 ./Makefile.tem fi sed -e "s|@prefix@|${prefix}|" \ -e "s|@exec_prefix@|${exec_prefix}|" \ @@ -1409,7 +1368,7 @@ EOF s%^CXXFLAGS[ ]*=.*$%CXXFLAGS = ${CXXFLAGS}% }" \ -e "s|@config_shell@|${config_shell}|" \ - -e "s|@srcdir@|${makesrcdir}|" \ + -e "s|@srcdir@|${srcdir}|" \ -e "s/ //" \ -e "s:@program_transform_name@:${program_transform_name}:" \ -e "s|@tooldir@|${tooldir}|" \ @@ -1417,7 +1376,7 @@ EOF -e "s:@DEFAULT_YACC@:${DEFAULT_YACC}:" \ -e "s:@DEFAULT_LEX@:${DEFAULT_LEX}:" \ -e "s:@DEFAULT_M4@:${DEFAULT_M4}:" \ - ${subdir}/Makefile.tem >> ${Makefile} + ./Makefile.tem >> ${Makefile} sed -e "s:@GDB_TK@:${GDB_TK}:" ${Makefile} >${Makefile}.tem mv -f ${Makefile}.tem ${Makefile} @@ -1441,10 +1400,10 @@ EOF # final copy now in ${Makefile} else - echo "No Makefile.in found in ${srcdir}/${subdir}, unable to configure" 1>&2 + echo "No Makefile.in found in ${srcdir}, unable to configure" 1>&2 fi - rm -f ${subdir}/Makefile.tem + rm -f ./Makefile.tem case "${host_makefile_frag}" in "") using= ;; @@ -1477,30 +1436,20 @@ EOF *) ;; esac - if [ ${subdir} = . ] ; then - echo "#!/bin/sh -# ${NO_EDIT} -# This directory was configured as follows: -${progname}" ${arguments} " -# ${using}" > ${subdir}/config.new - else - echo "#!/bin/sh + echo "#!/bin/sh # ${NO_EDIT} # This directory was configured as follows: -cd ${invsubdir} ${progname}" ${arguments} " -# ${using}" > ${subdir}/config.new +# ${using}" > ./config.new + chmod a+x ./config.new + if [ -r ./config.back ] ; then + mv -f ./config.back ./config.status fi - chmod a+x ${subdir}/config.new - if [ -r ${subdir}/config.back ] ; then - mv -f ${subdir}/config.back ${subdir}/config.status - fi - ${config_shell} ${moveifchange} ${subdir}/config.new ${subdir}/config.status + ${config_shell} ${moveifchange} ./config.new ./config.status ;; - *) rm -f ${Makefile} ${subdir}/config.status ${links} ;; + *) rm -f ${Makefile} ./config.status ${links} ;; esac -done # If there are subdirectories, then recur. if [ -z "${norecursion}" ] && [ -n "${configdirs}" ] ; then diff --git a/configure.in b/configure.in index 1a34976..3041dd4 100644 --- a/configure.in +++ b/configure.in @@ -331,6 +331,12 @@ case "${target}" in arc-*-*) noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" ;; + arm-*-coff | strongarm-*-coff | xscale-*-coff) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + arm-*-elf* | strongarm-*-elf* | xscale-*-elf*) + noconfigdirs="$noconfigdirs target-libffi target-qthreads" + ;; arm-*-pe*) noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" ;; @@ -346,18 +352,6 @@ case "${target}" in thumb-*-oabi) noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" ;; - strongarm-*-elf) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - strongarm-*-coff) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - xscale-*-elf) - noconfigdirs="$noconfigdirs target-libffi target-qthreads" - ;; - xscale-*-coff) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; thumb-*-pe) noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" ;; |