diff options
author | Tom Tromey <tom@tromey.com> | 2020-03-12 13:32:15 -0600 |
---|---|---|
committer | Tom Tromey <tromey@adacore.com> | 2020-03-12 13:32:16 -0600 |
commit | 4635ff975351603e64da3cbdeec3b999ee842ac8 (patch) | |
tree | 2347ceabf8611e64b4e0e753651f3ce56e8922cd /gdbserver/Makefile.in | |
parent | 213291361b4ddb2d05b8c89bf47d23ca4306912e (diff) | |
download | gdb-4635ff975351603e64da3cbdeec3b999ee842ac8.zip gdb-4635ff975351603e64da3cbdeec3b999ee842ac8.tar.gz gdb-4635ff975351603e64da3cbdeec3b999ee842ac8.tar.bz2 |
Change gdbserver to use existing gdbsupport
This changes the gdbserver build to use the gdbsupport that was built
for gdb.
gdbserver and gdbreplay now must use WIN32APILIBS (aka -lws2_32).
Before this change, gdbserver did not define USE_WIN32API when
building gdbsupport, but now this is always done.
ChangeLog
2020-03-12 Tom Tromey <tom@tromey.com>
* Makefile.in: Rebuild.
* Makefile.def (gdbserver): Depend on gdbsupport.
gdbserver/ChangeLog
2020-03-12 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
* configure.ac (GDBSERVER_DEPFILES): Remove srv_selftest_objs.
(WIN32APILIBS): New subst.
* Makefile.in (SFILES, OBS, TAGS, GDBREPLAY_OBS): Remove
gdbsupport files.
(gdbsupport/%.o): Remove target.
(GDBSUPPORT_BUILDDIR, GDBSUPPORT): New variables.
(gdbserver$(EXEEXT), gdbreplay$(EXEEXT)): Add GDBSUPPORT.
(WIN32APILIBS): New variable.
(gdbserver$(EXEEXT)): Add WIN32APILIBS.
(gdbreplay$(EXEEXT)): Likewise.
Diffstat (limited to 'gdbserver/Makefile.in')
-rw-r--r-- | gdbserver/Makefile.in | 88 |
1 files changed, 13 insertions, 75 deletions
diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in index d6b7938..8c35c16 100644 --- a/gdbserver/Makefile.in +++ b/gdbserver/Makefile.in @@ -102,6 +102,9 @@ INCLUDE_DEP = $$(INCLUDE_DIR) LIBIBERTY_BUILDDIR = ../libiberty LIBIBERTY = $(LIBIBERTY_BUILDDIR)/libiberty.a +GDBSUPPORT_BUILDDIR = ../gdbsupport +GDBSUPPORT = $(GDBSUPPORT_BUILDDIR)/libgdbsupport.a + # Where is ust? These will be empty if ust was not available. ustlibs = @ustlibs@ ustinc = @ustinc@ @@ -152,6 +155,8 @@ CPPFLAGS = @CPPFLAGS@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@ +WIN32APILIBS = @WIN32APILIBS@ + # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros. INTERNAL_CFLAGS_BASE = ${CXXFLAGS} ${GLOBAL_CFLAGS} \ ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} $(PTHREAD_CFLAGS) @@ -213,32 +218,6 @@ SFILES = \ $(srcdir)/../gdb/arch/arm-linux.c \ $(srcdir)/../gdb/arch/ppc-linux-common.c \ $(srcdir)/../gdb/arch/riscv.c \ - $(srcdir)/../gdbsupport/btrace-common.cc \ - $(srcdir)/../gdbsupport/buffer.cc \ - $(srcdir)/../gdbsupport/cleanups.cc \ - $(srcdir)/../gdbsupport/common-debug.cc \ - $(srcdir)/../gdbsupport/common-exceptions.cc \ - $(srcdir)/../gdbsupport/common-inferior.cc \ - $(srcdir)/../gdbsupport/common-regcache.cc \ - $(srcdir)/../gdbsupport/common-utils.cc \ - $(srcdir)/../gdbsupport/errors.cc \ - $(srcdir)/../gdbsupport/environ.cc \ - $(srcdir)/../gdbsupport/fileio.cc \ - $(srcdir)/../gdbsupport/filestuff.cc \ - $(srcdir)/../gdbsupport/job-control.cc \ - $(srcdir)/../gdbsupport/gdb-dlfcn.cc \ - $(srcdir)/../gdbsupport/gdb_tilde_expand.cc \ - $(srcdir)/../gdbsupport/gdb_vecs.cc \ - $(srcdir)/../gdbsupport/gdb_wait.cc \ - $(srcdir)/../gdbsupport/netstuff.cc \ - $(srcdir)/../gdbsupport/new-op.cc \ - $(srcdir)/../gdbsupport/pathstuff.cc \ - $(srcdir)/../gdbsupport/print-utils.cc \ - $(srcdir)/../gdbsupport/ptid.cc \ - $(srcdir)/../gdbsupport/rsp-low.cc \ - $(srcdir)/../gdbsupport/safe-strerror.cc \ - $(srcdir)/../gdbsupport/tdesc.cc \ - $(srcdir)/../gdbsupport/xml-utils.cc \ $(srcdir)/../gdb/nat/aarch64-sve-linux-ptrace.c \ $(srcdir)/../gdb/nat/linux-btrace.c \ $(srcdir)/../gdb/nat/linux-namespaces.c \ @@ -260,36 +239,6 @@ TAGFILES = $(SOURCES) ${HFILES} ${ALLPARAM} ${POSSLIBS} OBS = \ alloc.o \ ax.o \ - gdbsupport/agent.o \ - gdbsupport/btrace-common.o \ - gdbsupport/buffer.o \ - gdbsupport/cleanups.o \ - gdbsupport/common-debug.o \ - gdbsupport/common-exceptions.o \ - gdbsupport/common-inferior.o \ - gdbsupport/job-control.o \ - gdbsupport/common-regcache.o \ - gdbsupport/common-utils.o \ - gdbsupport/errors.o \ - gdbsupport/environ.o \ - gdbsupport/fileio.o \ - gdbsupport/filestuff.o \ - gdbsupport/format.o \ - gdbsupport/gdb-dlfcn.o \ - gdbsupport/gdb_tilde_expand.o \ - gdbsupport/gdb_vecs.o \ - gdbsupport/gdb_wait.o \ - gdbsupport/netstuff.o \ - gdbsupport/new-op.o \ - gdbsupport/pathstuff.o \ - gdbsupport/print-utils.o \ - gdbsupport/ptid.o \ - gdbsupport/rsp-low.o \ - gdbsupport/safe-strerror.o \ - gdbsupport/signals.o \ - gdbsupport/signals-state-save-restore.o \ - gdbsupport/tdesc.o \ - gdbsupport/xml-utils.o \ debug.o \ dll.o \ event-loop.o \ @@ -312,14 +261,6 @@ OBS = \ $(XML_BUILTIN) GDBREPLAY_OBS = \ - gdbsupport/cleanups.o \ - gdbsupport/common-exceptions.o \ - gdbsupport/common-utils.o \ - gdbsupport/rsp-low.o \ - gdbsupport/errors.o \ - gdbsupport/netstuff.o \ - gdbsupport/print-utils.o \ - gdbsupport/safe-strerror.o \ gdbreplay.o \ utils.o \ version.o @@ -412,18 +353,20 @@ install-html: clean-info: gdbserver$(EXEEXT): $(sort $(OBS)) ${CDEPS} $(LIBGNU) $(LIBIBERTY) \ - $(INTL_DEPS) + $(INTL_DEPS) $(GDBSUPPORT) $(SILENCE) rm -f gdbserver$(EXEEXT) $(ECHO_CXXLD) $(CC_LD) $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \ - -o gdbserver$(EXEEXT) $(OBS) $(LIBGNU) $(LIBIBERTY) \ - $(INTL) $(GDBSERVER_LIBS) $(XM_CLIBS) + -o gdbserver$(EXEEXT) $(OBS) $(GDBSUPPORT) $(LIBGNU) \ + $(LIBIBERTY) $(INTL) $(GDBSERVER_LIBS) $(XM_CLIBS) \ + $(WIN32APILIBS) gdbreplay$(EXEEXT): $(sort $(GDBREPLAY_OBS)) $(LIBGNU) $(LIBIBERTY) \ - $(INTL_DEPS) + $(INTL_DEPS) $(GDBSUPPORT) $(SILENCE) rm -f gdbreplay$(EXEEXT) $(ECHO_CXXLD) $(CC_LD) $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \ - -o gdbreplay$(EXEEXT) $(GDBREPLAY_OBS) $(XM_CLIBS) $(LIBGNU) \ - $(LIBIBERTY) $(INTL) + -o gdbreplay$(EXEEXT) $(GDBREPLAY_OBS) $(XM_CLIBS) \ + $(GDBSUPPORT) $(LIBGNU) $(LIBIBERTY) $(INTL) \ + $(WIN32APILIBS) IPA_OBJS = \ alloc-ipa.o \ @@ -459,7 +402,6 @@ TAGS: ${TAGFILES} if [ x$$i != xyzzy ]; then \ echo ${srcdir}/$$i | sed -e 's/\.o$$/\.cc/' \ -e 's,/\(arch\|nat\|target\)/,/../\1/,' \ - -e 's,/\(gdbsupport\)/,/../../\1/,'; \ fi; \ done` \ ${TAGFILES} @@ -595,10 +537,6 @@ arch/%.o: ../gdb/arch/%.c $(COMPILE) -x c++ $< $(POSTCOMPILE) -gdbsupport/%.o: ../gdbsupport/%.cc - $(COMPILE) $< - $(POSTCOMPILE) - %.o: %-generated.cc $(COMPILE) $< $(POSTCOMPILE) |