cross/avr-binutils: Update to 2.38

2022-02-09  Nick Clifton  <nickc@redhat.com>

        2.38 release.
        * ChangeLog.git.2.37-2.38: New file.

2022-01-22  Nick Clifton  <nickc@redhat.com>

        * configure: Regenerate.

2022-01-22  Nick Clifton  <nickc@redhat.com>

        * 2.38 release branch created.

2022-01-17  Nick Clifton  <nickc@redhat.com>

        Update config.[guess|sub] from upstream:

        2022-01-09  Idan Horowitz  <idan.horowitz@gmail.com>

        config.guess: recognize SerenityOS
        * config.guess (*:SerenityOS:*:*): Recognize.
        (timestamp): Update.

        2022-01-03  Bernhard Voelker  <mail@bernhard-voelker.de>

        Fix GPLv3 license headers to use a comma instead of semicolon
        See: https://www.gnu.org/licenses/gpl-3.0.html#howto

        Update license headers automatically using the following script:

          $ git grep -l 'Foundation; either version 3' \
            | xargs sed -i '/Foundation; either version 3/ s/n; e/n, e/'

        * config.guess: Adjust via the above command.
        (timestamp): Update.
        * config.sub: Likewise.
        * doc/config.guess.1: Regenerate.
        * doc/config.sub.1: Likewise.

        2022-01-01  Dmitry V. Levin  <ldv@altlinux.org>

        Update copyright years
        * config.guess: Update copyright years.
        * config.sub: Likewise.

        2021-12-25  Dmitry V. Levin  <ldv@altlinux.org>

        config.sub: alias armh to armv7l
        ALT uses armh as an alias for armv7l-alt-linux-gnueabihf since 2012.

        * config.sub (armh-unknown|armh-alt): Set cpu, vendor, and basic_os.
        (timestamp): Update.

        2021-12-24  Dmitry V. Levin  <ldv@altlinux.org>

        config.sub: alias aarch64le to aarch64
        Apparently, QNX reports aarch64 as aarch64le on little-endian machines.

        * config.sub (aarch64le-*): Set cpu to aarch64.
        (timestamp): Update.

        2021-12-13  Dmitry V. Levin  <ldv@altlinux.org>

        config.sub: fix typo in timestamp
        * config.sub: Fix timestamp.

        2021-11-30  Andreas F. Borchert  <github@andreas-borchert.de>

        config.guess: x86_64-pc-solaris2.11 is not properly recognized
        config.guess guesses Solaris 11 to run on a 32-bit platform
        despite Solaris 11 no longer supporting any 32-bit platform.

        See the following code at lines 434 to 445:

        | SUN_ARCH=i386
        | # If there is a compiler, see if it is configured for 64-bit objects.
        | # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
        | # This test works for both compilers.
        | if test "$CC_FOR_BUILD" != no_compiler_found; then
        |     if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
        |         (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
        |         grep IS_64BIT_ARCH >/dev/null
        |     then
        |         SUN_ARCH=x86_64
        |     fi
        | fi

        If "cc" is installed, i.e. the Oracle Studio compiler, this one is
        chosen for $CC_FOR_BUILD.  This compiler, the gcc provided by Oracle
        and also gcc bootstrapped from sources on that platform with a default
        configuration will by default generate 32-bit binaries -- even on
        a 64-bit platform.  And __amd64 will not be defined for compilations
        targeting a 32-bit platform.  This is different from the corresponding
        behaviour on GNU/Linux systems where the local platform is targeted by
        default.

        Thus, as long as you do not add "-m64" or if you have a custom-built
        gcc which defaults to 64 bit, you will get 32-bit binaries on Solaris
        despite living on a 64-bit platform.

        * config.guess (i86pc:SunOS:5.*:* || i86xen:SunOS:5.*:*): Adapt the
        test by adding the "-m64" flag.  This will work properly for Solaris
        10 as well (the last Solaris release that supported x86 32-bit
        platforms).

        2021-10-27  Jordi Sanfeliu  <jordi@fibranet.cat>

        Recognize Fiwix
        $ make check
        cd testsuite && bash config-guess.sh && rm uname
        PASS: config.guess checks (137 tests)
        cd testsuite && bash config-sub.sh
        PASS: config.sub checks (882 tests)
        PASS: config.sub idempotency checks (819 tests)
        PASS: config.sub canonicalise each config.guess testcase (137 tests)

        * config.guess (i*86:Fiwix:*:*): Recognize.
        * config.sub (fiwix*): Likewise.

        2021-10-18  Kinshuk Dua  <kinshukdua@gmail.com>

        config.sub: Fix typo in comment
        Fixes: 5e531d391852a54e7fab2d8ff55625fca514b305

        2021-08-14  Nick Bowler  <nbowler@draconx.ca>

        config.sub: work around command assignment bug in some shells
        When combining variable assignments with a shell command, some older
        shells (notably heirloom-sh and presumably also Solaris 10 /bin/sh)
        have a bug which causes the assignment to alter the current execution
        environment whenever the command is a shell built-in.  For example:

          % dash -c 'x=good; x=bad echo >/dev/null; echo $x'
          good

          % jsh -c 'x=good; x=bad echo >/dev/null; echo $x'
          bad

        The config.sub script contains a few commands of the form:

          IFS=- read ...

        which triggers this bug, causing the IFS assignment to persist for the
        remainder of the script.  This can cause misbehaviour in certain cases,
        for example:

          % jsh config.sub i386-linux-gnu
          config.sub: test: unknown operator gnu

          % jsh config.sub i386-gnu/linux
          sed: can't read s|gnu/linux|gnu|: No such file or directory
          Invalid configuration `i386-gnu/linux': OS `' not recognized

        * config.sub: Save and restore IFS explicitly to avoid shell bugs.
        * doc/config.sub.1: Regenerate.

        2021-08-04  Jeremy Soller  <jackpot51@gmail.com>

        config.sub: add Linux Relibc Target
        $ make check
        cd testsuite && bash config-guess.sh && rm uname
        PASS: config.guess checks (136 tests)
        cd testsuite && bash config-sub.sh
        PASS: config.sub checks (881 tests)
        PASS: config.sub idempotency checks (818 tests)
        PASS: config.sub canonicalise each config.guess testcase (136 tests)

        * config.sub (relibc*): Recognize.
        * doc/config.sub.1: Regenerate.
        * testsuite/config-sub.data (x86_64-linux-relibc): New test.

        2021-07-06  Stephanos Ioannidis  <root@stephanos.io>

        config.sub: add Zephyr RTOS support
        This adds the Zephyr RTOS targets in preparation for implementing the
        Zephyr RTOS-specific toolchain support.

        $ make check
        cd testsuite && bash config-guess.sh && rm uname
        PASS: config.guess checks (136 tests)
        cd testsuite && bash config-sub.sh
        PASS: config.sub checks (880 tests)
        PASS: config.sub idempotency checks (817 tests)
        PASS: config.sub canonicalise each config.guess testcase (136 tests)

        * config.sub (zephyr*): Recognize.
        * doc/config.sub.1: Regenerate.
        * testsuite/config-sub.data: Add testcases for *-zephyr.

        2021-07-03  Ozkan Sezer  <sezero@users.sourceforge.net>

        config.sub: disable shellcheck SC2006 / SC2268 warnings
        This is in line with the recent config.guess change in commit
        12fcf67c9108f4c4b581eaa302088782f0ee40ea

        * config.sub (shellcheck disable): Add SC2006,SC2268.

        Suggested-by: Jacob Bachmeyer <jcb@gnu.org>

        2021-07-03  Ozkan Sezer  <sezero@users.sourceforge.net>

        config.sub: normalize the quoting in the `echo FOO | sed ...`
        Some cases quote the argument to echo and some do not.  At runtime
        it probably does not matter because the substituted values will never
        contain whitespace, but quoting them all would make shellcheck more
        useful.

        * config.sub: Consistently quote the argument of echo.
        * doc/config.sub.1: Regenerate.

        Suggested-by: Jacob Bachmeyer <jcb@gnu.org>

        2021-07-02  Ozkan Sezer  <sezero@users.sourceforge.net>

        config.sub: replace POSIX $( ) with classic ` ` throughout
        This is in line with the recent config.guess change in commit
        d70c4fa934de164178054c3a60aaa0024ed07c91.

        The patch was generated using patch-6.gawk script introduced in that
        commit.

        * config.sub: Revert POSIX command substitutions to classic form.

        2021-06-04  Vineet Gupta  <Vineet.Gupta1@synopsys.com>

        Recognize arc32
        This is the 32-bit variant of ARCv3 ISA (which is not compatible with the
        32-bit ARCv2 ISA)

        | make check
        | cd testsuite && bash config-guess.sh && rm uname
        | PASS: config.guess checks (136 tests)
        | cd testsuite && bash config-sub.sh
        | PASS: config.sub checks (864 tests)
        | PASS: config.sub idempotency checks (801 tests)
        | PASS: config.sub canonicalise each config.guess testcase (136 tests)

        * config.guess (arc32:Linux:*:*): Recognize.
        * config.sub (arc32): Likewise.

        2021-05-27  Jacob Bachmeyer  <jcb@gnu.org>

        Remove automatic patch generators
        These tools have served their purposes and need not be kept outside of
        the repository history any longer.  This patch as a diff also collects
        the contents of the various tools in one convenient place.

        * patch-1.gawk: Remove.
        * patch-3.gawk: Likewise.
        * patch-6.gawk: Likewise.

        2021-05-26  Jacob Bachmeyer  <jcb@gnu.org>

        config.guess: manual fixups after previous automatic patch
        The tool could not handle command substitutions that span lines, but
        fortunately there were only two such substitutions in the script.

        The test for which universe is active on Pyramid is rewritten into a
        case block because it was the only use of a command substitution as an
        argument to the test command, which would require quoting.

        * config.guess: Rewrite "if" for Pyramid systems to "case".

        2021-05-26  Jacob Bachmeyer  <jcb@gnu.org>

        config.guess: replace POSIX $( ) with classic ` ` throughout
        The previous replacement of backticks with POSIX command substitutions
        was ill-considered and illogical: this script recognizes many archaic
        machine types that probably never had POSIX shells, therefore it needs
        to be able to run successfully under pre-POSIX shells.

        This patch was generated using the included GNU Awk program.

        * config.guess: Revert POSIX command substitutions to classic form.
        * patch-6.gawk: Store the tool that produced the automated patch.

        2021-05-26  Jacob Bachmeyer  <jcb@gnu.org>

        config.guess: manual fixup after previous automated patches
        This patch provides the special handling for the GNU system.  As these
        were two small and unique edits, they were not included in the scripts.

        This patch also cleans up other minor issues that must be addressed
        before reverting to classic command substitutions and updates
        "shellcheck" directives to account for changes in this script and the
        change in "shellcheck" towards reporting individual portability issues.

        2021-05-26  Jacob Bachmeyer  <jcb@gnu.org>

        config.guess: automatic fixups after previous automated patch
        This patch was generated using the following command:

          sed -i config.guess \
              -e '/="[^"]\+"\(-\|$\)/s/="\([^"([:space:])]\+\)"/=\1/' \
              -e '/="[^"]\+"[[:alnum:]]/s/="\$\([^([:space:])]\+\)"/=${\1}/' \
              -e \
        '/\$(echo[^|]\+|/s/\([^[:space:]]\)[[:space:]]*|[[:space:]]*sed/\1 | sed/g'

        * config.guess: Remove unneeded quotes in other variable assignments,
        standardize spacing for "echo ... | sed" substitutions.

        2021-05-26  Jacob Bachmeyer  <jcb@gnu.org>

        config.guess: remove unneeded quotes and factor command substitutions
        This is further cleanup and simplifies some constructs that can confuse
        Emacs' syntax highlighting while generally reducing required quoting.

        This patch was generated using the included GNU Awk program.

        * config.guess: Remove unneeded variable quotes and factor out command
        substitutions when setting GUESS.
        * patch-3.gawk: Store the tool that produced the automated patch.

        2021-05-25  Jacob Bachmeyer  <jcb@gnu.org>

        config.guess: manual fixups after previous automatic patch
        * config.guess: Adjust a few "leftover" cases that the tool could not
        easily recognize and fixes comment indentation in a few other special
        cases.

        2021-05-25  Jacob Bachmeyer  <jcb@gnu.org>

        config.guess: use intermediate variable with uname results
        This will allow quoting to be significantly simplified in another
        pass through the file.

        This patch was generated using the included GNU Awk program.

        * config.guess: Use GUESS variable to hold results of uname analysis.
        * patch-1.gawk: Store the tool that produced the automated patch.

        2021-05-25  Jacob Bachmeyer  <jcb@gnu.org>

        config.guess: introduce intermediate variable with uname results
        This will allow quoting to be significantly simplified in another
        pass through the file.

        * config.guess: Introduce GUESS variable to hold results of uname analysis.

        2021-05-24  Dmitry V. Levin  <ldv@altlinux.org>

        config.guess: fix shellcheck warning SC2154
        While, according to Plan 9 documentation, the environment variable
        $cputype is set to the name of the kernel's CPU's architecture,
        shellcheck warns that cputype is referenced but not assigned.
        Be on the safe side and do not use cputype if it is not defined
        or empty.

        * config.guess (*:Plan9:*:*): Fix shellcheck warning SC2154.

        2021-05-24  Dmitry V. Levin  <ldv@altlinux.org>

        config.guess: remove redundant quotes in case commands
        According to the GNU Autoconf Portable Shell Programming manual,
        the Bourne shell does not systematically split variables and back-quoted
        expressions, in particular on the right-hand side of assignments and in
        the argument of 'case'.

        The change is made automatically using the following command:
        $ sed -E -i 's/(\<case )"(\$[^"]+)"( in\>)/\1\2\3/' config.guess

        * config.guess: Simplify case commands by removing quotes around the
        argument.

        Suggested-by: Jacob Bachmeyer <jcb@gnu.org>

        2021-05-24  Dmitry V. Levin  <ldv@altlinux.org>

        config.guess: simplify exit status workaround on alphaev67-dec-osf5.1
        Commit 29865ea8a5622cdd80b7a69a0afa78004b4cd311 introduced an exit trap
        reset before exiting to avoid a spurious non-zero exit status on
        alphaev67-dec-osf5.1.  Simplify that code a bit by moving the exit trap
        reset around.

        * config.guess (alpha:OSF1:*:*): Reset exit trap earlier.
        * doc/config.guess.1: Regenerate.

2021-10-29  Eli Zaretskii  <eliz@gnu.org>

        * gdb/doc/gdb.texinfo (Command Options): (Data): Document
        '-memory-tag-violations'.  Update the example.

2021-09-28  Andrew Burgess  <andrew.burgess@embecosm.com>

        * src-release.sh (GDB_SUPPPORT_DIRS): Add libbacktrace.

2021-09-27  Nick Alcock  <nick.alcock@oracle.com>

        PR libctf/27967
        * libtool.m4 (LT_PATH_NM): Try BSDization flags with a user-provided
        NM, if there is one.  Run nm on itself, not on /dev/null, to avoid
        errors from nms that refuse to work on non-regular files.  Remove
        other workarounds for this problem.  Strip out blank lines from the
        nm output.

2021-09-27  Nick Alcock  <nick.alcock@oracle.com>

        PR libctf/27967
        * libtool.m4 (lt_cv_sys_global_symbol_pipe): Augment symcode for
        Solaris 11.

10 files changed, 60 insertions, 83 deletions

diff --git a/cross/avr-binutils/Makefile b/cross/avr-binutils/Makefile
index 233449f59f9..fb12492100c 100644
--- a/cross/avr-binutils/Makefile
+++ b/cross/avr-binutils/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2021/09/22 05:59:26 mef Exp $
+# $NetBSD: Makefile,v 1.35 2022/05/23 11:56:34 micha Exp $
 
-DISTNAME=		binutils-2.37
+DISTNAME=		binutils-2.38
 PKGNAME=		${DISTNAME:S/^/avr-/}
-PKGREVISION=		2
 CATEGORIES=		cross
 MASTER_SITES=		${MASTER_SITE_GNU:=binutils/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/cross/avr-binutils/distinfo b/cross/avr-binutils/distinfo
index 14543aa5fc0..0956be22115 100644
--- a/cross/avr-binutils/distinfo
+++ b/cross/avr-binutils/distinfo
@@ -1,13 +1,11 @@
-$NetBSD: distinfo,v 1.16 2021/10/26 10:07:51 nia Exp $
+$NetBSD: distinfo,v 1.17 2022/05/23 11:56:34 micha Exp $
 
-BLAKE2s (binutils-2.37.tar.bz2) = cbcd25c08c84f0fca9c77936991cef9b3a2c6f8350ecb98a7877fc0107f34db9
-SHA512 (binutils-2.37.tar.bz2) = b3f5184697f77e94c95d48f6879de214eb5e17aa6ef8e96f65530d157e515b1ae2f290e98453e4ff126462520fa0f63852b6e1c8fbb397ed2e41984336bc78c6
-Size (binutils-2.37.tar.bz2) = 33888611 bytes
-SHA1 (patch-bfd_Makefile.in) = 64aa6b3b4582164d589c8a6b7e5321919ce0e2b9
-SHA1 (patch-binutils_Makefile.in) = 2866358451685cc1c8a2fa675c5a5439cb0cddab
-SHA1 (patch-binutils_doc_Makefile.in) = f5dfd53f615f57856dedc563b8c462d639d8bb98
-SHA1 (patch-etc_Makefile.in) = 454259296ed8b8ee51d2bd629b4aff6c969ef4b5
-SHA1 (patch-gas_Makefile.in) = 4a4b585299b1f4c8254fb1e59e6ac6acb47bf859
-SHA1 (patch-gas_doc_Makefile.in) = da2e1774e308a3b994d1c801331ba392922c3066
+BLAKE2s (binutils-2.38.tar.bz2) = 80609a31f2040a8418a2004cb9de8b3d409e954c7c1d17afef8e9237227d00ee
+SHA512 (binutils-2.38.tar.bz2) = 7690b4158bd6587a85c6b98903980b9ac6f16b47f7fd1e60986b0a70388bedcfdc05d75597aa49c81fec1609ce24bed6c26583f76fd2471a9d63394fd9798afc
+Size (binutils-2.38.tar.bz2) = 34866647 bytes
+SHA1 (patch-bfd_Makefile.in) = f8855061f6ee3b365b9482bd55412d551e4e1206
+SHA1 (patch-binutils_Makefile.in) = e264bf986cd75f2c45e07ee3bd40a81c13760e7b
+SHA1 (patch-gas_Makefile.in) = c11e7ae5913f62bb0aa50b728dbae88172f154c3
 SHA1 (patch-gprof_Makefile.in) = d0fa34064b1fdde3bacff1d223e7490d4747a0b9
-SHA1 (patch-ld_Makefile.in) = 45a26c12d8a95d046ce9b859fd1ccf6a097f19d4
+SHA1 (patch-ld_Makefile.in) = 609f81b79b9d0de857d32c1e17eaccf6073aba3f
+SHA1 (patch-libctf_Makefile.in) = 8858241ac2db31b74883b2490212b72ac1420a99
diff --git a/cross/avr-binutils/patches/patch-bfd_Makefile.in b/cross/avr-binutils/patches/patch-bfd_Makefile.in
index 17bef3e833a..ad5bcacc7a1 100644
--- a/cross/avr-binutils/patches/patch-bfd_Makefile.in
+++ b/cross/avr-binutils/patches/patch-bfd_Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-bfd_Makefile.in,v 1.1 2021/09/08 12:03:00 micha Exp $
+$NetBSD: patch-bfd_Makefile.in,v 1.2 2022/05/23 11:56:35 micha Exp $
 
 Avoid installing info and po (NLS) files.
 
 --- bfd/Makefile.in.orig	2021-07-18 16:36:53.000000000 +0000
 +++ bfd/Makefile.in
-@@ -1748,7 +1748,6 @@ installdirs-am:
+@@ -1788,7 +1788,6 @@ installdirs-am:
  	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
  	done
  install: $(BUILT_SOURCES)
diff --git a/cross/avr-binutils/patches/patch-binutils_Makefile.in b/cross/avr-binutils/patches/patch-binutils_Makefile.in
index 723e1823a15..fe26d42a2a8 100644
--- a/cross/avr-binutils/patches/patch-binutils_Makefile.in
+++ b/cross/avr-binutils/patches/patch-binutils_Makefile.in
@@ -1,15 +1,25 @@
-$NetBSD: patch-binutils_Makefile.in,v 1.1 2021/09/08 12:03:00 micha Exp $
+$NetBSD: patch-binutils_Makefile.in,v 1.2 2022/05/23 11:56:35 micha Exp $
 
 Avoid installing po (NLS) files.
+Avoid installing info files (which duplicates with other CPU).
 
---- binutils/Makefile.in.orig	2021-07-18 16:38:08.000000000 +0000
+--- binutils/Makefile.in.orig	2022-02-09 11:48:29.000000000 +0000
 +++ binutils/Makefile.in
-@@ -569,7 +569,7 @@ zlibdir = @zlibdir@
+@@ -403,7 +403,7 @@ AM_V_texidevnull = $(am__v_texidevnull_@
+ am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@)
+ am__v_texidevnull_0 = > /dev/null
+ am__v_texidevnull_1 = 
+-INFO_DEPS = doc/binutils.info
++INFO_DEPS =
+ am__TEXINFO_TEX_DIR = $(srcdir)
+ DVIS = doc/binutils.dvi
+ PDFS = doc/binutils.pdf
+@@ -632,7 +632,7 @@ zlibdir = @zlibdir@
  zlibinc = @zlibinc@
- AUTOMAKE_OPTIONS = dejagnu no-dist foreign subdir-objects
+ AUTOMAKE_OPTIONS = dejagnu no-dist foreign subdir-objects info-in-builddir no-texinfo.tex
  ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd
--SUBDIRS = doc po
-+SUBDIRS = doc
+-SUBDIRS = po
++SUBDIRS =
  tooldir = $(exec_prefix)/$(target_alias)
+ MAINTAINERCLEANFILES = $(man_MANS) doc/binutils.info doc/cxxfilt.man
  
- # Automake 1.10+ disables lex and yacc output file regeneration if
diff --git a/cross/avr-binutils/patches/patch-binutils_doc_Makefile.in b/cross/avr-binutils/patches/patch-binutils_doc_Makefile.in
deleted file mode 100644
index 9eebb6e4b60..00000000000
--- a/cross/avr-binutils/patches/patch-binutils_doc_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-binutils_doc_Makefile.in,v 1.1 2021/09/08 12:03:00 micha Exp $
-
-Avoid installing info files (which duplicates with other CPU).
-
---- binutils/doc/Makefile.in.orig	2021-07-18 16:38:08.000000000 +0000
-+++ binutils/doc/Makefile.in
-@@ -182,7 +182,7 @@ AM_V_texidevnull = $(am__v_texidevnull_@
- am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@)
- am__v_texidevnull_0 = > /dev/null
- am__v_texidevnull_1 = 
--INFO_DEPS = binutils.info
-+INFO_DEPS =
- am__TEXINFO_TEX_DIR = $(srcdir)
- DVIS = binutils.dvi
- PDFS = binutils.pdf
diff --git a/cross/avr-binutils/patches/patch-etc_Makefile.in b/cross/avr-binutils/patches/patch-etc_Makefile.in
deleted file mode 100644
index 1096f84892d..00000000000
--- a/cross/avr-binutils/patches/patch-etc_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-etc_Makefile.in,v 1.1 2021/09/08 12:03:00 micha Exp $
-
-Avoid installing info files (which duplicates with other CPU).
-
---- etc/Makefile.in.orig	2021-07-08 11:37:19.000000000 +0000
-+++ etc/Makefile.in
-@@ -68,7 +68,7 @@ config.status: $(srcdir)/configure
- dist:
- check:
- info html dvi ps pdf:
--install install-strip install-info install-html install-pdf:
-+install install-strip install-html install-pdf:
- installcheck:
- uninstall:
- TAGS:
diff --git a/cross/avr-binutils/patches/patch-gas_Makefile.in b/cross/avr-binutils/patches/patch-gas_Makefile.in
index 1f00d5c4aef..a6beed07702 100644
--- a/cross/avr-binutils/patches/patch-gas_Makefile.in
+++ b/cross/avr-binutils/patches/patch-gas_Makefile.in
@@ -1,15 +1,15 @@
-$NetBSD: patch-gas_Makefile.in,v 1.1 2021/09/08 12:03:00 micha Exp $
+$NetBSD: patch-gas_Makefile.in,v 1.2 2022/05/23 11:56:35 micha Exp $
 
-Avoid installing po (NLS) files.
+Avoid installing info files (which duplicates with other CPU).
 
---- gas/Makefile.in.orig	2021-07-18 16:37:38.000000000 +0000
+--- gas/Makefile.in.orig	2022-02-09 11:48:02.000000000 +0000
 +++ gas/Makefile.in
-@@ -421,7 +421,7 @@ zlibdir = @zlibdir@
- zlibinc = @zlibinc@
- AUTOMAKE_OPTIONS = dejagnu foreign no-dist subdir-objects
- ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd
--SUBDIRS = doc po
-+SUBDIRS = doc
- tooldir = $(exec_prefix)/$(target_alias)
- 
- # This is where we get zlib from.  zlibdir is -L../zlib and zlibinc is
+@@ -266,7 +266,7 @@ AM_V_texidevnull = $(am__v_texidevnull_@
+ am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@)
+ am__v_texidevnull_0 = > /dev/null
+ am__v_texidevnull_1 = 
+-INFO_DEPS = doc/as.info
++INFO_DEPS =
+ TEXINFO_TEX = $(top_srcdir)/../texinfo.tex
+ am__TEXINFO_TEX_DIR = $(top_srcdir)/..
+ DVIS = doc/as.dvi
diff --git a/cross/avr-binutils/patches/patch-gas_doc_Makefile.in b/cross/avr-binutils/patches/patch-gas_doc_Makefile.in
deleted file mode 100644
index d1033191f99..00000000000
--- a/cross/avr-binutils/patches/patch-gas_doc_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-gas_doc_Makefile.in,v 1.1 2021/09/08 12:03:00 micha Exp $
-
-Avoid installing info files (which duplicates with other CPU).
-
---- gas/doc/Makefile.in.orig	2021-07-18 16:37:38.000000000 +0000
-+++ gas/doc/Makefile.in
-@@ -175,7 +175,7 @@ AM_V_texidevnull = $(am__v_texidevnull_@
- am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@)
- am__v_texidevnull_0 = > /dev/null
- am__v_texidevnull_1 = 
--INFO_DEPS = as.info
-+INFO_DEPS =
- TEXINFO_TEX = $(top_srcdir)/../texinfo.tex
- am__TEXINFO_TEX_DIR = $(top_srcdir)/..
- DVIS = as.dvi
diff --git a/cross/avr-binutils/patches/patch-ld_Makefile.in b/cross/avr-binutils/patches/patch-ld_Makefile.in
index b73d20e6555..6213225a847 100644
--- a/cross/avr-binutils/patches/patch-ld_Makefile.in
+++ b/cross/avr-binutils/patches/patch-ld_Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-ld_Makefile.in,v 1.1 2021/09/08 12:03:00 micha Exp $
+$NetBSD: patch-ld_Makefile.in,v 1.2 2022/05/23 11:56:35 micha Exp $
 
 Avoid installing info and po (NLS) files.
 
 --- ld/Makefile.in.orig	2021-07-18 16:38:34.000000000 +0000
 +++ ld/Makefile.in
-@@ -298,7 +298,7 @@ AM_V_texidevnull = $(am__v_texidevnull_@
+@@ -299,7 +299,7 @@ AM_V_texidevnull = $(am__v_texidevnull_@
  am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@)
  am__v_texidevnull_0 = > /dev/null
  am__v_texidevnull_1 = 
@@ -13,7 +13,7 @@ Avoid installing info and po (NLS) files.
  am__TEXINFO_TEX_DIR = $(srcdir)/../texinfo
  DVIS = ld.dvi
  PDFS = ld.pdf
-@@ -540,7 +540,7 @@ zlibinc = @zlibinc@
+@@ -541,7 +541,7 @@ zlibinc = @zlibinc@
  AUTOMAKE_OPTIONS = dejagnu no-texinfo.tex no-dist foreign info-in-builddir
  ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd
  TEXINFO_TEX = ../texinfo/texinfo.tex
diff --git a/cross/avr-binutils/patches/patch-libctf_Makefile.in b/cross/avr-binutils/patches/patch-libctf_Makefile.in
new file mode 100644
index 00000000000..3068376b433
--- /dev/null
+++ b/cross/avr-binutils/patches/patch-libctf_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-libctf_Makefile.in,v 1.1 2022/05/23 11:56:35 micha Exp $
+
+Avoid installing info files (which duplicates with other CPU).
+
+--- libctf/Makefile.in.orig	2022-01-22 12:22:10.000000000 +0000
++++ libctf/Makefile.in
+@@ -306,7 +306,7 @@ am__v_texidevnull_ = $(am__v_texidevnull
+ am__v_texidevnull_0 = > /dev/null
+ am__v_texidevnull_1 = 
+ am__dirstamp = $(am__leading_dot)dirstamp
+-INFO_DEPS = doc/ctf-spec.info
++INFO_DEPS =
+ am__TEXINFO_TEX_DIR = $(srcdir)
+ DVIS = doc/ctf-spec.dvi
+ PDFS = doc/ctf-spec.pdf