From beec5b74f24e0616e3527ac687b264d52028ad9d Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Thu, 14 Feb 2002 05:31:46 +0000 Subject: [PATCH] 2002-02-14 Daniel Jacobowitz * configure.tgt: Configure gdbserver only for known working targets. Set ${build_gdbserver} instead of modifying ${configdirs}. * configure.in: Check ${build_gdbserver}. Put gdbserver/ into SUBDIRS if it is configured. Update comment for ${nativefile}. * configure: Regenerated. --- gdb/ChangeLog | 8 ++++++ gdb/configure | 40 ++++++++++++++++++------------ gdb/configure.in | 21 ++++++++++------ gdb/configure.tgt | 73 +++++++++++++++++++++++++------------------------------ 4 files changed, 79 insertions(+), 63 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b8b2a3e734..6fa2d356fc 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2002-02-14 Daniel Jacobowitz + + * configure.tgt: Configure gdbserver only for known working + targets. Set ${build_gdbserver} instead of modifying ${configdirs}. + * configure.in: Check ${build_gdbserver}. Put gdbserver/ into + SUBDIRS if it is configured. Update comment for ${nativefile}. + * configure: Regenerated. + 2002-02-13 Michael Snyder * gcore.c (gcore_command): Use gcore_default_target instead of NULL. diff --git a/gdb/configure b/gdb/configure index e34f29e5af..8a9500b814 100755 --- a/gdb/configure +++ b/gdb/configure @@ -8470,16 +8470,12 @@ GDB_MULTI_ARCH=`sed -n ' s/GDB_MULTI_ARCH[ ]*=[ ]*\([^ ]*\)[ ]*/\1/p ' ${target_makefile_frag}` -# these really aren't orthogonal true/false values of the same condition, -# but shells are slow enough that I like to reuse the test conditions -# whenever possible if test "${target}" = "${host}"; then +# We pick this up from the host configuration file (.mh) because we +# do not have a native configuration Makefile fragment. nativefile=`sed -n ' s/NAT_FILE[ ]*=[ ]*\([^ ]*\)/\1/p ' ${host_makefile_frag}` -# else -# GDBserver is only useful in a "native" environment -# configdirs=`echo $configdirs | sed 's/gdbserver//'` fi @@ -8513,12 +8509,24 @@ case "${GDB_MULTI_ARCH}" in *) { echo "configure: error: "GDB: Unknown GDB_MULTI_ARCH value ${GDB_MULTI_ARCH}"" 1>&2; exit 1; };; esac - SUBDIRS="doc testsuite nlm" if test "${enable_multi_ice}" = "yes"; then SUBDIRS="${SUBDIRS} multi-ice" fi +# ``gdbserver'' can only be built in a native configuration. +if test x"${target}" = x"${host}"; then + echo $ac_n "checking whether gdbserver is supported on this host""... $ac_c" 1>&6 +echo "configure:8521: checking whether gdbserver is supported on this host" >&5 + if test x"${build_gdbserver}" = xyes ; then + configdirs="${configdirs} gdbserver" + SUBDIRS="${SUBDIRS} gdbserver" + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi +fi + # If hostfile (XM_FILE) and/or targetfile (TM_FILE) and/or nativefile @@ -8571,7 +8579,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:8575: checking whether ln -s works" >&5 +echo "configure:8583: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8595,12 +8603,12 @@ fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:8599: checking for Cygwin environment" >&5 +echo "configure:8607: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8623: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -8628,19 +8636,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:8632: checking for mingw32 environment" >&5 +echo "configure:8640: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8652: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -8659,7 +8667,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:8663: checking for executable suffix" >&5 +echo "configure:8671: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8669,7 +8677,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:8673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:8681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj | *.ilk | *.pdb) ;; diff --git a/gdb/configure.in b/gdb/configure.in index 25d7068016..672f260057 100644 --- a/gdb/configure.in +++ b/gdb/configure.in @@ -1237,16 +1237,12 @@ GDB_MULTI_ARCH=`sed -n ' s/GDB_MULTI_ARCH[ ]*=[ ]*\([^ ]*\)[ ]*/\1/p ' ${target_makefile_frag}` -# these really aren't orthogonal true/false values of the same condition, -# but shells are slow enough that I like to reuse the test conditions -# whenever possible if test "${target}" = "${host}"; then +# We pick this up from the host configuration file (.mh) because we +# do not have a native configuration Makefile fragment. nativefile=`sed -n ' s/NAT_FILE[ ]*=[ ]*\([^ ]*\)/\1/p ' ${host_makefile_frag}` -# else -# GDBserver is only useful in a "native" environment -# configdirs=`echo $configdirs | sed 's/gdbserver//'` fi changequote([,]) @@ -1277,12 +1273,23 @@ case "${GDB_MULTI_ARCH}" in *) AC_MSG_ERROR("GDB: Unknown GDB_MULTI_ARCH value ${GDB_MULTI_ARCH}");; esac - SUBDIRS="doc testsuite nlm" if test "${enable_multi_ice}" = "yes"; then SUBDIRS="${SUBDIRS} multi-ice" fi +# ``gdbserver'' can only be built in a native configuration. +if test x"${target}" = x"${host}"; then + AC_MSG_CHECKING(whether gdbserver is supported on this host) + if test x"${build_gdbserver}" = xyes ; then + configdirs="${configdirs} gdbserver" + SUBDIRS="${SUBDIRS} gdbserver" + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + fi +fi + AC_SUBST(SUBDIRS) # If hostfile (XM_FILE) and/or targetfile (TM_FILE) and/or nativefile diff --git a/gdb/configure.tgt b/gdb/configure.tgt index eeaca170e9..453201ac02 100644 --- a/gdb/configure.tgt +++ b/gdb/configure.tgt @@ -52,8 +52,8 @@ alpha*-*-freebsd*) gdb_target=fbsd ;; arc-*-*) gdb_target=arc ;; arm*-wince-pe) gdb_target=wince ;; -arm*-*-linux*) gdb_target=linux - configdirs="$configdirs gdbserver" +arm*-*-linux*) gdb_target=linux + build_gdbserver=yes ;; arm*-*-netbsd*) gdb_target=nbsd ;; arm*-*-* | thumb*-*-* | strongarm*-*-*) @@ -76,14 +76,12 @@ h8500-*-*) gdb_target=h8500 ;; fr30-*-elf*) gdb_target=fr30 ;; -hppa*-*-bsd*) gdb_target=hppabsd - configdirs="${configdirs} gdbserver" ;; +hppa*-*-bsd*) gdb_target=hppabsd ;; hppa*-*-pro*) gdb_target=hppapro ;; hppa*64*-*-hpux11*) gdb_target=hppa64 ;; hppa*-*-hpux*) gdb_target=hppahpux ;; hppa*-*-hiux*) gdb_target=hppahpux ;; -hppa*-*-osf*) gdb_target=hppaosf - configdirs="${configdirs} gdbserver" ;; +hppa*-*-osf*) gdb_target=hppaosf ;; i[3456]86-sequent-bsd*) gdb_target=symmetry ;; i[3456]86-sequent-sysv4*) gdb_target=ptx4 ;; @@ -95,15 +93,12 @@ i[3456]86-*-elf*) gdb_target=embed ;; i[3456]86-*-aix*) gdb_target=i386aix ;; i[3456]86-*-bsd*) gdb_target=i386bsd ;; i[3456]86-*-freebsd*) gdb_target=fbsd ;; -i[3456]86-*-netbsdelf*) gdb_target=nbsdelf - configdirs="${configdirs} gdbserver" ;; -i[3456]86-*-netbsd*) gdb_target=nbsd - configdirs="${configdirs} gdbserver" ;; +i[3456]86-*-netbsdelf*) gdb_target=nbsdelf ;; +i[3456]86-*-netbsd*) gdb_target=nbsd ;; i[3456]86-*-os9k) gdb_target=i386os9k ;; i[3456]86-*-go32*) gdb_target=i386aout ;; i[3456]86-*-msdosdjgpp*) gdb_target=go32 ;; -i[3456]86-*-lynxos*) gdb_target=i386lynx - configdirs="${configdirs} gdbserver" ;; +i[3456]86-*-lynxos*) gdb_target=i386lynx ;; i[3456]86-*-openbsd*) gdb_target=obsd ;; i[3456]86-*-solaris*) gdb_target=i386sol2 ;; i[3456]86-*-sysv4.2*) gdb_target=i386v42mp ;; @@ -116,9 +111,8 @@ i[3456]86-*-sco3.2v5*) gdb_target=i386sco5 ;; i[3456]86-*-sco*) gdb_target=i386v ;; i[3456]86-*-sysv*) gdb_target=i386v ;; i[3456]86-*-linux*) gdb_target=linux - configdirs="${configdirs} gdbserver" ;; -i[3456]86-pc-linux-gnu) gdb_target=linux - configdirs="${configdirs} gdbserver" ;; + build_gdbserver=yes + ;; i[3456]86-*-isc*) gdb_target=i386v ;; i[3456]86-*-mach3*) gdb_target=i386m3 ;; i[3456]86-*-gnu*) gdb_target=i386gnu ;; @@ -138,7 +132,9 @@ i960-*-nindy*) gdb_target=nindy960 ;; i960-*-vxworks*) gdb_target=vxworks960 ;; ia64-*-aix*) gdb_target=aix ;; -ia64-*-linux*) gdb_target=linux ;; +ia64-*-linux*) gdb_target=linux + build_gdbserver=yes + ;; m32r-*-elf*) gdb_target=m32r ;; @@ -161,15 +157,13 @@ m68*-*-aout*) gdb_target=monitor ;; m68*-*-coff*) gdb_target=monitor ;; m68*-*-elf*) gdb_target=monitor ;; m68*-*-linux*) gdb_target=linux - configdirs="${configdirs} gdbserver" ;; -m68*-*-lynxos*) gdb_target=m68klynx - configdirs="${configdirs} gdbserver" ;; -m68*-*-netbsd*) gdb_target=nbsd - configdirs="${configdirs} gdbserver" ;; + build_gdbserver=yes + ;; +m68*-*-lynxos*) gdb_target=m68klynx ;; +m68*-*-netbsd*) gdb_target=nbsd ;; m68*-*-os68k*) gdb_target=os68k ;; m68*-*-sunos3*) gdb_target=sun3os3 ;; -m68*-*-sunos4*) gdb_target=sun3os4 - configdirs="${configdirs} gdbserver" ;; +m68*-*-sunos4*) gdb_target=sun3os4 ;; m68*-*-sysv4*) gdb_target=m68kv4 ;; m68*-*-vxworks*) gdb_target=vxworks68 ;; @@ -192,8 +186,7 @@ mips64*vr4300*-*-elf*) gdb_target=vr4300 ;; mips64*vr4100*el-*-elf*) gdb_target=vr4300el ;; mips64*vr4100*-*-elf*) gdb_target=vr4100 ;; mips64*vr5000*el-*-elf*) gdb_target=vr5000el ;; -mips64*vr5000*-*-elf*) gdb_target=vr5000 - configdirs="${configdirs} gdbserver" ;; +mips64*vr5000*-*-elf*) gdb_target=vr5000 ;; mips*tx39*el*-elf*) gdb_target=tx39l ;; mips*tx39*-elf*) gdb_target=tx39 ;; mips64*el-*-elf*) gdb_target=embedl64 ;; @@ -208,7 +201,9 @@ mips*-sgi-irix5*) gdb_target=irix5 ;; mips*-sgi-irix6*) gdb_target=irix6 ;; mips*-sgi-*) gdb_target=irix3 ;; mips*-sony-*) gdb_target=bigmips ;; -mips*-*-linux*) gdb_target=linux ;; +mips*-*-linux*) gdb_target=linux + build_gdbserver=yes + ;; mips*-*-mach3*) gdb_target=mipsm3 ;; mips*-*-sysv4*) gdb_target=mipsv4 ;; mips*-*-sysv*) gdb_target=bigmips ;; @@ -220,11 +215,9 @@ mn10300-*-*) gdb_target=mn10300 ;; none-*-*) gdb_target=none ;; -ns32k-*-netbsd*) gdb_target=nbsd - configdirs="${configdirs} gdbserver" ;; +ns32k-*-netbsd*) gdb_target=nbsd ;; -powerpc-*-netbsd*) gdb_target=nbsd - configdirs="${configdirs} gdbserver" ;; +powerpc-*-netbsd*) gdb_target=nbsd ;; powerpc-*-aix*) gdb_target=aix ;; powerpc-*-eabi* | powerpc-*-sysv* | powerpc-*-elf*) if test -f ../sim/ppc/Makefile; then @@ -238,11 +231,12 @@ powerpcle-*-eabi* | powerpcle-*-sysv* | powerpcle-*-elf*) else gdb_target=ppcle-eabi fi ;; -powerpc-*-linux*) gdb_target=linux ;; +powerpc-*-linux*) gdb_target=linux + build_gdbserver=yes + ;; powerpc-*-vxworks*) gdb_target=vxworks ;; -rs6000-*-lynxos*) gdb_target=rs6000lynx - configdirs="${configdirs} gdbserver" ;; +rs6000-*-lynxos*) gdb_target=rs6000lynx ;; rs6000-*-aix4*) gdb_target=aix4 ;; rs6000-*-*) gdb_target=rs6000 ;; @@ -253,18 +247,18 @@ sh*-*-pe) gdb_target=wince ;; sh-*-hms) gdb_target=embed ;; sh-*-coff*) gdb_target=embed ;; sh-*-elf*) gdb_target=embed ;; -sh-*-linux*) gdb_target=linux ;; +sh-*-linux*) gdb_target=linux + build_gdbserver=yes + ;; sparc-*-aout*) gdb_target=sparc-em ;; sparc-*-coff*) gdb_target=sparc-em ;; sparc-*-elf*) gdb_target=sparc-em ;; sparc-*-linux*) gdb_target=linux ;; -sparc-*-lynxos*) gdb_target=sparclynx - configdirs="${configdirs} gdbserver" ;; +sparc-*-lynxos*) gdb_target=sparclynx ;; sparc-*-netbsd*) gdb_target=nbsd ;; sparc-*-solaris2*) gdb_target=sun4sol2 ;; -sparc-*-sunos4*) gdb_target=sun4os4 - configdirs="${configdirs} gdbserver" ;; +sparc-*-sunos4*) gdb_target=sun4os4 ;; sparc-*-sunos5*) gdb_target=sun4sol2 ;; sparc-*-vxworks*) gdb_target=vxsparc ;; sparc-*-*) gdb_target=sun4os4 ;; @@ -295,8 +289,7 @@ v850*-*-*) gdb_target=v850 esac ;; -x86_64-*-linux*) gdb_target=x86-64linux - configdirs="${configdirs} gdbserver" ;; +x86_64-*-linux*) gdb_target=x86-64linux ;; z8k-*-coff*) gdb_target=z8k ;; -- 2.11.0