Makefiles: Flatten and sort file lists
authorSimon Marchi <simon.marchi@polymtl.ca>
Tue, 22 Nov 2016 21:14:22 +0000 (16:14 -0500)
committerSimon Marchi <simon.marchi@ericsson.com>
Wed, 23 Nov 2016 14:45:22 +0000 (09:45 -0500)
I find the big file lists in the Makefiles a bit ugly and not very
practical.  Since there are multiple filenames on each line (as much as
fits in 80 columns), it's not easy to add, remove or change a name in
the middle.  As a result, we have a mix of long and short lines in no
particular order (ALL_TARGET_OBS is a good example).

I therefore suggest flattening the lists (one name per line) and keeping
them in alphabetical order.  The diffs will be much clearer and merge
conflicts will be easier to resolve.

A nice (IMO) side-effect I observed is that the files are compiled
alphabetically by make, so it gives a rough idea of the progress of the
build.

I added a comment in gdb/Makefile.in to mention to keep the file lists
ordered, and gave the general guidelines on what order to respect.  I
added a comment in other Makefiles which refers to gdb/Makefile.in, to
avoid duplication.

Running the patch through the buildbot found that gdb.base/default.exp
started to fail.  The languages in the error message shown when typing
"set language" have changed order.  We could probably improve gdb so
that it prints them in a stable order, regardless of the order of the
object list passed to the linked, but just fixing the test is easier for
now.

New in v2:

 - Change ordering style, directories go at the end.
 - Cleanup gdbserver's and data-directory's Makefile as well.
 - Add comments at top of Makefiles about the ordering.
 - Remove wrong trailing backslahes.
 - Fix test gdb.base/default.exp.

gdb/ChangeLog:

* Makefile.in: Add comment about file lists ordering.
(SUBDIR_CLI_OBS, SUBDIR_CLI_SRCS, SUBDIR_MI_OBS, SUBDIR_MI_SRCS,
SUBDIR_TUI_OBS, SUBDIR_TUI_SRCS, SUBDIR_GCC_COMPILE_OBS,
SUBDIR_GCC_COMPILE_SRCS, SUBDIR_GUILE_OBS, SUBDIR_GUILE_SRCS,
SUBDIR_PYTHON_OBS, SUBDIR_PYTHON_SRCS, SUBDIR_GDBTK_OBS,
SUBDIR_GDBTK_SRCS, XMLFILES, REMOTE_OBS, ALL_64_TARGET_OBS,
ALL_TARGET_OBS, SFILES, HFILES_NO_SRCDIR, HFILES_WITH_SRCDIR,
COMMON_OBS, YYFILES, YYOBJ, generated_files, ALLDEPFILES):
Flatten list and order alphabetically.
* data-directory/Makefile.in: Add comment about file lists
ordering.
(GEN_SYSCALLS_FILES, PYTHON_FILE_LIST): Flatten list and order
alphabetically.

gdb/gdbserver/ChangeLog:

* Makefile.in (SFILES, OBS): Flatten list and order
alphabetically.

gdb/testsuite/ChangeLog:

* gdb.base/default.exp: Fix output of "set language".

gdb/ChangeLog
gdb/Makefile.in
gdb/data-directory/Makefile.in
gdb/gdbserver/ChangeLog
gdb/gdbserver/Makefile.in
gdb/testsuite/ChangeLog
gdb/testsuite/gdb.base/default.exp

index 284906743c00901363492e94f1ce7e8ded669aa6..45c1eeee86358be5792b15dcd357892c91a6fbbd 100644 (file)
@@ -1,3 +1,19 @@
+2016-11-22  Simon Marchi  <simon.marchi@polymtl.ca>
+
+       * Makefile.in: Add comment about file lists ordering.
+       (SUBDIR_CLI_OBS, SUBDIR_CLI_SRCS, SUBDIR_MI_OBS, SUBDIR_MI_SRCS,
+       SUBDIR_TUI_OBS, SUBDIR_TUI_SRCS, SUBDIR_GCC_COMPILE_OBS,
+       SUBDIR_GCC_COMPILE_SRCS, SUBDIR_GUILE_OBS, SUBDIR_GUILE_SRCS,
+       SUBDIR_PYTHON_OBS, SUBDIR_PYTHON_SRCS, SUBDIR_GDBTK_OBS,
+       SUBDIR_GDBTK_SRCS, XMLFILES, REMOTE_OBS, ALL_64_TARGET_OBS,
+       ALL_TARGET_OBS, SFILES, HFILES_NO_SRCDIR, HFILES_WITH_SRCDIR,
+       COMMON_OBS, YYFILES, YYOBJ, generated_files, ALLDEPFILES):
+       Flatten list and order alphabetically.
+       * data-directory/Makefile.in: Add comment about file lists
+       ordering.
+       (GEN_SYSCALLS_FILES, PYTHON_FILE_LIST): Flatten list and order
+       alphabetically.
+
 2016-11-22  Ambrogino Modigliani  <ambrogino.modigliani@gmail.com>
 
         * contrib/expect-read1.sh: Fix spelling in comments.
index 3ea47a7d7576ba33de73095fc03260b63f10b2e4..af916aa0798183797ad668637dda3e219b1143fc 100644 (file)
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+# Please keep lists in this file sorted alphabetically, with one item per line.
+# Here are the general guidelines for ordering files and directories:
+#
+#   - Files come before directories.
+#   - The extensions are not taken into account when comparing filenames, except
+#     if the filenames are otherwise equal.
+#   - A filename that is a prefix of another one comes before.
+#   - Underscores and dashes are treated equally, and come before alphanumeric
+#     characters.
+#
+# For example:
+#
+# SOME_FILES = \
+#      foo.c \
+#      foo.h \
+#      foo-bar.c \
+#      foobar.c \
+#      foo/bar.c
+
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
@@ -214,15 +233,25 @@ GNULIB_H = $(GNULIB_BUILDDIR)/import/string.h @GNULIB_STDINT_H@
 # CLI sub directory definitons
 #
 SUBDIR_CLI_OBS = \
+       cli-cmds.o \
+       cli-decode.o \
        cli-dump.o \
-       cli-decode.o cli-script.o cli-cmds.o cli-setshow.o \
+       cli-interp.o \
        cli-logging.o \
-       cli-interp.o cli-utils.o
+       cli-script.o \
+       cli-setshow.o \
+       cli-utils.o
+
 SUBDIR_CLI_SRCS = \
+       cli/cli-cmds.c \
+       cli/cli-decode.c \
        cli/cli-dump.c \
-       cli/cli-decode.c cli/cli-script.c cli/cli-cmds.c cli/cli-setshow.c \
+       cli/cli-interp.c \
        cli/cli-logging.c \
-       cli/cli-interp.c cli/cli-utils.c
+       cli/cli-script.c \
+       cli/cli-setshow.c \
+       cli/cli-utils.c
+
 SUBDIR_CLI_DEPS =
 SUBDIR_CLI_LDFLAGS=
 SUBDIR_CLI_CFLAGS=
@@ -231,19 +260,43 @@ SUBDIR_CLI_CFLAGS=
 # MI sub directory definitons
 #
 SUBDIR_MI_OBS = \
-       mi-out.o mi-console.o \
-       mi-cmds.o mi-cmd-catch.o mi-cmd-env.o \
-       mi-cmd-var.o mi-cmd-break.o mi-cmd-stack.o \
-       mi-cmd-file.o mi-cmd-disas.o mi-symbol-cmds.o mi-cmd-target.o \
-       mi-cmd-info.o mi-interp.o \
-       mi-main.o mi-parse.o mi-getopt.o
+       mi-cmd-break.o \
+       mi-cmd-catch.o \
+       mi-cmd-disas.o \
+       mi-cmd-env.o \
+       mi-cmd-file.o \
+       mi-cmd-info.o \
+       mi-cmd-stack.o \
+       mi-cmd-target.o \
+       mi-cmd-var.o \
+       mi-cmds.o \
+       mi-console.o \
+       mi-getopt.o \
+       mi-interp.o \
+       mi-main.o \
+       mi-out.o \
+       mi-parse.o \
+       mi-symbol-cmds.o
+
 SUBDIR_MI_SRCS = \
-       mi/mi-out.c mi/mi-console.c \
-       mi/mi-cmds.c mi/mi-cmd-catch.c mi/mi-cmd-env.c \
-       mi/mi-cmd-var.c mi/mi-cmd-break.c mi/mi-cmd-stack.c \
-       mi/mi-cmd-file.c mi/mi-cmd-disas.c mi/mi-symbol-cmds.c \
-       mi/mi-cmd-target.c mi/mi-cmd-info.c mi/mi-interp.c \
-       mi/mi-main.c mi/mi-parse.c mi/mi-getopt.c
+       mi/mi-cmd-break.c \
+       mi/mi-cmd-catch.c \
+       mi/mi-cmd-disas.c \
+       mi/mi-cmd-env.c \
+       mi/mi-cmd-file.c \
+       mi/mi-cmd-info.c \
+       mi/mi-cmd-stack.c \
+       mi/mi-cmd-target.c \
+       mi/mi-cmd-var.c \
+       mi/mi-cmds.c \
+       mi/mi-console.c \
+       mi/mi-getopt.c \
+       mi/mi-interp.c \
+       mi/mi-main.c \
+       mi/mi-out.c \
+       mi/mi-parse.c \
+       mi/mi-symbol-cmds.c
+
 SUBDIR_MI_DEPS =
 SUBDIR_MI_LDFLAGS=
 SUBDIR_MI_CFLAGS=
@@ -253,6 +306,7 @@ SUBDIR_MI_CFLAGS=
 #
 
 SUBDIR_TUI_OBS = \
+       tui.o \
        tui-command.o \
        tui-data.o \
        tui-disasm.o \
@@ -268,10 +322,10 @@ SUBDIR_TUI_OBS = \
        tui-win.o \
        tui-windata.o \
        tui-wingeneral.o \
-       tui-winsource.o \
-       tui.o
+       tui-winsource.o
 
 SUBDIR_TUI_SRCS = \
+       tui/tui.c \
        tui/tui-command.c \
        tui/tui-data.c \
        tui/tui-disasm.c \
@@ -287,8 +341,7 @@ SUBDIR_TUI_SRCS = \
        tui/tui-win.c \
        tui/tui-windata.c \
        tui/tui-wingeneral.c \
-       tui/tui-winsource.c \
-       tui/tui.c
+       tui/tui-winsource.c
 
 SUBDIR_TUI_DEPS =
 SUBDIR_TUI_LDFLAGS=
@@ -299,19 +352,24 @@ SUBDIR_TUI_CFLAGS= \
 # GCC Compile support sub-directory definitions
 #
 SUBDIR_GCC_COMPILE_OBS = \
-       compile.o compile-c-symbols.o compile-c-types.o \
-       compile-object-load.o compile-object-run.o \
-       compile-loc2c.o compile-c-support.o
+       compile.o \
+       compile-c-support.o \
+       compile-c-symbols.o \
+       compile-c-types.o \
+       compile-loc2c.o \
+       compile-object-load.o \
+       compile-object-run.o
+
 SUBDIR_GCC_COMPILE_SRCS = \
        compile/compile.c \
+       compile/compile-c-support.c \
        compile/compile-c-symbols.c \
        compile/compile-c-types.c \
+       compile/compile-loc2c.c \
        compile/compile-object-load.c \
        compile/compile-object-load.h \
        compile/compile-object-run.c \
-       compile/compile-object-run.h \
-       compile/compile-loc2c.c \
-       compile/compile-c-support.c
+       compile/compile-object-run.h
 
 # Guile sub directory definitons for guile support.
 
@@ -328,8 +386,8 @@ SUBDIR_GUILE_OBS = \
        scm-gsmob.o \
        scm-iterator.o \
        scm-lazy-string.o \
-       scm-objfile.o \
        scm-math.o \
+       scm-objfile.o \
        scm-param.o \
        scm-ports.o \
        scm-pretty-print.o \
@@ -341,6 +399,7 @@ SUBDIR_GUILE_OBS = \
        scm-type.o \
        scm-utils.o \
        scm-value.o
+
 SUBDIR_GUILE_SRCS = \
        guile/guile.c \
        guile/scm-arch.c \
@@ -354,8 +413,8 @@ SUBDIR_GUILE_SRCS = \
        guile/scm-gsmob.c \
        guile/scm-iterator.c \
        guile/scm-lazy-string.c \
-       guile/scm-objfile.c \
        guile/scm-math.c \
+       guile/scm-objfile.c \
        guile/scm-param.c \
        guile/scm-ports.c \
        guile/scm-pretty-print.c \
@@ -367,6 +426,7 @@ SUBDIR_GUILE_SRCS = \
        guile/scm-type.c \
        guile/scm-utils.c \
        guile/scm-value.c
+
 SUBDIR_GUILE_DEPS =
 SUBDIR_GUILE_LDFLAGS=
 SUBDIR_GUILE_CFLAGS=
@@ -375,7 +435,6 @@ SUBDIR_GUILE_CFLAGS=
 # python sub directory definitons
 #
 SUBDIR_PYTHON_OBS = \
-       python.o \
        py-arch.o \
        py-auto-load.o \
        py-block.o \
@@ -383,7 +442,6 @@ SUBDIR_PYTHON_OBS = \
        py-breakpoint.o \
        py-cmd.o \
        py-continueevent.o \
-       py-xmethods.o \
        py-event.o \
        py-evtregistry.o \
        py-evts.o \
@@ -412,10 +470,11 @@ SUBDIR_PYTHON_OBS = \
        py-unwind.o \
        py-utils.o \
        py-value.o \
-       py-varobj.o
+       py-varobj.o \
+       py-xmethods.o \
+       python.o
 
 SUBDIR_PYTHON_SRCS = \
-       python/python.c \
        python/py-arch.c \
        python/py-auto-load.c \
        python/py-block.c \
@@ -423,7 +482,6 @@ SUBDIR_PYTHON_SRCS = \
        python/py-breakpoint.c \
        python/py-cmd.c \
        python/py-continueevent.c \
-       python/py-xmethods.c \
        python/py-event.c \
        python/py-evtregistry.c \
        python/py-evts.c \
@@ -452,7 +510,10 @@ SUBDIR_PYTHON_SRCS = \
        python/py-unwind.c \
        python/py-utils.c \
        python/py-value.c \
-       python/py-varobj.c
+       python/py-varobj.c \
+       python/py-xmethods.c \
+       python/python.c
+
 SUBDIR_PYTHON_DEPS =
 SUBDIR_PYTHON_LDFLAGS=
 SUBDIR_PYTHON_CFLAGS=
@@ -509,15 +570,28 @@ GDBTK_LIBRARY = $(datadir)/insight$(GDBTK_VERSION)
 GDBTK_SRC_DIR = @GDBTK_SRC_DIR@
 
 SUBDIR_GDBTK_OBS = \
-       gdbtk.o gdbtk-bp.o gdbtk-cmds.o gdbtk-hooks.o gdbtk-interp.o \
-       gdbtk-register.o gdbtk-stack.o gdbtk-varobj.o gdbtk-wrapper.o
+       gdbtk.o \
+       gdbtk-bp.o \
+       gdbtk-cmds.o \
+       gdbtk-hooks.o \
+       gdbtk-interp.o \
+       gdbtk-register.o \
+       gdbtk-stack.o \
+       gdbtk-varobj.o \
+       gdbtk-wrapper.o
+
 SUBDIR_GDBTK_SRCS = \
-       gdbtk/generic/gdbtk.c gdbtk/generic/gdbtk-bp.c \
-       gdbtk/generic/gdbtk-cmds.c gdbtk/generic/gdbtk-hooks.c \
+       gdbtk/generic/gdbtk.c \
+       gdbtk/generic/gdbtk-bp.c \
+       gdbtk/generic/gdbtk-cmds.c \
+       gdbtk/generic/gdbtk-hooks.c \
        gdbtk/generic/gdbtk-interp.c \
-       gdbtk/generic/gdbtk-register.c gdbtk/generic/gdbtk-stack.c \
-       gdbtk/generic/gdbtk-varobj.c gdbtk/generic/gdbtk-wrapper.c \
-       gdbtk/generic/gdbtk-main.c
+       gdbtk/generic/gdbtk-main.c \
+       gdbtk/generic/gdbtk-register.c \
+       gdbtk/generic/gdbtk-stack.c \
+       gdbtk/generic/gdbtk-varobj.c \
+       gdbtk/generic/gdbtk-wrapper.c
+
 SUBDIR_GDBTK_DEPS = $(LIBGUI) $(TCL_DEPS) $(TK_DEPS)
 SUBDIR_GDBTK_LDFLAGS=
 SUBDIR_GDBTK_CFLAGS= -DGDBTK
@@ -611,12 +685,17 @@ RUNTEST = runtest
 RUNTESTFLAGS=
 
 # XML files to build in to GDB.
-XMLFILES = $(srcdir)/features/gdb-target.dtd $(srcdir)/features/xinclude.dtd \
+XMLFILES = \
+       $(srcdir)/features/btrace.dtd \
+       $(srcdir)/features/btrace-conf.dtd \
+       $(srcdir)/features/gdb-target.dtd \
        $(srcdir)/features/library-list.dtd \
        $(srcdir)/features/library-list-aix.dtd \
-       $(srcdir)/features/library-list-svr4.dtd $(srcdir)/features/osdata.dtd \
-       $(srcdir)/features/threads.dtd $(srcdir)/features/traceframe-info.dtd \
-       $(srcdir)/features/btrace.dtd $(srcdir)/features/btrace-conf.dtd
+       $(srcdir)/features/library-list-svr4.dtd \
+       $(srcdir)/features/osdata.dtd \
+       $(srcdir)/features/threads.dtd \
+       $(srcdir)/features/traceframe-info.dtd \
+       $(srcdir)/features/xinclude.dtd
 
 # This is ser-unix.o for any system which supports a v7/BSD/SYSV/POSIX
 # interface to the serial port.  Hopefully if get ported to OS/2, VMS,
@@ -628,8 +707,17 @@ SER_HARDWIRE = @SER_HARDWIRE@
 
 # The `remote' debugging target is supported for most architectures,
 # but not all (e.g. 960)
-REMOTE_OBS = remote.o dcache.o tracepoint.o ax-general.o ax-gdb.o remote-fileio.o \
-       remote-notif.o ctf.o tracefile.o tracefile-tfile.o
+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@
@@ -640,85 +728,160 @@ TARGET_OBS = @TARGET_OBS@
 # All target-dependent objects files that require 64-bit CORE_ADDR
 # (used with --enable-targets=all --enable-64-bit-bfd).
 ALL_64_TARGET_OBS = \
-       aarch64-tdep.o aarch64-linux-tdep.o aarch64-newlib-tdep.o aarch64-insn.o \
-       alphabsd-tdep.o alphafbsd-tdep.o alpha-linux-tdep.o alpha-mdebug-tdep.o \
-       alphanbsd-tdep.o alphaobsd-tdep.o alpha-tdep.o \
-       amd64fbsd-tdep.o amd64-darwin-tdep.o amd64-dicos-tdep.o \
-       amd64-linux-tdep.o amd64nbsd-tdep.o \
-       amd64obsd-tdep.o amd64-sol2-tdep.o amd64-tdep.o amd64-windows-tdep.o \
-       ia64-linux-tdep.o ia64-vms-tdep.o ia64-tdep.o \
+       aarch64-insn.o \
+       aarch64-linux-tdep.o \
+       aarch64-newlib-tdep.o \
+       aarch64-tdep.o \
+       alpha-linux-tdep.o \
+       alpha-mdebug-tdep.o \
+       alpha-tdep.o \
+       alphabsd-tdep.o \
+       alphafbsd-tdep.o \
+       alphanbsd-tdep.o \
+       alphaobsd-tdep.o \
+       amd64-darwin-tdep.o \
+       amd64-dicos-tdep.o \
+       amd64-linux-tdep.o \
+       amd64-sol2-tdep.o \
+       amd64-tdep.o \
+       amd64-windows-tdep.o \
+       amd64fbsd-tdep.o \
+       amd64nbsd-tdep.o \
+       amd64obsd-tdep.o \
+       ia64-linux-tdep.o \
+       ia64-tdep.o \
+       ia64-vms-tdep.o \
        mips64obsd-tdep.o \
-       sparc64fbsd-tdep.o sparc64-linux-tdep.o sparc64nbsd-tdep.o \
-       sparc64obsd-tdep.o sparc64-sol2-tdep.o sparc64-tdep.o
+       sparc64-linux-tdep.o \
+       sparc64-sol2-tdep.o \
+       sparc64-tdep.o \
+       sparc64fbsd-tdep.o \
+       sparc64nbsd-tdep.o \
+       sparc64obsd-tdep.o
 
 # All other target-dependent objects files (used with --enable-targets=all).
 ALL_TARGET_OBS = \
        arc-tdep.o \
-       armbsd-tdep.o arm.o arm-linux.o arm-linux-tdep.o \
-       arm-get-next-pcs.o arm-symbian-tdep.o \
-       armnbsd-tdep.o armobsd-tdep.o \
-       arm-tdep.o arm-wince-tdep.o \
+       arm.o \
+       arm-get-next-pcs.o \
+       arm-linux.o \
+       arm-linux-tdep.o \
+       arm-symbian-tdep.o \
+       arm-tdep.o \
+       arm-wince-tdep.o \
+       armbsd-tdep.o \
+       armnbsd-tdep.o \
+       armobsd-tdep.o \
        avr-tdep.o \
-       bfin-linux-tdep.o bfin-tdep.o \
-       cris-linux-tdep.o cris-tdep.o \
+       bfin-linux-tdep.o \
+       bfin-tdep.o \
+       bsd-uthread.o \
+       cris-linux-tdep.o \
+       cris-tdep.o \
        dicos-tdep.o \
        fbsd-tdep.o \
-       frv-linux-tdep.o frv-tdep.o \
+       frv-linux-tdep.o \
+       frv-tdep.o \
        ft32-tdep.o \
+       glibc-tdep.o \
        h8300-tdep.o \
-       hppabsd-tdep.o hppanbsd-tdep.o hppaobsd-tdep.o \
-       hppa-linux-tdep.o hppa-tdep.o \
-       i386bsd-tdep.o i386-cygwin-tdep.o i386fbsd-tdep.o i386gnu-tdep.o \
-       i386-linux-tdep.o i386nbsd-tdep.o i386-nto-tdep.o i386obsd-tdep.o \
-       i386-sol2-tdep.o i386-tdep.o i387-tdep.o \
-       i386-dicos-tdep.o i386-darwin-tdep.o \
+       hppa-linux-tdep.o \
+       hppa-tdep.o \
+       hppabsd-tdep.o \
+       hppanbsd-tdep.o \
+       hppaobsd-tdep.o \
+       i386-cygwin-tdep.o \
+       i386-darwin-tdep.o \
+       i386-dicos-tdep.o \
+       i386-linux-tdep.o \
+       i386-nto-tdep.o \
+       i386-sol2-tdep.o \
+       i386-tdep.o \
+       i386bsd-tdep.o \
+       i386fbsd-tdep.o \
+       i386gnu-tdep.o \
+       i386nbsd-tdep.o \
+       i386obsd-tdep.o \
+       i387-tdep.o \
        iq2000-tdep.o \
+       linux-record.o \
        linux-tdep.o \
        lm32-tdep.o \
        m32c-tdep.o \
-       m32r-linux-tdep.o m32r-tdep.o \
+       m32r-linux-tdep.o \
+       m32r-tdep.o \
        m68hc11-tdep.o \
-       m68kbsd-tdep.o m68klinux-tdep.o m68k-tdep.o \
+       m68k-tdep.o \
+       m68kbsd-tdep.o \
+       m68klinux-tdep.o \
        m88k-tdep.o \
        mep-tdep.o \
-       microblaze-tdep.o microblaze-linux-tdep.o \
-       mips-linux-tdep.o mips-sde-tdep.o \
-       mipsnbsd-tdep.o mips-tdep.o \
-       mn10300-linux-tdep.o mn10300-tdep.o \
+       microblaze-linux-tdep.o \
+       microblaze-tdep.o \
+       mips-linux-tdep.o \
+       mips-sde-tdep.o \
+       mips-tdep.o \
+       mipsnbsd-tdep.o \
+       mn10300-linux-tdep.o \
+       mn10300-tdep.o \
        moxie-tdep.o \
        msp430-tdep.o \
        mt-tdep.o \
+       nbsd-tdep.o \
        nds32-tdep.o \
-       nios2-tdep.o nios2-linux-tdep.o \
+       nios2-linux-tdep.o \
+       nios2-tdep.o \
        nto-tdep.o \
-       ppc-linux-tdep.o ppcfbsd-tdep.o ppcnbsd-tdep.o ppcobsd-tdep.o  \
-       ppc-sysv-tdep.o ppc64-tdep.o rl78-tdep.o \
-       rs6000-aix-tdep.o rs6000-tdep.o solib-aix.o ppc-ravenscar-thread.o \
+       obsd-tdep.o \
+       ppc-linux-tdep.o \
+       ppc-ravenscar-thread.o \
+       ppc-sysv-tdep.o \
+       ppc64-tdep.o \
+       ppcfbsd-tdep.o \
+       ppcnbsd-tdep.o \
+       ppcobsd-tdep.o \
+       ravenscar-thread.o \
+       rl78-tdep.o \
+       rs6000-aix-tdep.o \
        rs6000-lynx178-tdep.o \
+       rs6000-tdep.o \
        rx-tdep.o \
        s390-linux-tdep.o \
        score-tdep.o \
-       sh64-tdep.o sh-linux-tdep.o shnbsd-tdep.o sh-tdep.o \
-       sparc-linux-tdep.o sparcnbsd-tdep.o sparcobsd-tdep.o \
-       sparc-sol2-tdep.o sparc-tdep.o sparc-ravenscar-thread.o \
-       spu-tdep.o spu-multiarch.o solib-spu.o \
-       tic6x-tdep.o tic6x-linux-tdep.o \
-       tilegx-tdep.o tilegx-linux-tdep.o \
-       v850-tdep.o \
-       vaxnbsd-tdep.o vaxobsd-tdep.o vax-tdep.o \
-       xstormy16-tdep.o \
-       xtensa-config.o xtensa-tdep.o xtensa-linux-tdep.o \
-       glibc-tdep.o \
-       bsd-uthread.o \
-       nbsd-tdep.o obsd-tdep.o \
+       sh-linux-tdep.o \
+       sh-tdep.o \
+       sh64-tdep.o \
+       shnbsd-tdep.o \
        sol2-tdep.o \
-       solib-frv.o solib-svr4.o \
-       solib-darwin.o solib-dsbt.o \
-       xcoffread.o \
+       solib-aix.o \
+       solib-darwin.o \
+       solib-dsbt.o \
+       solib-frv.o \
+       solib-spu.o \
+       solib-svr4.o \
+       sparc-linux-tdep.o \
+       sparc-ravenscar-thread.o \
+       sparc-sol2-tdep.o \
+       sparc-tdep.o \
+       sparcnbsd-tdep.o \
+       sparcobsd-tdep.o \
+       spu-multiarch.o \
+       spu-tdep.o \
        symfile-mem.o \
+       tic6x-linux-tdep.o \
+       tic6x-tdep.o \
+       tilegx-linux-tdep.o \
+       tilegx-tdep.o \
+       v850-tdep.o \
+       vax-tdep.o \
+       vaxnbsd-tdep.o \
+       vaxobsd-tdep.o \
        windows-tdep.o \
-       linux-record.o \
-       ravenscar-thread.o
+       xcoffread.o \
+       xstormy16-tdep.o \
+       xtensa-config.o \
+       xtensa-linux-tdep.o \
+       xtensa-tdep.o
 
 # Host-dependent makefile fragment comes in here.
 @host_makefile_frag@
@@ -821,80 +984,230 @@ TARGET_FLAGS_TO_PASS = \
 # Links made at configuration time should not be specified here, since
 # SFILES is used in building the distribution archive.
 
-SFILES = ada-exp.y ada-lang.c ada-typeprint.c ada-valprint.c ada-tasks.c \
+SFILES = \
+       ada-exp.y \
+       ada-lang.c \
+       ada-tasks.c \
+       ada-typeprint.c \
+       ada-valprint.c \
        ada-varobj.c \
-       addrmap.c auto-load.c \
-       auxv.c ax-general.c ax-gdb.c \
+       addrmap.c \
        agent.c \
+       annotate.c \
+       arch-utils.c \
+       auto-load.c \
+       auxv.c \
+       ax-gdb.c \
+       ax-general.c \
        bcache.c \
        bfd-target.c \
-       block.c blockframe.c \
-       breakpoint.c break-catch-sig.c break-catch-throw.c \
+       block.c \
+       blockframe.c \
+       break-catch-sig.c \
        break-catch-syscall.c \
-       build-id.c buildsym.c \
-       c-exp.y c-lang.c c-typeprint.c c-valprint.c c-varobj.c \
-       charset.c common/cleanups.c cli-out.c coffread.c coff-pe-read.c \
-       complaints.c completer.c continuations.c corefile.c corelow.c \
-       cp-abi.c cp-support.c cp-namespace.c cp-valprint.c \
-       d-exp.y d-lang.c d-namespace.c d-valprint.c \
+       break-catch-throw.c \
+       breakpoint.c \
+       btrace.c \
+       build-id.c \
+       buildsym.c \
+       c-exp.y \
+       c-lang.c \
+       c-typeprint.c \
+       c-valprint.c \
+       c-varobj.c \
+       charset.c \
+       cli-out.c \
+       coff-pe-read.c \
+       coffread.c \
+       complaints.c \
+       completer.c \
+       continuations.c \
+       copying.c \
+       corefile.c \
+       corelow.c \
+       cp-abi.c \
        cp-name-parser.y \
-       dbxread.c demangle.c dictionary.c disasm.c doublest.c \
-       dtrace-probe.c dummy-frame.c \
-       dwarf2expr.c dwarf2loc.c dwarf2read.c dwarf2-frame.c \
+       cp-namespace.c \
+       cp-support.c \
+       cp-valprint.c \
+       ctf.c \
+       d-exp.y \
+       d-lang.c \
+       d-namespace.c \
+       d-valprint.c \
+       dbxread.c \
+       demangle.c \
+       dfp.c \
+       dictionary.c \
+       disasm.c \
+       doublest.c \
+       dtrace-probe.c \
+       dummy-frame.c \
+       dwarf2-frame.c \
        dwarf2-frame-tailcall.c \
-       elfread.c environ.c eval.c event-loop.c event-top.c \
-       exceptions.c expprint.c extension.c \
-       f-exp.y f-lang.c f-typeprint.c f-valprint.c filesystem.c \
-       findcmd.c findvar.c frame.c frame-base.c frame-unwind.c \
-       gdbarch.c arch-utils.c gdb_bfd.c gdb_obstack.c \
-       gdbtypes.c gnu-v2-abi.c gnu-v3-abi.c \
-       go-exp.y go-lang.c go-typeprint.c go-valprint.c \
+       dwarf2expr.c \
+       dwarf2loc.c \
+       dwarf2read.c \
+       elfread.c \
+       environ.c \
+       eval.c \
+       event-loop.c \
+       event-top.c \
+       exceptions.c \
+       expprint.c \
+       extension.c \
+       f-exp.y \
+       f-lang.c \
+       f-typeprint.c \
+       f-valprint.c \
+       filesystem.c \
+       findcmd.c \
+       findvar.c \
+       frame.c \
+       frame-base.c \
+       frame-unwind.c \
+       gcore.c \
+       gdb.c \
+       gdb_bfd.c \
+       gdb-dlfcn.c \
+       gdb_obstack.c \
+       gdb_usleep.c \
+       gdbarch.c \
+       gdbtypes.c \
+       gnu-v2-abi.c \
+       gnu-v3-abi.c \
+       go-exp.y \
+       go-lang.c \
+       go-typeprint.c \
+       go-valprint.c \
+       inf-child.c \
        inf-loop.c \
        infcall.c \
-       infcmd.c inflow.c infrun.c \
+       infcmd.c \
+       inferior.c \
+       inflow.c \
+       infrun.c \
        inline-frame.c \
        interps.c \
-       language.c linespec.c location.c minidebug.c \
-       m2-exp.y m2-lang.c m2-typeprint.c m2-valprint.c \
-       macrotab.c macroexp.c macrocmd.c macroscope.c main.c maint.c \
-       mdebugread.c memattr.c mem-break.c minsyms.c mipsread.c memory-map.c \
-       memrange.c mi/mi-common.c \
+       jit.c \
+       language.c \
+       linespec.c \
+       location.c \
+       m2-exp.y \
+       m2-lang.c \
+       m2-typeprint.c \
+       m2-valprint.c \
+       macrocmd.c \
+       macroexp.c \
+       macroscope.c \
+       macrotab.c \
+       main.c \
+       maint.c \
+       mdebugread.c \
+       mem-break.c \
+       memattr.c \
+       memory-map.c \
+       memrange.c \
+       minidebug.c \
+       minsyms.c \
+       mipsread.c \
        namespace.c \
        objc-lang.c \
-       objfiles.c osabi.c observer.c osdata.c \
+       objfiles.c \
+       observer.c \
        opencl-lang.c \
-       p-exp.y p-lang.c p-typeprint.c p-valprint.c parse.c printcmd.c \
-       proc-service.list progspace.c \
-       prologue-value.c psymtab.c \
-       regcache.c reggroups.c remote.c remote-fileio.c remote-notif.c reverse.c \
-       rust-exp.y rust-lang.c \
-       selftest.c sentinel-frame.c \
-       serial.c ser-base.c ser-unix.c ser-event.c skip.c \
-       solib.c solib-target.c source.c \
-       stabsread.c stack.c probe.c stap-probe.c std-regs.c \
-       symfile.c symfile-debug.c symfile-mem.c symmisc.c symtab.c \
-       target.c target-dcache.c target-descriptions.c target-memory.c \
-       tid-parse.c thread.c top.c tracepoint.c \
+       osabi.c \
+       osdata.c \
+       p-exp.y \
+       p-lang.c \
+       p-typeprint.c \
+       p-valprint.c \
+       parse.c \
+       printcmd.c \
+       probe.c \
+       proc-service.list \
+       progspace.c \
+       prologue-value.c \
+       psymtab.c \
+       record.c \
+       record-btrace.c \
+       record-full.c \
+       regcache.c \
+       reggroups.c \
+       remote.c \
+       remote-fileio.c \
+       remote-notif.c \
+       reverse.c \
+       rust-exp.y \
+       rust-lang.c \
+       selftest.c \
+       sentinel-frame.c \
+       ser-base.c \
+       ser-event.c \
+       ser-unix.c \
+       serial.c \
+       skip.c \
+       sol-thread.c \
+       solib.c \
+       solib-target.c \
+       source.c \
+       stabsread.c \
+       stack.c \
+       stap-probe.c \
+       std-regs.c \
+       stub-termcap.c \
+       symfile.c \
+       symfile-debug.c \
+       symfile-mem.c \
+       symmisc.c \
+       symtab.c \
+       target.c \
+       target-dcache.c \
+       target-descriptions.c \
+       target-memory.c \
+       thread.c \
+       tid-parse.c \
+       top.c \
+       tracepoint.c \
        trad-frame.c \
        tramp-frame.c \
        typeprint.c \
-       ui-out.c utils.c ui-file.h ui-file.c \
+       ui-file.c \
+       ui-file.h \
+       ui-out.c \
        user-regs.c \
-       valarith.c valops.c valprint.c value.c varobj.c common/vec.c \
-       xml-tdesc.c xml-support.c \
-       inferior.c gdb_usleep.c \
-       record.c record-full.c gcore.c \
-       jit.c \
+       utils.c \
+       valarith.c \
+       valops.c \
+       valprint.c \
+       value.c \
+       varobj.c \
+       xml-support.c \
        xml-syscall.c \
-       annotate.c common/signals.c copying.c dfp.c gdb.c inf-child.c \
-       sol-thread.c stub-termcap.c \
-       common/gdb_vecs.c common/common-utils.c common/xml-utils.c \
-       common/ptid.c common/buffer.c gdb-dlfcn.c common/agent.c \
-       common/format.c common/filestuff.c btrace.c record-btrace.c ctf.c \
-       target/waitstatus.c common/print-utils.c common/rsp-low.c \
-       common/errors.c common/common-debug.c common/common-exceptions.c \
-       common/btrace-common.c common/fileio.c common/common-regcache.c \
-       common/signals-state-save-restore.c common/new-op.c \
+       xml-tdesc.c \
+       common/agent.c \
+       common/btrace-common.c \
+       common/buffer.c \
+       common/cleanups.c \
+       common/common-debug.c \
+       common/common-exceptions.c \
+       common/common-regcache.c \
+       common/common-utils.c \
+       common/errors.c \
+       common/fileio.c \
+       common/filestuff.c \
+       common/format.c \
+       common/gdb_vecs.c \
+       common/new-op.c \
+       common/print-utils.c \
+       common/ptid.c \
+       common/rsp-low.c \
+       common/signals.c \
+       common/signals-state-save-restore.c \
+       common/vec.c \
+       common/xml-utils.c \
+       mi/mi-common.c \
+       target/waitstatus.c \
        $(SUBDIR_GCC_COMPILE_SRCS)
 
 LINTFILES = $(SFILES) $(YYFILES) $(CONFIG_SRCS) init.c
@@ -906,94 +1219,351 @@ LINTFILES = $(SFILES) $(YYFILES) $(CONFIG_SRCS) init.c
 # right, it is probably easiest just to list .h files here directly.
 
 HFILES_NO_SRCDIR = \
-common/gdb_signals.h nat/gdb_thread_db.h common/gdb_vecs.h \
-common/x86-xstate.h nat/linux-ptrace.h nat/mips-linux-watch.h \
-proc-utils.h aarch64-tdep.h arc-tdep.h arm-tdep.h ax-gdb.h ppcfbsd-tdep.h \
-ppcnbsd-tdep.h cli-out.h gdb_expat.h breakpoint.h infcall.h obsd-tdep.h \
-exec.h m32r-tdep.h osabi.h gdbcore.h x86bsd-nat.h \
-i386bsd-nat.h xml-support.h xml-tdesc.h alphabsd-tdep.h gdb_obstack.h \
-ia64-tdep.h ada-lang.h varobj.h varobj-iter.h frv-tdep.h \
-nto-tdep.h serial.h \
-c-lang.h d-lang.h go-lang.h frame.h event-loop.h block.h cli/cli-setshow.h \
-cli/cli-decode.h cli/cli-cmds.h cli/cli-utils.h \
-cli/cli-script.h macrotab.h symtab.h common/version.h \
-compile/compile.h gnulib/import/string.in.h gnulib/import/str-two-way.h \
-gnulib/import/stdint.in.h remote.h remote-notif.h gdb.h sparc-nat.h \
-gdbthread.h dwarf2-frame.h dwarf2-frame-tailcall.h nbsd-nat.h dcache.h \
-amd64-nat.h s390-linux-tdep.h arm-linux-tdep.h exceptions.h macroscope.h \
-gdbarch.h bsd-uthread.h memory-map.h memrange.h obsd-nat.h \
-mdebugread.h m88k-tdep.h stabsread.h hppa-linux-offsets.h linux-fork.h \
-ser-unix.h inf-ptrace.h terminal.h ui-out.h frame-base.h \
-f-lang.h dwarf2loc.h value.h sparc-tdep.h defs.h target-descriptions.h \
-objfiles.h common/vec.h disasm.h mips-tdep.h ser-base.h \
-gdb_curses.h bfd-target.h memattr.h inferior.h ax.h dummy-frame.h \
-inflow.h fbsd-nat.h ia64-libunwind-tdep.h completer.h \
-solib-target.h gdb_vfork.h alpha-tdep.h dwarf2expr.h \
-m2-lang.h stack.h charset.h addrmap.h command.h solist.h source.h \
-target.h target-dcache.h prologue-value.h cp-abi.h tui/tui-hooks.h tui/tui.h \
-tui/tui-file.h tui/tui-command.h tui/tui-disasm.h tui/tui-wingeneral.h \
-tui/tui-windata.h tui/tui-data.h tui/tui-win.h tui/tui-stack.h \
-tui/tui-winsource.h tui/tui-regs.h tui/tui-io.h tui/tui-layout.h \
-tui/tui-source.h sol2-tdep.h gregset.h sh-tdep.h sh64-tdep.h \
-expression.h score-tdep.h gdb_select.h ser-tcp.h \
-extension.h extension-priv.h nat/aarch64-linux-hw-point.h \
-build-id.h buildsym.h valprint.h nat/aarch64-linux.h \
-typeprint.h mi/mi-getopt.h mi/mi-parse.h mi/mi-console.h \
-mi/mi-out.h mi/mi-main.h mi/mi-common.h mi/mi-cmds.h linux-nat.h \
-complaints.h gdb_proc_service.h gdb_regex.h xtensa-tdep.h inf-loop.h \
-common/gdb_wait.h common/gdb_assert.h solib.h ppc-tdep.h cp-support.h glibc-tdep.h \
-interps.h auxv.h gdbcmd.h tramp-frame.h mipsnbsd-tdep.h        \
-amd64-linux-tdep.h linespec.h location.h i387-tdep.h mn10300-tdep.h \
-sparc64-tdep.h ppcobsd-tdep.h \
-coff-pe-read.h parser-defs.h gdb_ptrace.h mips-linux-tdep.h \
-m68k-tdep.h spu-tdep.h environ.h amd64-tdep.h \
-doublest.h regset.h hppa-tdep.h ppc-linux-tdep.h ppc64-tdep.h \
-rs6000-tdep.h rs6000-aix-tdep.h \
-common/gdb_locale.h arch-utils.h trad-frame.h gnu-nat.h \
-language.h nbsd-tdep.h solib-svr4.h \
-macroexp.h ui-file.h regcache.h tracepoint.h tracefile.h i386-tdep.h \
-inf-child.h p-lang.h event-top.h gdbtypes.h user-regs.h \
-regformats/regdef.h config/i386/nm-i386gnu.h \
-config/i386/nm-fbsd.h \
-config/nm-nto.h config/sparc/nm-sol2.h config/nm-linux.h \
-top.h bsd-kvm.h gdb-stabs.h reggroups.h \
-annotate.h sim-regno.h dictionary.h dfp.h main.h frame-unwind.h        \
-remote-fileio.h i386-linux-tdep.h vax-tdep.h objc-lang.h \
-sentinel-frame.h bcache.h symfile.h windows-tdep.h linux-tdep.h \
-gdb_usleep.h jit.h xml-syscall.h microblaze-tdep.h \
-psymtab.h psympriv.h progspace.h bfin-tdep.h \
-amd64-darwin-tdep.h charset-list.h \
-config/djgpp/langinfo.h config/djgpp/nl_types.h darwin-nat.h \
-dicos-tdep.h filesystem.h gcore.h gdb_wchar.h hppabsd-tdep.h \
-i386-darwin-tdep.h x86-nat.h linux-record.h moxie-tdep.h nios2-tdep.h \
-ft32-tdep.h nds32-tdep.h \
-osdata.h procfs.h python/py-event.h python/py-events.h python/py-stopevent.h \
-python/python-internal.h python/python.h ravenscar-thread.h record.h \
-record-full.h solib-aix.h \
-solib-darwin.h solib-spu.h windows-nat.h xcoffread.h \
-gnulib/import/extra/snippet/arg-nonnull.h gnulib/import/extra/snippet/c++defs.h \
-gnulib/import/extra/snippet/warn-on-use.h \
-gnulib/import/stddef.in.h gnulib/import/inttypes.in.h inline-frame.h skip.h \
-common/common-utils.h common/xml-utils.h common/buffer.h common/ptid.h \
-common/format.h common/host-defs.h utils.h common/queue.h \
-nat/linux-osdata.h gdb-dlfcn.h auto-load.h probe.h stap-probe.h \
-gdb_bfd.h sparc-ravenscar-thread.h ppc-ravenscar-thread.h nat/linux-btrace.h \
-nat/ppc-linux.h ctf.h nat/x86-cpuid.h nat/x86-gcc-cpuid.h target/resume.h \
-target/wait.h target/waitstatus.h nat/linux-nat.h nat/linux-waitpid.h \
-common/print-utils.h common/rsp-low.h nat/x86-dregs.h x86-linux-nat.h \
-i386-linux-nat.h common/common-defs.h common/errors.h common/common-types.h \
-common/common-debug.h common/cleanups.h common/gdb_setjmp.h \
-common/common-exceptions.h target/target.h common/symbol.h \
-common/common-regcache.h fbsd-tdep.h nat/linux-personality.h \
-common/fileio.h nat/x86-linux.h nat/x86-linux-dregs.h nat/amd64-linux-siginfo.h\
-nat/linux-namespaces.h arch/arm.h common/gdb_sys_time.h arch/aarch64-insn.h \
-tid-parse.h ser-event.h \
-common/signals-state-save-restore.h
+       aarch64-tdep.h \
+       ada-lang.h \
+       addrmap.h \
+       alpha-tdep.h \
+       alphabsd-tdep.h \
+       amd64-darwin-tdep.h \
+       amd64-linux-tdep.h \
+       amd64-nat.h \
+       amd64-tdep.h \
+       annotate.h \
+       arc-tdep.h \
+       arch-utils.h \
+       arm-linux-tdep.h \
+       arm-tdep.h \
+       auto-load.h \
+       auxv.h \
+       ax.h \
+       ax-gdb.h \
+       bcache.h \
+       bfd-target.h \
+       bfin-tdep.h \
+       block.h \
+       breakpoint.h \
+       bsd-kvm.h \
+       bsd-uthread.h \
+       build-id.h \
+       buildsym.h \
+       c-lang.h \
+       charset.h \
+       charset-list.h \
+       cli-out.h \
+       coff-pe-read.h \
+       command.h \
+       complaints.h \
+       completer.h \
+       cp-abi.h \
+       cp-support.h \
+       ctf.h \
+       d-lang.h \
+       darwin-nat.h \
+       dcache.h \
+       defs.h \
+       dfp.h \
+       dicos-tdep.h \
+       dictionary.h \
+       disasm.h \
+       doublest.h \
+       dummy-frame.h \
+       dwarf2-frame.h \
+       dwarf2-frame-tailcall.h \
+       dwarf2expr.h \
+       dwarf2loc.h \
+       environ.h \
+       event-loop.h \
+       event-top.h \
+       exceptions.h \
+       exec.h \
+       expression.h \
+       extension.h \
+       extension-priv.h \
+       f-lang.h \
+       fbsd-nat.h \
+       fbsd-tdep.h \
+       filesystem.h \
+       frame.h \
+       frame-base.h \
+       frame-unwind.h \
+       frv-tdep.h \
+       ft32-tdep.h \
+       gcore.h \
+       gdb.h \
+       gdb_bfd.h \
+       gdb_curses.h \
+       gdb-dlfcn.h \
+       gdb_expat.h \
+       gdb_obstack.h \
+       gdb_proc_service.h \
+       gdb_ptrace.h \
+       gdb_regex.h \
+       gdb_select.h \
+       gdb-stabs.h \
+       gdb_usleep.h \
+       gdb_vfork.h \
+       gdb_wchar.h \
+       gdbarch.h \
+       gdbcmd.h \
+       gdbcore.h \
+       gdbthread.h \
+       gdbtypes.h \
+       glibc-tdep.h \
+       gnu-nat.h \
+       go-lang.h \
+       gregset.h \
+       hppa-linux-offsets.h \
+       hppa-tdep.h \
+       hppabsd-tdep.h \
+       i386-darwin-tdep.h \
+       i386-linux-nat.h \
+       i386-linux-tdep.h \
+       i386-tdep.h \
+       i386bsd-nat.h \
+       i387-tdep.h \
+       ia64-libunwind-tdep.h \
+       ia64-tdep.h \
+       inf-child.h \
+       inf-loop.h \
+       inf-ptrace.h \
+       infcall.h \
+       inferior.h \
+       inflow.h \
+       inline-frame.h \
+       interps.h \
+       jit.h \
+       language.h \
+       linespec.h \
+       linux-fork.h \
+       linux-nat.h \
+       linux-record.h \
+       linux-tdep.h \
+       location.h \
+       m2-lang.h \
+       m32r-tdep.h \
+       m68k-tdep.h \
+       m88k-tdep.h \
+       macroexp.h \
+       macroscope.h \
+       macrotab.h \
+       main.h \
+       mdebugread.h \
+       memattr.h \
+       memory-map.h \
+       memrange.h \
+       microblaze-tdep.h \
+       mips-linux-tdep.h \
+       mips-tdep.h \
+       mipsnbsd-tdep.h \
+       mn10300-tdep.h \
+       moxie-tdep.h \
+       nbsd-nat.h \
+       nbsd-tdep.h \
+       nds32-tdep.h \
+       nios2-tdep.h \
+       nto-tdep.h \
+       objc-lang.h \
+       objfiles.h \
+       obsd-nat.h \
+       obsd-tdep.h \
+       osabi.h \
+       osdata.h \
+       p-lang.h \
+       parser-defs.h \
+       ppc-linux-tdep.h \
+       ppc-ravenscar-thread.h \
+       ppc-tdep.h \
+       ppc64-tdep.h \
+       ppcfbsd-tdep.h \
+       ppcnbsd-tdep.h \
+       ppcobsd-tdep.h \
+       probe.h \
+       proc-utils.h \
+       procfs.h \
+       progspace.h \
+       prologue-value.h \
+       psympriv.h \
+       psymtab.h \
+       ravenscar-thread.h \
+       record.h \
+       record-full.h \
+       regcache.h \
+       reggroups.h \
+       regset.h \
+       remote.h \
+       remote-fileio.h \
+       remote-notif.h \
+       rs6000-aix-tdep.h \
+       rs6000-tdep.h \
+       s390-linux-tdep.h \
+       score-tdep.h \
+       sentinel-frame.h \
+       ser-base.h \
+       ser-event.h \
+       ser-tcp.h \
+       ser-unix.h \
+       serial.h \
+       sh-tdep.h \
+       sh64-tdep.h \
+       sim-regno.h \
+       skip.h \
+       sol2-tdep.h \
+       solib.h \
+       solib-aix.h \
+       solib-darwin.h \
+       solib-spu.h \
+       solib-svr4.h \
+       solib-target.h \
+       solist.h \
+       source.h \
+       sparc-nat.h \
+       sparc-ravenscar-thread.h \
+       sparc-tdep.h \
+       sparc64-tdep.h \
+       spu-tdep.h \
+       stabsread.h \
+       stack.h \
+       stap-probe.h \
+       symfile.h \
+       symtab.h \
+       target.h \
+       target-dcache.h \
+       target-descriptions.h \
+       terminal.h \
+       tid-parse.h \
+       top.h \
+       tracefile.h \
+       tracepoint.h \
+       trad-frame.h \
+       tramp-frame.h \
+       typeprint.h \
+       ui-file.h \
+       ui-out.h \
+       user-regs.h \
+       utils.h \
+       valprint.h \
+       value.h \
+       varobj.h \
+       varobj-iter.h \
+       vax-tdep.h \
+       windows-nat.h \
+       windows-tdep.h \
+       x86-linux-nat.h \
+       x86-nat.h \
+       x86bsd-nat.h \
+       xcoffread.h \
+       xml-support.h \
+       xml-syscall.h \
+       xml-tdesc.h \
+       xtensa-tdep.h \
+       arch/aarch64-insn.h \
+       arch/arm.h \
+       cli/cli-cmds.h \
+       cli/cli-decode.h \
+       cli/cli-script.h \
+       cli/cli-setshow.h \
+       cli/cli-utils.h \
+       common/buffer.h \
+       common/cleanups.h \
+       common/common-debug.h \
+       common/common-defs.h \
+       common/common-exceptions.h \
+       common/common-regcache.h \
+       common/common-types.h \
+       common/common-utils.h \
+       common/errors.h \
+       common/fileio.h \
+       common/format.h \
+       common/gdb_assert.h \
+       common/gdb_locale.h \
+       common/gdb_setjmp.h \
+       common/gdb_signals.h \
+       common/gdb_sys_time.h \
+       common/gdb_vecs.h \
+       common/gdb_wait.h \
+       common/host-defs.h \
+       common/print-utils.h \
+       common/ptid.h \
+       common/queue.h \
+       common/rsp-low.h \
+       common/signals-state-save-restore.h \
+       common/symbol.h \
+       common/vec.h \
+       common/version.h \
+       common/x86-xstate.h \
+       common/xml-utils.h \
+       compile/compile.h \
+       config/nm-linux.h \
+       config/nm-nto.h \
+       config/djgpp/langinfo.h \
+       config/djgpp/nl_types.h \
+       config/i386/nm-fbsd.h \
+       config/i386/nm-i386gnu.h \
+       config/sparc/nm-sol2.h \
+       gnulib/import/inttypes.in.h \
+       gnulib/import/stddef.in.h \
+       gnulib/import/stdint.in.h \
+       gnulib/import/str-two-way.h \
+       gnulib/import/string.in.h \
+       gnulib/import/extra/snippet/arg-nonnull.h \
+       gnulib/import/extra/snippet/c++defs.h \
+       gnulib/import/extra/snippet/warn-on-use.h \
+       mi/mi-cmds.h \
+       mi/mi-common.h \
+       mi/mi-console.h \
+       mi/mi-getopt.h \
+       mi/mi-main.h \
+       mi/mi-out.h \
+       mi/mi-parse.h \
+       nat/aarch64-linux.h \
+       nat/aarch64-linux-hw-point.h \
+       nat/amd64-linux-siginfo.h \
+       nat/gdb_thread_db.h \
+       nat/linux-btrace.h \
+       nat/linux-namespaces.h \
+       nat/linux-nat.h \
+       nat/linux-osdata.h \
+       nat/linux-personality.h \
+       nat/linux-ptrace.h \
+       nat/linux-waitpid.h \
+       nat/mips-linux-watch.h \
+       nat/ppc-linux.h \
+       nat/x86-cpuid.h \
+       nat/x86-dregs.h \
+       nat/x86-gcc-cpuid.h \
+       nat/x86-linux.h \
+       nat/x86-linux-dregs.h \
+       python/py-event.h \
+       python/py-events.h \
+       python/py-stopevent.h \
+       python/python.h \
+       python/python-internal.h \
+       regformats/regdef.h \
+       target/resume.h \
+       target/target.h \
+       target/wait.h \
+       target/waitstatus.h \
+       tui/tui.h \
+       tui/tui-command.h \
+       tui/tui-data.h \
+       tui/tui-disasm.h \
+       tui/tui-file.h \
+       tui/tui-hooks.h \
+       tui/tui-io.h \
+       tui/tui-layout.h \
+       tui/tui-regs.h \
+       tui/tui-source.h \
+       tui/tui-stack.h \
+       tui/tui-win.h \
+       tui/tui-windata.h \
+       tui/tui-wingeneral.h \
+       tui/tui-winsource.h
 
 # Header files that already have srcdir in them, or which are in objdir.
 
-HFILES_WITH_SRCDIR = ../bfd/bfd.h jit-reader.h
-
+HFILES_WITH_SRCDIR = \
+       ../bfd/bfd.h \
+       jit-reader.h
 
 # GDB "info" files, which should be included in their entirety
 INFOFILES = gdb.info*
@@ -1015,80 +1585,208 @@ TAGFILES_NO_SRCDIR = $(SFILES) $(HFILES_NO_SRCDIR) $(ALLDEPFILES) \
 TAGFILES_WITH_SRCDIR = $(HFILES_WITH_SRCDIR)
 
 COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \
-       version.o \
-       annotate.o \
+       ada-lang.o \
+       ada-tasks.o \
+       ada-typeprint.o \
+       ada-valprint.o \
+       ada-varobj.o \
        addrmap.o \
-       auto-load.o auxv.o \
        agent.o \
+       annotate.o \
+       arch-utils.o \
+       auto-load.o \
+       auxv.o \
+       bcache.o \
        bfd-target.o \
-       blockframe.o breakpoint.o break-catch-sig.o break-catch-throw.o \
+       block.o \
+       blockframe.o \
+       break-catch-sig.o \
        break-catch-syscall.o \
-       findvar.o regcache.o cleanups.o \
-       charset.o continuations.o corelow.o disasm.o dummy-frame.o dfp.o \
-       source.o value.o eval.o valops.o valarith.o valprint.o printcmd.o \
-       block.o symtab.o psymtab.o symfile.o symfile-debug.o symmisc.o \
-       linespec.o dictionary.o namespace.o \
-       location.o infcall.o \
-       infcmd.o infrun.o \
-       expprint.o environ.o stack.o tid-parse.o thread.o thread-fsm.o \
+       break-catch-throw.o \
+       breakpoint.o \
+       btrace.o \
+       btrace-common.o \
+       buffer.o \
+       build-id.o \
+       buildsym.o \
+       c-lang.o \
+       c-typeprint.o \
+       c-valprint.o \
+       c-varobj.o \
+       charset.o \
+       cleanups.o \
+       cli-out.o \
+       coff-pe-read.o \
+       coffread.o \
+       common-agent.o \
+       common-debug.o \
+       common-exceptions.o \
+       common-regcache.o \
+       common-utils.o \
+       complaints.o \
+       completer.o \
+       continuations.o \
+       copying.o \
+       corefile.o \
+       corelow.o \
+       cp-abi.o \
+       cp-namespace.o \
+       cp-support.o \
+       cp-valprint.o \
+       d-lang.o \
+       d-namespace.o \
+       d-valprint.o \
+       dbxread.o \
+       debug.o \
+       demangle.o \
+       dfp.o \
+       dictionary.o \
+       disasm.o \
+       doublest.o \
+       dummy-frame.o \
+       dwarf2-frame.o \
+       dwarf2-frame-tailcall.o \
+       dwarf2expr.o \
+       dwarf2loc.o \
+       dwarf2read.o \
+       environ.o \
+       errors.o \
+       eval.o \
+       event-loop.o \
+       event-top.o \
        exceptions.o \
+       exec.o \
+       expprint.o \
        extension.o \
-       filesystem.o \
+       f-lang.o \
+       f-typeprint.o \
+       f-valprint.o \
+       fileio.o \
        filestuff.o \
+       filesystem.o \
+       findcmd.o \
+       findvar.o \
+       format.o \
+       frame.o \
+       frame-base.o \
+       frame-unwind.o \
+       gcore.o \
+       gdb_bfd.o \
+       gdb-dlfcn.o \
+       gdb_obstack.o \
+       gdb_usleep.o \
+       gdb_vecs.o \
+       gdbarch.o \
+       gdbtypes.o \
+       gnu-v2-abi.o \
+       gnu-v3-abi.o \
+       go-lang.o \
+       go-typeprint.o \
+       go-valprint.o \
        inf-child.o \
+       inf-loop.o \
+       infcall.o \
+       infcmd.o \
+       inferior.o \
+       infrun.o \
+       inline-frame.o \
        interps.o \
-       minidebug.o \
+       jit.o \
+       language.o \
+       linespec.o \
+       location.o \
+       m2-lang.o \
+       m2-typeprint.o \
+       m2-valprint.o \
+       macrocmd.o \
+       macroexp.o \
+       macroscope.o \
+       macrotab.o \
        main.o \
-       macrotab.o macrocmd.o macroexp.o macroscope.o \
+       maint.o \
+       mdebugread.o \
+       mem-break.o \
+       memattr.o \
+       memory-map.o \
+       memrange.o \
        mi-common.o \
-       event-loop.o event-top.o inf-loop.o completer.o \
-       gdbarch.o arch-utils.o gdbtypes.o gdb_bfd.o gdb_obstack.o \
-       osabi.o copying.o \
-       memattr.o mem-break.o target.o target-dcache.o parse.o language.o \
-       build-id.o buildsym.o \
-       findcmd.o \
-       std-regs.o \
-       signals-state-save-restore.o \
-       signals.o \
-       exec.o reverse.o \
-       bcache.o objfiles.o observer.o minsyms.o maint.o demangle.o \
-       dbxread.o coffread.o coff-pe-read.o \
-       dwarf2read.o mipsread.o stabsread.o corefile.o \
-       dwarf2expr.o dwarf2loc.o dwarf2-frame.o dwarf2-frame-tailcall.o \
-       ada-lang.o c-lang.o d-lang.o f-lang.o objc-lang.o \
-       ada-tasks.o ada-varobj.o c-varobj.o \
-       ui-out.o cli-out.o \
-       varobj.o vec.o \
-       go-lang.o go-valprint.o go-typeprint.o \
-       m2-lang.o opencl-lang.o p-lang.o p-typeprint.o p-valprint.o \
-       selftest.o sentinel-frame.o \
-       complaints.o typeprint.o \
-       ada-typeprint.o c-typeprint.o f-typeprint.o m2-typeprint.o \
-       ada-valprint.o c-valprint.o cp-valprint.o d-valprint.o f-valprint.o \
-       m2-valprint.o \
-       ser-event.o serial.o mdebugread.o top.o utils.o utils-selftests.o \
-       ui-file.o \
-       user-regs.o \
-       frame.o frame-unwind.o doublest.o \
-       frame-base.o \
-       inline-frame.o \
-       gnu-v2-abi.o gnu-v3-abi.o cp-abi.o cp-support.o \
-       cp-namespace.o d-namespace.o \
+       minidebug.o \
+       minsyms.o \
+       mipsread.o \
+       namespace.o \
+       new-op.o \
+       objc-lang.o \
+       objfiles.o \
+       observer.o \
+       opencl-lang.o \
+       osabi.o \
+       osdata.o \
+       p-lang.o \
+       p-typeprint.o \
+       p-valprint.o \
+       parse.o \
+       print-utils.o \
+       printcmd.o \
+       probe.o \
+       progspace.o \
+       prologue-value.o \
+       psymtab.o \
+       ptid.o \
+       record.o \
+       record-btrace.o \
+       record-full.o \
+       regcache.o \
        reggroups.o \
+       registry.o \
+       reverse.o \
+       rsp-low.o \
        rust-lang.o \
+       selftest.o \
+       sentinel-frame.o \
+       ser-event.o \
+       serial.o \
+       signals.o \
+       signals-state-save-restore.o \
+       skip.o \
+       solib.o \
+       solib-target.o \
+       source.o \
+       stabsread.o \
+       stack.o \
+       std-regs.o \
+       symfile.o \
+       symfile-debug.o \
+       symmisc.o \
+       symtab.o \
+       target.o \
+       target-dcache.o \
+       target-descriptions.o \
+       target-memory.o \
+       thread.o \
+       thread-fsm.o \
+       tid-parse.o \
+       top.o \
        trad-frame.o \
        tramp-frame.o \
-       solib.o solib-target.o \
-       prologue-value.o memory-map.o memrange.o \
-       xml-support.o xml-syscall.o xml-utils.o \
-       target-descriptions.o target-memory.o xml-tdesc.o xml-builtin.o \
-       inferior.o osdata.o gdb_usleep.o record.o record-full.o gcore.o \
-       gdb_vecs.o jit.o progspace.o skip.o probe.o \
-       common-utils.o buffer.o ptid.o gdb-dlfcn.o common-agent.o \
-       format.o registry.o btrace.o record-btrace.o waitstatus.o \
-       print-utils.o rsp-low.o errors.o common-debug.o debug.o \
-       common-exceptions.o btrace-common.o fileio.o \
-       common-regcache.o new-op.o \
+       typeprint.o \
+       ui-file.o \
+       ui-out.o \
+       user-regs.o \
+       utils.o \
+       utils-selftests.o \
+       valarith.o \
+       valops.o \
+       valprint.o \
+       value.o \
+       varobj.o \
+       vec.o \
+       version.o \
+       waitstatus.o \
+       xml-builtin.o \
+       xml-support.o \
+       xml-syscall.o \
+       xml-tdesc.o \
+       xml-utils.o \
        $(SUBDIR_GCC_COMPILE_OBS)
 
 TSOBS = inflow.o
@@ -1103,15 +1801,28 @@ CLEANDIRS = $(SUBDIRS)
 REQUIRED_SUBDIRS = doc | testsuite | $(GNULIB_BUILDDIR) | data-directory
 
 # For now, shortcut the "configure GDB for fewer languages" stuff.
-YYFILES = c-exp.c \
-       cp-name-parser.c \
-       ada-lex.c \
+YYFILES = \
        ada-exp.c \
-       d-exp.c f-exp.c go-exp.c m2-exp.c p-exp.c rust-exp.c
-YYOBJ = c-exp.o \
-       cp-name-parser.o \
+       ada-lex.c \
+       c-exp.c \
+       cp-name-parser.c \
+       d-exp.c \
+       f-exp.c \
+       go-exp.c \
+       m2-exp.c \
+       p-exp.c \
+       rust-exp.c
+
+YYOBJ = \
        ada-exp.o \
-       d-exp.o f-exp.o go-exp.o m2-exp.o p-exp.o rust-exp.o
+       c-exp.o \
+       cp-name-parser.o \
+       d-exp.o \
+       f-exp.o \
+       go-exp.o \
+       m2-exp.o \
+       p-exp.o \
+       rust-exp.o
 
 # Things which need to be built when making a distribution.
 
@@ -1119,8 +1830,15 @@ DISTSTUFF = $(YYFILES)
 
 
 # All generated files which can be included by another file.
-generated_files = config.h observer.h observer.inc ada-lex.c jit-reader.h \
-       $(GNULIB_H) $(NAT_GENERATED_FILES) gcore
+generated_files = \
+       ada-lex.c \
+       config.h \
+       gcore \
+       jit-reader.h \
+       observer.h \
+       observer.inc \
+       $(GNULIB_H) \
+       $(NAT_GENERATED_FILES)
 
 # Flags needed to compile Python code
 PYTHON_CFLAGS=@PYTHON_CFLAGS@
@@ -1710,114 +2428,211 @@ force_update:
 MAKEOVERRIDES=
 
 ALLDEPFILES = \
-       aarch64-tdep.c aarch64-linux-tdep.c aarch64-newlib-tdep.c \
        aarch64-linux-nat.c \
+       aarch64-linux-tdep.c \
+       aarch64-newlib-tdep.c \
+       aarch64-tdep.c \
        aix-thread.c \
-       alphabsd-nat.c alpha-linux-nat.c \
-       alpha-tdep.c alpha-mdebug-tdep.c \
+       alpha-linux-nat.c \
        alpha-linux-tdep.c \
-       alphabsd-tdep.c alphafbsd-tdep.c alphanbsd-tdep.c alphaobsd-tdep.c \
-       arc-tdep.c \
-       amd64-nat.c amd64-tdep.c \
-       amd64bsd-nat.c amd64fbsd-nat.c amd64fbsd-tdep.c \
-       amd64nbsd-nat.c amd64nbsd-tdep.c \
-       amd64obsd-nat.c amd64obsd-tdep.c \
+       alpha-mdebug-tdep.c \
+       alpha-tdep.c \
+       alphabsd-nat.c \
+       alphabsd-tdep.c \
+       alphafbsd-tdep.c \
+       alphanbsd-tdep.c \
+       alphaobsd-tdep.c \
        amd64-darwin-tdep.c \
        amd64-dicos-tdep.c \
-       amd64-linux-nat.c amd64-linux-tdep.c \
+       amd64-linux-nat.c \
+       amd64-linux-tdep.c \
+       amd64-nat.c \
        amd64-sol2-tdep.c \
-       arm.c arm-get-next-pcs.c \
-       arm-linux.c arm-linux-nat.c arm-linux-tdep.c \
-       arm-symbian-tdep.c arm-tdep.c \
-       armnbsd-nat.c armbsd-tdep.c armnbsd-tdep.c armobsd-tdep.c \
+       amd64-tdep.c \
+       amd64bsd-nat.c \
+       amd64fbsd-nat.c \
+       amd64fbsd-tdep.c \
+       amd64nbsd-nat.c \
+       amd64nbsd-tdep.c \
+       amd64obsd-nat.c \
+       amd64obsd-tdep.c \
+       arc-tdep.c \
+       arm.c \
+       arm-get-next-pcs.c \
+       arm-linux.c \
+       arm-linux-nat.c \
+       arm-linux-tdep.c \
+       arm-symbian-tdep.c \
+       arm-tdep.c \
+       armbsd-tdep.c \
+       armnbsd-nat.c \
+       armnbsd-tdep.c \
+       armobsd-tdep.c \
        avr-tdep.c \
-       bfin-linux-tdep.c bfin-tdep.c \
-       bsd-uthread.c bsd-kvm.c \
+       bfin-linux-tdep.c \
+       bfin-tdep.c \
+       bsd-kvm.c \
+       bsd-uthread.c \
        core-regset.c \
-       dcache.c dicos-tdep.c darwin-nat.c \
+       darwin-nat.c \
+       dcache.c \
+       dcache.c \
+       dicos-tdep.c \
        exec.c \
        fbsd-nat.c \
        fbsd-tdep.c \
        fork-child.c \
        ft32-tdep.c \
        glibc-tdep.c \
-       go32-nat.c h8300-tdep.c \
+       go32-nat.c \
+       h8300-tdep.c \
+       hppa-linux-nat.c \
+       hppa-linux-tdep.c \
        hppa-tdep.c \
-       hppa-linux-tdep.c hppa-linux-nat.c \
        hppabsd-tdep.c \
-       hppanbsd-nat.c hppanbsd-tdep.c \
-       hppaobsd-nat.c hppaobsd-tdep.c \
-       i386-tdep.c i386-linux-nat.c \
-       i386v4-nat.c i386-cygwin-tdep.c \
-       i386bsd-nat.c i386bsd-tdep.c i386fbsd-nat.c i386fbsd-tdep.c \
-       i386nbsd-nat.c i386nbsd-tdep.c i386obsd-nat.c i386obsd-tdep.c \
-       i387-tdep.c \
-       i386-darwin-tdep.c i386-darwin-nat.c \
+       hppanbsd-nat.c \
+       hppanbsd-tdep.c \
+       hppaobsd-nat.c \
+       hppaobsd-tdep.c \
+       i386-cygwin-tdep.c \
+       i386-darwin-nat.c \
+       i386-darwin-tdep.c \
        i386-dicos-tdep.c \
-       i386-linux-tdep.c x86-nat.c \
-       i386-sol2-nat.c i386-sol2-tdep.c \
-       i386gnu-nat.c i386gnu-tdep.c \
-       ia64-linux-nat.c ia64-linux-tdep.c ia64-tdep.c ia64-vms-tdep.c \
-       inf-ptrace.c \
+       i386-linux-nat.c \
+       i386-linux-tdep.c \
+       i386-sol2-nat.c \
+       i386-sol2-tdep.c \
+       i386-tdep.c \
+       i386bsd-nat.c \
+       i386bsd-tdep.c \
+       i386fbsd-nat.c \
+       i386fbsd-tdep.c \
+       i386gnu-nat.c \
+       i386gnu-tdep.c \
+       i386nbsd-nat.c \
+       i386nbsd-tdep.c \
+       i386obsd-nat.c \
+       i386obsd-tdep.c \
+       i386v4-nat.c \
+       i387-tdep.c \
        ia64-libunwind-tdep.c \
+       ia64-linux-nat.c \
+       ia64-linux-tdep.c \
+       ia64-tdep.c \
+       ia64-vms-tdep.c \
+       inf-ptrace.c \
        linux-fork.c \
-       linux-tdep.c \
        linux-record.c \
+       linux-tdep.c \
        lm32-tdep.c \
-       m68hc11-tdep.c \
+       m32r-linux-nat.c \
+       m32r-linux-tdep.c \
        m32r-tdep.c \
-       m32r-linux-nat.c m32r-linux-tdep.c \
+       m68hc11-tdep.c \
        m68k-tdep.c \
-       m68kbsd-nat.c m68kbsd-tdep.c \
-       m68klinux-nat.c m68klinux-tdep.c \
-       m88k-tdep.c m88kbsd-nat.c \
-       microblaze-tdep.c microblaze-linux-tdep.c \
-       mingw-hdep.c common/mingw-strerror.c \
-       mips-linux-nat.c mips-linux-tdep.c \
+       m68kbsd-nat.c \
+       m68kbsd-tdep.c \
+       m68klinux-nat.c \
+       m68klinux-tdep.c \
+       m88k-tdep.c \
+       m88kbsd-nat.c \
+       microblaze-linux-tdep.c \
+       microblaze-tdep.c \
+       mingw-hdep.c \
+       mips-linux-nat.c \
+       mips-linux-tdep.c \
        mips-sde-tdep.c \
        mips-tdep.c \
-       mipsnbsd-nat.c mipsnbsd-tdep.c \
-       mips64obsd-nat.c mips64obsd-tdep.c \
+       mips64obsd-nat.c \
+       mips64obsd-tdep.c \
+       mipsnbsd-nat.c \
+       mipsnbsd-tdep.c \
        msp430-tdep.c \
+       nbsd-nat.c \
+       nbsd-tdep.c \
        nds32-tdep.c \
-       nios2-tdep.c nios2-linux-tdep.c \
-       nbsd-nat.c nbsd-tdep.c obsd-nat.c obsd-tdep.c \
-       posix-hdep.c common/posix-strerror.c \
-       ppc-sysv-tdep.c ppc-linux-nat.c ppc-linux-tdep.c ppc64-tdep.c \
-       ppcfbsd-nat.c ppcfbsd-tdep.c \
-       ppcnbsd-nat.c ppcnbsd-tdep.c \
-       ppcobsd-nat.c ppcobsd-tdep.c \
+       nios2-linux-tdep.c \
+       nios2-tdep.c \
+       obsd-nat.c \
+       obsd-tdep.c \
+       posix-hdep.c \
+       ppc-linux-nat.c \
+       ppc-linux-tdep.c \
+       ppc-ravenscar-thread.c \
+       ppc-sysv-tdep.c \
+       ppc64-tdep.c \
+       ppcfbsd-nat.c \
+       ppcfbsd-tdep.c \
+       ppcnbsd-nat.c \
+       ppcnbsd-tdep.c \
+       ppcobsd-nat.c \
+       ppcobsd-tdep.c \
        procfs.c \
        ravenscar-thread.c \
        remote-sim.c \
-       dcache.c \
        rl78-tdep.c \
-       rs6000-nat.c rs6000-tdep.c solib-aix.c ppc-ravenscar-thread.c \
        rs6000-lynx178-tdep.c \
+       rs6000-nat.c \
+       rs6000-tdep.c \
        rx-tdep.c \
-       s390-linux-tdep.c s390-linux-nat.c \
+       s390-linux-nat.c \
+       s390-linux-tdep.c \
        score-tdep.c \
-       ser-go32.c ser-pipe.c ser-tcp.c ser-mingw.c \
-       sh-tdep.c sh64-tdep.c shnbsd-tdep.c shnbsd-nat.c \
+       ser-go32.c \
+       ser-mingw.c \
+       ser-pipe.c \
+       ser-tcp.c \
+       sh-tdep.c \
+       sh64-tdep.c \
+       shnbsd-nat.c \
+       shnbsd-tdep.c \
        sol2-tdep.c \
+       solib-aix.c \
+       solib-spu.c \
        solib-svr4.c \
-       sparc-linux-nat.c sparc-linux-tdep.c \
-       sparc-sol2-nat.c sparc-sol2-tdep.c sparc64-sol2-tdep.c \
-       sparc-nat.c sparc-tdep.c sparc64-linux-nat.c sparc64-linux-tdep.c \
-       sparc64-nat.c sparc64-tdep.c sparc64fbsd-nat.c sparc64fbsd-tdep.c \
-       sparc64nbsd-nat.c sparc64nbsd-tdep.c \
-       sparc64obsd-nat.c sparc64obsd-tdep.c \
-       sparcnbsd-nat.c sparcnbsd-tdep.c sparcobsd-tdep.c \
+       sparc-linux-nat.c \
+       sparc-linux-tdep.c \
+       sparc-nat.c \
        sparc-ravenscar-thread.c \
-       spu-linux-nat.c spu-tdep.c spu-multiarch.c solib-spu.c \
-       tilegx-linux-nat.c tilegx-tdep.c tilegx-linux-tdep.c \
+       sparc-sol2-nat.c \
+       sparc-sol2-tdep.c \
+       sparc-tdep.c \
+       sparc64-linux-nat.c \
+       sparc64-linux-tdep.c \
+       sparc64-nat.c \
+       sparc64-sol2-tdep.c \
+       sparc64-tdep.c \
+       sparc64fbsd-nat.c \
+       sparc64fbsd-tdep.c \
+       sparc64nbsd-nat.c \
+       sparc64nbsd-tdep.c \
+       sparc64obsd-nat.c \
+       sparc64obsd-tdep.c \
+       sparcnbsd-nat.c \
+       sparcnbsd-tdep.c \
+       sparcobsd-tdep.c \
+       spu-linux-nat.c \
+       spu-multiarch.c \
+       spu-tdep.c \
+       tilegx-linux-nat.c \
+       tilegx-linux-tdep.c \
+       tilegx-tdep.c \
        v850-tdep.c \
-       vax-tdep.c vaxbsd-nat.c vaxnbsd-tdep.c \
-       windows-nat.c windows-tdep.c \
+       vax-tdep.c \
+       vaxbsd-nat.c \
+       vaxnbsd-tdep.c \
+       windows-nat.c \
+       windows-tdep.c \
+       x86-nat.c \
        xcoffread.c \
        xstormy16-tdep.c \
-       xtensa-tdep.c xtensa-config.c \
-       xtensa-linux-tdep.c xtensa-linux-nat.c xtensa-xtregs.c
+       xtensa-config.c \
+       xtensa-linux-nat.c \
+       xtensa-linux-tdep.c \
+       xtensa-tdep.c \
+       xtensa-xtregs.c \
+       common/mingw-strerror.c \
+       common/posix-strerror.c
 
 # Some files need explicit build rules (due to -Werror problems) or due
 # to sub-directory fun 'n' games.
index 3f2351687621c88fe4d826b827d70481ec66b270..51b5c2ab40887e43ed3309bc41f261da6b717bdb 100644 (file)
@@ -16,6 +16,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+# Please keep lists in this file sorted alphabetically, with one item per line.
+# See gdb/Makefile.in for guidelines on ordering files and directories.
+
 srcdir = @srcdir@
 SYSCALLS_SRCDIR = $(srcdir)/../syscalls
 PYTHON_SRCDIR = $(srcdir)/../python/lib
@@ -45,12 +48,20 @@ GDB_DATADIR = @GDB_DATADIR@
 
 SYSCALLS_DIR = syscalls
 SYSCALLS_INSTALL_DIR = $(DESTDIR)$(GDB_DATADIR)/$(SYSCALLS_DIR)
-GEN_SYSCALLS_FILES = arm-linux.xml aarch64-linux.xml \
-       ppc-linux.xml ppc64-linux.xml \
-       i386-linux.xml amd64-linux.xml \
-       sparc-linux.xml sparc64-linux.xml \
-       mips-o32-linux.xml mips-n32-linux.xml mips-n64-linux.xml \
-       s390-linux.xml s390x-linux.xml
+GEN_SYSCALLS_FILES = \
+       aarch64-linux.xml \
+       amd64-linux.xml \
+       arm-linux.xml \
+       i386-linux.xml \
+       mips-n32-linux.xml \
+       mips-n64-linux.xml \
+       mips-o32-linux.xml \
+       ppc-linux.xml \
+       ppc64-linux.xml \
+       s390-linux.xml \
+       s390x-linux.xml \
+       sparc-linux.xml \
+       sparc64-linux.xml
 
 SYSCALLS_FILES = gdb-syscalls.dtd freebsd.xml $(GEN_SYSCALLS_FILES)
 
@@ -58,22 +69,22 @@ PYTHON_DIR = python
 PYTHON_INSTALL_DIR = $(DESTDIR)$(GDB_DATADIR)/$(PYTHON_DIR)
 PYTHON_FILE_LIST = \
        gdb/__init__.py \
-       gdb/frames.py \
-       gdb/FrameIterator.py \
        gdb/FrameDecorator.py \
-       gdb/types.py \
+       gdb/FrameIterator.py \
+       gdb/frames.py \
        gdb/printing.py \
-       gdb/unwinder.py \
        gdb/prompt.py \
+       gdb/types.py \
+       gdb/unwinder.py \
        gdb/xmethod.py \
        gdb/command/__init__.py \
-       gdb/command/xmethods.py \
+       gdb/command/explore.py \
        gdb/command/frame_filters.py \
-       gdb/command/unwinders.py \
-       gdb/command/type_printers.py \
        gdb/command/pretty_printers.py \
        gdb/command/prompt.py \
-       gdb/command/explore.py \
+       gdb/command/type_printers.py \
+       gdb/command/unwinders.py \
+       gdb/command/xmethods.py \
        gdb/function/__init__.py \
        gdb/function/as_string.py \
        gdb/function/caller_is.py \
index 8d57fa7eaaa312c5b435108cd486fc11d7ac7838..e141021c3f0fd525ff74ce15ee71187f28eabe8a 100644 (file)
@@ -1,3 +1,8 @@
+2016-11-22  Simon Marchi  <simon.marchi@polymtl.ca>
+
+       * Makefile.in (SFILES, OBS): Flatten list and order
+       alphabetically.
+
 2016-11-23  Pedro Alves  <palves@redhat.com>
 
        * event-loop.c (handle_file_event): Use warning.
index c25d21eec0570a511b6d2cfd7d3d8a1429ef9163..261ab55baba787ee96184897b2b7160d66732e97 100644 (file)
@@ -15,6 +15,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+# Please keep lists in this file sorted alphabetically, with one item per line.
+# See gdb/Makefile.in for guidelines on ordering files and directories.
+
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
@@ -146,43 +149,74 @@ INTERNAL_LDFLAGS = $(LDFLAGS) @RDYNAMIC@
 
 # All source files that go into linking GDB remote server.
 
-SFILES=        $(srcdir)/gdbreplay.c $(srcdir)/inferiors.c $(srcdir)/dll.c \
-       $(srcdir)/mem-break.c $(srcdir)/proc-service.c \
-       $(srcdir)/proc-service.list $(srcdir)/regcache.c \
-       $(srcdir)/remote-utils.c $(srcdir)/server.c $(srcdir)/target.c \
-       $(srcdir)/thread-db.c $(srcdir)/utils.c $(srcdir)/debug.c \
+SFILES = \
+       $(srcdir)/debug.c \
+       $(srcdir)/dll.c \
+       $(srcdir)/gdbreplay.c \
+       $(srcdir)/hostio.c \
+       $(srcdir)/hostio-errno.c \
+       $(srcdir)/i387-fp.c \
+       $(srcdir)/inferiors.c \
        $(srcdir)/linux-aarch64-low.c \
-       $(srcdir)/linux-arm-low.c $(srcdir)/linux-bfin-low.c \
-       $(srcdir)/linux-cris-low.c $(srcdir)/linux-crisv32-low.c \
-       ${srcdir}/x86-low.c $(srcdir)/i387-fp.c \
-       $(srcdir)/linux-ia64-low.c $(srcdir)/linux-low.c \
+       $(srcdir)/linux-arm-low.c \
+       $(srcdir)/linux-bfin-low.c \
+       $(srcdir)/linux-cris-low.c \
+       $(srcdir)/linux-crisv32-low.c \
+       $(srcdir)/linux-ia64-low.c \
+       $(srcdir)/linux-low.c \
        $(srcdir)/linux-m32r-low.c \
-       $(srcdir)/linux-m68k-low.c $(srcdir)/linux-mips-low.c \
+       $(srcdir)/linux-m68k-low.c \
+       $(srcdir)/linux-mips-low.c \
        $(srcdir)/linux-nios2-low.c \
-       $(srcdir)/linux-ppc-low.c $(srcdir)/nat/ppc-linux.c \
+       $(srcdir)/linux-ppc-low.c \
        $(srcdir)/linux-s390-low.c \
-       $(srcdir)/linux-sh-low.c $(srcdir)/linux-sparc-low.c \
+       $(srcdir)/linux-sh-low.c \
+       $(srcdir)/linux-sparc-low.c \
+       $(srcdir)/linux-tile-low.c \
        $(srcdir)/linux-x86-low.c \
        $(srcdir)/linux-xtensa-low.c \
-       $(srcdir)/linux-tile-low.c \
-       $(srcdir)/win32-arm-low.c $(srcdir)/win32-i386-low.c \
-       $(srcdir)/win32-low.c $(srcdir)/wincecompat.c \
-       $(srcdir)/hostio.c $(srcdir)/hostio-errno.c \
-       $(srcdir)/common/vec.c $(srcdir)/common/gdb_vecs.c \
-       $(srcdir)/common/common-utils.c $(srcdir)/common/xml-utils.c \
-       $(srcdir)/nat/linux-osdata.c $(srcdir)/common/ptid.c \
-       $(srcdir)/nat/linux-personality.c \
-       $(srcdir)/common/buffer.c $(srcdir)/nat/linux-btrace.c \
-       $(srcdir)/common/filestuff.c $(srcdir)/target/waitstatus.c \
-       $(srcdir)/nat/mips-linux-watch.c $(srcdir)/common/print-utils.c \
-       $(srcdir)/common/rsp-low.c $(srcdir)/common/errors.c \
-       $(srcdir)/common/common-debug.c $(srcdir)/common/cleanups.c \
-       $(srcdir)/common/common-exceptions.c $(srcdir)/symbol.c \
+       $(srcdir)/mem-break.c \
+       $(srcdir)/proc-service.c \
+       $(srcdir)/proc-service.list \
+       $(srcdir)/regcache.c \
+       $(srcdir)/remote-utils.c \
+       $(srcdir)/server.c \
+       $(srcdir)/symbol.c \
+       $(srcdir)/target.c \
+       $(srcdir)/thread-db.c \
+       $(srcdir)/utils.c \
+       $(srcdir)/win32-arm-low.c \
+       $(srcdir)/win32-i386-low.c \
+       $(srcdir)/win32-low.c \
+       $(srcdir)/wincecompat.c \
+       $(srcdir)/x86-low.c \
+       $(srcdir)/arch/arm.c \
+       $(srcdir)/arch/arm-get-next-pcs.c \
+       $(srcdir)/arch/arm-linux.c \
        $(srcdir)/common/btrace-common.c \
-       $(srcdir)/common/fileio.c $(srcdir)/nat/linux-namespaces.c \
-       $(srcdir)/arch/arm.c $(srcdir)/common/common-regcache.c \
-       $(srcdir)/arch/arm-linux.c $(srcdir)/arch/arm-get-next-pcs.c \
-       $(srcdir)/common/new-op.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/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)/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)/target/waitstatus.c
 
 DEPFILES = @GDBSERVER_DEPFILES@
 
@@ -191,14 +225,50 @@ LIBOBJS = @LIBOBJS@
 SOURCES = $(SFILES)
 TAGFILES = $(SOURCES) ${HFILES} ${ALLPARAM} ${POSSLIBS}
 
-OBS = agent.o ax.o inferiors.o regcache.o remote-utils.o server.o signals.o \
-      target.o waitstatus.o utils.o debug.o version.o vec.o gdb_vecs.o \
-      mem-break.o hostio.o event-loop.o tracepoint.o xml-utils.o \
-      common-utils.o ptid.o buffer.o format.o filestuff.o dll.o notif.o \
-      tdesc.o print-utils.o rsp-low.o errors.o common-debug.o cleanups.o \
-      common-exceptions.o symbol.o btrace-common.o fileio.o common-regcache.o \
-      signals-state-save-restore.o new-op.o \
-      $(XML_BUILTIN) $(DEPFILES) $(LIBOBJS)
+OBS = \
+       agent.o \
+       ax.o \
+       btrace-common.o \
+       buffer.o \
+       cleanups.o \
+       common-debug.o \
+       common-exceptions.o \
+       common-regcache.o \
+       common-utils.o \
+       debug.o \
+       dll.o \
+       errors.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@
 XM_CLIBS = @LIBS@
index 8d779811a369d4cefaed313e0ad7e679303b1f56..c34b37d83b9aac7d505845acc836bdc5a1509b4b 100644 (file)
@@ -1,3 +1,7 @@
+2016-11-22  Simon Marchi  <simon.marchi@polymtl.ca>
+
+       * gdb.base/default.exp: Fix output of "set language".
+
 2016-11-17  Simon Marchi  <simon.marchi@polymtl.ca>
 
        * Makefile.in: Remove @GMAKE_TRUE@ prefixes and removes lines
index b8a449bcb24d845c3987baa47acdcc1b247dd310..c5a90728753d9089419bd063211e0d839cb5b1f7 100644 (file)
@@ -511,7 +511,7 @@ gdb_test "set history size" "Argument required .integer to set it to.*" "set his
 #test set history
 gdb_test "set history" "\"set history\" must be followed by the name of a history subcommand.(\[^\r\n\]*\[\r\n\])+List of set history subcommands:(\[^\r\n\]*\[\r\n\])+set history expansion -- Set history expansion on command input(\[^\r\n\]*\[\r\n\])+set history filename -- Set the filename in which to record the command history(\[^\r\n\]*\[\r\n\])+set history save -- Set saving of the history record on exit(\[^\r\n\]*\[\r\n\])+set history size -- Set the size of the command history(\[^\r\n\]*\[\r\n\])+Type \"help set history\" followed by set history subcommand name for full documentation.(\[^\r\n\]*\[\r\n\])+Command name abbreviations are allowed if unambiguous." "set history"
 #test set language
-gdb_test "set language" "Requires an argument. Valid arguments are auto, local, unknown, ada, c, c.., asm, minimal, d, fortran, objective-c, go, modula-2, opencl, pascal, rust." "set language"
+gdb_test "set language" "Requires an argument. Valid arguments are ada, c, c.., asm, minimal, d, fortran, go, auto, local, unknown, modula-2, objective-c, opencl, pascal, rust." "set language"
 #test set listsize
 gdb_test "set listsize" "Argument required .integer to set it to.*" "set listsize"
 #test set print "p" abbreviation