gdbserver/linux-low: turn 'get_pc' and 'set_pc' into methods

[deliverable/binutils-gdb.git] / gdbserver / Makefile.in

diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in
index d6b79385e15732c962e09fdebab28b1e0782961e..8c35c169d62bc41b420ede45fe3ef384d35c117f 100644 (file)
--- 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)