X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=configure.in;h=7913e4a24b3b2f496c7add644f2fbbf004f64674;hb=130c6e3d59796f33ad8a57b58d16395c0d1d496b;hp=56541f546aecc0e1353792d06cece9c13cda066f;hpb=0f45fbc133af8abd6834e7bc5926515ad9864efa;p=deliverable%2Fbinutils-gdb.git diff --git a/configure.in b/configure.in index 56541f546a..7913e4a24b 100644 --- a/configure.in +++ b/configure.in @@ -24,7 +24,11 @@ # these libraries are used by various programs built for the host environment # -host_libs="mmalloc libiberty opcodes bfd readline glob gash tcl tk tclX" +host_libs="mmalloc libiberty opcodes bfd readline gash tcl tk tclX" + +if [ "${enable_gdbgui}" = "yes" ] ; then + host_libs="${host_libs} libgui" +fi # these tools are built for the host environment # @@ -38,7 +42,7 @@ host_tools="texinfo byacc flex bison binutils ld gas gcc gdb make patch # these libraries are built for the target environment, and are built after # the host libraries and the host tools (which may be a cross compiler) # -target_libs="libm xiberty newlib libio librx libg++" +target_libs="target-libiberty target-libgloss target-newlib target-libio target-librx target-libstdc++ target-libg++" # these tools are built using the target libs, and are intended to run only @@ -48,31 +52,34 @@ target_libs="libm xiberty newlib libio librx libg++" # list belongs in this list. those programs are also very likely # candidates for the "native_only" list which follows # -target_tools="examples groff" +target_tools="target-examples target-groff" ################################################################################ ## These two lists are of directories that are to be removed from the ## ${configdirs} list for either cross-compilations or for native- ## compilations. For example, it doesn't make that much sense to -## cross-compile Emacs, nor is it terribly useful to compile xiberty in +## cross-compile Emacs, nor is it terribly useful to compile target-libiberty in ## a native environment. # directories to be built in the native environment only # -native_only="autoconf cvs emacs emacs19 fileutils find grep groff gzip hello indent - ispell m4 rcs recode sed shellutils tar textutils gash tk uudecode wdiff - gprof" +native_only="autoconf cvs emacs emacs19 fileutils find grep gzip hello + indent ispell m4 rcs recode sed shellutils tar textutils gash + uudecode wdiff gprof target-groff" # directories to be built in a cross environment only # -cross_only="xiberty newlib" +cross_only="target-libiberty target-libgloss target-newlib" ## All tools belong in one of the four categories, and are assigned above ## We assign ${configdirs} this way to remove all embedded newlines. This ## is important because configure will choke if they ever get through. +## ${configdirs} is directories we build using the host tools. +## ${target_configdirs} is directories we build using the target tools. # -configdirs=`echo ${host_libs} ${host_tools} ${target_libs} ${target_tools}` +configdirs=`echo ${host_libs} ${host_tools}` +target_configdirs=`echo ${target_libs} ${target_tools}` ################################################################################ @@ -94,12 +101,12 @@ case "${host}" in m88k-harris-cxux*) host_makefile_frag=config/mh-cxux ;; m88k-motorola-sysv*) host_makefile_frag=config/mh-delta88;; mips*-dec-ultrix*) host_makefile_frag=config/mh-decstation ;; - mips*-sgi-irix5*) host_makefile_frag=config/mh-irix5 ;; + mips*-sgi-irix[56]*) host_makefile_frag=config/mh-irix5 ;; mips*-sgi-irix4*) host_makefile_frag=config/mh-irix4 ;; mips*-sgi-irix3*) host_makefile_frag=config/mh-sysv ;; mips*-*-sysv4*) host_makefile_frag=config/mh-sysv4 ;; mips*-*-sysv*) host_makefile_frag=config/mh-riscos ;; - i[345]86-ncr-sysv43) host_makefile_frag=config/mh-ncrsvr43 ;; + i[345]86-ncr-sysv4.3) host_makefile_frag=config/mh-ncrsvr43 ;; i[345]86-ncr-sysv4*) host_makefile_frag=config/mh-ncr3000 ;; i[345]86-*-sco*) host_makefile_frag=config/mh-sco ;; i[345]86-*-isc*) host_makefile_frag=config/mh-sysv ;; @@ -107,12 +114,11 @@ case "${host}" in i[345]86-*-solaris2*) host_makefile_frag=config/mh-sysv4 ;; i[345]86-*-aix*) host_makefile_frag=config/mh-aix386 ;; i[345]86-*-go32*) host_makefile_frag=config/mh-go32 ;; + i[345]86-*-win32) host_makefile_frag=config/mh-i386win32 ;; vax-*-ultrix2*) host_makefile_frag=config/mh-vaxult2 ;; - *-ibm-aix*) host_makefile_frag=config/mh-aix ;; - *-bull-bosx*) host_makefile_frag=config/mh-aix ;; *-*-solaris2*) host_makefile_frag=config/mh-solaris ;; - m68k-sun-*) host_makefile_frag=config/mh-sun3 ;; - *-sun-*) host_makefile_frag=config/mh-sun ;; + m68k-sun-sunos*) host_makefile_frag=config/mh-sun3 ;; + *-hp-hpux[78]*) host_makefile_frag=config/mh-hpux8 ;; *-hp-hpux*) host_makefile_frag=config/mh-hpux ;; *-*-hiux*) host_makefile_frag=config/mh-hpux ;; rs6000-*-lynxos*) host_makefile_frag=config/mh-lynxrs6k ;; @@ -122,6 +128,16 @@ case "${host}" in esac fi +# See if we can extract a definition of CC from the fragment. +if [ -z "${CC}" ]; then + if [ -n "${host_makefile_frag}" -a -f "${srcdir}/${host_makefile_frag}" ]; then + xx=`sed -n -e 's/^[ ]*CC[ ]*=[ ]*\(.*\)$/\1/p' < ${srcdir}/${host_makefile_frag}` + if [ -n "${xx}" ] ; then + CC=$xx + fi + fi +fi + # The Solaris /usr/ucb/cc compiler does not appear to work. case "${host}" in sparc-sun-solaris2*) @@ -129,7 +145,7 @@ case "${host}" in could_use= [ -d /opt/SUNWspro/bin ] && could_use="/opt/SUNWspro/bin" if [ -d /opt/cygnus/bin ] ; then - if [ "$could_use" == "" ] ; then + if [ "$could_use" = "" ] ; then could_use="/opt/cygnus/bin" else could_use="$could_use or /opt/cygnus/bin" @@ -149,12 +165,43 @@ case "${host}" in ;; esac +# We default to --with-shared on platforms where -fpic is meaningless. +# Well, we don't yet, but we will. +if false && [ "${host}" = "${target}" ] && [ x${enable_shared} = x ]; then + case "${target}" in + alpha-dec-osf*) enable_shared=yes ;; + mips-sgi-irix5*) enable_shared=yes ;; + *) enable_shared=no ;; + esac +fi + +if [ x${enable_shared} = xyes ]; then + waugh= + case "${host}" in + hppa*) waugh=config/mh-papic ;; + i[345]86-*) waugh=config/mh-x86pic ;; + *) waugh=config/mh-${host_cpu}pic ;; + esac + if [ -f ${srcdir}/${waugh} ]; then + if [ -n "${host_makefile_frag}" ] ; then + cat ${srcdir}/${host_makefile_frag} > mh-frag + cat ${srcdir}/${waugh} >> mh-frag + host_makefile_frag=mh-frag + else + host_makefile_frag=${waugh} + fi + fi +fi + # per-target: case "${target}" in v810*) target_makefile_frag=config/mt-v810 ;; + i[345]86-*-netware*) target_makefile_frag=config/mt-netware ;; + powerpc-*-netware*) target_makefile_frag=config/mt-netware ;; esac +skipdirs= gasdir=gas use_gnu_ld= use_gnu_as= @@ -166,7 +213,7 @@ case ${with_x} in yes | "") # the default value for this tree is that X11 is available ;; no) - configdirs=`echo " ${configdirs} " | sed -e 's/ tk / /;/ gash / /'` + skipdirs="${skipdirs} tk gash" ;; *) echo "*** bad value \"${with_x}\" for -with-x flag; ignored" 1>&2 @@ -183,23 +230,28 @@ is_cross_compiler= if [ x"${host}" = x"${target}" ] ; then # when doing a native toolchain, don't build the targets # that are in the 'cross only' list - for i in ${cross_only} ; do - configdirs=`echo " ${configdirs} " | sed -e "s/ $i / /"` - done + skipdirs="${skipdirs} ${cross_only}" is_cross_compiler=no + target_subdir=. else # similarly, don't build the targets in the 'native only' # list when building a cross compiler - for i in ${native_only} ; do - configdirs=`echo " ${configdirs} " | sed -e "s/ $i / /"` - done + skipdirs="${skipdirs} ${native_only}" is_cross_compiler=yes + target_subdir=${target_alias} + if [ ! -d ${target_subdir} ] ; then + if mkdir ${target_subdir} ; then true + else + echo "'*** could not make ${PWD=`pwd`}/${target_subdir}" 1>&2 + exit 1 + fi + fi fi copy_dirs= # Handle --with-headers=XXX. The contents of the named directory are -# copied to $(tooldir)/include. +# copied to $(tooldir)/sys-include. if [ x"${with_headers}" != x ]; then if [ x${is_cross_compiler} = xno ]; then echo 1>&2 '***' --with-headers is only supported when cross compiling @@ -209,7 +261,7 @@ if [ x"${with_headers}" != x ]; then "") x=${prefix} ;; *) x=${exec_prefix} ;; esac - copy_dirs="${copy_dirs} ${with_headers} $x/${target_alias}/include" + copy_dirs="${copy_dirs} ${with_headers} $x/${target_alias}/sys-include" fi # Handle --with-libs=XXX. Multiple directories are permitted. The @@ -238,9 +290,21 @@ if [ x"${with_headers}" != x ] && [ x"${with_libs}" != x ]; then fi fi -# Recognize --without-newlib. +# Recognize --with-newlib/--without-newlib. if [ x${with_newlib} = xno ]; then - configdirs=`echo " ${configdirs} " | sed -e 's/ newlib / /'` + skipdirs="${skipdirs} target-newlib" +elif [ x${with_newlib} = xyes ]; then + skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'` +fi + +# Default to using --with-stabs for certain targets. +if [ x${with_stabs} = x ]; then + case "${target}" in + mips*-*-* | alpha*-*-osf* | i[345]86*-*-sysv4* | i[345]86*-*-unixware*) + with_stabs=yes; + withoptions="${withoptions} --with-stabs" + ;; + esac fi # Handle ${copy_dirs} @@ -277,8 +341,8 @@ done # Configure extra directories which are host specific case "${host}" in - i[345]86-*-go32*) - configdirs="$configdirs dosrel" ;; + i[345]86-*-win32* | i[345]86-*-go32*) + configdirs="$configdirs dosrel" ;; esac # Remove more programs from consideration, based on the host or @@ -288,37 +352,53 @@ esac noconfigdirs="" case "${host}" in - i[345]86-*-netbsd*) - noconfigdirs="tk fileutils" - ;; i[345]86-*-vsta) noconfigdirs="tcl expect dejagnu make texinfo bison patch flex byacc send-pr gprof uudecode dejagnu diff" ;; i[345]86-*-go32) - noconfigdirs="tcl expect deja-gnu make texinfo bison patch flex byacc send-pr gprof uudecode dejagnu diff" + noconfigdirs="tcl tk expect dejagnu make texinfo bison patch flex byacc send-pr gprof uudecode dejagnu diff" + ;; + i[345]86-*-win32) + noconfigdirs="patch diff flex make tk tcl expect dejagnu cvs autoconf texinfo bison send-pr gprof rcs" + ;; + ppc*-*-pe) + noconfigdirs="patch diff flex make tk tcl expect dejagnu cvs autoconf texinfo bison send-pr gprof rcs" ;; esac case "${target}" in *-*-netware) - noconfigdirs="$noconfigdirs libg++ libio librx newlib" + noconfigdirs="$noconfigdirs target-libg++ target-libstdc++ target-librx target-newlib target-libiberty" + ;; + *-*-vxworks*) + noconfigdirs="$noconfigdirs target-newlib" ;; alpha-dec-osf*) # ld works, but does not support shared libraries. emacs doesn't - # work. newlib is not 64 bit ready. I'm not sure about emacs19, - # fileutils or grep. - noconfigdirs="$noconfigdirs ld emacs emacs19 fileutils grep newlib" + # work. newlib is not 64 bit ready. I'm not sure about fileutils or grep. + # gas doesn't generate exception information. + noconfigdirs="$noconfigdirs gas ld emacs fileutils grep target-newlib" ;; alpha*-*-*) # newlib is not 64 bit ready - noconfigdirs="$noconfigdirs newlib" + noconfigdirs="$noconfigdirs target-newlib" + ;; +# start-sanitize-arc + arc-*-*) + ;; +# end-sanitize-arc + arm-*-pe*) + ;; + arm-*-riscix*) + noconfigdirs="$noconfigdirs ld" ;; h8300*-*-* | \ h8500-*-*) - noconfigdirs="$noconfigdirs libg++ libio librx" + noconfigdirs="$noconfigdirs target-libg++ target-libstdc++ target-libio target-librx" ;; - hppa*-*-*elf*) + hppa*-*-*elf* | \ + hppa*-*-lites*) # Do configure ld/binutils/gas for this case. ;; hppa*-*-*) @@ -332,10 +412,20 @@ case "${target}" in noconfigdirs="$noconfigdirs ld shellutils" ;; i[345]86-*-go32) - # add the go32 support tools to the list # but don't build gdb - configdirs=`echo go32 ${configdirs}` - noconfigdirs="$noconfigdirs gdb libg++ libio librx" + noconfigdirs="$noconfigdirs gdb target-libg++ target-libstdc++ target-libio target-librx" + ;; + + i[345]86-*-win32) + # Can't build gdb for win32 if not native. + # make/glob's configure uses some AC_TRY_RUN type tests + target_configdirs="$target_configdirs target-winsup" + noconfigdirs="$noconfigdirs gdb tcl tk expect make" + # always build newlib. + skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'` + ;; + i[345]86-*-pe) + noconfigdirs="$noconfigdirs target-libg++ target-libstdc++ target-libio target-librx" ;; i[345]86-*-sco*) noconfigdirs="$noconfigdirs gprof" @@ -357,78 +447,159 @@ case "${target}" in ;; powerpc-*-aix*) # copied from rs6000-*-* entry - noconfigdirs="$noconfigdirs ld binutils gprof textutils cvs" + noconfigdirs="$noconfigdirs gprof cvs" + ;; + powerpc*-*-winnt* | powerpc*-*-pe* | ppc*-*-pe) + target_configdirs="$target_configdirs target-winsup" + noconfigdirs="$noconfigdirs gdb tcl tk make expect" + # always build newlib. + skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'` ;; rs6000-*-lynxos*) - # a gcc built textutils will cause the linker to hang on 'join' # The CVS server code doesn't work on the RS/6000 # Newlib makes problems for libg++ in crosses. - noconfigdirs="$noconfigdirs gas ld newlib gprof textutils cvs" - use_gnu_ld=no - use_gnu_as=no + noconfigdirs="$noconfigdirs target-newlib gprof cvs" ;; rs6000-*-*) - # a gcc built textutils will cause the linker to hang on 'join' - noconfigdirs="$noconfigdirs ld binutils gprof textutils" + noconfigdirs="$noconfigdirs gprof" + ;; + m68k-*-netbsd*) + noconfigdirs="$noconfigdirs gdb" ;; m68k-apollo-*) noconfigdirs="$noconfigdirs ld binutils gprof" ;; mips*-*-irix5*) # The GNU linker does not support shared libraries. - noconfigdirs="$noconfigdirs ld gprof" + # emacs is emacs 18, which does not work on Irix 5 (emacs19 does work) + noconfigdirs="$noconfigdirs ld gprof emacs" ;; mips*-dec-bsd*) noconfigdirs="$noconfigdirs gprof" ;; mips*-*-bsd*) - noconfigdirs="$noconfigdirs gprof ld" + noconfigdirs="$noconfigdirs gprof" ;; mips*-*-*) noconfigdirs="$noconfigdirs gprof" ;; romp-*-*) - noconfigdirs="bfd binutils ld gas opcodes" + noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes" ;; sh-*-*) case "${host}" in i[345]86-*-vsta) ;; # don't add gprof back in - *) configdirs=`echo gprof ${configdirs}` ;; i[345]86-*-go32) ;; # don't add gprof back in - *) configdirs=`echo gprof ${configdirs}` ;; + *) skipdirs=`echo " ${skipdirs} " | sed -e 's/ gprof / /'` ;; esac ;; sparc-*-sunos4*) if [ x${is_cross_compiler} != xno ] ; then - noconfigdirs="$noconfigdirs gdb gdbtest newlib sim dejagnu expect tcl" + noconfigdirs="$noconfigdirs gdb gdbtest target-newlib" else use_gnu_ld=no fi ;; + v810-*-*) + noconfigdirs="$noconfigdirs bfd binutils gas gcc gdb ld target-libio target-libg++ target-libstdc++ opcodes" + ;; vax-*-vms) - noconfigdirs="$noconfigdirs bfd binutils gdb ld newlib opcodes" + noconfigdirs="$noconfigdirs bfd binutils gdb ld target-newlib opcodes" ;; vax-*-*) - noconfigdirs="$noconfigdirs newlib" + noconfigdirs="$noconfigdirs target-newlib" ;; *-*-lynxos*) - # Newlib makes problems for libg++ in crosses. - noconfigdirs="$noconfigdirs newlib" - ;; + # Newlib makes problems for libg++ in crosses. + noconfigdirs="$noconfigdirs target-newlib" + ;; + *-*-macos* | \ + *-*-mpw*) + # Macs want a resource compiler. + configdirs="$configdirs grez" + ;; esac -# Remove the entries in $noconfigdirs from $configdirs. If we have the -# source for them, add them to $notsupp. +# If we are building a Canadian Cross, discard tools that can not be built +# using a cross compiler. FIXME: These tools should be fixed. +if [ "${build}" != "${host}" ]; then + noconfigdirs="$noconfigdirs expect dejagnu make texinfo diff" +fi + +# Make sure we don't let GNU ld be added if we didn't want it. +if [ x$with_gnu_ld = xno ]; then + use_gnu_ld=no + noconfigdirs="$noconfigdirs ld" +fi + +# Make sure we don't let GNU as be added if we didn't want it. +if [ x$with_gnu_as = xno ]; then + use_gnu_as=no + noconfigdirs="$noconfigdirs gas" +fi + +# Remove the entries in $skipdirs and $noconfigdirs from $configdirs and +# $target_configdirs. +# If we have the source for $noconfigdirs entries, add them to $notsupp. + notsupp="" -for dir in . $noconfigdirs ; do +for dir in . $skipdirs $noconfigdirs ; do + dirname=`echo $dir | sed -e s/target-//g` if [ $dir != . ] && echo " ${configdirs} " | grep " ${dir} " >/dev/null 2>&1; then configdirs=`echo " ${configdirs} " | sed -e "s/ ${dir} / /"` - if [ -r $srcdir/$dir/configure ] || [ -r $srcdir/$dir/configure.in ]; then - notsupp="$notsupp $dir" + if [ -r $srcdir/$dirname/configure ] \ + || [ -r $srcdir/$dirname/configure.in ]; then + if echo " ${skipdirs} " | grep " ${dir} " >/dev/null 2>&1; then + true + else + notsupp="$notsupp $dir" + fi + fi + fi + if [ $dir != . ] && echo " ${target_configdirs} " | grep " ${dir} " >/dev/null 2>&1; then + target_configdirs=`echo " ${target_configdirs} " | sed -e "s/ ${dir} / /"` + if [ -r $srcdir/$dirname/configure ] \ + || [ -r $srcdir/$dirname/configure.in ]; then + if echo " ${skipdirs} " | grep " ${dir} " >/dev/null 2>&1; then + true + else + notsupp="$notsupp $dir" + fi fi fi done +# Sometimes the tools are distributed with libiberty but with no other +# libraries. In that case, we don't want to build target-libiberty. +if [ -n "${target_configdirs}" ]; then + others= + for i in `echo ${target_configdirs} | sed -e s/target-//g` ; do + if [ "$i" != "libiberty" ]; then + if [ -r $srcdir/$i/configure ] || [ -r $srcdir/$i/configure.in ]; then + others=yes; + break; + fi + fi + done + if [ -z "${others}" ]; then + target_configdirs= + fi +fi + +# Deconfigure all subdirectories, in case we are changing the +# configuration from one where a subdirectory is supported to one where it +# is not. +if [ -z "${norecursion}" -a -n "${configdirs}" ]; then + for i in `echo ${configdirs} | sed -e s/target-//g` ; do + rm -f $i/Makefile + done +fi +if [ -z "${norecursion}" -a -n "${target_configdirs}" ]; then + for i in `echo ${target_configdirs} | sed -e s/target-//` ; do + rm -f ${target_subdir}/$i/Makefile + done +fi + # Produce a warning message for the subdirs we can't configure. # This isn't especially interesting in the Cygnus tree, but in the individual # FSF releases, it's important to let people know when their machine isn't @@ -441,9 +612,15 @@ if [ -n "${notsupp}" ] && [ -z "${norecursion}" ]; then # pretend that all is well.) if [ -n "$appdirs" ]; then for dir in $appdirs ; do - if [ -r $dir/Makefile.in ] && echo " ${configdirs} " | grep " ${dir} " >/dev/null 2>&1 ; then - appdirs="" - break + if [ -r $dir/Makefile.in ]; then + if echo " ${configdirs} " | grep " ${dir} " >/dev/null 2>&1; then + appdirs="" + break + fi + if echo " ${target_configdirs} " | grep " ${dir} " >/dev/null 2>&1; then + appdirs="" + break + fi fi done if [ -n "$appdirs" ]; then @@ -485,6 +662,57 @@ if [ x${use_gnu_ld} = x ] ; then fi fi +if [ x${enable_shared} = xyes ]; then + case "${target}" in + hppa*) target_makefile_frag=config/mt-papic ;; + i[345]86-*) target_makefile_frag=config/mt-x86pic ;; + *) target_makefile_frag=config/mt-${target_cpu}pic ;; + esac +fi + +# post-target: + +# Make sure that the compiler is able to generate an executable. If it +# can't, we are probably in trouble. We don't care whether we can run the +# executable--we might be using a cross compiler--we only care whether it +# can be created. At this point the main configure script has set CC. +echo "int main () { return 0; }" > conftest.c +${CC} -o conftest ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} conftest.c +if [ $? = 0 ] && [ -s conftest ]; then + : +else + echo 1>&2 "*** The command '${CC} -o conftest ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} conftest.c' failed." + echo 1>&2 "*** You must set the environment variable CC to a working compiler." + rm -f conftest* + exit 1 +fi +rm -f conftest* + +# Record target_configdirs and the configure arguments in Makefile. +target_configdirs=`echo "${target_configdirs}" | sed -e 's/target-//g'` +targargs=`echo "${arguments}" | \ + sed -e 's/--norecursion//' \ + -e 's/--cache[a-z-]*=[^ ]*//' \ + -e 's/--ho[a-z-]*=[^ ]*//' \ + -e 's/--ta[a-z-]*=[^ ]*//'` + +# Passing a --with-cross-host argument lets the target libraries know +# whether they are being built with a cross-compiler or being built +# native. However, it would be better to use other mechanisms to make the +# sorts of decisions they want to make on this basis. Please consider +# this option to be deprecated. FIXME. +if [ x${is_cross_compiler} = xyes ]; then + targargs="--with-cross-host=${host_alias} ${targargs}" +fi + +targargs="--host=${target_alias} ${targargs}" +sed -e "s:^TARGET_CONFIGDIRS[ ]*=.*$:TARGET_CONFIGDIRS = ${target_configdirs}:" \ + -e "s%^CONFIG_ARGUMENTS[ ]*=.*$%CONFIG_ARGUMENTS = ${targargs}%" \ + -e "s%^TARGET_SUBDIR[ ]*=.*$%TARGET_SUBDIR = ${target_subdir}%" \ + Makefile > Makefile.tem +rm -f Makefile +mv -f Makefile.tem Makefile + # # Local Variables: # fill-column: 131