From patchwork Sun Oct 20 03:55:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Simon Marchi (Code Review)" X-Patchwork-Id: 35178 Received: (qmail 28869 invoked by alias); 20 Oct 2019 04:03:04 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 28803 invoked by uid 89); 20 Oct 2019 04:03:03 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-20.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.1 spammy=D*adacore.com X-HELO: mx1.osci.io Received: from polly.osci.io (HELO mx1.osci.io) (8.43.85.229) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 20 Oct 2019 04:02:53 +0000 Received: by mx1.osci.io (Postfix, from userid 994) id 4DAF7201A1; Sat, 19 Oct 2019 23:55:20 -0400 (EDT) Received: from gnutoolchain-gerrit.osci.io (gnutoolchain-gerrit.osci.io [8.43.85.239]) by mx1.osci.io (Postfix) with ESMTP id C786A20564 for ; Sat, 19 Oct 2019 23:55:11 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by gnutoolchain-gerrit.osci.io (Postfix) with ESMTP id A1DBF20AF6 for ; Sat, 19 Oct 2019 23:55:11 -0400 (EDT) X-Gerrit-PatchSet: 1 Date: Sat, 19 Oct 2019 23:55:11 -0400 From: "Tom Tromey (Code Review)" To: gdb-patches@sourceware.org Message-ID: Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange Subject: [review] Use m4_include, not sinclude in .m4 files X-Gerrit-Change-Id: I970362e0af7875f9f72796401126acf0ff6dba11 X-Gerrit-Change-Number: 164 X-Gerrit-ChangeURL: X-Gerrit-Commit: 0ac46d70f2062f918eab3a617915a249a2baefca References: Reply-To: tromey@sourceware.org, gdb-patches@sourceware.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Gerrit/3.0.3 Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/164 ...................................................................... Use m4_include, not sinclude in .m4 files Pedro pointed out that sinclude does not error if a file is missing. This patch changes gdb to only use m4_include, which seems more correct. gdb/ChangeLog 2019-10-19 Tom Tromey * configure: Rebuild. * acinclude.m4: Use m4_include, not sinclude. gdb/gdbserver/ChangeLog 2019-10-19 Tom Tromey * configure: Rebuild. * acinclude.m4: Use m4_include, not sinclude. gdb/testsuite/ChangeLog 2019-10-19 Tom Tromey * configure: Rebuild. * aclocal.m4: Use m4_include, not sinclude. Change-Id: I970362e0af7875f9f72796401126acf0ff6dba11 --- M gdb/ChangeLog M gdb/acinclude.m4 M gdb/gdbserver/ChangeLog M gdb/gdbserver/acinclude.m4 M gdb/testsuite/ChangeLog M gdb/testsuite/aclocal.m4 6 files changed, 45 insertions(+), 30 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c6e516d..c4d402f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2019-10-19 Tom Tromey + + * configure: Rebuild. + * acinclude.m4: Use m4_include, not sinclude. + 2019-10-19 Sergio Durigan Junior * symfile.c (init_entry_point_info): Fix typo. diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4 index 6e81aae..5f1358b 100644 --- a/gdb/acinclude.m4 +++ b/gdb/acinclude.m4 @@ -4,64 +4,64 @@ # Keep these includes in sync with the aclocal_m4_deps list in # Makefile.in. -sinclude(acx_configure_dir.m4) +m4_include(acx_configure_dir.m4) # This gets GDB_AC_TRANSFORM. -sinclude(transform.m4) +m4_include(transform.m4) # This gets AM_GDB_WARNINGS. -sinclude(warning.m4) +m4_include(warning.m4) # AM_GDB_UBSAN -sinclude(sanitize.m4) +m4_include(sanitize.m4) # This gets GDB_AC_SELFTEST. -sinclude(selftest.m4) +m4_include(selftest.m4) dnl gdb/configure.in uses BFD_NEED_DECLARATION, so get its definition. -sinclude(../bfd/bfd.m4) +m4_include(../bfd/bfd.m4) dnl This gets the standard macros. -sinclude(../config/acinclude.m4) +m4_include(../config/acinclude.m4) dnl This gets AC_PLUGINS, needed by ACX_LARGEFILE. -sinclude(../config/plugins.m4) +m4_include(../config/plugins.m4) dnl For ACX_LARGEFILE. -sinclude(../config/largefile.m4) +m4_include(../config/largefile.m4) dnl For AM_SET_LEADING_DOT. -sinclude(../config/lead-dot.m4) +m4_include(../config/lead-dot.m4) dnl This gets autoconf bugfixes. -sinclude(../config/override.m4) +m4_include(../config/override.m4) dnl For ZW_GNU_GETTEXT_SISTER_DIR. -sinclude(../config/gettext-sister.m4) +m4_include(../config/gettext-sister.m4) dnl For AC_LIB_HAVE_LINKFLAGS. -sinclude(../config/lib-ld.m4) -sinclude(../config/lib-prefix.m4) -sinclude(../config/lib-link.m4) +m4_include(../config/lib-ld.m4) +m4_include(../config/lib-prefix.m4) +m4_include(../config/lib-link.m4) dnl For ACX_PKGVERSION and ACX_BUGURL. -sinclude(../config/acx.m4) +m4_include(../config/acx.m4) dnl for TCL definitions -sinclude(../config/tcl.m4) +m4_include(../config/tcl.m4) dnl For dependency tracking macros. -sinclude([../config/depstand.m4]) +m4_include([../config/depstand.m4]) dnl For AM_LC_MESSAGES -sinclude([../config/lcmessage.m4]) +m4_include([../config/lcmessage.m4]) dnl For AM_LANGINFO_CODESET. -sinclude([../config/codeset.m4]) +m4_include([../config/codeset.m4]) -sinclude([../config/iconv.m4]) +m4_include([../config/iconv.m4]) -sinclude([../config/zlib.m4]) +m4_include([../config/zlib.m4]) m4_include([gdbsupport/common.m4]) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index fa78eba..02033ae 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,8 @@ +2019-10-19 Tom Tromey + + * configure: Rebuild. + * acinclude.m4: Use m4_include, not sinclude. + 2019-10-17 Tom Tromey * configure: Rebuild. diff --git a/gdb/gdbserver/acinclude.m4 b/gdb/gdbserver/acinclude.m4 index 3887b16..880c03a 100644 --- a/gdb/gdbserver/acinclude.m4 +++ b/gdb/gdbserver/acinclude.m4 @@ -1,16 +1,16 @@ dnl gdb/gdbserver/configure.in uses BFD_HAVE_SYS_PROCFS_TYPE. -sinclude(../../bfd/bfd.m4) +m4_include(../../bfd/bfd.m4) -sinclude(../acx_configure_dir.m4) +m4_include(../acx_configure_dir.m4) # This gets AM_GDB_WARNINGS. -sinclude(../warning.m4) +m4_include(../warning.m4) dnl This gets autoconf bugfixes -sinclude(../../config/override.m4) +m4_include(../../config/override.m4) dnl For ACX_PKGVERSION and ACX_BUGURL. -sinclude(../../config/acx.m4) +m4_include(../../config/acx.m4) m4_include(../../config/depstand.m4) m4_include(../../config/lead-dot.m4) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 1075a1d..63089f3 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-10-19 Tom Tromey + + * configure: Rebuild. + * aclocal.m4: Use m4_include, not sinclude. + 2019-10-17 Tom de Vries * gdb.fortran/module.exp: Allow info variables to print info for files diff --git a/gdb/testsuite/aclocal.m4 b/gdb/testsuite/aclocal.m4 index d40c3a9..5061eef 100644 --- a/gdb/testsuite/aclocal.m4 +++ b/gdb/testsuite/aclocal.m4 @@ -1,6 +1,6 @@ -sinclude(../../config/acx.m4) -sinclude(../../config/override.m4) -sinclude(../transform.m4) +m4_include(../../config/acx.m4) +m4_include(../../config/override.m4) +m4_include(../transform.m4) # AM_CONDITIONAL -*- Autoconf -*-