Fix build with g++ 6.3.1

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

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 71035565fa2a413f6a2b96688b32b6820f1627ea..58230980366587d0a1189f78f1b77b8308c0083d 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -429,6 +429,10 @@ SUBDIR_UNITTESTS_SRCS = \
 
 SUBDIR_UNITTESTS_OBS = $(patsubst %.c,%.o,$(SUBDIR_UNITTESTS_SRCS))
 
+SUBDIR_TARGET_SRCS = target/waitstatus.c
+SUBDIR_TARGET_OBS = $(patsubst %.c,%.o,$(SUBDIR_TARGET_SRCS))
+
+
 # Opcodes currently live in one of two places.  Either they are in the
 # opcode library, typically ../opcodes, or they are in a header file
 # in INCLUDE_DIR.
@@ -518,7 +522,7 @@ CONFIG_INSTALL = @CONFIG_INSTALL@
 CONFIG_UNINSTALL = @CONFIG_UNINSTALL@
 HAVE_NATIVE_GCORE_TARGET = @HAVE_NATIVE_GCORE_TARGET@
 
-CONFIG_SRC_SUBDIR = arch cli mi compile tui unittests guile python
+CONFIG_SRC_SUBDIR = arch cli mi compile tui unittests guile python target
 CONFIG_DEP_SUBDIR = $(addsuffix /$(DEPDIR),$(CONFIG_SRC_SUBDIR))
 
 # -I. for config files.
@@ -616,20 +620,6 @@ XMLFILES = \
 # See configure.ac.
 SER_HARDWIRE = @SER_HARDWIRE@
 
-# The `remote' debugging target is supported for most architectures,
-# but not all (e.g. 960)
-REMOTE_OBS = \
-       ax-gdb.o \
-       ax-general.o \
-       ctf.o \
-       dcache.o \
-       remote.o \
-       remote-fileio.o \
-       remote-notif.o \
-       tracefile.o \
-       tracefile-tfile.o \
-       tracepoint.o
-
 # This is remote-sim.o if a simulator is to be linked in.
 SIM_OBS = @SIM_OBS@
 
@@ -924,6 +914,8 @@ COMMON_SFILES = \
        arch-utils.c \
        auto-load.c \
        auxv.c \
+       ax-gdb.c \
+       ax-general.c \
        bcache.c \
        bfd-target.c \
        block.c \
@@ -953,10 +945,13 @@ COMMON_SFILES = \
        cp-namespace.c \
        cp-support.c \
        cp-valprint.c \
+       ctf.c \
        d-lang.c \
        d-namespace.c \
        d-valprint.c \
        dbxread.c \
+       dcache.c \
+       debug.c \
        demangle.c \
        dictionary.c \
        disasm.c \
@@ -976,6 +971,7 @@ COMMON_SFILES = \
        f-lang.c \
        f-typeprint.c \
        f-valprint.c \
+       filename-seen-cache.c \
        filesystem.c \
        findcmd.c \
        findvar.c \
@@ -1048,6 +1044,10 @@ COMMON_SFILES = \
        record-full.c \
        regcache.c \
        reggroups.c \
+       registry.c \
+       remote.c \
+       remote-fileio.c \
+       remote-notif.c \
        reverse.c \
        rust-lang.c \
        selftest-arch.c \
@@ -1070,8 +1070,12 @@ COMMON_SFILES = \
        target-descriptions.c \
        target-memory.c \
        thread.c \
+       thread-fsm.c \
        tid-parse.c \
        top.c \
+       tracefile.c \
+       tracefile-tfile.c \
+       tracepoint.c \
        trad-frame.c \
        tramp-frame.c \
        target-float.c \
@@ -1094,11 +1098,8 @@ COMMON_SFILES = \
 SFILES = \
        ada-exp.y \
        arch/i386.c \
-       ax-gdb.c \
-       ax-general.c \
        c-exp.y \
        cp-name-parser.y \
-       ctf.c \
        d-exp.y \
        dtrace-probe.c \
        elfread.c \
@@ -1109,9 +1110,6 @@ SFILES = \
        m2-exp.y \
        p-exp.y \
        proc-service.list \
-       remote.c \
-       remote-fileio.c \
-       remote-notif.c \
        rust-exp.y \
        ser-base.c \
        ser-unix.c \
@@ -1119,7 +1117,6 @@ SFILES = \
        stap-probe.c \
        stub-termcap.c \
        symfile-mem.c \
-       tracepoint.c \
        ui-file.h \
        common/agent.c \
        common/btrace-common.c \
@@ -1148,7 +1145,7 @@ SFILES = \
        common/vec.c \
        common/xml-utils.c \
        mi/mi-common.c \
-       target/waitstatus.c \
+       $(SUBDIR_TARGET_SRCS) \
        $(COMMON_SFILES) \
        $(SUBDIR_GCC_COMPILE_SRCS)
 
@@ -1544,12 +1541,10 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \
        job-control.o \
        common-regcache.o \
        common-utils.o \
-       debug.o \
        environ.o \
        errors.o \
        exec.o \
        fileio.o \
-       filename-seen-cache.o \
        filestuff.o \
        format.o \
        gdb_tilde_expand.o \
@@ -1558,19 +1553,17 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \
        new-op.o \
        print-utils.o \
        ptid.o \
-       registry.o \
        rsp-low.o \
        run-time-clock.o \
        selftest.o \
        signals.o \
        signals-state-save-restore.o \
-       thread-fsm.o \
        vec.o \
        version.o \
-       waitstatus.o \
        xml-builtin.o \
        xml-utils.o \
        $(patsubst %.c,%.o,$(COMMON_SFILES)) \
+       $(SUBDIR_TARGET_OBS) \
        $(SUBDIR_GCC_COMPILE_OBS)
 
 TSOBS = inflow.o
@@ -1648,10 +1641,6 @@ python/%.o: INTERNAL_CFLAGS += $(PYTHON_CFLAGS)
        $(COMPILE) $<
        $(POSTCOMPILE)
 
-%.o: ${srcdir}/target/%.c
-       $(COMPILE) $<
-       $(POSTCOMPILE)
-
 # Specify an explicit rule for gdb/common/agent.c, to avoid a clash with the
 # object file generate by gdb/agent.c.
 common-agent.o: $(srcdir)/common/agent.c
@@ -2006,7 +1995,7 @@ distclean: clean
        rm -f Makefile
        rm -rf $(DEPDIR)
        for i in $(CONFIG_SRC_SUBDIR); do \
-               rmdir $$i/$(DEPDIR); \
+               if test -d $$i/$(DEPDIR); then rmdir $$i/$(DEPDIR); fi \
        done
 
 maintainer-clean: local-maintainer-clean do-maintainer-clean distclean
@@ -2240,8 +2229,6 @@ ALLDEPFILES = \
        bsd-kvm.c \
        bsd-uthread.c \
        darwin-nat.c \
-       dcache.c \
-       dcache.c \
        dicos-tdep.c \
        exec.c \
        fbsd-nat.c \
@@ -2657,6 +2644,10 @@ endif
 all_object_files = gdb.o $(LIBGDB_OBS) gdbtk-main.o \
        test-cp-name-parser.o
 
+# All the .deps files to include.
+all_deps_files = $(foreach dep,$(patsubst %.o,%.Po,$(all_object_files)),\
+    $(dir $(dep))/$(DEPDIR)/$(notdir $(dep)))
+
 # Ensure that generated files are created early.  Use order-only
 # dependencies if available.  They require GNU make 3.80 or newer,
 # and the .VARIABLES variable was introduced at the same time.
@@ -2667,7 +2658,7 @@ $(all_object_files) : $(generated_files)
 endif
 
 # Dependencies.
--include $(patsubst %.o, $(DEPDIR)/%.Po, $(all_object_files))
+-include $(all_deps_files)
 
 # Disable implicit make rules.
 include $(srcdir)/disable-implicit-rules.mk