gdb/gdbserver: Remove reference to vec-ipa.o
[deliverable/binutils-gdb.git] / gdb / gdbserver / Makefile.in
index 675faa43642ffc716123e577dbe5cf806a5053bf..34d8060c256899e0b5311639c5ef1bf8d3676fbe 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright (C) 1989-2018 Free Software Foundation, Inc.
+# Copyright (C) 1989-2019 Free Software Foundation, Inc.
 
 # This file is part of GDB.
 
@@ -103,7 +103,7 @@ ustinc = @ustinc@
 # gnulib
 GNULIB_BUILDDIR = build-gnulib-gdbserver
 LIBGNU = $(GNULIB_BUILDDIR)/import/libgnu.a
-INCGNU = -I$(srcdir)/../gnulib/import -I$(GNULIB_BUILDDIR)/import
+INCGNU = -I$(srcdir)/../../gnulib/import -I$(GNULIB_BUILDDIR)/import
 
 # Generated headers in the gnulib directory.  These must be listed
 # so that they are generated before other files are compiled.
@@ -118,7 +118,7 @@ GNULIB_H = $(GNULIB_BUILDDIR)/import/string.h @GNULIB_STDINT_H@
 # in those directories should be included with the subdirectory.
 # e.g.: "target/wait.h".
 #
-INCLUDE_CFLAGS = -I. -I${srcdir} -I$(srcdir)/../common \
+INCLUDE_CFLAGS = -I. -I${srcdir} \
        -I$(srcdir)/../regformats -I$(srcdir)/.. -I$(INCLUDE_DIR) \
        $(INCGNU)
 
@@ -197,28 +197,32 @@ SFILES = \
        $(srcdir)/arch/arm-get-next-pcs.c \
        $(srcdir)/arch/arm-linux.c \
        $(srcdir)/arch/ppc-linux-common.c \
-       $(srcdir)/common/btrace-common.c \
-       $(srcdir)/common/buffer.c \
-       $(srcdir)/common/cleanups.c \
-       $(srcdir)/common/common-debug.c \
-       $(srcdir)/common/common-exceptions.c \
-       $(srcdir)/common/common-regcache.c \
-       $(srcdir)/common/common-utils.c \
-       $(srcdir)/common/errors.c \
-       $(srcdir)/common/environ.c \
-       $(srcdir)/common/fileio.c \
-       $(srcdir)/common/filestuff.c \
-       $(srcdir)/common/job-control.c \
-       $(srcdir)/common/gdb_tilde_expand.c \
-       $(srcdir)/common/gdb_vecs.c \
-       $(srcdir)/common/new-op.c \
-       $(srcdir)/common/pathstuff.c \
-       $(srcdir)/common/print-utils.c \
-       $(srcdir)/common/ptid.c \
-       $(srcdir)/common/rsp-low.c \
-       $(srcdir)/common/tdesc.c \
-       $(srcdir)/common/vec.c \
-       $(srcdir)/common/xml-utils.c \
+       $(srcdir)/../alloc.c \
+       $(srcdir)/gdbsupport/btrace-common.c \
+       $(srcdir)/gdbsupport/buffer.c \
+       $(srcdir)/gdbsupport/cleanups.c \
+       $(srcdir)/gdbsupport/common-debug.c \
+       $(srcdir)/gdbsupport/common-exceptions.c \
+       $(srcdir)/gdbsupport/common-inferior.c \
+       $(srcdir)/gdbsupport/common-regcache.c \
+       $(srcdir)/gdbsupport/common-utils.c \
+       $(srcdir)/gdbsupport/errors.c \
+       $(srcdir)/gdbsupport/environ.c \
+       $(srcdir)/gdbsupport/fileio.c \
+       $(srcdir)/gdbsupport/filestuff.c \
+       $(srcdir)/gdbsupport/job-control.c \
+       $(srcdir)/gdbsupport/gdb-dlfcn.c \
+       $(srcdir)/gdbsupport/gdb_tilde_expand.c \
+       $(srcdir)/gdbsupport/gdb_vecs.c \
+       $(srcdir)/gdbsupport/netstuff.c \
+       $(srcdir)/gdbsupport/new-op.c \
+       $(srcdir)/gdbsupport/pathstuff.c \
+       $(srcdir)/gdbsupport/print-utils.c \
+       $(srcdir)/gdbsupport/ptid.c \
+       $(srcdir)/gdbsupport/rsp-low.c \
+       $(srcdir)/gdbsupport/tdesc.c \
+       $(srcdir)/gdbsupport/xml-utils.c \
+       $(srcdir)/nat/aarch64-sve-linux-ptrace.c \
        $(srcdir)/nat/linux-btrace.c \
        $(srcdir)/nat/linux-namespaces.c \
        $(srcdir)/nat/linux-osdata.c \
@@ -236,33 +240,36 @@ SOURCES = $(SFILES)
 TAGFILES = $(SOURCES) ${HFILES} ${ALLPARAM} ${POSSLIBS}
 
 OBS = \
+       alloc.o \
        ax.o \
-       common/agent.o \
-       common/btrace-common.o \
-       common/buffer.o \
-       common/cleanups.o \
-       common/common-debug.o \
-       common/common-exceptions.o \
-       common/job-control.o \
-       common/common-regcache.o \
-       common/common-utils.o \
-       common/errors.o \
-       common/environ.o \
-       common/fileio.o \
-       common/filestuff.o \
-       common/format.o \
-       common/gdb_tilde_expand.o \
-       common/gdb_vecs.o \
-       common/new-op.o \
-       common/pathstuff.o \
-       common/print-utils.o \
-       common/ptid.o \
-       common/rsp-low.o \
-       common/signals.o \
-       common/signals-state-save-restore.o \
-       common/tdesc.o \
-       common/vec.o \
-       common/xml-utils.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/netstuff.o \
+       gdbsupport/new-op.o \
+       gdbsupport/pathstuff.o \
+       gdbsupport/print-utils.o \
+       gdbsupport/ptid.o \
+       gdbsupport/rsp-low.o \
+       gdbsupport/signals.o \
+       gdbsupport/signals-state-save-restore.o \
+       gdbsupport/tdesc.o \
+       gdbsupport/xml-utils.o \
        debug.o \
        dll.o \
        event-loop.o \
@@ -284,7 +291,18 @@ OBS = \
        $(LIBOBJS) \
        $(XML_BUILTIN)
 
-GDBREPLAY_OBS = gdbreplay.o version.o
+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 \
+       gdbreplay.o \
+       utils.o \
+       version.o
+
 GDBSERVER_LIBS = @GDBSERVER_LIBS@
 XM_CLIBS = @LIBS@
 CDEPS = $(srcdir)/proc-service.list
@@ -382,7 +400,7 @@ install-html:
 clean-info: force
        @$(MAKE) $(FLAGS_TO_PASS) DO=$@ "DODIRS=$(SUBDIRS)" subdir_do
 
-gdbserver$(EXEEXT): $(OBS) ${ADD_DEPS} ${CDEPS} $(LIBGNU) $(LIBIBERTY)
+gdbserver$(EXEEXT): $(sort $(OBS)) ${CDEPS} $(LIBGNU) $(LIBIBERTY)
        $(SILENCE) rm -f gdbserver$(EXEEXT)
        $(ECHO_CXXLD) $(CC_LD) $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \
                -o gdbserver$(EXEEXT) $(OBS) $(LIBGNU) $(LIBIBERTY) \
@@ -393,21 +411,21 @@ all-lib: $(GNULIB_BUILDDIR)/Makefile $(LIBIBERTY_BUILDDIR)/Makefile
        @$(MAKE) $(FLAGS_TO_PASS) DO=all DODIRS="$(SUBDIRS)" subdir_do
 .PHONY: all-lib
 
-gdbreplay$(EXEEXT): $(GDBREPLAY_OBS) $(LIBGNU) $(LIBIBERTY)
+gdbreplay$(EXEEXT): $(sort $(GDBREPLAY_OBS)) $(LIBGNU) $(LIBIBERTY)
        $(SILENCE) rm -f gdbreplay$(EXEEXT)
        $(ECHO_CXXLD) $(CC_LD) $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \
                -o gdbreplay$(EXEEXT) $(GDBREPLAY_OBS) $(XM_CLIBS) $(LIBGNU) \
                $(LIBIBERTY)
 
 IPA_OBJS = \
+       alloc-ipa.o \
        ax-ipa.o \
-       common/common-utils-ipa.o \
-       common/errors-ipa.o \
-       common/format-ipa.o \
-       common/print-utils-ipa.o \
-       common/rsp-low-ipa.o \
-       common/tdesc-ipa.o \
-       common/vec-ipa.o \
+       gdbsupport/common-utils-ipa.o \
+       gdbsupport/errors-ipa.o \
+       gdbsupport/format-ipa.o \
+       gdbsupport/print-utils-ipa.o \
+       gdbsupport/rsp-low-ipa.o \
+       gdbsupport/tdesc-ipa.o \
        regcache-ipa.o \
        remote-utils-ipa.o \
        tdesc-ipa.o \
@@ -417,7 +435,7 @@ IPA_OBJS = \
 
 IPA_LIB = libinproctrace.so
 
-$(IPA_LIB): $(IPA_OBJS) ${ADD_DEPS} ${CDEPS}
+$(IPA_LIB): $(sort $(IPA_OBJS)) ${CDEPS}
        $(SILENCE) rm -f $(IPA_LIB)
        $(ECHO_CXXLD) $(CC_LD) -shared -fPIC -Wl,--soname=$(IPA_LIB) \
                -Wl,--no-undefined $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \
@@ -483,7 +501,7 @@ stamp-h: config.in config.status
 Makefile: Makefile.in config.status
        CONFIG_HEADERS="" $(SHELL) ./config.status
 
-$(GNULIB_BUILDDIR)/Makefile: $(srcdir)/../gnulib/Makefile.in config.status
+$(GNULIB_BUILDDIR)/Makefile: $(srcdir)/../../gnulib/Makefile.in config.status
          @cd $(GNULIB_BUILDDIR); CONFIG_FILES="Makefile" \
          CONFIG_COMMANDS="depfiles" \
          CONFIG_HEADERS= \
@@ -502,8 +520,8 @@ am--refresh:
 
 force:
 
-version-generated.c: Makefile $(srcdir)/../version.in $(srcdir)/../../bfd/version.h $(srcdir)/../common/create-version.sh
-       $(ECHO_GEN) $(SHELL) $(srcdir)/../common/create-version.sh $(srcdir)/.. \
+version-generated.c: Makefile $(srcdir)/../version.in $(srcdir)/../../bfd/version.h $(srcdir)/../gdbsupport/create-version.sh
+       $(ECHO_GEN) $(SHELL) $(srcdir)/../gdbsupport/create-version.sh $(srcdir)/.. \
                $(host_alias) $(target_alias) $@
 
 xml-builtin-generated.c: stamp-xml; @true
@@ -531,9 +549,15 @@ regdat_sh = $(srcdir)/../regformats/regdat.sh
 
 UST_CFLAGS = $(ustinc) -DCONFIG_UST_GDB_INTEGRATION
 
+# Undo gnulib replacements for the IPA shared library build.
+# The gnulib headers are still needed, but gnulib is not linked
+# into the IPA lib so replacement apis don't work.
+UNDO_GNULIB_CFLAGS = -Drpl_strerror=strerror
+
 # Note, we only build the IPA if -fvisibility=hidden is supported in
 # the first place.
 IPAGENT_CFLAGS = $(INTERNAL_CFLAGS) $(UST_CFLAGS) \
+       $(UNDO_GNULIB_CFLAGS) \
        -fPIC -DIN_PROCESS_AGENT \
        -fvisibility=hidden
 
@@ -549,13 +573,17 @@ ax.o: ax.c
        $(COMPILE) $(WARN_CFLAGS_NO_FORMAT) $<
        $(POSTCOMPILE)
 
+alloc-ipa.o: ../alloc.c
+       $(IPAGENT_COMPILE) $(WARN_CFLAGS_NO_FORMAT) $<
+       $(POSTCOMPILE)
+
 # Rules for objects that go in the in-process agent.
 
 arch/%-ipa.o: ../arch/%.c
        $(IPAGENT_COMPILE) $<
        $(POSTCOMPILE)
 
-common/%-ipa.o: ../common/%.c
+gdbsupport/%-ipa.o: ../gdbsupport/%.c
        $(IPAGENT_COMPILE) $<
        $(POSTCOMPILE)
 
@@ -584,7 +612,7 @@ arch/%.o: ../arch/%.c
        $(COMPILE) $<
        $(POSTCOMPILE)
 
-common/%.o: ../common/%.c
+gdbsupport/%.o: ../gdbsupport/%.c
        $(COMPILE) $<
        $(POSTCOMPILE)
 
@@ -604,6 +632,10 @@ common/%.o: ../common/%.c
        $(COMPILE) $<
        $(POSTCOMPILE)
 
+%.o: ../%.c
+       $(COMPILE) $<
+       $(POSTCOMPILE)
+
 # Rules for register format descriptions.  Suffix destination files with
 # -generated to identify and clean them easily.
 
This page took 0.028554 seconds and 4 git commands to generate.