diff options
40 files changed, 127 insertions, 85 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 011481705c0..bbdb2a79499 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,28 @@ +Mon Jun 12 15:24:04 2000 Andrew Cagney <cagney@b1.cygnus.com> + + * Makefile.in (SER_HARDWIRE): Set using autoconf. + * configure.in (SER_HARDWIRE): Define, add ser-tcp.o. + * configure: Re-generate. + + * config/i386/go32.mh (SER_HARDWIRE): Delete. Handled by + configure.in. + * config/sparc/sun4sol2.mh, config/sparc/sun4os4.mh, + config/sparc/sparclynx.mh, config/sparc/nbsdelf.mh, + config/sparc/nbsd.mh, config/sparc/linux.mh, + config/rs6000/rs6000lynx.mh, config/powerpc/solaris.mh, + config/powerpc/nbsd.mh, config/powerpc/linux.mh, + config/powerpc/cygwin.mh, config/pa/hpux11w.mh, + config/pa/hpux11.mh, config/pa/hpux1020.mh, config/pa/hppaosf.mh, + config/pa/hppahpux.mh, config/pa/hppabsd.mh, config/ns32k/nbsd.mh, + config/mips/irix5.mh, config/mips/irix4.mh, config/m68k/nbsd.mh, + config/m68k/m68klynx.mh, config/m68k/linux.mh, + config/i386/nbsdelf.mh, config/i386/nbsd.mh, config/i386/linux.mh, + config/i386/i386sco5.mh, config/i386/i386lynx.mh, + config/i386/i386dgux.mh, config/i386/fbsd.mh, + config/i386/cygwin.mh, config/arm/linux.mh, config/alpha/fbsd.mh, + config/alpha/alpha-osf3.mh, config/alpha/alpha-linux.mh: Remove + ser-tcp.o from XDEPFILES. + Mon Jun 12 14:26:02 2000 Andrew Cagney <cagney@b1.cygnus.com> * mips-tdep.c (GDB_TARGET_IS_MIPS64): Define. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 0963cdaeae2..7d0474f0a99 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -342,7 +342,7 @@ RUNTESTFLAGS= # part of libiberty) a POSIX interface. But at least for now the # host-dependent makefile fragment might need to use something else # besides ser-unix.o -SER_HARDWIRE = ser-unix.o ser-pipe.o +SER_HARDWIRE = @SER_HARDWIRE@ # The `remote' debugging target is supported for most architectures, # but not all (e.g. 960) diff --git a/gdb/config/alpha/alpha-linux.mh b/gdb/config/alpha/alpha-linux.mh index 9a733888786..458a5d476f0 100644 --- a/gdb/config/alpha/alpha-linux.mh +++ b/gdb/config/alpha/alpha-linux.mh @@ -1,5 +1,5 @@ # Host: Little-endian Alpha running Linux -XDEPFILES= ser-tcp.o +XDEPFILES= XM_FILE= xm-alphalinux.h NAT_FILE= nm-linux.h NATDEPFILES= infptrace.o inftarg.o corelow.o alpha-nat.o \ diff --git a/gdb/config/alpha/alpha-osf3.mh b/gdb/config/alpha/alpha-osf3.mh index 61594a772b4..6af28084d66 100644 --- a/gdb/config/alpha/alpha-osf3.mh +++ b/gdb/config/alpha/alpha-osf3.mh @@ -1,5 +1,5 @@ # Host: Little-endian Alpha running OSF/1-3.x and higher using procfs -XDEPFILES= ser-tcp.o ser-pipe.o +XDEPFILES= XM_FILE= xm-alphaosf.h NAT_FILE= nm-osf3.h NATDEPFILES= infptrace.o inftarg.o corelow.o alpha-nat.o fork-child.o \ diff --git a/gdb/config/alpha/fbsd.mh b/gdb/config/alpha/fbsd.mh index 9c2b5e580d2..55b6fc400f9 100644 --- a/gdb/config/alpha/fbsd.mh +++ b/gdb/config/alpha/fbsd.mh @@ -1,5 +1,5 @@ # Host: FreeBSD/Alpha -XDEPFILES= ser-tcp.o +XDEPFILES= NATDEPFILES= fork-child.o infptrace.o inftarg.o solib.o \ corelow.o core-regset.o alphabsd-nat.o XM_FILE= xm-fbsd.h diff --git a/gdb/config/arm/linux.mh b/gdb/config/arm/linux.mh index 98e0e93a0e4..9f503f24a64 100644 --- a/gdb/config/arm/linux.mh +++ b/gdb/config/arm/linux.mh @@ -1,7 +1,7 @@ # Host: ARM based machine running GNU/Linux XM_FILE= xm-linux.h -XDEPFILES= ser-tcp.o +XDEPFILES= NAT_FILE= nm-linux.h NATDEPFILES= infptrace.o solib.o inftarg.o fork-child.o corelow.o \ diff --git a/gdb/config/i386/cygwin.mh b/gdb/config/i386/cygwin.mh index d93acb696cd..8eb0d6d2cc2 100644 --- a/gdb/config/i386/cygwin.mh +++ b/gdb/config/i386/cygwin.mh @@ -1,6 +1,6 @@ MH_CFLAGS= XM_FILE=xm-cygwin.h -XDEPFILES=ser-tcp.o +XDEPFILES= NATDEPFILES= win32-nat.o NAT_FILE=../nm-empty.h XM_CLIBS= diff --git a/gdb/config/i386/fbsd.mh b/gdb/config/i386/fbsd.mh index 243d0a60ad8..661c08e85c3 100644 --- a/gdb/config/i386/fbsd.mh +++ b/gdb/config/i386/fbsd.mh @@ -1,5 +1,5 @@ # Host: Intel 386 running FreeBSD -XDEPFILES= ser-tcp.o +XDEPFILES= NATDEPFILES= fork-child.o infptrace.o inftarg.o solib.o \ corelow.o core-aout.o core-regset.o i387-nat.o i386bsd-nat.o XM_FILE= xm-fbsd.h diff --git a/gdb/config/i386/go32.mh b/gdb/config/i386/go32.mh index d4fa352adc5..ce6c5324e2e 100644 --- a/gdb/config/i386/go32.mh +++ b/gdb/config/i386/go32.mh @@ -12,7 +12,6 @@ NATDEPFILES= go32-nat.o TERMCAP= HOST_IPC= -SER_HARDWIRE= ser-go32.o CC= gcc XM_CLIBS= -ldbg diff --git a/gdb/config/i386/i386dgux.mh b/gdb/config/i386/i386dgux.mh index ab8eab28e37..bf27e0fd2a4 100644 --- a/gdb/config/i386/i386dgux.mh +++ b/gdb/config/i386/i386dgux.mh @@ -1,7 +1,7 @@ # Host: Intel 386 running DGUX, cloned from SVR4 XM_FILE= xm-i386v4.h -XDEPFILES= ser-tcp.o +XDEPFILES= # for network communication XM_CLIBS= -lsocket -lnsl diff --git a/gdb/config/i386/i386lynx.mh b/gdb/config/i386/i386lynx.mh index 9cb086f6e39..6fe9d95b1d7 100644 --- a/gdb/config/i386/i386lynx.mh +++ b/gdb/config/i386/i386lynx.mh @@ -2,7 +2,7 @@ XM_FILE= xm-i386lynx.h XM_CLIBS= -lbsd -XDEPFILES= ser-tcp.o +XDEPFILES= NAT_FILE= nm-i386lynx.h NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o lynx-nat.o diff --git a/gdb/config/i386/i386sco5.mh b/gdb/config/i386/i386sco5.mh index 3bea87a2cdc..0a205dd0f0e 100644 --- a/gdb/config/i386/i386sco5.mh +++ b/gdb/config/i386/i386sco5.mh @@ -8,7 +8,7 @@ XM_FILE= xm-i386sco.h # runtime, but all come with the development system, so we always # have socket(), gethostbyname(), and friends. # -XDEPFILES= ser-tcp.o +XDEPFILES= XM_CLIBS= -lPW -lsocket NAT_FILE= nm-i386sco5.h diff --git a/gdb/config/i386/linux.mh b/gdb/config/i386/linux.mh index febed9a2958..67c1dd227f6 100644 --- a/gdb/config/i386/linux.mh +++ b/gdb/config/i386/linux.mh @@ -1,7 +1,7 @@ # Host: Intel 386 running GNU/Linux XM_FILE= xm-linux.h -XDEPFILES= ser-tcp.o +XDEPFILES= NAT_FILE= nm-linux.h NATDEPFILES= infptrace.o solib.o inftarg.o fork-child.o corelow.o \ diff --git a/gdb/config/i386/nbsd.mh b/gdb/config/i386/nbsd.mh index aea6a77b347..c3838e2532a 100644 --- a/gdb/config/i386/nbsd.mh +++ b/gdb/config/i386/nbsd.mh @@ -1,5 +1,5 @@ # Host: Intel 386 running NetBSD -XDEPFILES= ser-tcp.o +XDEPFILES= NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o \ i386nbsd-nat.o solib.o XM_FILE= xm-nbsd.h diff --git a/gdb/config/i386/nbsdelf.mh b/gdb/config/i386/nbsdelf.mh index 4c197541468..08db3049d9b 100644 --- a/gdb/config/i386/nbsdelf.mh +++ b/gdb/config/i386/nbsdelf.mh @@ -1,5 +1,5 @@ # Host: Intel 386 running NetBSD -XDEPFILES= ser-tcp.o +XDEPFILES= NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o \ i386nbsd-nat.o solib.o XM_FILE= xm-nbsd.h diff --git a/gdb/config/m68k/linux.mh b/gdb/config/m68k/linux.mh index 510248df030..3504a08f275 100644 --- a/gdb/config/m68k/linux.mh +++ b/gdb/config/m68k/linux.mh @@ -1,7 +1,7 @@ # Host: Motorola m68k running Linux XM_FILE= xm-linux.h -XDEPFILES= ser-tcp.o +XDEPFILES= NAT_FILE= nm-linux.h NATDEPFILES= infptrace.o solib.o inftarg.o fork-child.o \ diff --git a/gdb/config/m68k/m68klynx.mh b/gdb/config/m68k/m68klynx.mh index 48fdf2915ec..ee0800c76a3 100644 --- a/gdb/config/m68k/m68klynx.mh +++ b/gdb/config/m68k/m68klynx.mh @@ -2,7 +2,7 @@ XM_FILE= xm-m68klynx.h XM_CLIBS= -lbsd -XDEPFILES= ser-tcp.o +XDEPFILES= NAT_FILE= nm-m68klynx.h NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o lynx-nat.o diff --git a/gdb/config/m68k/nbsd.mh b/gdb/config/m68k/nbsd.mh index 2d117091ef5..dfb8950d32e 100644 --- a/gdb/config/m68k/nbsd.mh +++ b/gdb/config/m68k/nbsd.mh @@ -1,5 +1,5 @@ # Host: Motorola m68k running NetBSD -XDEPFILES= ser-tcp.o +XDEPFILES= NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o \ m68knbsd-nat.o solib.o XM_FILE= xm-nbsd.h diff --git a/gdb/config/mips/irix4.mh b/gdb/config/mips/irix4.mh index ad61b6694ee..c54b38423f2 100644 --- a/gdb/config/mips/irix4.mh +++ b/gdb/config/mips/irix4.mh @@ -1,5 +1,5 @@ # Host: SGI Iris running irix 4.x -XDEPFILES= ser-tcp.o +XDEPFILES= XM_FILE= xm-irix4.h NAT_FILE= nm-irix4.h NATDEPFILES= fork-child.o irix4-nat.o corelow.o procfs.o \ diff --git a/gdb/config/mips/irix5.mh b/gdb/config/mips/irix5.mh index 5413f413a8a..0d949376ac3 100644 --- a/gdb/config/mips/irix5.mh +++ b/gdb/config/mips/irix5.mh @@ -1,5 +1,5 @@ # Host: SGI Iris running irix 5.x -XDEPFILES= ser-tcp.o +XDEPFILES= XM_FILE= xm-irix5.h NAT_FILE= nm-irix5.h NATDEPFILES= fork-child.o irix5-nat.o corelow.o procfs.o \ diff --git a/gdb/config/ns32k/nbsd.mh b/gdb/config/ns32k/nbsd.mh index 30fb192e54e..d1fe321083e 100644 --- a/gdb/config/ns32k/nbsd.mh +++ b/gdb/config/ns32k/nbsd.mh @@ -1,5 +1,5 @@ # Host: PC532 running NetBSD -XDEPFILES= ser-tcp.o +XDEPFILES= NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o \ ns32knbsd-nat.o solib.o XM_FILE= xm-nbsd.h diff --git a/gdb/config/pa/hppabsd.mh b/gdb/config/pa/hppabsd.mh index dfd2d4cca4b..38daeaa654c 100644 --- a/gdb/config/pa/hppabsd.mh +++ b/gdb/config/pa/hppabsd.mh @@ -1,5 +1,5 @@ # Host: Hewlett-Packard PA-RISC machine, running BSD -XDEPFILES= ser-tcp.o +XDEPFILES= XM_FILE= xm-hppab.h NAT_FILE= nm-hppab.h NATDEPFILES= hppab-nat.o corelow.o core-aout.o inftarg.o fork-child.o somread.o infptrace.o hp-psymtab-read.o hp-symtab-read.o somsolib.o diff --git a/gdb/config/pa/hppahpux.mh b/gdb/config/pa/hppahpux.mh index 0d302448417..16003c91223 100644 --- a/gdb/config/pa/hppahpux.mh +++ b/gdb/config/pa/hppahpux.mh @@ -1,7 +1,7 @@ # Host: Hewlett-Packard PA-RISC machine, running HPUX XM_FILE= xm-hppah.h -XDEPFILES= ser-tcp.o +XDEPFILES= NAT_FILE= nm-hppah.h NATDEPFILES= hppah-nat.o corelow.o core-aout.o inftarg.o fork-child.o somread.o infptrace.o hp-psymtab-read.o hp-symtab-read.o somsolib.o diff --git a/gdb/config/pa/hppaosf.mh b/gdb/config/pa/hppaosf.mh index 6bde9c09aa6..8a38312d67b 100644 --- a/gdb/config/pa/hppaosf.mh +++ b/gdb/config/pa/hppaosf.mh @@ -1,5 +1,5 @@ # Host: Hewlett-Packard PA-RISC machine, running BSD -XDEPFILES= ser-tcp.o +XDEPFILES= XM_FILE= xm-hppab.h NAT_FILE= nm-hppao.h NATDEPFILES= fork-child.o m3-nat.o hppam3-nat.o somread.o hp-psymtab-read.o hp-symtab-read.o somsolib.o diff --git a/gdb/config/pa/hpux1020.mh b/gdb/config/pa/hpux1020.mh index 28eae11cf5c..af6ccdacdb4 100644 --- a/gdb/config/pa/hpux1020.mh +++ b/gdb/config/pa/hpux1020.mh @@ -3,7 +3,7 @@ MH_CFLAGS = -D__HP_CURSES XM_FILE= xm-hppah.h -XDEPFILES= ser-tcp.o +XDEPFILES= NAT_FILE= nm-hppah.h NATDEPFILES= hppah-nat.o corelow.o core-aout.o inftarg.o fork-child.o infptrace.o somread.o hp-psymtab-read.o hp-symtab-read.o somsolib.o diff --git a/gdb/config/pa/hpux11.mh b/gdb/config/pa/hpux11.mh index 10fbd7eb3bd..44fe6492194 100644 --- a/gdb/config/pa/hpux11.mh +++ b/gdb/config/pa/hpux11.mh @@ -3,7 +3,7 @@ MH_CFLAGS = -D__HP_CURSES XM_FILE= xm-hppah.h -XDEPFILES= ser-tcp.o +XDEPFILES= NAT_FILE= nm-hppah11.h NATDEPFILES= hppah-nat.o corelow.o core-aout.o inftarg.o fork-child.o infttrace.o somread.o hp-psymtab-read.o hp-symtab-read.o somsolib.o diff --git a/gdb/config/pa/hpux11w.mh b/gdb/config/pa/hpux11w.mh index 248bb6eb291..0a60cd21ff8 100644 --- a/gdb/config/pa/hpux11w.mh +++ b/gdb/config/pa/hpux11w.mh @@ -3,7 +3,7 @@ MH_CFLAGS = -D__HP_CURSES XM_FILE= xm-hppah.h -XDEPFILES= ser-tcp.o +XDEPFILES= NAT_FILE= nm-hppah11.h NATDEPFILES= hppah-nat.o corelow.o core-aout.o inftarg.o fork-child.o infttrace.o hp-psymtab-read.o hp-symtab-read.o pa64solib.o diff --git a/gdb/config/powerpc/cygwin.mh b/gdb/config/powerpc/cygwin.mh index 0c257092e70..9001a7d4a90 100644 --- a/gdb/config/powerpc/cygwin.mh +++ b/gdb/config/powerpc/cygwin.mh @@ -1,5 +1,5 @@ MH_CFLAGS= XM_FILE=xm-cygwin.h -XDEP_FILES=ser-tcp.o +XDEP_FILES= NATDEPFILES=win32-nat.o XM_CLIBS=-lkernel32 diff --git a/gdb/config/powerpc/linux.mh b/gdb/config/powerpc/linux.mh index b4621f4244d..b074e6a40ad 100644 --- a/gdb/config/powerpc/linux.mh +++ b/gdb/config/powerpc/linux.mh @@ -1,7 +1,7 @@ # Host: PowerPC, running Linux XM_FILE= xm-linux.h -XDEPFILES= ser-tcp.o +XDEPFILES= XM_CLIBS= NAT_FILE= nm-linux.h diff --git a/gdb/config/powerpc/nbsd.mh b/gdb/config/powerpc/nbsd.mh index e79f84a734e..b27aad4be4b 100644 --- a/gdb/config/powerpc/nbsd.mh +++ b/gdb/config/powerpc/nbsd.mh @@ -1,5 +1,5 @@ # Host: PowerPC, running NetBSD -XDEPFILES= ser-tcp.o +XDEPFILES= NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o solib.o ppcnbsd-nat.o XM_FILE= xm-nbsd.h NAT_FILE= nm-nbsd.h diff --git a/gdb/config/powerpc/solaris.mh b/gdb/config/powerpc/solaris.mh index 9c740ea9ea5..51d1764eaab 100644 --- a/gdb/config/powerpc/solaris.mh +++ b/gdb/config/powerpc/solaris.mh @@ -1,7 +1,7 @@ # Host: PowerPC, running Solaris 2 XM_FILE= xm-solaris.h -XDEPFILES= ser-tcp.o +XDEPFILES= XM_CLIBS= -lsocket -lnsl NAT_FILE= nm-solaris.h diff --git a/gdb/config/rs6000/rs6000lynx.mh b/gdb/config/rs6000/rs6000lynx.mh index b93815233e7..b7f03c773d5 100644 --- a/gdb/config/rs6000/rs6000lynx.mh +++ b/gdb/config/rs6000/rs6000lynx.mh @@ -1,7 +1,7 @@ # Host: RS6000 running LynxOS XM_FILE= xm-rs6000ly.h -XDEPFILES= ser-tcp.o +XDEPFILES= XM_CLIBS= -lbsd NAT_FILE= nm-rs6000ly.h diff --git a/gdb/config/sparc/linux.mh b/gdb/config/sparc/linux.mh index 4ad98c224bf..937be172a87 100644 --- a/gdb/config/sparc/linux.mh +++ b/gdb/config/sparc/linux.mh @@ -1,5 +1,5 @@ # Host: Sparcstation, running Linux -XDEPFILES= ser-tcp.o +XDEPFILES= XM_FILE= xm-linux.h NAT_FILE= nm-linux.h NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o sparc-nat.o \ diff --git a/gdb/config/sparc/nbsd.mh b/gdb/config/sparc/nbsd.mh index 292cc2b9932..a47faa1b4ba 100644 --- a/gdb/config/sparc/nbsd.mh +++ b/gdb/config/sparc/nbsd.mh @@ -1,5 +1,5 @@ # Host: Sun 4 or Sparcstation, running NetBSD -XDEPFILES= ser-tcp.o +XDEPFILES= XM_FILE= xm-nbsd.h NAT_FILE= nm-nbsd.h NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o sparc-nat.o solib.o diff --git a/gdb/config/sparc/nbsdelf.mh b/gdb/config/sparc/nbsdelf.mh index d76e7cb99ad..bd8c28c1884 100644 --- a/gdb/config/sparc/nbsdelf.mh +++ b/gdb/config/sparc/nbsdelf.mh @@ -1,5 +1,5 @@ # Host: Sun 4 or Sparcstation, running NetBSD -XDEPFILES= ser-tcp.o +XDEPFILES= XM_FILE= xm-nbsd.h NAT_FILE= nm-nbsdelf.h NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o sparc-nat.o solib.o diff --git a/gdb/config/sparc/sparclynx.mh b/gdb/config/sparc/sparclynx.mh index 6fdddddb6ec..4f5bb4da7dc 100644 --- a/gdb/config/sparc/sparclynx.mh +++ b/gdb/config/sparc/sparclynx.mh @@ -1,7 +1,7 @@ # Host: Sparc running LynxOS XM_FILE= xm-sparclynx.h -XDEPFILES= ser-tcp.o +XDEPFILES= XM_CLIBS= -lbsd NAT_FILE= nm-sparclynx.h diff --git a/gdb/config/sparc/sun4os4.mh b/gdb/config/sparc/sun4os4.mh index 4047c5cb82a..4392a0c43f3 100644 --- a/gdb/config/sparc/sun4os4.mh +++ b/gdb/config/sparc/sun4os4.mh @@ -1,5 +1,5 @@ # Host: Sun 4 or Sparcstation, running SunOS 4 -XDEPFILES= ser-tcp.o +XDEPFILES= XM_FILE= xm-sun4os4.h NAT_FILE= nm-sun4os4.h NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o sparc-nat.o diff --git a/gdb/config/sparc/sun4sol2.mh b/gdb/config/sparc/sun4sol2.mh index b9ab28e8273..e6c1201839c 100644 --- a/gdb/config/sparc/sun4sol2.mh +++ b/gdb/config/sparc/sun4sol2.mh @@ -1,7 +1,7 @@ # Host: Sun 4 or Sparcstation, running Solaris 2 XM_FILE= xm-sun4sol2.h -XDEPFILES= ser-tcp.o +XDEPFILES= XM_CLIBS= -lsocket -lnsl NAT_FILE= nm-sun4sol2.h diff --git a/gdb/configure b/gdb/configure index c27e7e05b0f..ad6894145c5 100755 --- a/gdb/configure +++ b/gdb/configure @@ -5811,6 +5811,14 @@ fi echo "$ac_t""$gdb_cv_os_cygwin" 1>&6 + +SER_HARDWIRE="ser-unix.o ser-pipe.o ser-tcp.o" +case ${host} in + go32*-*-* ) SER_HARDWIRE=ser-go32.o ;; +esac + + + if test x$gdb_host = xgo32; then TERM_LIB= else @@ -5819,7 +5827,7 @@ if test x$gdb_cv_os_cygwin = xyes; then else TERM_LIB= echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -echo "configure:5823: checking for tgetent in -lncurses" >&5 +echo "configure:5831: checking for tgetent in -lncurses" >&5 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5827,7 +5835,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 5831 "configure" +#line 5839 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5838,7 +5846,7 @@ int main() { tgetent() ; return 0; } EOF -if { (eval echo configure:5842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5857,7 +5865,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -lHcurses""... $ac_c" 1>&6 -echo "configure:5861: checking for tgetent in -lHcurses" >&5 +echo "configure:5869: checking for tgetent in -lHcurses" >&5 ac_lib_var=`echo Hcurses'_'tgetent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5865,7 +5873,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lHcurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 5869 "configure" +#line 5877 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5876,7 +5884,7 @@ int main() { tgetent() ; return 0; } EOF -if { (eval echo configure:5880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5895,7 +5903,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -ltermlib""... $ac_c" 1>&6 -echo "configure:5899: checking for tgetent in -ltermlib" >&5 +echo "configure:5907: checking for tgetent in -ltermlib" >&5 ac_lib_var=`echo termlib'_'tgetent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5903,7 +5911,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermlib $LIBS" cat > conftest.$ac_ext <<EOF -#line 5907 "configure" +#line 5915 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5914,7 +5922,7 @@ int main() { tgetent() ; return 0; } EOF -if { (eval echo configure:5918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5933,7 +5941,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:5937: checking for tgetent in -ltermcap" >&5 +echo "configure:5945: checking for tgetent in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5941,7 +5949,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <<EOF -#line 5945 "configure" +#line 5953 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5952,7 +5960,7 @@ int main() { tgetent() ; return 0; } EOF -if { (eval echo configure:5956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5971,7 +5979,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6 -echo "configure:5975: checking for tgetent in -lcurses" >&5 +echo "configure:5983: checking for tgetent in -lcurses" >&5 ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5979,7 +5987,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 5983 "configure" +#line 5991 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5990,7 +5998,7 @@ int main() { tgetent() ; return 0; } EOF -if { (eval echo configure:5994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6009,7 +6017,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -lterminfo""... $ac_c" 1>&6 -echo "configure:6013: checking for tgetent in -lterminfo" >&5 +echo "configure:6021: checking for tgetent in -lterminfo" >&5 ac_lib_var=`echo terminfo'_'tgetent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6017,7 +6025,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lterminfo $LIBS" cat > conftest.$ac_ext <<EOF -#line 6021 "configure" +#line 6029 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6028,7 +6036,7 @@ int main() { tgetent() ; return 0; } EOF -if { (eval echo configure:6032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6186,7 +6194,7 @@ if test "${with_tclconfig+set}" = set; then fi echo $ac_n "checking for Tcl configuration""... $ac_c" 1>&6 -echo "configure:6190: checking for Tcl configuration" >&5 +echo "configure:6198: checking for Tcl configuration" >&5 if eval "test \"`echo '$''{'ac_cv_c_tclconfig'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6294,7 +6302,7 @@ if test "${with_tkconfig+set}" = set; then fi echo $ac_n "checking for Tk configuration""... $ac_c" 1>&6 -echo "configure:6298: checking for Tk configuration" >&5 +echo "configure:6306: checking for Tk configuration" >&5 if eval "test \"`echo '$''{'ac_cv_c_tkconfig'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6390,7 +6398,7 @@ fi no_tcl=true echo $ac_n "checking for Tcl private headers. dir=${configdir}""... $ac_c" 1>&6 -echo "configure:6394: checking for Tcl private headers. dir=${configdir}" >&5 +echo "configure:6402: checking for Tcl private headers. dir=${configdir}" >&5 # Check whether --with-tclinclude or --without-tclinclude was given. if test "${with_tclinclude+set}" = set; then withval="$with_tclinclude" @@ -6456,17 +6464,17 @@ fi if test x"${ac_cv_c_tclh}" = x ; then ac_safe=`echo "tclInt.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tclInt.h""... $ac_c" 1>&6 -echo "configure:6460: checking for tclInt.h" >&5 +echo "configure:6468: checking for tclInt.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6465 "configure" +#line 6473 "configure" #include "confdefs.h" #include <tclInt.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6470: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6478: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6526,7 +6534,7 @@ fi # no_tk=true echo $ac_n "checking for Tk private headers""... $ac_c" 1>&6 -echo "configure:6530: checking for Tk private headers" >&5 +echo "configure:6538: checking for Tk private headers" >&5 # Check whether --with-tkinclude or --without-tkinclude was given. if test "${with_tkinclude+set}" = set; then withval="$with_tkinclude" @@ -6592,17 +6600,17 @@ fi if test x"${ac_cv_c_tkh}" = x ; then ac_safe=`echo "tk.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tk.h""... $ac_c" 1>&6 -echo "configure:6596: checking for tk.h" >&5 +echo "configure:6604: checking for tk.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6601 "configure" +#line 6609 "configure" #include "confdefs.h" #include <tk.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6606: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6614: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6648,7 +6656,7 @@ fi echo $ac_n "checking for Itcl private headers. srcdir=${srcdir}""... $ac_c" 1>&6 -echo "configure:6652: checking for Itcl private headers. srcdir=${srcdir}" >&5 +echo "configure:6660: checking for Itcl private headers. srcdir=${srcdir}" >&5 if test x"${ac_cv_c_itclh}" = x ; then for i in ${srcdir}/../itcl ${srcdir}/../../itcl ${srcdir}/../../../itcl ${srcdir}/../itcl/itcl; do if test -f $i/generic/itcl.h ; then @@ -6671,7 +6679,7 @@ fi echo $ac_n "checking for Itk private headers. srcdir=${srcdir}""... $ac_c" 1>&6 -echo "configure:6675: checking for Itk private headers. srcdir=${srcdir}" >&5 +echo "configure:6683: checking for Itk private headers. srcdir=${srcdir}" >&5 if test x"${ac_cv_c_itkh}" = x ; then for i in ${srcdir}/../itcl ${srcdir}/../../itcl ${srcdir}/../../../itcl ${srcdir}/../itcl/itk; do if test -f $i/generic/itk.h ; then @@ -6694,7 +6702,7 @@ fi echo $ac_n "checking for Tix private headers. srcdir=${srcdir}""... $ac_c" 1>&6 -echo "configure:6698: checking for Tix private headers. srcdir=${srcdir}" >&5 +echo "configure:6706: checking for Tix private headers. srcdir=${srcdir}" >&5 if test x"${ac_cv_c_tixh}" = x ; then for i in ${srcdir}/../tix ${srcdir}/../../tix ${srcdir}/../../../tix ; do if test -f $i/generic/tix.h ; then @@ -6732,7 +6740,7 @@ if test "${with_itclconfig+set}" = set; then fi echo $ac_n "checking for Itcl configuration""... $ac_c" 1>&6 -echo "configure:6736: checking for Itcl configuration" >&5 +echo "configure:6744: checking for Itcl configuration" >&5 if eval "test \"`echo '$''{'ac_cv_c_itclconfig'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6844,7 +6852,7 @@ if test "${with_itkconfig+set}" = set; then fi echo $ac_n "checking for Itk configuration""... $ac_c" 1>&6 -echo "configure:6848: checking for Itk configuration" >&5 +echo "configure:6856: checking for Itk configuration" >&5 if eval "test \"`echo '$''{'ac_cv_c_itkconfig'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6956,7 +6964,7 @@ if test "${with_tixconfig+set}" = set; then fi echo $ac_n "checking for Tix configuration""... $ac_c" 1>&6 -echo "configure:6960: checking for Tix configuration" >&5 +echo "configure:6968: checking for Tix configuration" >&5 if eval "test \"`echo '$''{'ac_cv_c_tixconfig'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7095,7 +7103,7 @@ fi # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:7099: checking for X" >&5 +echo "configure:7107: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -7157,12 +7165,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext <<EOF -#line 7161 "configure" +#line 7169 "configure" #include "confdefs.h" #include <$x_direct_test_include> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7166: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7174: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7231,14 +7239,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <<EOF -#line 7235 "configure" +#line 7243 "configure" #include "confdefs.h" int main() { ${x_direct_test_function}() ; return 0; } EOF -if { (eval echo configure:7242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -7520,7 +7528,7 @@ files="${files} config/nm-empty.h" links="${links} nm.h" fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:7524: checking whether ln -s works" >&5 +echo "configure:7532: 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 @@ -7544,12 +7552,12 @@ fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:7548: checking for Cygwin environment" >&5 +echo "configure:7556: 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 <<EOF -#line 7553 "configure" +#line 7561 "configure" #include "confdefs.h" int main() { @@ -7560,7 +7568,7 @@ int main() { return __CYGWIN__; ; return 0; } EOF -if { (eval echo configure:7564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -7577,19 +7585,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:7581: checking for mingw32 environment" >&5 +echo "configure:7589: 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 <<EOF -#line 7586 "configure" +#line 7594 "configure" #include "confdefs.h" int main() { return __MINGW32__; ; return 0; } EOF -if { (eval echo configure:7593: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7601: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -7608,7 +7616,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:7612: checking for executable suffix" >&5 +echo "configure:7620: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7618,7 +7626,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:7622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:7630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj | *.ilk | *.pdb) ;; @@ -7832,6 +7840,7 @@ s%@WERROR_CFLAGS@%$WERROR_CFLAGS%g s%@MMALLOC_CFLAGS@%$MMALLOC_CFLAGS%g s%@MMALLOC@%$MMALLOC%g s%@REGEX@%$REGEX%g +s%@SER_HARDWIRE@%$SER_HARDWIRE%g s%@TERM_LIB@%$TERM_LIB%g s%@WIN32LIBS@%$WIN32LIBS%g s%@LIBGUI@%$LIBGUI%g diff --git a/gdb/configure.in b/gdb/configure.in index 958ff9c8a53..df543083361 100644 --- a/gdb/configure.in +++ b/gdb/configure.in @@ -626,6 +626,15 @@ AC_CACHE_CHECK([for cygwin], gdb_cv_os_cygwin, lose #endif],[gdb_cv_os_cygwin=yes],[gdb_cv_os_cygwin=no])]) + +dnl Figure out which of the many generic ser-*.c files the _host_ supports. +SER_HARDWIRE="ser-unix.o ser-pipe.o ser-tcp.o" +case ${host} in + go32*-*-* ) SER_HARDWIRE=ser-go32.o ;; +esac +AC_SUBST(SER_HARDWIRE) + + dnl Figure out which term library to use. if test x$gdb_host = xgo32; then TERM_LIB= |