From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 72100 invoked by alias); 30 Aug 2018 17:05:16 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 72087 invoked by uid 89); 30 Aug 2018 17:05:15 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-24.9 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: smtp.polymtl.ca Received: from smtp.polymtl.ca (HELO smtp.polymtl.ca) (132.207.4.11) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 30 Aug 2018 17:05:11 +0000 Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id w7UH54Bb002466 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 30 Aug 2018 13:05:09 -0400 Received: by simark.ca (Postfix, from userid 112) id 553FE1E4A5; Thu, 30 Aug 2018 13:05:04 -0400 (EDT) Received: from simark.ca (localhost [127.0.0.1]) by simark.ca (Postfix) with ESMTP id C58151E012; Thu, 30 Aug 2018 13:04:57 -0400 (EDT) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Thu, 30 Aug 2018 17:05:00 -0000 From: Simon Marchi To: Sergio Durigan Junior Cc: GDB Patches , Pedro Alves , Tom Tromey Subject: Re: [PATCH] Update gnulib/Makefile.in:aclocal_m4_deps In-Reply-To: <20180830155724.20000-1-sergiodj@redhat.com> References: <20180830155724.20000-1-sergiodj@redhat.com> Message-ID: <72e6edf3ddf2c9994c5e5d3ebfbfb171@polymtl.ca> X-Sender: simon.marchi@polymtl.ca User-Agent: Roundcube Webmail/1.3.6 X-IsSubscribed: yes X-SW-Source: 2018-08/txt/msg00837.txt.bz2 On 2018-08-30 11:57, Sergio Durigan Junior wrote: > It was pointed by Pedro that gnulib/Makefile.in should be updated > accordingly after our local gnulib is also updated. The specific part > that needs to be refreshed is the "aclocal_m4_deps" variable, which > lists the .m4 files present under the "gnulib/import/m4/" directory. > This patch does that. > > No regressions introduced. > > gdb/ChangeLog: > 2018-08-30 Sergio Durigan Junior > > * gnulib/Makefile.in (aclocal_m4_deps): Update according to > the files present in "gnulib/import/m4/". > --- > gdb/ChangeLog | 5 ++ > gdb/gnulib/Makefile.in | 155 ++++++++++++++++++++++++++++++++--------- > 2 files changed, 128 insertions(+), 32 deletions(-) > > diff --git a/gdb/ChangeLog b/gdb/ChangeLog > index 0d55fd45f5..2ecc4173e8 100644 > --- a/gdb/ChangeLog > +++ b/gdb/ChangeLog > @@ -1,3 +1,8 @@ > +2018-08-30 Sergio Durigan Junior > + > + * gnulib/Makefile.in (aclocal_m4_deps): Update according to > + the files present in "gnulib/import/m4/". > + > 2018-08-30 Andrew Burgess > > * riscv-tdep.c (riscv_insn::decode): Decode c.addi4spn, c.sd, > diff --git a/gdb/gnulib/Makefile.in b/gdb/gnulib/Makefile.in > index 191ecbda02..1602da54b6 100644 > --- a/gdb/gnulib/Makefile.in > +++ b/gdb/gnulib/Makefile.in > @@ -207,49 +207,140 @@ ACLOCAL = aclocal > ACLOCAL_AMFLAGS = -I import/m4 -I ../../config > aclocal_m4_deps = \ > configure.ac \ > - import/m4/00gnulib.m4 \ > - import/m4/alloca.m4 \ > - import/m4/codeset.m4 \ > - import/m4/configmake.m4 \ > - import/m4/extensions.m4 \ > - import/m4/fcntl-o.m4 \ > - import/m4/fnmatch.m4 \ > - import/m4/glibc21.m4 \ > - import/m4/gnulib-cache.m4 \ > + import/m4/flexmember.m4 \ > + import/m4/eealloc.m4 \ > + import/m4/mkdir.m4 \ > + import/m4/close.m4 \ > + import/m4/unistd-safer.m4 \ > + import/m4/inttypes-pri.m4 \ > + import/m4/chdir-long.m4 \ > import/m4/gnulib-common.m4 \ > - import/m4/gnulib-comp.m4 \ > + import/m4/readdir.m4 \ > + import/m4/stdlib_h.m4 \ > + import/m4/getlogin_r.m4 \ > + import/m4/warn-on-use.m4 \ > + import/m4/getdtablesize.m4 \ > + import/m4/rewinddir.m4 \ > + import/m4/string_h.m4 \ > + import/m4/closedir.m4 \ > + import/m4/canonicalize.m4 \ > + import/m4/stdio_h.m4 \ > + import/m4/fdopendir.m4 \ > + import/m4/getcwd-abort-bug.m4 \ > + import/m4/alloca.m4 \ > + import/m4/strstr.m4 \ > + import/m4/stat-time.m4 \ > + import/m4/builtin-expect.m4 \ > + import/m4/rawmemchr.m4 \ > + import/m4/msvc-nothrow.m4 \ > + import/m4/absolute-header.m4 \ > + import/m4/isnanl.m4 \ > + import/m4/stddef_h.m4 \ > import/m4/gnulib-tool.m4 \ > - import/m4/include_next.m4 \ > - import/m4/inttypes-pri.m4 \ > - import/m4/inttypes.m4 \ > - import/m4/localcharset.m4 \ > - import/m4/locale-fr.m4 \ > + import/m4/realloc.m4 \ > + import/m4/d-type.m4 \ > + import/m4/frexp.m4 \ > + import/m4/getcwd-path-max.m4 \ > + import/m4/dup2.m4 \ > + import/m4/strtok_r.m4 \ > + import/m4/exponentd.m4 \ > + import/m4/std-gnu11.m4 \ > import/m4/locale-ja.m4 \ > + import/m4/gettimeofday.m4 \ > + import/m4/time_h.m4 \ > + import/m4/malloc.m4 \ > + import/m4/fnmatch_h.m4 \ > + import/m4/codeset.m4 \ > + import/m4/getcwd.m4 \ > + import/m4/readlink.m4 \ > import/m4/locale-zh.m4 \ > - import/m4/longlong.m4 \ > + import/m4/stdint.m4 \ > + import/m4/memrchr.m4 \ > + import/m4/onceonly.m4 \ > + import/m4/pathmax.m4 \ > + import/m4/rename.m4 \ > + import/m4/rmdir.m4 \ > + import/m4/dup.m4 \ > + import/m4/errno_h.m4 \ > import/m4/mbrtowc.m4 \ > - import/m4/mbsinit.m4 \ > + import/m4/environ.m4 \ > + import/m4/wchar_h.m4 \ > + import/m4/strchrnul.m4 \ > + import/m4/fcntl_h.m4 \ > + import/m4/getpagesize.m4 \ > + import/m4/largefile.m4 \ > + import/m4/openat.m4 \ > + import/m4/save-cwd.m4 \ > + import/m4/stat.m4 \ > + import/m4/include_next.m4 \ > + import/m4/mmap-anon.m4 \ > + import/m4/mode_t.m4 \ > + import/m4/exponentl.m4 \ > + import/m4/sys_types_h.m4 \ > + import/m4/fcntl-o.m4 \ > + import/m4/stdbool.m4 \ > + import/m4/float_h.m4 \ > + import/m4/msvc-inval.m4 \ > + import/m4/wctype_h.m4 \ > + import/m4/gnulib-cache.m4 \ > import/m4/mbsrtowcs.m4 \ > - import/m4/mbstate_t.m4 \ > + import/m4/limits-h.m4 \ > + import/m4/locale-fr.m4 \ > + import/m4/fstatat.m4 \ > + import/m4/inttypes.m4 \ > import/m4/memchr.m4 \ > - import/m4/memmem.m4 \ > - import/m4/mmap-anon.m4 \ > - import/m4/multiarch.m4 \ > + import/m4/glob.m4 \ > + import/m4/fstat.m4 \ > + import/m4/sys_stat_h.m4 \ > import/m4/off_t.m4 \ > - import/m4/pathmax.m4 \ > + import/m4/strdup.m4 \ > import/m4/ssize_t.m4 \ > - import/m4/stdbool.m4 \ > - import/m4/stddef_h.m4 \ > - import/m4/stdint.m4 \ > - import/m4/string_h.m4 \ > - import/m4/strtok_r.m4 \ > - import/m4/sys_types_h.m4 \ > + import/m4/math_h.m4 \ > import/m4/unistd_h.m4 \ > - import/m4/warn-on-use.m4 \ > - import/m4/wchar_h.m4 \ > + import/m4/fpieee.m4 \ > + import/m4/mempcpy.m4 \ > + import/m4/wint_t.m4 \ > + import/m4/d-ino.m4 \ > + import/m4/setenv.m4 \ > + import/m4/open-cloexec.m4 \ > + import/m4/longlong.m4 \ > + import/m4/multiarch.m4 \ > + import/m4/filenamecat.m4 \ > + import/m4/gnulib-comp.m4 \ > + import/m4/mkstemp.m4 \ > + import/m4/dirfd.m4 \ > + import/m4/getlogin.m4 \ > + import/m4/signal_h.m4 \ > + import/m4/sys_socket_h.m4 \ > + import/m4/dirname.m4 \ > + import/m4/00gnulib.m4 \ > + import/m4/dirent_h.m4 \ > + import/m4/opendir.m4 \ > + import/m4/error.m4 \ > + import/m4/extensions.m4 \ > + import/m4/fchdir.m4 \ > + import/m4/mbsinit.m4 \ > + import/m4/__inline.m4 \ > + import/m4/extern-inline.m4 \ > + import/m4/fnmatch.m4 \ > + import/m4/lstat.m4 \ > + import/m4/nocrash.m4 \ > + import/m4/sys_time_h.m4 \ > + import/m4/localcharset.m4 \ > + import/m4/open.m4 \ > + import/m4/localtime-buffer.m4 \ > + import/m4/getprogname.m4 \ > import/m4/wchar_t.m4 \ > - import/m4/wctype_h.m4 \ > - import/m4/wint_t.m4 > + import/m4/isnand.m4 \ > + import/m4/double-slash-root.m4 \ > + import/m4/malloca.m4 \ > + import/m4/fcntl.m4 \ > + import/m4/frexpl.m4 \ > + import/m4/strerror.m4 \ > + import/m4/glob_h.m4 \ > + import/m4/tempname.m4 \ > + import/m4/memmem.m4 \ > + import/m4/mbstate_t.m4 > > $(srcdir)/aclocal.m4: @MAINTAINER_MODE_TRUE@ $(aclocal_m4_deps) > cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) This looks good to me, the set of m4 files listed here matches the list of actual m4 files in import/m4. Follow-up question, could we use $(wildcard ...) instead of listing them by hand? Simon