From 58df732b2166c31c8ee868b95cb62ef232e25387 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Tue, 11 Feb 2020 10:51:43 -0500 Subject: [PATCH] Move gdb/warning.m4 to gdbsupport This file is used by gdbsupport, gdbserver and gdb, so I think it belongs in gdbsupport. Move it there and update the references the various acinclude.m4 files. gdbsupport/ChangeLog: * warning.m4: Move here, from gdb/warning.m4. * acinclude.m4: Update warning.m4 path. * Makefile.in: Re-generate. gdbserver/ChangeLog: * acinclude.m4: Update warning.m4 path. gdb/ChangeLog: * acinclude: Update warning.m4 path. * warning.m4: Move to gdbsupport. --- gdb/ChangeLog | 5 +++++ gdb/acinclude.m4 | 2 +- gdbserver/ChangeLog | 4 ++++ gdbserver/acinclude.m4 | 4 ++-- gdbsupport/ChangeLog | 6 ++++++ gdbsupport/Makefile.in | 2 +- gdbsupport/acinclude.m4 | 2 +- {gdb => gdbsupport}/warning.m4 | 0 8 files changed, 20 insertions(+), 5 deletions(-) rename {gdb => gdbsupport}/warning.m4 (100%) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4f104bc8df1..fcb7980c367 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2020-02-11 Simon Marchi + + * acinclude: Update warning.m4 path. + * warning.m4: Move to gdbsupport. + 2020-02-11 Tom Tromey * remote.c (remote_console_output): Update. diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4 index d60b2fe19c1..14304bbe50f 100644 --- a/gdb/acinclude.m4 +++ b/gdb/acinclude.m4 @@ -10,7 +10,7 @@ m4_include(acx_configure_dir.m4) m4_include(transform.m4) # This gets AM_GDB_WARNINGS. -m4_include(warning.m4) +m4_include(../gdbsupport/warning.m4) # AM_GDB_UBSAN m4_include(sanitize.m4) diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index 4f3e8cb2478..05620affa92 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,3 +1,7 @@ +2020-02-11 Simon Marchi + + * acinclude.m4: Update warning.m4 path. + 2020-02-09 Hannes Domani * win32-low.c (win32_clear_inferiors): Reset siginfo_er. diff --git a/gdbserver/acinclude.m4 b/gdbserver/acinclude.m4 index 5a284515c82..6ed43ddd521 100644 --- a/gdbserver/acinclude.m4 +++ b/gdbserver/acinclude.m4 @@ -3,8 +3,8 @@ m4_include(../bfd/bfd.m4) m4_include(../gdb/acx_configure_dir.m4) -# This gets AM_GDB_WARNINGS. -m4_include(../gdb/warning.m4) +dnl This gets AM_GDB_WARNINGS. +m4_include(../gdbsupport/warning.m4) dnl This gets autoconf bugfixes m4_include(../config/override.m4) diff --git a/gdbsupport/ChangeLog b/gdbsupport/ChangeLog index 4a820acf527..f03bb34bac1 100644 --- a/gdbsupport/ChangeLog +++ b/gdbsupport/ChangeLog @@ -1,3 +1,9 @@ +2020-02-11 Simon Marchi + + * warning.m4: Move here, from gdb/warning.m4. + * acinclude.m4: Update warning.m4 path. + * Makefile.in: Re-generate. + 2020-02-11 Simon Marchi * acinclude.m4: Include ../gdb/warning.m4. diff --git a/gdbsupport/Makefile.in b/gdbsupport/Makefile.in index 91164175bc0..be4d5354531 100644 --- a/gdbsupport/Makefile.in +++ b/gdbsupport/Makefile.in @@ -124,7 +124,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/codeset.m4 \ $(top_srcdir)/../gdb/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/../gdb/libiberty.m4 \ $(top_srcdir)/../gdb/selftest.m4 \ - $(top_srcdir)/../gdb/ptrace.m4 $(top_srcdir)/../gdb/warning.m4 \ + $(top_srcdir)/../gdb/ptrace.m4 $(top_srcdir)/warning.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) diff --git a/gdbsupport/acinclude.m4 b/gdbsupport/acinclude.m4 index 3598b201b94..d638ebcb543 100644 --- a/gdbsupport/acinclude.m4 +++ b/gdbsupport/acinclude.m4 @@ -7,4 +7,4 @@ m4_include([../gdb/selftest.m4]) m4_include([../gdb/ptrace.m4]) dnl This gets AM_GDB_WARNINGS. -m4_include(../gdb/warning.m4) +m4_include(warning.m4) diff --git a/gdb/warning.m4 b/gdbsupport/warning.m4 similarity index 100% rename from gdb/warning.m4 rename to gdbsupport/warning.m4 -- 2.30.2