From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH v4 01/11] Use m4_include, not sinclude in .m4 files
Date: Tue, 01 Oct 2019 20:12:00 -0000 [thread overview]
Message-ID: <20191001201227.8519-2-tom@tromey.com> (raw)
In-Reply-To: <20191001201227.8519-1-tom@tromey.com>
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-01 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
* acinclude.m4: Use m4_include, not sinclude.
gdb/gdbserver/ChangeLog
2019-10-01 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
* acinclude.m4: Use m4_include, not sinclude.
gdb/testsuite/ChangeLog
2019-10-01 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
* aclocal.m4: Use m4_include, not sinclude.
---
gdb/ChangeLog | 5 +++++
gdb/acinclude.m4 | 44 +++++++++++++++++++-------------------
gdb/gdbserver/ChangeLog | 5 +++++
gdb/gdbserver/acinclude.m4 | 10 ++++-----
gdb/testsuite/ChangeLog | 5 +++++
gdb/testsuite/aclocal.m4 | 6 +++---
6 files changed, 45 insertions(+), 30 deletions(-)
diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4
index 6e81aaed3bf..5f1358b8207 100644
--- a/gdb/acinclude.m4
+++ b/gdb/acinclude.m4
@@ -4,64 +4,64 @@ dnl major rewriting for Tcl 7.5 by Don Libes <libes@nist.gov>
# 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/acinclude.m4 b/gdb/gdbserver/acinclude.m4
index 3887b165c66..880c03ac1db 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/aclocal.m4 b/gdb/testsuite/aclocal.m4
index d40c3a9fc6a..5061eef5372 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 -*-
--
2.17.2
next prev parent reply other threads:[~2019-10-01 20:12 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-01 20:16 [PATCH v4 00/11] Demangle minimal symbol names in worker threads Tom Tromey
2019-10-01 20:12 ` [PATCH v4 10/11] Add maint set/show max-worker-threads Tom Tromey
2019-10-02 14:54 ` Eli Zaretskii
2019-10-01 20:12 ` [PATCH v4 09/11] Demangle minsyms in parallel Tom Tromey
2019-10-01 20:12 ` [PATCH v4 04/11] Add RAII class for blocking gdb signals Tom Tromey
2019-10-01 20:12 ` [PATCH v4 08/11] Introduce thread-safe way to handle SIGSEGV Tom Tromey
2019-10-01 20:12 ` Tom Tromey [this message]
2019-10-01 20:12 ` [PATCH v4 07/11] Introduce run_on_main_thread Tom Tromey
2019-10-01 20:12 ` [PATCH v4 11/11] Use run_on_main_thread in gdb.post_event Tom Tromey
2019-10-01 20:12 ` [PATCH v4 03/11] Add configure check for std::thread Tom Tromey
2019-10-01 20:12 ` [PATCH v4 05/11] Introduce alternate_signal_stack RAII class Tom Tromey
2019-10-01 20:16 ` [PATCH v4 02/11] Defer minimal symbol name-setting Tom Tromey
2019-10-01 20:16 ` [PATCH v4 06/11] Lock the demangled hash table Tom Tromey
2019-10-06 22:34 ` [PATCH v4 00/11] Demangle minimal symbol names in worker threads Christian Biesinger via gdb-patches
2019-10-07 0:58 ` Tom Tromey
2019-10-08 2:01 ` Christian Biesinger via gdb-patches
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191001201227.8519-2-tom@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).