X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=configure.in;h=74558227b960324793ba32a8ecfc2b20b6be91d2;hb=08714af65cd0898c76d55837ddc52d32ac2379c8;hp=51da239d49ecefe089820c491a222674223cda8b;hpb=39772dd8f1ce0472ed9469fef90cbb2c38983d07;p=deliverable%2Fbinutils-gdb.git diff --git a/configure.in b/configure.in index 51da239d49..74558227b9 100644 --- a/configure.in +++ b/configure.in @@ -52,7 +52,7 @@ target_libs="target-libiberty target-libgloss target-newlib target-libio target- # 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" ################################################################################ @@ -64,9 +64,9 @@ target_tools="examples groff" # directories to be built in the native environment only # -native_only="autoconf cvs emacs emacs19 fileutils find grep groff gzip hello +native_only="autoconf cvs emacs emacs19 fileutils find grep gzip hello indent ispell m4 rcs recode sed shellutils tar textutils gash - uudecode wdiff gprof" + uudecode wdiff gprof target-groff" # directories to be built in a cross environment only # @@ -97,6 +97,7 @@ case "${host}" in m68k-hp-hpux*) host_makefile_frag=config/mh-hp300 ;; m68k-apollo-sysv*) host_makefile_frag=config/mh-apollo68 ;; m68k-apollo-bsd*) host_makefile_frag=config/mh-a68bsd ;; + m68k-*-linux*) host_makefile_frag=config/mh-linux ;; m88k-dg-dgux*) host_makefile_frag=config/mh-dgux ;; m88k-harris-cxux*) host_makefile_frag=config/mh-cxux ;; m88k-motorola-sysv*) host_makefile_frag=config/mh-delta88;; @@ -108,13 +109,13 @@ case "${host}" in mips*-*-sysv*) host_makefile_frag=config/mh-riscos ;; 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-*-sco3.2v5*) host_makefile_frag=config/mh-sysv ;; i[345]86-*-sco*) host_makefile_frag=config/mh-sco ;; i[345]86-*-isc*) host_makefile_frag=config/mh-sysv ;; i[345]86-*-linux*) host_makefile_frag=config/mh-linux ;; 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 ;; *-*-solaris2*) host_makefile_frag=config/mh-solaris ;; m68k-sun-sunos*) host_makefile_frag=config/mh-sun3 ;; @@ -128,9 +129,20 @@ 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 +# If we aren't going to be using gcc, see if we can extract a definition +# of CC from the fragment. +if [ -z "${CC}" -a "${build}" = "${host}" ]; then + IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" + found= + for dir in $PATH; do + test -z "$dir" && dir=. + if test -f $dir/gcc; then + found=yes + break + fi + done + IFS="$save_ifs" + if [ -z "${found}" -a -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 @@ -138,33 +150,6 @@ if [ -z "${CC}" ]; then fi fi -# The Solaris /usr/ucb/cc compiler does not appear to work. -case "${host}" in - sparc-sun-solaris2*) - if [ "`/usr/bin/which ${CC-cc}`" = "/usr/ucb/cc" ] ; then - could_use= - [ -d /opt/SUNWspro/bin ] && could_use="/opt/SUNWspro/bin" - if [ -d /opt/cygnus/bin ] ; then - if [ "$could_use" = "" ] ; then - could_use="/opt/cygnus/bin" - else - could_use="$could_use or /opt/cygnus/bin" - fi - fi - if [ "$could_use" = "" ] ; then - echo "Warning: compilation may fail because you're using" - echo "/usr/ucb/cc. You should change your PATH or CC " - echo "variable and rerun configure." - else - echo "Warning: compilation may fail because you're using" - echo "/usr/ucb/cc, when you should use the C compiler from" - echo "$could_use. You should change your" - echo "PATH or CC variable and rerun configure." - fi - fi - ;; -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 @@ -180,6 +165,7 @@ if [ x${enable_shared} = xyes ]; then case "${host}" in hppa*) waugh=config/mh-papic ;; i[345]86-*) waugh=config/mh-x86pic ;; + sparc64-*) waugh=config/mh-sparcpic ;; *) waugh=config/mh-${host_cpu}pic ;; esac if [ -f ${srcdir}/${waugh} ]; then @@ -297,6 +283,16 @@ 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} set fnord ${copy_dirs} shift @@ -331,7 +327,7 @@ done # Configure extra directories which are host specific case "${host}" in - i[345]86-*-win32* | i[345]86-*-go32*) + i[345]86-*-go32*) configdirs="$configdirs dosrel" ;; esac @@ -348,8 +344,11 @@ case "${host}" in i[345]86-*-go32) noconfigdirs="tcl tk expect dejagnu make texinfo bison patch flex byacc send-pr gprof uudecode dejagnu diff" ;; - i[345]86-*-win32) - noconfigdirs="tk tcl expect dejagnu cvs autoconf texinfo bison send-pr gprof rcs" + *-*-cygwin32) + noconfigdirs="patch diff make tk tcl expect dejagnu cvs autoconf texinfo bison send-pr gprof rcs" + ;; + ppc*-*-pe) + noconfigdirs="patch diff make tk tcl expect dejagnu cvs autoconf texinfo bison send-pr gprof rcs" ;; esac @@ -358,13 +357,14 @@ case "${target}" in *-*-netware) noconfigdirs="$noconfigdirs target-libg++ target-libstdc++ target-librx target-newlib target-libiberty" ;; - *-*-vxworks5.1) + *-*-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 fileutils or grep. - noconfigdirs="$noconfigdirs ld emacs fileutils grep target-newlib" + # gas doesn't generate exception information. + noconfigdirs="$noconfigdirs gas ld emacs fileutils grep target-newlib" ;; alpha*-*-*) # newlib is not 64 bit ready @@ -374,10 +374,8 @@ case "${target}" in arc-*-*) ;; # end-sanitize-arc -# start-sanitize-psion arm-*-pe*) ;; -# end-sanitize-psion arm-*-riscix*) noconfigdirs="$noconfigdirs ld" ;; @@ -403,21 +401,29 @@ case "${target}" in # but don't build gdb noconfigdirs="$noconfigdirs gdb target-libg++ target-libstdc++ target-libio target-librx" ;; + *-*-cygwin32) - i[345]86-*-win32) - noconfigdirs="$noconfigdirs tk" - # Can't build gdb for win32 if not native. - if [ x${is_cross_compiler} = xyes ]; then - noconfigdirs="$noconfigdirs gdb" - fi + # make/glob's configure uses some AC_TRY_RUN type tests + target_configdirs="$target_configdirs target-winsup" + noconfigdirs="$noconfigdirs tcl tk expect make" # always build newlib. skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'` - # and winsup - configdirs="$configdirs target-winsup" + + # Can't build gdb for cygwin32 if not native. + case "${host}:${build}" in + *-*-cygwin32 | *-*-cygwin32:*-*-cygwin32) ;; # keep gdb + *) noconfigdirs="$noconfigdirs gdb" + esac + ;; i[345]86-*-pe) noconfigdirs="$noconfigdirs target-libg++ target-libstdc++ target-libio target-librx" ;; + i[345]86-*-sco3.2v5*) + # The linker does not yet know about weak symbols in COFF, + # and is not configured to handle mixed ELF and COFF. + noconfigdirs="$noconfigdirs gprof ld" + ;; i[345]86-*-sco*) noconfigdirs="$noconfigdirs gprof" ;; @@ -436,16 +442,15 @@ case "${target}" in # but that's okay since emacs doesn't work anyway noconfigdirs="$noconfigdirs emacs emacs19" ;; -# start-sanitize-jaguar - jaguar-*-*) - ;; -# end-sanitize-jaguar powerpc-*-aix*) # copied from rs6000-*-* entry noconfigdirs="$noconfigdirs gprof cvs" ;; - powerpc*-*-winnt* | powerpc*-*-pe*) - noconfigdirs="$noconfigdirs ld gdb" + 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*) # The CVS server code doesn't work on the RS/6000 @@ -455,9 +460,6 @@ case "${target}" in rs6000-*-*) noconfigdirs="$noconfigdirs gprof" ;; - m68k-*-netbsd*) - noconfigdirs="$noconfigdirs gdb" - ;; m68k-apollo-*) noconfigdirs="$noconfigdirs ld binutils gprof" ;; @@ -493,7 +495,7 @@ case "${target}" in fi ;; v810-*-*) - noconfigdirs="$noconfigdirs bfd binutils gas gcc gdb ld target-libg++ target-libstdc++ opcodes" + noconfigdirs="$noconfigdirs bfd binutils gas gcc gdb ld target-libio target-libg++ target-libstdc++ opcodes" ;; vax-*-vms) noconfigdirs="$noconfigdirs bfd binutils gdb ld target-newlib opcodes" @@ -502,20 +504,52 @@ case "${target}" in noconfigdirs="$noconfigdirs target-newlib" ;; *-*-lynxos*) - # Newlib makes problems for libg++ in crosses. - noconfigdirs="$noconfigdirs target-newlib" - ;; + # Newlib makes problems for libg++ in crosses. + noconfigdirs="$noconfigdirs target-newlib" + ;; + *-*-macos* | \ + *-*-mpw*) + # Macs want a resource compiler. + configdirs="$configdirs grez" + ;; +esac + +# targets that need a second pass +case "${target}" in + *-gm-magic*) + noconfigdirs="$noconfigdirs libgloss" + ;; esac +# 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 . $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 + if [ -r $srcdir/$dirname/configure ] \ + || [ -r $srcdir/$dirname/configure.in ]; then if echo " ${skipdirs} " | grep " ${dir} " >/dev/null 2>&1; then true else @@ -525,7 +559,8 @@ for dir in . $skipdirs $noconfigdirs ; do 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/$dir/configure ] || [ -r $srcdir/$dir/configure.in ]; then + if [ -r $srcdir/$dirname/configure ] \ + || [ -r $srcdir/$dirname/configure.in ]; then if echo " ${skipdirs} " | grep " ${dir} " >/dev/null 2>&1; then true else @@ -535,16 +570,33 @@ for dir in . $skipdirs $noconfigdirs ; do 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 ${configdirs} ; do + 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 ${target_configdirs} ; do + for i in `echo ${target_configdirs} | sed -e s/target-//` ; do rm -f ${target_subdir}/$i/Makefile done fi @@ -621,12 +673,85 @@ 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* + +# The Solaris /usr/ucb/cc compiler does not appear to work. +case "${host}" in + sparc-sun-solaris2*) + if [ "`/usr/bin/which ${CC-cc}`" = "/usr/ucb/cc" ] ; then + could_use= + [ -d /opt/SUNWspro/bin ] && could_use="/opt/SUNWspro/bin" + if [ -d /opt/cygnus/bin ] ; then + if [ "$could_use" = "" ] ; then + could_use="/opt/cygnus/bin" + else + could_use="$could_use or /opt/cygnus/bin" + fi + fi + if [ "$could_use" = "" ] ; then + echo "Warning: compilation may fail because you're using" + echo "/usr/ucb/cc. You should change your PATH or CC " + echo "variable and rerun configure." + else + echo "Warning: compilation may fail because you're using" + echo "/usr/ucb/cc, when you should use the C compiler from" + echo "$could_use. You should change your" + echo "PATH or CC variable and rerun configure." + fi + fi + ;; +esac + +# If --enable-shared was set, we must set LD_LIBRARY_PATH so that the +# binutils tools will find libbfd.so. +if [ "${enable_shared}" = "yes" ]; then + sed -e 's/^SET_LIB_PATH[ ]*=.*$/SET_LIB_PATH = $(REALLY_SET_LIB_PATH)/' \ + Makefile > Makefile.tem + rm -f Makefile + mv -f Makefile.tem Makefile + + case "${host}" in + *-*-hpux*) + sed -e 's/RPATH_ENVVAR[ ]*=.*$/RPATH_ENVVAR = SHLIB_PATH/' \ + Makefile > Makefile.tem + rm -f Makefile + mv -f Makefile.tem Makefile + ;; + esac +fi + # 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/--*cache[a-z-]*[ ][ ]*[^ ]*//'` + 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}%" \