]> git.ipfire.org Git - thirdparty/binutils-gdb.git/blobdiff - gdb/gdbserver/Makefile.in
Move gdbsupport to the top level
[thirdparty/binutils-gdb.git] / gdb / gdbserver / Makefile.in
index 3baa96f4a95b4ce02cd8d3e2fd04352131015cbc..38f30a027708f85e5d927d54ff6e88e4ba0e08b3 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright (C) 1989-2017 Free Software Foundation, Inc.
+# Copyright (C) 1989-2020 Free Software Foundation, Inc.
 
 # This file is part of GDB.
 
@@ -43,6 +43,7 @@ man9dir = $(mandir)/man9
 infodir = @infodir@
 htmldir = $(prefix)/html
 includedir = @includedir@
+CONFIG_SRC_SUBDIR = @CONFIG_SRC_SUBDIR@
 
 SHELL = @SHELL@
 EXEEXT = @EXEEXT@
@@ -61,14 +62,7 @@ AR_FLAGS = rc
 # Dependency tracking information.
 DEPMODE = @CCDEPMODE@
 DEPDIR = @DEPDIR@
-depcomp = $(SHELL) $(srcdir)/../depcomp
-
-# Note that these are overridden by GNU make-specific code below if
-# GNU make is used.  The overrides implement dependency tracking.
-COMPILE.pre = $(CXX) $(CXX_DIALECT)
-COMPILE.post = -c -o $@
-COMPILE = $(COMPILE.pre) $(INTERNAL_CFLAGS) $(COMPILE.post)
-POSTCOMPILE = @true
+depcomp = $(SHELL) $(srcdir)/../../depcomp
 
 # Directory containing source files.  Don't clean up the spacing,
 # this exact string is matched for by the "configure" script.
@@ -77,6 +71,15 @@ abs_top_srcdir = @abs_top_srcdir@
 abs_srcdir = @abs_srcdir@
 VPATH = @srcdir@
 
+include $(srcdir)/../silent-rules.mk
+
+# Note that these are overridden by GNU make-specific code below if
+# GNU make is used.  The overrides implement dependency tracking.
+COMPILE.pre = $(CXX) -x c++ $(CXX_DIALECT)
+COMPILE.post = -c -o $@
+COMPILE = $(ECHO_CXX) $(COMPILE.pre) $(INTERNAL_CFLAGS) $(COMPILE.post)
+POSTCOMPILE = @true
+
 # It is also possible that you will need to add -I/usr/include/sys to the
 # CFLAGS section if your system doesn't have fcntl.h in /usr/include (which
 # is where it should be according to Posix).
@@ -100,12 +103,14 @@ 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.
 GNULIB_H = $(GNULIB_BUILDDIR)/import/string.h @GNULIB_STDINT_H@
 
+INCSUPPORT = -I$(srcdir)/../.. -I../..
+
 # All the includes used for CFLAGS and for lint.
 # -I. for config files.
 # -I${srcdir} for our headers.
@@ -115,9 +120,9 @@ 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)
+       $(INCGNU) $(INCSUPPORT)
 
 # M{H,T}_CFLAGS, if defined, has host- and target-dependent CFLAGS
 # from the config/ directory.
@@ -136,9 +141,12 @@ CFLAGS = @CFLAGS@
 CXXFLAGS = @CXXFLAGS@
 CPPFLAGS = @CPPFLAGS@
 
+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+
 # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros.
 INTERNAL_CFLAGS_BASE = ${CXXFLAGS} ${GLOBAL_CFLAGS} \
-       ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS}
+       ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} $(PTHREAD_CFLAGS)
 INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS)
 INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) -DGDBSERVER
 
@@ -193,30 +201,42 @@ SFILES = \
        $(srcdir)/arch/arm.c \
        $(srcdir)/arch/arm-get-next-pcs.c \
        $(srcdir)/arch/arm-linux.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/gdb_vecs.c \
-       $(srcdir)/common/new-op.c \
-       $(srcdir)/common/print-utils.c \
-       $(srcdir)/common/ptid.c \
-       $(srcdir)/common/rsp-low.c \
-       $(srcdir)/common/vec.c \
-       $(srcdir)/common/xml-utils.c \
+       $(srcdir)/arch/ppc-linux-common.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/gdb_wait.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/safe-strerror.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 \
        $(srcdir)/nat/linux-personality.c \
        $(srcdir)/nat/mips-linux-watch.c \
        $(srcdir)/nat/ppc-linux.c \
+       $(srcdir)/nat/fork-inferior.c \
        $(srcdir)/target/waitstatus.c
 
 DEPFILES = @GDBSERVER_DEPFILES@
@@ -227,52 +247,73 @@ SOURCES = $(SFILES)
 TAGFILES = $(SOURCES) ${HFILES} ${ALLPARAM} ${POSSLIBS}
 
 OBS = \
-       agent.o \
+       alloc.o \
        ax.o \
-       btrace-common.o \
-       buffer.o \
-       cleanups.o \
-       common-debug.o \
-       common-exceptions.o \
-       common-regcache.o \
-       common-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/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 \
-       errors.o \
-       environ.o \
        event-loop.o \
-       fileio.o \
-       filestuff.o \
-       format.o \
-       gdb_vecs.o \
        hostio.o \
        inferiors.o \
        mem-break.o \
-       new-op.o \
        notif.o \
-       print-utils.o \
-       ptid.o \
        regcache.o \
        remote-utils.o \
-       rsp-low.o \
        server.o \
-       signals.o \
-       signals-state-save-restore.o \
        symbol.o \
        target.o \
        tdesc.o \
        tracepoint.o \
        utils.o \
-       vec.o \
        version.o \
        waitstatus.o \
-       xml-utils.o \
        $(DEPFILES) \
        $(LIBOBJS) \
        $(XML_BUILTIN)
 
-GDBREPLAY_OBS = gdbreplay.o version.o
-GDBSERVER_LIBS = @GDBSERVER_LIBS@
+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
+
+GDBSERVER_LIBS = @GDBSERVER_LIBS@ $(PTHREAD_LIBS)
 XM_CLIBS = @LIBS@
 CDEPS = $(srcdir)/proc-service.list
 
@@ -344,10 +385,10 @@ install-only:
        if [ x$$n = x ]; then n=gdbserver; else true; fi; \
        if [ x"$(IPA_DEPFILES)" != x ]; then \
                $(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(libdir); \
-               $(INSTALL_PROGRAM) $(IPA_LIB) $(DESTDIR)$(libdir)/$(IPA_LIB); \
+               $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $(IPA_LIB) $(DESTDIR)$(libdir)/$(IPA_LIB); \
        fi; \
        $(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(bindir); \
-       $(INSTALL_PROGRAM) gdbserver$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT)
+       $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) gdbserver$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT)
        # Note that we run install and not install-only, as the latter
        # is not part of GNU standards and in particular not provided
        # in libiberty.
@@ -369,32 +410,47 @@ install-html:
 clean-info: force
        @$(MAKE) $(FLAGS_TO_PASS) DO=$@ "DODIRS=$(SUBDIRS)" subdir_do
 
-gdbserver$(EXEEXT): $(OBS) ${ADD_DEPS} ${CDEPS} $(LIBGNU) $(LIBIBERTY)
-       rm -f gdbserver$(EXEEXT)
-       $(CC_LD) $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) -o gdbserver$(EXEEXT) $(OBS) \
-       $(LIBGNU) $(LIBIBERTY) $(GDBSERVER_LIBS) $(XM_CLIBS)
+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) \
+               $(GDBSERVER_LIBS) $(XM_CLIBS)
 
 $(LIBGNU) $(LIBIBERTY) $(GNULIB_H): all-lib
 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)
-       rm -f gdbreplay$(EXEEXT)
-       $(CC_LD) $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) -o gdbreplay$(EXEEXT) $(GDBREPLAY_OBS) \
-         $(XM_CLIBS) $(LIBGNU) $(LIBIBERTY)
-
-IPA_OBJS = ax-ipa.o tracepoint-ipa.o format-ipa.o utils-ipa.o \
-       regcache-ipa.o remote-utils-ipa.o common-utils-ipa.o \
-       tdesc-ipa.o print-utils-ipa.o rsp-low-ipa.o errors-ipa.o \
+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 \
+       gdbsupport/common-utils-ipa.o \
+       gdbsupport/errors-ipa.o \
+       gdbsupport/format-ipa.o \
+       gdbsupport/print-utils-ipa.o \
+       gdbsupport/rsp-low-ipa.o \
+       gdbsupport/safe-strerror-ipa.o \
+       gdbsupport/tdesc-ipa.o \
+       regcache-ipa.o \
+       remote-utils-ipa.o \
+       tdesc-ipa.o \
+       tracepoint-ipa.o \
+       utils-ipa.o \
        ${IPA_DEPFILES}
 
 IPA_LIB = libinproctrace.so
 
-$(IPA_LIB): $(IPA_OBJS) ${ADD_DEPS} ${CDEPS}
-       rm -f $(IPA_LIB)
-       $(CC_LD) -shared -fPIC -Wl,--soname=$(IPA_LIB) -Wl,--no-undefined $(INTERNAL_CFLAGS) \
-       $(INTERNAL_LDFLAGS) -o $(IPA_LIB) ${IPA_OBJS} -ldl -pthread
+$(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) \
+               -o $(IPA_LIB) ${IPA_OBJS} -ldl -pthread
 
 # Put the proper machine-specific files first, so M-. on a machine
 # specific routine gets the one for the correct machine.
@@ -413,47 +469,15 @@ tags: TAGS
 
 clean:
        rm -f *.o ${ADD_FILES} *~
-       rm -f version.c
        rm -f gdbserver$(EXEEXT) gdbreplay$(EXEEXT) core make.log
        rm -f $(IPA_LIB)
-       rm -f aarch64.c
-       rm -f reg-arm.c reg-bfin.c i386.c reg-ia64.c reg-m32r.c reg-m68k.c
-       rm -f reg-sh.c reg-sparc.c reg-spu.c amd64.c i386-linux.c
-       rm -f reg-cris.c reg-crisv32.c amd64-linux.c reg-xtensa.c
-       rm -f reg-tilegx.c reg-tilegx32.c
-       rm -f arm-with-iwmmxt.c
-       rm -f arm-with-vfpv2.c arm-with-vfpv3.c arm-with-neon.c
-       rm -f mips-linux.c mips-dsp-linux.c
-       rm -f mips64-linux.c mips64-dsp-linux.c
-       rm -f nios2-linux.c
-       rm -f powerpc-32.c powerpc-32l.c powerpc-64l.c powerpc-e500l.c
-       rm -f powerpc-altivec32l.c powerpc-cell32l.c powerpc-vsx32l.c
-       rm -f powerpc-altivec64l.c powerpc-cell64l.c powerpc-vsx64l.c
-       rm -f powerpc-isa205-32l.c powerpc-isa205-64l.c
-       rm -f powerpc-isa205-altivec32l.c powerpc-isa205-vsx32l.c powerpc-isa205-altivec64l.c
-       rm -f powerpc-isa205-vsx64l.c
-       rm -f s390-linux32.c s390-linux64.c s390x-linux64.c
-       rm -f s390-linux32v1.c s390-linux32v2.c s390-linux64v1.c
-       rm -f s390-linux64v2.c s390x-linux64v1.c s390x-linux64v2.c
-       rm -f s390-te-linux64.c s390x-te-linux64.c
-       rm -f s390-vx-linux64.c s390x-vx-linux64.c
-       rm -f s390-tevx-linux64.c s390x-tevx-linux64.c
-       rm -f tic6x-c64xp-linux.c tic6x-c64x-linux.c tic6x-c62x-linux.c
-       rm -f xml-builtin.c stamp-xml
-       rm -f i386-avx.c i386-avx-linux.c
-       rm -f i386-mpx.c i386-mpx-linux.c
-       rm -f i386-avx-mpx.c i386-avx-mpx-linux.c
-       rm -f i386-avx-avx512.c i386-avx-avx512-linux.c
-       rm -f i386-avx-mpx-avx512-pku.c i386-avx-mpx-avx512-pku-linux.c
-       rm -f amd64-avx.c amd64-avx-linux.c
-       rm -f amd64-mpx.c amd64-mpx-linux.c
-       rm -f amd64-avx-mpx.c amd64-avx-mpx-linux.c
-       rm -f amd64-avx-avx512.c amd64-avx-avx512-linux.c
-       rm -f amd64-avx-mpx-avx512-pku.c amd64-avx-mpx-avx512-pku-linux.c
-       rm -f i386-mmx.c i386-mmx-linux.c
-       rm -f x32.c x32-linux.c
-       rm -f x32-avx.c x32-avx-linux.c
-       rm -f x32-avx-avx512.c x32-avx-avx512-linux.c
+       rm -f *-generated.c
+       rm -f stamp-xml
+       rm -f $(DEPDIR)/*.Po
+       for i in $(CONFIG_SRC_SUBDIR); do \
+               rm -f $$i/*.o;  \
+               rm -f $$i/$(DEPDIR)/*; \
+       done
        @$(MAKE) $(FLAGS_TO_PASS) DO=$@ "DODIRS=$(SUBDIRS)" subdir_do
 
 maintainer-clean realclean distclean: clean
@@ -461,6 +485,9 @@ maintainer-clean realclean distclean: clean
        rm -rf $(GNULIB_BUILDDIR)
        rm -f Makefile config.status config.h stamp-h config.log
        rm -f Makefile
+       for i in $(CONFIG_SRC_SUBDIR); do \
+               rmdir $$i/$(DEPDIR); \
+       done
 
 subdir_do: force
        @for i in $(DODIRS); do \
@@ -480,12 +507,12 @@ subdir_do: force
 
 config.h: stamp-h ; @true
 stamp-h: config.in config.status
-       CONFIG_FILES="" CONFIG_HEADERS=config.h:config.in $(SHELL) ./config.status
+       $(SHELL) ./config.status config.h
 
 Makefile: Makefile.in config.status
-       CONFIG_HEADERS="" $(SHELL) ./config.status
+       $(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= \
@@ -504,16 +531,17 @@ am--refresh:
 
 force:
 
-version.c: Makefile $(srcdir)/../version.in $(srcdir)/../../bfd/version.h $(srcdir)/../common/create-version.sh
-       $(SHELL) $(srcdir)/../common/create-version.sh $(srcdir)/.. \
-           $(host_alias) $(target_alias) version.c
+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.c: stamp-xml; @true
+xml-builtin-generated.c: stamp-xml; @true
 stamp-xml: $(XML_DIR)/feature_to_c.sh Makefile $(XML_FILES)
-       rm -f xml-builtin.tmp
-       $(SHELL) $(XML_DIR)/feature_to_c.sh xml-builtin.tmp $(XML_FILES)
-       $(SHELL) $(srcdir)/../../move-if-change xml-builtin.tmp xml-builtin.c
-       echo stamp > stamp-xml
+       $(SILENCE) rm -f xml-builtin.tmp
+       $(ECHO_GEN_XML_BUILTIN_GENERATED) $(SHELL) $(XML_DIR)/feature_to_c.sh \
+               xml-builtin.tmp $(XML_FILES)
+       $(SILENCE) $(SHELL) $(srcdir)/../../move-if-change xml-builtin.tmp xml-builtin-generated.c
+       $(SILENCE) echo stamp > stamp-xml
 
 .PRECIOUS: xml-builtin.c
 
@@ -532,220 +560,78 @@ 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_r=strerror_r
+
 # 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
 
-IPAGENT_COMPILE = $(COMPILE.pre) $(IPAGENT_CFLAGS) $(COMPILE.post)
+IPAGENT_COMPILE = $(ECHO_CXX) $(COMPILE.pre) $(IPAGENT_CFLAGS) $(COMPILE.post)
+
+# Rules for special cases.
 
-# In-process agent object rules
 ax-ipa.o: ax.c
        $(IPAGENT_COMPILE) $(WARN_CFLAGS_NO_FORMAT) $<
        $(POSTCOMPILE)
-tracepoint-ipa.o: tracepoint.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-utils-ipa.o: utils.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-format-ipa.o: ../common/format.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-common-utils-ipa.o: ../common/common-utils.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-remote-utils-ipa.o: remote-utils.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-regcache-ipa.o: regcache.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-i386-linux-ipa.o: i386-linux.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-i386-mmx-linux-ipa.o: i386-mmx-linux.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-i386-avx-linux-ipa.o: i386-avx-linux.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-i386-mpx-linux-ipa.o: i386-mpx-linux.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-i386-avx-mpx-linux-ipa.o: i386-avx-mpx-linux.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-i386-avx-avx512-linux-ipa.o: i386-avx-avx512-linux.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-i386-avx-mpx-avx512-pku-linux-ipa.o: i386-avx-mpx-avx512-pku-linux.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-linux-i386-ipa.o: linux-i386-ipa.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-linux-amd64-ipa.o: linux-amd64-ipa.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-amd64-linux-ipa.o: amd64-linux.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-amd64-avx-linux-ipa.o: amd64-avx-linux.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-amd64-mpx-linux-ipa.o: amd64-mpx-linux.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-amd64-avx-mpx-linux-ipa.o: amd64-avx-mpx-linux.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-amd64-avx-avx512-linux-ipa.o: amd64-avx-avx512-linux.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-amd64-avx-mpx-avx512-pku-linux-ipa.o: amd64-avx-mpx-avx512-pku-linux.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-linux-aarch64-ipa.o: linux-aarch64-ipa.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-aarch64-ipa.o: aarch64.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-linux-s390-ipa.o: linux-s390-ipa.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-s390-linux32-ipa.o: s390-linux32.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-s390-linux32v1-ipa.o: s390-linux32v1.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-s390-linux32v2-ipa.o: s390-linux32v2.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-s390-linux64-ipa.o: s390-linux64.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-s390-linux64v1-ipa.o: s390-linux64v1.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-s390-linux64v2-ipa.o: s390-linux64v2.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-s390-te-linux64-ipa.o: s390-te-linux64.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-s390-vx-linux64-ipa.o: s390-vx-linux64.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-s390-tevx-linux64-ipa.o: s390-tevx-linux64.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-s390x-linux64-ipa.o: s390x-linux64.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-s390x-linux64v1-ipa.o: s390x-linux64v1.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-s390x-linux64v2-ipa.o: s390x-linux64v2.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-s390x-te-linux64-ipa.o: s390x-te-linux64.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-s390x-vx-linux64-ipa.o: s390x-vx-linux64.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-s390x-tevx-linux64-ipa.o: s390x-tevx-linux64.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-linux-ppc-ipa.o: linux-ppc-ipa.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-powerpc-32l-ipa.o: powerpc-32l.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-powerpc-altivec32l-ipa.o: powerpc-altivec32l.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-powerpc-cell32l-ipa.o: powerpc-cell32l.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-powerpc-vsx32l-ipa.o: powerpc-vsx32l.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-powerpc-isa205-32l-ipa.o: powerpc-isa205-32l.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-powerpc-isa205-altivec32l-ipa.o: powerpc-isa205-altivec32l.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-powerpc-isa205-vsx32l-ipa.o: powerpc-isa205-vsx32l.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-powerpc-e500l-ipa.o: powerpc-e500l.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-powerpc-64l-ipa.o: powerpc-64l.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-powerpc-altivec64l-ipa.o: powerpc-altivec64l.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-powerpc-cell64l-ipa.o: powerpc-cell64l.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-powerpc-vsx64l-ipa.o: powerpc-vsx64l.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-powerpc-isa205-64l-ipa.o: powerpc-isa205-64l.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-powerpc-isa205-altivec64l-ipa.o: powerpc-isa205-altivec64l.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-powerpc-isa205-vsx64l-ipa.o: powerpc-isa205-vsx64l.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-tdesc-ipa.o: tdesc.c
-       $(IPAGENT_COMPILE) $<
-       $(POSTCOMPILE)
-print-utils-ipa.o: ../common/print-utils.c
-       $(IPAGENT_COMPILE) $<
+
+ax.o: ax.c
+       $(COMPILE) $(WARN_CFLAGS_NO_FORMAT) $<
        $(POSTCOMPILE)
-rsp-low-ipa.o: ../common/rsp-low.c
+
+# Rules for objects that go in the in-process agent.
+
+arch/%-ipa.o: ../arch/%.c
        $(IPAGENT_COMPILE) $<
        $(POSTCOMPILE)
-errors-ipa.o: ../common/errors.c
+
+gdbsupport/%-ipa.o: ../../gdbsupport/%.c
        $(IPAGENT_COMPILE) $<
        $(POSTCOMPILE)
-x32-linux-ipa.o: x32-linux.c
+
+%-ipa.o: %-generated.c
        $(IPAGENT_COMPILE) $<
        $(POSTCOMPILE)
-x32-avx-linux-ipa.o: x32-avx-linux.c
+
+%-ipa.o: %.c
        $(IPAGENT_COMPILE) $<
        $(POSTCOMPILE)
-x32-avx512-linux-ipa.o: x32-avx512-linux.c
+
+%-ipa.o: ../%.c
        $(IPAGENT_COMPILE) $<
        $(POSTCOMPILE)
 
-ax.o: ax.c
-       $(COMPILE) $(WARN_CFLAGS_NO_FORMAT) $<
+# Note: Between two matching pattern rules, GNU Make 3.81 chooses the first one.
+# Therefore, this one needs to be before "%.o: %.c" for it to be considered for
+# files such as linux-amd64-ipa.o generated from linux-amd64-ipa.c.
+#
+# Later versions of GNU Make choose the rule with the shortest stem, so it would
+# work in any order.
+
+%-ipa.o: %-ipa.c
+       $(IPAGENT_COMPILE) $<
        $(POSTCOMPILE)
 
 # Rules for objects that go in the gdbserver binary.
 
-%.o: %.c
+arch/%.o: ../arch/%.c
        $(COMPILE) $<
        $(POSTCOMPILE)
 
-%.o: ../arch/%.c
+gdbsupport/%.o: ../../gdbsupport/%.c
        $(COMPILE) $<
        $(POSTCOMPILE)
 
-%.o: ../common/%.c
+%.o: %-generated.c
+       $(COMPILE) $<
+       $(POSTCOMPILE)
+
+%.o: %.c
        $(COMPILE) $<
        $(POSTCOMPILE)
 
@@ -757,19 +643,21 @@ ax.o: ax.c
        $(COMPILE) $<
        $(POSTCOMPILE)
 
-# Rules for register format descriptions.
+%.o: ../%.c
+       $(COMPILE) $<
+       $(POSTCOMPILE)
 
-%.c: ../regformats/%.dat | $(regdat_sh)
-       $(SHELL) $(regdat_sh) $< $@
+# Rules for register format descriptions.  Suffix destination files with
+# -generated to identify and clean them easily.
 
-%.c: ../regformats/arm/%.dat | $(regdat_sh)
-       $(SHELL) $(regdat_sh) $< $@
+%-generated.c: ../regformats/%.dat $(regdat_sh)
+       $(ECHO_REGDAT) $(SHELL) $(regdat_sh) $< $@
 
-%.c: ../regformats/i386/%.dat | $(regdat_sh)
-       $(SHELL) $(regdat_sh) $< $@
+%-generated.c: ../regformats/arm/%.dat $(regdat_sh)
+       $(ECHO_REGDAT) $(SHELL) $(regdat_sh) $< $@
 
-%.c: ../regformats/rs6000/%.dat | $(regdat_sh)
-       $(SHELL) $(regdat_sh) $< $@
+%-generated.c: ../regformats/rs6000/%.dat $(regdat_sh)
+       $(ECHO_REGDAT) $(SHELL) $(regdat_sh) $< $@
 
 #
 # Dependency tracking.
@@ -780,12 +668,13 @@ ifeq ($(DEPMODE),depmode=gcc3)
 # into place if the compile succeeds.  We need this because gcc does
 # not atomically write the dependency output file.
 override COMPILE.post = -c -o $@ -MT $@ -MMD -MP \
-       -MF $(DEPDIR)/$(basename $(@F)).Tpo
-override POSTCOMPILE = @mv $(DEPDIR)/$(basename $(@F)).Tpo \
-       $(DEPDIR)/$(basename $(@F)).Po
+       -MF $(@D)/$(DEPDIR)/$(basename $(@F)).Tpo
+override POSTCOMPILE = @mv $(@D)/$(DEPDIR)/$(basename $(@F)).Tpo \
+       $(@D)/$(DEPDIR)/$(basename $(@F)).Po
 else
 override COMPILE.pre = source='$<' object='$@' libtool=no \
-       DEPDIR=$(DEPDIR) $(DEPMODE) $(depcomp) $(CC)
+       DEPDIR=$(DEPDIR) $(DEPMODE) $(depcomp) \
+       $(CXX) -x c++ $(CXX_DIALECT)
 # depcomp handles atomicity for us, so we don't need a postcompile
 # step.
 override POSTCOMPILE =
@@ -804,10 +693,17 @@ else
 $(all_object_files) : $(generated_files)
 endif
 
+# All the .deps files to include.
+all_deps_files = $(foreach dep,$(patsubst %.o,%.Po,$(all_object_files)),\
+                  $(dir $(dep))/$(DEPDIR)/$(notdir $(dep)))
+
 # Dependencies.
--include $(patsubst %.o, $(DEPDIR)/%.Po, $(all_object_files))
+-include $(all_deps_files)
 
 # Disable implicit make rules.
 include $(srcdir)/../disable-implicit-rules.mk
 
+# Do not delete intermediate files (e.g. *-generated.c).
+.SECONDARY:
+
 # This is the end of "Makefile.in".