gdbserver: Ensure all debug output uses debug functions

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

diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index c377378809c3ac5f644cd6e304737aeed38576a0..f5fc55034ee9bb66018a9478e594f6f43cd0feba 100644 (file)
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -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.
 
@@ -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)
 
@@ -196,6 +196,7 @@ SFILES = \
        $(srcdir)/arch/arm.c \
        $(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 \
@@ -210,6 +211,7 @@ SFILES = \
        $(srcdir)/common/job-control.c \
        $(srcdir)/common/gdb_tilde_expand.c \
        $(srcdir)/common/gdb_vecs.c \
+       $(srcdir)/common/netstuff.c \
        $(srcdir)/common/new-op.c \
        $(srcdir)/common/pathstuff.c \
        $(srcdir)/common/print-utils.c \
@@ -218,6 +220,7 @@ SFILES = \
        $(srcdir)/common/tdesc.c \
        $(srcdir)/common/vec.c \
        $(srcdir)/common/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 \
@@ -252,6 +255,7 @@ OBS = \
        common/format.o \
        common/gdb_tilde_expand.o \
        common/gdb_vecs.o \
+       common/netstuff.o \
        common/new-op.o \
        common/pathstuff.o \
        common/print-utils.o \
@@ -283,7 +287,17 @@ OBS = \
        $(LIBOBJS) \
        $(XML_BUILTIN)
 
-GDBREPLAY_OBS = gdbreplay.o version.o
+GDBREPLAY_OBS = \
+       common/cleanups.o \
+       common/common-exceptions.o \
+       common/common-utils.o \
+       common/errors.o \
+       common/netstuff.o \
+       common/print-utils.o \
+       gdbreplay.o \
+       utils.o \
+       version.o
+
 GDBSERVER_LIBS = @GDBSERVER_LIBS@
 XM_CLIBS = @LIBS@
 CDEPS = $(srcdir)/proc-service.list
@@ -381,7 +395,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) \
@@ -392,7 +406,7 @@ 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) \
@@ -416,7 +430,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) \
@@ -530,9 +544,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