From: Tom Tromey Date: Thu, 12 Mar 2020 19:32:15 +0000 (-0600) Subject: Change gdbserver to use existing gdbsupport X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=4635ff975351603e64da3cbdeec3b999ee842ac8;p=deliverable%2Fbinutils-gdb.git 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 * Makefile.in: Rebuild. * Makefile.def (gdbserver): Depend on gdbsupport. gdbserver/ChangeLog 2020-03-12 Tom Tromey * 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. --- diff --git a/ChangeLog b/ChangeLog index 9fb604e359..c8683661a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2020-03-12 Tom Tromey + + * Makefile.in: Rebuild. + * Makefile.def (gdbserver): Depend on gdbsupport. + 2020-03-12 Tom Tromey * Makefile.in: Rebuild. diff --git a/Makefile.def b/Makefile.def index 3162199ac7..76d062bb67 100644 --- a/Makefile.def +++ b/Makefile.def @@ -412,6 +412,7 @@ dependencies = { module=all-gdb; on=all-libctf; }; // Host modules specific to gdbserver. dependencies = { module=configure-gdbserver; on=all-gnulib; }; +dependencies = { module=all-gdbserver; on=all-gdbsupport; }; dependencies = { module=all-gdbserver; on=all-gnulib; }; dependencies = { module=all-gdbserver; on=all-libiberty; }; diff --git a/Makefile.in b/Makefile.in index d24dfdfb86..9dfd39fae1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -51977,6 +51977,7 @@ all-gdb: maybe-all-build-bison all-gdb: maybe-all-sim all-gdb: maybe-all-libtermcap configure-gdbserver: maybe-all-gnulib +all-gdbserver: maybe-all-gdbsupport all-gdbserver: maybe-all-gnulib configure-libgui: maybe-configure-tcl configure-libgui: maybe-configure-tk diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index b516cb73f3..5c3761a671 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,3 +1,17 @@ +2020-03-12 Tom Tromey + + * 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. + 2020-03-12 Tom Tromey * config.in, configure: Rebuild. diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in index d6b79385e1..8c35c169d6 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) diff --git a/gdbserver/configure b/gdbserver/configure index 3f30a2bc6f..55cf2416b5 100755 --- a/gdbserver/configure +++ b/gdbserver/configure @@ -655,6 +655,7 @@ DEPDIR am__leading_dot host_noncanonical target_noncanonical +WIN32APILIBS LTLIBIPT LIBIPT HAVE_LIBIPT @@ -8900,6 +8901,8 @@ $as_echo "$bfd_cv_have_sys_procfs_type_elf_fpregset_t" >&6; } fi +# This is set by GDB_AC_COMMON. + # Check whether we will enable the inclusion of unit tests when @@ -8931,8 +8934,6 @@ if $enable_unittests; then $as_echo "#define GDB_SELF_TEST 1" >>confdefs.h - srv_selftest_objs="gdbsupport/selftest.o" - fi @@ -10633,7 +10634,7 @@ $as_echo "#define USE_XML 1" >>confdefs.h done fi -GDBSERVER_DEPFILES="$srv_regobj $srv_tgtobj $srv_hostio_err_objs $srv_thread_depfiles $srv_selftest_objs" +GDBSERVER_DEPFILES="$srv_regobj $srv_tgtobj $srv_hostio_err_objs $srv_thread_depfiles" GDBSERVER_LIBS="$srv_libs" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the target supports __sync_*_compare_and_swap" >&5 diff --git a/gdbserver/configure.ac b/gdbserver/configure.ac index d92005cf0f..755cc28cee 100644 --- a/gdbserver/configure.ac +++ b/gdbserver/configure.ac @@ -44,10 +44,10 @@ AX_CXX_COMPILE_STDCXX(11, , mandatory) AC_HEADER_STDC GDB_AC_COMMON +# This is set by GDB_AC_COMMON. +AC_SUBST(WIN32APILIBS) -GDB_AC_SELFTEST([ - srv_selftest_objs="gdbsupport/selftest.o" -]) +GDB_AC_SELFTEST ACX_NONCANONICAL_TARGET ACX_NONCANONICAL_HOST @@ -357,7 +357,7 @@ if test "$srv_xmlfiles" != ""; then done fi -GDBSERVER_DEPFILES="$srv_regobj $srv_tgtobj $srv_hostio_err_objs $srv_thread_depfiles $srv_selftest_objs" +GDBSERVER_DEPFILES="$srv_regobj $srv_tgtobj $srv_hostio_err_objs $srv_thread_depfiles" GDBSERVER_LIBS="$srv_libs" dnl Check whether the target supports __sync_*_compare_and_swap.