From 006811bc02fe28060a8557b1f17a129440c975d4 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Sun, 25 Oct 2020 21:08:49 -0400 Subject: [PATCH] gdb: move ptrace.m4 to gdbsupport ptrace.m4, providing the GDB_AC_PTRACE autoconf macro, is used by gdb, gdbserver and gdbsupport. I think it would make sense to move it to gdbsupport. gdb/ChangeLog: * acinclude.m4: Update ptrace.m4 path. * ptrace.m4: Moved to gdbsupport. gdbserver/ChangeLog: * acinclude.m4: Update ptrace.m4 path. gdbsupport/ChangeLog: * Makefile.in: Re-generate. * acinclude.m4: Update ptrace.m4 path. * ptrace.m4: Move here. Change-Id: I849c149fd5dd8c3b2b0af38654fb353e3727871b --- gdb/ChangeLog | 5 +++++ gdb/acinclude.m4 | 2 +- gdbserver/ChangeLog | 4 ++++ gdbserver/acinclude.m4 | 2 +- gdbsupport/ChangeLog | 6 ++++++ gdbsupport/Makefile.in | 2 +- gdbsupport/acinclude.m4 | 2 +- {gdb => gdbsupport}/ptrace.m4 | 0 8 files changed, 19 insertions(+), 4 deletions(-) rename {gdb => gdbsupport}/ptrace.m4 (100%) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2606f871170..d4d13c07b4c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2020-10-25 Simon Marchi + + * acinclude.m4: Update ptrace.m4 path. + * ptrace.m4: Moved to gdbsupport. + 2020-10-24 Simon Marchi * symfile-mem.c (add_vsyscall_page): Use inferior parameter diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4 index 6fbc88bb55c..9aa32e6d147 100644 --- a/gdb/acinclude.m4 +++ b/gdb/acinclude.m4 @@ -72,7 +72,7 @@ dnl For libiberty_INIT. m4_include(libiberty.m4) dnl For GDB_AC_PTRACE. -m4_include(ptrace.m4) +m4_include(../gdbsupport/ptrace.m4) m4_include(ax_cxx_compile_stdcxx.m4) diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index 74391ed137a..a7eebfd7a71 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,3 +1,7 @@ +2020-10-25 Simon Marchi + + * acinclude.m4: Update ptrace.m4 path. + 2020-10-24 Simon Marchi * config.in: Re-generate. diff --git a/gdbserver/acinclude.m4 b/gdbserver/acinclude.m4 index a49be8dff81..f02a63cc70c 100644 --- a/gdbserver/acinclude.m4 +++ b/gdbserver/acinclude.m4 @@ -27,7 +27,7 @@ dnl For libiberty_INIT. m4_include(../gdb/libiberty.m4) dnl For GDB_AC_PTRACE. -m4_include(../gdb/ptrace.m4) +m4_include(../gdbsupport/ptrace.m4) m4_include(../gdb/ax_cxx_compile_stdcxx.m4) diff --git a/gdbsupport/ChangeLog b/gdbsupport/ChangeLog index cd05d6adf75..759eea1296b 100644 --- a/gdbsupport/ChangeLog +++ b/gdbsupport/ChangeLog @@ -1,3 +1,9 @@ +2020-10-25 Simon Marchi + + * Makefile.in: Re-generate. + * acinclude.m4: Update ptrace.m4 path. + * ptrace.m4: Move here. + 2020-10-08 Andrew Burgess * tdesc.h (allocate_target_description): Update return type. diff --git a/gdbsupport/Makefile.in b/gdbsupport/Makefile.in index 044ef1555c2..ccfc27f43ae 100644 --- a/gdbsupport/Makefile.in +++ b/gdbsupport/Makefile.in @@ -123,7 +123,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/codeset.m4 \ $(top_srcdir)/../config/ax_pthread.m4 \ $(top_srcdir)/../gdb/ax_cxx_compile_stdcxx.m4 \ $(top_srcdir)/../gdb/libiberty.m4 $(top_srcdir)/selftest.m4 \ - $(top_srcdir)/../gdb/ptrace.m4 $(top_srcdir)/warning.m4 \ + $(top_srcdir)/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 4c86c4f8de7..cc9c2dcb32f 100644 --- a/gdbsupport/acinclude.m4 +++ b/gdbsupport/acinclude.m4 @@ -4,7 +4,7 @@ m4_include([../config/ax_pthread.m4]) m4_include([../gdb/ax_cxx_compile_stdcxx.m4]) m4_include([../gdb/libiberty.m4]) m4_include([selftest.m4]) -m4_include([../gdb/ptrace.m4]) +m4_include([ptrace.m4]) dnl This gets AM_GDB_WARNINGS. m4_include(warning.m4) diff --git a/gdb/ptrace.m4 b/gdbsupport/ptrace.m4 similarity index 100% rename from gdb/ptrace.m4 rename to gdbsupport/ptrace.m4 -- 2.30.2