X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=configure.ac;h=fb8f7102a85711d72661e421973925656448a90d;hb=2f629d2305e935524b49e14da64e1ffe26ea9d6b;hp=b469359631f54462e0eb470941fa7816854b9c34;hpb=0c24b341d26502e72111a6a14a4f372b25b28a4a;p=deliverable%2Fbinutils-gdb.git diff --git a/configure.ac b/configure.ac index b469359631..fb8f7102a8 100644 --- a/configure.ac +++ b/configure.ac @@ -101,6 +101,9 @@ do # Add the quoted argument to the list. TOPLEVEL_CONFIGURE_ARGUMENTS="$TOPLEVEL_CONFIGURE_ARGUMENTS $ac_arg" done +if test "$silent" = yes; then + TOPLEVEL_CONFIGURE_ARGUMENTS="$TOPLEVEL_CONFIGURE_ARGUMENTS --silent" +fi # Remove the initial space we just introduced and, as these will be # expanded by make, quote '$'. TOPLEVEL_CONFIGURE_ARGUMENTS=`echo "x$TOPLEVEL_CONFIGURE_ARGUMENTS" | sed -e 's/^x *//' -e 's,\\$,$$,g'` @@ -332,7 +335,7 @@ esac AC_ARG_ENABLE(libada, -[ --enable-libada Builds libada directory], +[ --enable-libada build libada directory], ENABLE_LIBADA=$enableval, ENABLE_LIBADA=yes) if test "${ENABLE_LIBADA}" != "yes" ; then @@ -340,7 +343,7 @@ if test "${ENABLE_LIBADA}" != "yes" ; then fi AC_ARG_ENABLE(libssp, -[ --enable-libssp Builds libssp directory], +[ --enable-libssp build libssp directory], ENABLE_LIBSSP=$enableval, ENABLE_LIBSSP=yes) @@ -364,7 +367,7 @@ esac # Disable libmudflap on some systems. if test x$enable_libmudflap = x ; then case "${target}" in - *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-linux-uclibc* | *-*-uclinux*) + *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | bfin*-*-uclinux*) # Enable libmudflap by default in GNU and friends. ;; *-*-freebsd*) @@ -395,6 +398,8 @@ if test x$enable_libgomp = x ; then esac fi +# Default libgloss CPU subdirectory. +libgloss_dir="$target_cpu" case "${target}" in *-*-chorusos) @@ -501,6 +506,7 @@ case "${target}" in *) noconfigdirs="$noconfigdirs gdb readline" ;; esac + libgloss_dir=wince ;; arc-*-*) noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" @@ -509,19 +515,23 @@ case "${target}" in ;; arm-*-coff | strongarm-*-coff | xscale-*-coff) noconfigdirs="$noconfigdirs ${libgcj}" + libgloss_dir=arm ;; arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* ) noconfigdirs="$noconfigdirs target-libffi target-qthreads" + libgloss_dir=arm ;; arm*-*-linux-gnueabi) - noconfigdirs="$noconfigdirs target-libffi target-qthreads" - noconfigdirs="$noconfigdirs target-libjava target-libobjc" + noconfigdirs="$noconfigdirs target-qthreads" + noconfigdirs="$noconfigdirs target-libobjc" case ${with_newlib} in no) noconfigdirs="$noconfigdirs target-newlib target-libgloss" esac + libgloss_dir=arm ;; arm*-*-symbianelf*) noconfigdirs="$noconfigdirs ${libgcj} target-libiberty" + libgloss_dir=arm ;; arm-*-pe*) noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" @@ -568,6 +578,7 @@ case "${target}" in unsupported_languages="$unsupported_languages fortran" noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss";; esac + libgloss_dir=cris ;; crx-*-*) noconfigdirs="$noconfigdirs target-libstdc++-v3 target-mudflap ${libgcj}" @@ -578,6 +589,9 @@ case "${target}" in d30v-*-*) noconfigdirs="$noconfigdirs ${libgcj} gdb" ;; + ep9312-*-elf | ep9312-*-coff) + libgloss_dir=arm + ;; fr30-*-elf*) noconfigdirs="$noconfigdirs ${libgcj} gdb" ;; @@ -609,6 +623,9 @@ case "${target}" in hppa*-hp-hpux11*) noconfigdirs="$noconfigdirs ld shellutils" ;; + hppa*-*-pro*) + libgloss_dir=pa + ;; hppa*-*-*) # According to Alexandre Oliva , libjava won't # build on HP-UX 10.20. @@ -629,6 +646,7 @@ case "${target}" in ;; i[[3456789]]86-*-coff | i[[3456789]]86-*-elf) noconfigdirs="$noconfigdirs ${libgcj}" + libgloss_dir=i386 ;; i[[3456789]]86-*-linux*) # The GCC port for glibc1 has no MD_FALLBACK_FRAME_STATE_FOR, so let's @@ -698,6 +716,7 @@ case "${target}" in ;; m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*) noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj}" + libgloss_dir=m68hc11 ;; m68k-*-elf*) noconfigdirs="$noconfigdirs ${libgcj}" @@ -705,6 +724,9 @@ case "${target}" in m68k-*-coff*) noconfigdirs="$noconfigdirs ${libgcj}" ;; + m68*-*-* | fido-*-*) + libgloss_dir=m68k + ;; mcore-*-pe*) # The EPOC C++ environment does not support exceptions or rtti, # and so building libstdc++-v3 tends not to always work. @@ -736,14 +758,17 @@ case "${target}" in # This is temporary until we can link against shared libraries powerpcle-*-solaris*) noconfigdirs="$noconfigdirs gdb sim make tcl tk expect itcl gnuserv ${libgcj}" + libgloss_dir=rs6000 ;; powerpc-*-beos*) noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss ${libgcj}" ;; powerpc-*-eabi) noconfigdirs="$noconfigdirs ${libgcj}" + libgloss_dir=rs6000 ;; powerpc-*-eabi* | powerpcle-*-eabi* | powerpc-*-rtems* ) + libgloss_dir=rs6000 ;; rs6000-*-lynxos*) noconfigdirs="$noconfigdirs target-newlib gprof ${libgcj}" @@ -778,6 +803,7 @@ case "${target}" in ;; mips*-*-*) noconfigdirs="$noconfigdirs gprof ${libgcj}" + libgloss_dir=mips ;; romp-*-*) noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}" @@ -791,14 +817,19 @@ case "${target}" in esac noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" ;; + sparclet-*-aout* | sparc86x-*-*) + libgloss_dir=sparc + ;; sparc-*-elf*) noconfigdirs="$noconfigdirs ${libgcj}" ;; sparc64-*-elf*) noconfigdirs="$noconfigdirs ${libgcj}" + libgloss_dir=sparc ;; sparclite-*-*) noconfigdirs="$noconfigdirs ${libgcj}" + libgloss_dir=sparc ;; sparc-*-sunos4*) noconfigdirs="$noconfigdirs ${libgcj}" @@ -971,8 +1002,10 @@ case "${host}" in host_makefile_frag="config/mh-cygwin" ;; *-mingw32*) + host_makefile_frag="config/mh-mingw" ;; *-mingw64*) + host_makefile_frag="config/mh-mingw" ;; *-interix*) host_makefile_frag="config/mh-interix" @@ -1081,16 +1114,16 @@ have_gmp=no # Specify a location for mpfr # check for this first so it ends up on the link line before gmp. -AC_ARG_WITH(mpfr-dir, [ --with-mpfr-dir=PATH This option has been REMOVED], +AC_ARG_WITH(mpfr-dir, [ --with-mpfr-dir=PATH this option has been REMOVED], AC_MSG_ERROR([The --with-mpfr-dir=PATH option has been removed. Use --with-mpfr=PATH or --with-mpfr-include=PATH plus --with-mpfr-lib=PATH])) -AC_ARG_WITH(mpfr, [ --with-mpfr=PATH Specify prefix directory for installed MPFR package +AC_ARG_WITH(mpfr, [ --with-mpfr=PATH specify prefix directory for installed MPFR package. Equivalent to --with-mpfr-include=PATH/include plus --with-mpfr-lib=PATH/lib]) AC_ARG_WITH(mpfr_include, [ --with-mpfr-include=PATH - Specify directory for installed MPFR include files]) -AC_ARG_WITH(mpfr_lib, [ --with-mpfr-lib=PATH Specify the directory for the installed MPFR library]) + specify directory for installed MPFR include files]) +AC_ARG_WITH(mpfr_lib, [ --with-mpfr-lib=PATH specify directory for the installed MPFR library]) if test "x$with_mpfr" != x; then gmplibs="-L$with_mpfr/lib $gmplibs" @@ -1113,15 +1146,15 @@ if test "x$with_mpfr$with_mpfr_include$with_mpfr_lib" = x && test -d ${srcdir}/m fi # Specify a location for gmp -AC_ARG_WITH(gmp-dir, [ --with-gmp-dir=PATH This option has been REMOVED], +AC_ARG_WITH(gmp-dir, [ --with-gmp-dir=PATH this option has been REMOVED], AC_MSG_ERROR([The --with-gmp-dir=PATH option has been removed. Use --with-gmp=PATH or --with-gmp-include=PATH plus --with-gmp-lib=PATH])) -AC_ARG_WITH(gmp, [ --with-gmp=PATH Specify prefix directory for the installed GMP package +AC_ARG_WITH(gmp, [ --with-gmp=PATH specify prefix directory for the installed GMP package. Equivalent to --with-gmp-include=PATH/include plus --with-gmp-lib=PATH/lib]) -AC_ARG_WITH(gmp_include, [ --with-gmp-include=PATH Specify directory for installed GMP include files]) -AC_ARG_WITH(gmp_lib, [ --with-gmp-lib=PATH Specify the directory for the installed GMP library]) +AC_ARG_WITH(gmp_include, [ --with-gmp-include=PATH specify directory for installed GMP include files]) +AC_ARG_WITH(gmp_lib, [ --with-gmp-lib=PATH specify directory for the installed GMP library]) if test "x$with_gmp" != x; then @@ -1365,7 +1398,7 @@ if test -d ${srcdir}/gcc; then done AC_ARG_ENABLE(stage1-languages, -[ --enable-stage1-languages[=all] choose additional languages to build during +[ --enable-stage1-languages@<:@=all@:>@ choose additional languages to build during stage1. Mostly useful for compiler development.], [case ,${enable_stage1_languages}, in ,no,|,,) @@ -1426,8 +1459,8 @@ done # Check for Boehm's garbage collector AC_ARG_ENABLE(objc-gc, -[ --enable-objc-gc enable the use of Boehm's garbage collector with - the GNU Objective-C runtime.], +[ --enable-objc-gc enable use of Boehm's garbage collector with the + GNU Objective-C runtime], [case ,${enable_languages},:${enable_objc_gc}:${noconfigdirs} in *,objc,*:*:yes:*target-boehm-gc*) AC_MSG_ERROR([Boehm's garbage collector was requested yet not supported in this configuration]) @@ -1582,7 +1615,7 @@ ACX_TOOL_DIRS copy_dirs= AC_ARG_WITH([build-sysroot], - [ --with-build-sysroot=sysroot + [ --with-build-sysroot=SYSROOT use sysroot as the system root during the build], [if test x"$withval" != x ; then SYSROOT_CFLAGS_FOR_TARGET="--sysroot=$withval" @@ -1590,6 +1623,18 @@ AC_ARG_WITH([build-sysroot], [SYSROOT_CFLAGS_FOR_TARGET=]) AC_SUBST(SYSROOT_CFLAGS_FOR_TARGET) +AC_ARG_WITH([debug-prefix-map], + [ --with-debug-prefix-map='A=B C=D ...' + map A to B, C to D ... in debug information], + [if test x"$withval" != x; then + DEBUG_PREFIX_CFLAGS_FOR_TARGET= + for debug_map in $withval; do + DEBUG_PREFIX_CFLAGS_FOR_TARGET="$DEBUG_PREFIX_CFLAGS_FOR_TARGET -fdebug-prefix-map=$debug_map" + done + fi], + [DEBUG_PREFIX_CFLAGS_FOR_TARGET=]) +AC_SUBST(DEBUG_PREFIX_CFLAGS_FOR_TARGET) + # Handle --with-headers=XXX. If the value is not "yes", the contents of # the named directory are copied to $(tooldir)/sys-include. if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then @@ -1693,10 +1738,10 @@ case "${target}" in alpha*-*-*vms*) md_exec_prefix=/gnu/lib/gcc-lib ;; - i[34567]86-pc-msdosdjgpp*) + i[[34567]]86-pc-msdosdjgpp*) md_exec_prefix=/dev/env/DJDIR/bin ;; - i[34567]86-*-sco3.2v5*) + i[[34567]]86-*-sco3.2v5*) if test $with_gnu_as = yes; then md_exec_prefix=/usr/gnu/bin else @@ -1727,7 +1772,7 @@ case "${target}" in *-*-nto-qnx* | \ *-*-rtems* | \ *-*-solaris2* | \ - *-*-sysv[45]* | \ + *-*-sysv[[45]]* | \ *-*-vxworks* | \ *-wrs-windiss) md_exec_prefix=/usr/ccs/bin @@ -1745,6 +1790,9 @@ case "${target}" in spu-*-*) target_makefile_frag="config/mt-spu" ;; + mips*-sde-elf*) + target_makefile_frag="config/mt-sde" + ;; *-*-netware*) target_makefile_frag="config/mt-netware" ;; @@ -1941,7 +1989,7 @@ INSTALL_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-install-/g` # not to nest @if/@endif pairs, because configure will not warn you at all. AC_ARG_ENABLE([bootstrap], -[ --enable-bootstrap Enable bootstrapping [yes if native build]],, +[ --enable-bootstrap enable bootstrapping @<:@yes if native build@:>@],, enable_bootstrap=default) # Issue errors and warnings for invalid/strange bootstrap combinations. @@ -2035,10 +2083,10 @@ extrasub="$extrasub # Create the serialization dependencies. This uses a temporary file. AC_ARG_ENABLE([serial-configure], -[ --enable-serial-[{host,target,build}-]configure - Force sequential configuration of +[ --enable-serial-@<:@{host,target,build}-@:>@configure + force sequential configuration of sub-packages for the host, target or build - machine, or all sub-packages]) + machine, or all sub-packages]) case ${enable_serial_configure} in yes) @@ -2178,6 +2226,9 @@ EOF_SED gcc_transform_name=`cat conftestsed.out` rm -f conftestsed.out baseargs="$baseargs --program-transform-name='${gcc_transform_name}'" +if test "$silent" = yes; then + baseargs="$baseargs --silent" +fi # For the build-side libraries, we just need to pretend we're native, # and not use the same cache file. Multilibs are neither needed nor @@ -2278,6 +2329,19 @@ case " $target_configdirs " in # for any libc-related directories first (so make it the last -B # switch). FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -B$$r/$(TARGET_SUBDIR)/newlib/ -isystem $$r/$(TARGET_SUBDIR)/newlib/targ-include -isystem $$s/newlib/libc/include' + + # If we're building libgloss, find the startup file, simulator library + # and linker script. + case " $target_configdirs " in + *" libgloss "*) + # Look for startup file, simulator library and maybe linker script. + FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -B$$r/$(TARGET_SUBDIR)/libgloss/'"$libgloss_dir" + # Look for libnosys.a in case the target needs it. + FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/libgloss/libnosys' + # Most targets have the linker script in the source directory. + FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$s/libgloss/'"$libgloss_dir" + ;; + esac ;; esac ;; @@ -2311,16 +2375,6 @@ fi # Search for other target-specific linker scripts and such. case "${target}" in - m32c-*-* ) - if test -d ${srcdir}/libgloss/m32c; then - # This is for crt0.o - FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -B$$r/$(TARGET_SUBDIR)/libgloss/m32c' - # This is for r8c.ld - FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/libgloss/m32c' - # This is for libnosys.a - FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/libgloss/libnosys' - fi - ;; mep*) FLAGS_FOR_TARGET="$FLAGS_FOR_TARGET -mlibrary" ;; @@ -2450,7 +2504,7 @@ AC_SUBST(CXXFLAGS) # Target tools. AC_ARG_WITH([build-time-tools], - [ --with-build-time-tools=path + [ --with-build-time-tools=PATH use given path to find target tools during the build], [case x"$withval" in x/*) ;; @@ -2589,13 +2643,13 @@ AC_SUBST(stage1_cflags) # Enable --enable-checking in stage1 of the compiler. AC_ARG_ENABLE(stage1-checking, -[ --enable-stage1-checking[=all] choose additional checking for stage1 - of the compiler.], +[ --enable-stage1-checking@<:@=all@:>@ choose additional checking for stage1 + of the compiler], [stage1_checking=--enable-checking=${enable_stage1_checking}], [if test "x$enable_checking" = xno; then - stage1_checking=--enable-checking + stage1_checking=--enable-checking=yes,types else - stage1_checking=--enable-checking${enable_checking+=}$enable_checking + stage1_checking=--enable-checking=types${enable_checking+,}$enable_checking fi]) AC_SUBST(stage1_checking) @@ -2615,22 +2669,22 @@ AC_SUBST(stage2_werror_flag) # Flags needed to enable html installing and building AC_ARG_WITH(datarootdir, -[ --with-datarootdir Use datarootdir as the data root directory.], +[ --with-datarootdir use datarootdir as the data root directory.], [datarootdir="\${prefix}/${withval}"], [datarootdir="\${prefix}/share"]) AC_ARG_WITH(docdir, -[ --with-docdir Install documentation in this directory.], +[ --with-docdir install documentation in this directory.], [docdir="\${prefix}/${withval}"], [docdir="\${datarootdir}/doc"]) AC_ARG_WITH(pdfdir, -[ --with-pdfdir Install pdf in this directory.], +[ --with-pdfdir install pdf in this directory.], [pdfdir="\${prefix}/${withval}"], [pdfdir="\${docdir}"]) AC_ARG_WITH(htmldir, -[ --with-htmldir Install html in this directory.], +[ --with-htmldir install html in this directory.], [htmldir="\${prefix}/${withval}"], [htmldir="\${docdir}"])