From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7919) id 95CC33858D35; Wed, 15 Nov 2023 15:17:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 95CC33858D35 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Sam James To: bfd-cvs@sourceware.org, gdb-cvs@sourceware.org Subject: [binutils-gdb] Finalized intl-update patches (trois) X-Act-Checkin: binutils-gdb X-Git-Author: Sam James X-Git-Refname: refs/heads/master X-Git-Oldrev: 9e11e7460da19bbb8ca1332f616545e79d917bde X-Git-Newrev: 35b38b0182d054a022fe8d5f3d056453fc72647d Message-Id: <20231115151747.95CC33858D35@sourceware.org> Date: Wed, 15 Nov 2023 15:17:47 +0000 (GMT) X-BeenThere: binutils-cvs@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Nov 2023 15:17:47 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D35b38b0182d0= 54a022fe8d5f3d056453fc72647d commit 35b38b0182d054a022fe8d5f3d056453fc72647d Author: Sam James Date: Wed Nov 15 14:33:59 2023 +0000 Finalized intl-update patches (trois) =20 Doing this on behalf of Arsen as obvious. Hopefully the last fixup. =20 * gdb: Regenerate. * gnulib: Regenerate. Diff: --- gdb/aclocal.m4 | 10 +++++----- gnulib/Makefile.in | 16 ++++++++-------- gnulib/aclocal.m4 | 12 ++++++------ gnulib/configure | 2 +- gnulib/import/Makefile.in | 16 ++++++++-------- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4 index 99714239668..05b492625df 100644 --- a/gdb/aclocal.m4 +++ b/gdb/aclocal.m4 @@ -199,6 +199,11 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) =20 +m4_include([../libtool.m4]) +m4_include([../ltoptions.m4]) +m4_include([../ltsugar.m4]) +m4_include([../ltversion.m4]) +m4_include([../lt~obsolete.m4]) m4_include([../config/acx.m4]) m4_include([../config/ax_pthread.m4]) m4_include([../config/bfd64.m4]) @@ -217,9 +222,4 @@ m4_include([../config/plugins.m4]) m4_include([../config/po.m4]) m4_include([../config/progtest.m4]) m4_include([../config/tcl.m4]) -m4_include([../libtool.m4]) -m4_include([../ltoptions.m4]) -m4_include([../ltsugar.m4]) -m4_include([../ltversion.m4]) -m4_include([../lt~obsolete.m4]) m4_include([acinclude.m4]) diff --git a/gnulib/Makefile.in b/gnulib/Makefile.in index 8d5bf7f1672..02886fe877a 100644 --- a/gnulib/Makefile.in +++ b/gnulib/Makefile.in @@ -107,12 +107,7 @@ host_triplet =3D @host@ target_triplet =3D @target@ subdir =3D . ACLOCAL_M4 =3D $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps =3D $(top_srcdir)/../config/depstand.m4 \ - $(top_srcdir)/../config/largefile.m4 \ - $(top_srcdir)/../config/lead-dot.m4 \ - $(top_srcdir)/../config/override.m4 \ - $(top_srcdir)/../config/plugins.m4 \ - $(top_srcdir)/import/m4/00gnulib.m4 \ +am__aclocal_m4_deps =3D $(top_srcdir)/import/m4/00gnulib.m4 \ $(top_srcdir)/import/m4/__inline.m4 \ $(top_srcdir)/import/m4/absolute-header.m4 \ $(top_srcdir)/import/m4/alloca.m4 \ @@ -125,7 +120,6 @@ am__aclocal_m4_deps =3D $(top_srcdir)/../config/depstan= d.m4 \ $(top_srcdir)/import/m4/clock_time.m4 \ $(top_srcdir)/import/m4/close.m4 \ $(top_srcdir)/import/m4/closedir.m4 \ - $(top_srcdir)/import/m4/codeset.m4 \ $(top_srcdir)/import/m4/ctype_h.m4 \ $(top_srcdir)/import/m4/d-ino.m4 \ $(top_srcdir)/import/m4/d-type.m4 \ @@ -282,7 +276,13 @@ am__aclocal_m4_deps =3D $(top_srcdir)/../config/depsta= nd.m4 \ $(top_srcdir)/import/m4/wmemchr.m4 \ $(top_srcdir)/import/m4/wmempcpy.m4 \ $(top_srcdir)/import/m4/year2038.m4 \ - $(top_srcdir)/import/m4/zzgnulib.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/import/m4/zzgnulib.m4 \ + $(top_srcdir)/../config/codeset.m4 \ + $(top_srcdir)/../config/depstand.m4 \ + $(top_srcdir)/../config/largefile.m4 \ + $(top_srcdir)/../config/lead-dot.m4 \ + $(top_srcdir)/../config/override.m4 \ + $(top_srcdir)/../config/plugins.m4 $(top_srcdir)/configure.ac am__configure_deps =3D $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON =3D $(srcdir)/Makefile.am $(top_srcdir)/configure \ diff --git a/gnulib/aclocal.m4 b/gnulib/aclocal.m4 index 707108d7abf..c7f866eb8bf 100644 --- a/gnulib/aclocal.m4 +++ b/gnulib/aclocal.m4 @@ -1169,11 +1169,6 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR =20 -m4_include([../config/depstand.m4]) -m4_include([../config/largefile.m4]) -m4_include([../config/lead-dot.m4]) -m4_include([../config/override.m4]) -m4_include([../config/plugins.m4]) m4_include([import/m4/00gnulib.m4]) m4_include([import/m4/__inline.m4]) m4_include([import/m4/absolute-header.m4]) @@ -1187,7 +1182,6 @@ m4_include([import/m4/chown.m4]) m4_include([import/m4/clock_time.m4]) m4_include([import/m4/close.m4]) m4_include([import/m4/closedir.m4]) -m4_include([import/m4/codeset.m4]) m4_include([import/m4/ctype_h.m4]) m4_include([import/m4/d-ino.m4]) m4_include([import/m4/d-type.m4]) @@ -1346,3 +1340,9 @@ m4_include([import/m4/wmemchr.m4]) m4_include([import/m4/wmempcpy.m4]) m4_include([import/m4/year2038.m4]) m4_include([import/m4/zzgnulib.m4]) +m4_include([../config/codeset.m4]) +m4_include([../config/depstand.m4]) +m4_include([../config/largefile.m4]) +m4_include([../config/lead-dot.m4]) +m4_include([../config/override.m4]) +m4_include([../config/plugins.m4]) diff --git a/gnulib/configure b/gnulib/configure index cc7e8287d5a..cb2a11359a1 100644 --- a/gnulib/configure +++ b/gnulib/configure @@ -8433,7 +8433,7 @@ else int main () { -char* cs =3D nl_langinfo(CODESET); return !cs; +char* cs =3D nl_langinfo(CODESET); ; return 0; } diff --git a/gnulib/import/Makefile.in b/gnulib/import/Makefile.in index 9893d17c28b..1899bebba36 100644 --- a/gnulib/import/Makefile.in +++ b/gnulib/import/Makefile.in @@ -259,12 +259,7 @@ target_triplet =3D @target@ @GL_COND_OBJ_WMEMPCPY_TRUE@am__append_81 =3D wmempcpy.c subdir =3D import ACLOCAL_M4 =3D $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps =3D $(top_srcdir)/../config/depstand.m4 \ - $(top_srcdir)/../config/largefile.m4 \ - $(top_srcdir)/../config/lead-dot.m4 \ - $(top_srcdir)/../config/override.m4 \ - $(top_srcdir)/../config/plugins.m4 \ - $(top_srcdir)/import/m4/00gnulib.m4 \ +am__aclocal_m4_deps =3D $(top_srcdir)/import/m4/00gnulib.m4 \ $(top_srcdir)/import/m4/__inline.m4 \ $(top_srcdir)/import/m4/absolute-header.m4 \ $(top_srcdir)/import/m4/alloca.m4 \ @@ -277,7 +272,6 @@ am__aclocal_m4_deps =3D $(top_srcdir)/../config/depstan= d.m4 \ $(top_srcdir)/import/m4/clock_time.m4 \ $(top_srcdir)/import/m4/close.m4 \ $(top_srcdir)/import/m4/closedir.m4 \ - $(top_srcdir)/import/m4/codeset.m4 \ $(top_srcdir)/import/m4/ctype_h.m4 \ $(top_srcdir)/import/m4/d-ino.m4 \ $(top_srcdir)/import/m4/d-type.m4 \ @@ -434,7 +428,13 @@ am__aclocal_m4_deps =3D $(top_srcdir)/../config/depsta= nd.m4 \ $(top_srcdir)/import/m4/wmemchr.m4 \ $(top_srcdir)/import/m4/wmempcpy.m4 \ $(top_srcdir)/import/m4/year2038.m4 \ - $(top_srcdir)/import/m4/zzgnulib.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/import/m4/zzgnulib.m4 \ + $(top_srcdir)/../config/codeset.m4 \ + $(top_srcdir)/../config/depstand.m4 \ + $(top_srcdir)/../config/largefile.m4 \ + $(top_srcdir)/../config/lead-dot.m4 \ + $(top_srcdir)/../config/override.m4 \ + $(top_srcdir)/../config/plugins.m4 $(top_srcdir)/configure.ac am__configure_deps =3D $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON =3D $(srcdir)/Makefile.am $(noinst_HEADERS)