From 175cd82e74190e61f5e9e36cc87db1890a912034 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@debian.org>
Date: Sun, 30 Jan 2022 16:51:18 +0000
Subject: [PATCH] Import binutils_2.37.90.20220130-2.debian.tar.xz

[dgit import tarball binutils 2.37.90.20220130-2 binutils_2.37.90.20220130-2.debian.tar.xz]
---
 README.cross                                  |    38 +
 README.source                                 |    16 +
 binutils-common.overrides                     |     2 +
 binutils-cross.overrides                      |    15 +
 binutils-hppa64-linux-gnu.overrides           |    10 +
 binutils-multiarch-dev.overrides              |     2 +
 binutils-multiarch.overrides                  |    13 +
 binutils-multiarch.postinst.in                |    80 +
 binutils-multiarch.postrm.in                  |    47 +
 binutils-multiarch.preinst.in                 |    29 +
 binutils-multiarch.prerm.in                   |    98 +
 binutils-multiarch.shlibs.in                  |     4 +
 binutils-triplet.overrides                    |     4 +
 binutils.overrides                            |     6 +
 binutils.presubj                              |    25 +
 binutils.triggers                             |     1 +
 changelog                                     |  6276 +++++++
 control                                       |  1057 ++
 control.cross.in                              |    27 +
 control.in                                    |   225 +
 copyright                                     |    45 +
 dwp.1                                         |    33 +
 gfdl.texi                                     |    41 +
 ld.gold.1                                     |   893 +
 libbinutils.overrides                         |     5 +
 libbinutils.shlibs.in                         |     2 +
 libctf-nobfd0.symbols                         |     4 +
 libctf0.symbols                               |     4 +
 patches/001_ld_makefile_patch.patch           |    27 +
 patches/002_gprof_profile_arcs.patch          |    27 +
 patches/003_gprof_see_also_monitor.patch      |    13 +
 patches/006_better_file_error.patch           |    19 +
 patches/013_bash_in_ld_testsuite.patch        |    13 +
 patches/014_hash_style-both.patch             |    30 +
 patches/014_hash_style-gnu.patch              |    31 +
 patches/127_x86_64_i386_biarch.patch          |    20 +
 patches/128_build_id.patch                    |    42 +
 patches/128_ppc64_powerpc_biarch.patch        |    15 +
 patches/129_multiarch_libpath.patch           |   341 +
 .../130_gold_disable_testsuite_build.patch    |    26 +
 patches/131_ld_bootstrap_testsuite.patch      |    45 +
 patches/135_bfd_soversion.patch               |    38 +
 patches/136_bfd_pic.patch                     |    25 +
 patches/157_ar_scripts_with_tilde.patch       |    11 +
 patches/158_ld_system_root.patch              |    42 +
 patches/161_gold_dummy_zoption.diff           |    25 +
 patches/164_ld_doc_remove_xref.diff           |    14 +
 patches/7c4643efe7b.diff                      |    26 +
 patches/aarch64-libpath.diff                  |    25 +
 patches/branch-updates.diff                   | 14075 ++++++++++++++++
 patches/branch-version.diff                   |   756 +
 patches/gold-mips.diff                        |    39 +
 patches/gold-no-keep-files-mapped.diff        |    14 +
 patches/gprof-build.diff                      |    14 +
 patches/infinity-notes.diff                   |   183 +
 patches/libctf-soname.diff                    |  1177 ++
 patches/mips-hack.diff                        |    12 +
 patches/mips64-default-n64.diff               |    82 +
 patches/pr-ld-16428.diff                      |   158 +
 patches/pr28826.diff                          |    14 +
 patches/pr28827-1.diff                        |   205 +
 patches/pr28827-2.diff                        |    69 +
 patches/series                                |    39 +
 rules                                         |  1973 +++
 source.lintian-overrides                      |    12 +
 source/format                                 |     1 +
 test-suite-compare.py                         |   230 +
 tests/build                                   |    21 +
 tests/control                                 |    17 +
 tests/libc-link                               |    29 +
 tests/shlib-build                             |    44 +
 watch                                         |     2 +
 72 files changed, 29023 insertions(+)
 create mode 100644 README.cross
 create mode 100644 README.source
 create mode 100644 binutils-common.overrides
 create mode 100644 binutils-cross.overrides
 create mode 100644 binutils-hppa64-linux-gnu.overrides
 create mode 100644 binutils-multiarch-dev.overrides
 create mode 100644 binutils-multiarch.overrides
 create mode 100644 binutils-multiarch.postinst.in
 create mode 100644 binutils-multiarch.postrm.in
 create mode 100644 binutils-multiarch.preinst.in
 create mode 100644 binutils-multiarch.prerm.in
 create mode 100644 binutils-multiarch.shlibs.in
 create mode 100644 binutils-triplet.overrides
 create mode 100644 binutils.overrides
 create mode 100644 binutils.presubj
 create mode 100644 binutils.triggers
 create mode 100644 changelog
 create mode 100644 control
 create mode 100644 control.cross.in
 create mode 100644 control.in
 create mode 100644 copyright
 create mode 100644 dwp.1
 create mode 100644 gfdl.texi
 create mode 100644 ld.gold.1
 create mode 100644 libbinutils.overrides
 create mode 100644 libbinutils.shlibs.in
 create mode 100644 libctf-nobfd0.symbols
 create mode 100644 libctf0.symbols
 create mode 100644 patches/001_ld_makefile_patch.patch
 create mode 100644 patches/002_gprof_profile_arcs.patch
 create mode 100644 patches/003_gprof_see_also_monitor.patch
 create mode 100644 patches/006_better_file_error.patch
 create mode 100644 patches/013_bash_in_ld_testsuite.patch
 create mode 100644 patches/014_hash_style-both.patch
 create mode 100644 patches/014_hash_style-gnu.patch
 create mode 100644 patches/127_x86_64_i386_biarch.patch
 create mode 100644 patches/128_build_id.patch
 create mode 100644 patches/128_ppc64_powerpc_biarch.patch
 create mode 100644 patches/129_multiarch_libpath.patch
 create mode 100644 patches/130_gold_disable_testsuite_build.patch
 create mode 100644 patches/131_ld_bootstrap_testsuite.patch
 create mode 100644 patches/135_bfd_soversion.patch
 create mode 100644 patches/136_bfd_pic.patch
 create mode 100644 patches/157_ar_scripts_with_tilde.patch
 create mode 100644 patches/158_ld_system_root.patch
 create mode 100644 patches/161_gold_dummy_zoption.diff
 create mode 100644 patches/164_ld_doc_remove_xref.diff
 create mode 100644 patches/7c4643efe7b.diff
 create mode 100644 patches/aarch64-libpath.diff
 create mode 100644 patches/branch-updates.diff
 create mode 100644 patches/branch-version.diff
 create mode 100644 patches/gold-mips.diff
 create mode 100644 patches/gold-no-keep-files-mapped.diff
 create mode 100644 patches/gprof-build.diff
 create mode 100644 patches/infinity-notes.diff
 create mode 100644 patches/libctf-soname.diff
 create mode 100644 patches/mips-hack.diff
 create mode 100644 patches/mips64-default-n64.diff
 create mode 100644 patches/pr-ld-16428.diff
 create mode 100644 patches/pr28826.diff
 create mode 100644 patches/pr28827-1.diff
 create mode 100644 patches/pr28827-2.diff
 create mode 100644 patches/series
 create mode 100755 rules
 create mode 100644 source.lintian-overrides
 create mode 100644 source/format
 create mode 100644 test-suite-compare.py
 create mode 100644 tests/build
 create mode 100644 tests/control
 create mode 100644 tests/libc-link
 create mode 100644 tests/shlib-build
 create mode 100644 watch

diff --git a/README.cross b/README.cross
new file mode 100644
index 000000000..ea184f84f
--- /dev/null
+++ b/README.cross
@@ -0,0 +1,38 @@
+Cross-binutils debian packages are directly built from the binutils
+source package together with the native binutils packages.
+
+To build a cross-binutils package which is not yet built:
+
+ o Download and unpack the binutils source package:
+
+    apt-get source binutils
+
+ o Ensure you have the binutils build-dependencies installed:
+
+    apt-get build-dep binutils
+
+ o Add the binutils-<your-target> package to the control file:
+
+    rm -f stamps/control
+    debian/rules stamps/control TARGET=<your-target>
+
+    This change is permanent and will survive 'make clean'.  If you
+    need to restore the original debian/control file:
+
+    rm -f stamps/control
+    debian/rules stamps/control TARGET=
+
+ o Then build the cross-binutils package:
+   
+    TARGET=<your-target> dpkg-buildpackage -b -uc -us 
+    or 
+    echo arm >debian/target; dpkg-buildpackage -b -uc -us
+
+   (substitute your target name, e.g. "arm" or "m68k", instead of
+    "<your-target>")
+
+--
+Hector Oron <zumbi@debian.org>
+Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
+Matthias Klose <doko@debian.org>
+Nikita Youshchenko <yoush@cs.msu.su>
diff --git a/README.source b/README.source
new file mode 100644
index 000000000..ca8bc0722
--- /dev/null
+++ b/README.source
@@ -0,0 +1,16 @@
+This source package builds native packages and packages targeting
+debian architectures.  To shorten a test build, some of these builds
+can be skipped.
+
+DEB_BUILD_OPTIONS="parallel=<N> <option> ..." dpkg-buildpackage ...
+
+Where <option> can be:
+
+ - nomult to diable the binutils-multilib build
+ - nohppa64 to disable the hppa64 build
+ - nopgo to disable the PGO/LTO build
+ - nocheck to disable running the testsuite
+ - nocross to disable all builds for other targets
+
+To build only a subset of the target architectures, also
+set CROSS_ARCHS in the env, e.g. CROSS_ARCHS="arm64 ppc64el"
diff --git a/binutils-common.overrides b/binutils-common.overrides
new file mode 100644
index 000000000..65ee8dc90
--- /dev/null
+++ b/binutils-common.overrides
@@ -0,0 +1,2 @@
+# big tables
+binutils-common binary: manpage-has-errors-from-man
diff --git a/binutils-cross.overrides b/binutils-cross.overrides
new file mode 100644
index 000000000..e5e9ca5df
--- /dev/null
+++ b/binutils-cross.overrides
@@ -0,0 +1,15 @@
+@PKG@ binary: package-name-doesnt-match-sonames
+@PKG@ binary: non-standard-dir-in-usr
+
+# needed for kfreebsd and the hurd
+@PKG@ binary: file-in-unusual-dir
+
+# internal libs, with the target name encoded
+@PKG@ binary: no-shlibs-control-file
+
+# yes, intended
+@PKG@ binary: shlib-in-multi-arch-foreign-package
+@PKG@ binary: triplet-dir-and-architecture-mismatch
+
+# some triplets are long ...
+@PKG@ binary: extended-description-line-too-long
diff --git a/binutils-hppa64-linux-gnu.overrides b/binutils-hppa64-linux-gnu.overrides
new file mode 100644
index 000000000..ce5267c97
--- /dev/null
+++ b/binutils-hppa64-linux-gnu.overrides
@@ -0,0 +1,10 @@
+# don't warn about missing man pages for diverted binaries
+binutils-hppa64-linux-gnu binary: binary-without-manpage
+
+# the API of the shared libs is not public, don't care about the name
+binutils-hppa64-linux-gnu binary: package-name-doesnt-match-sonames
+
+binutils-hppa64-linux-gnu binary: non-standard-dir-in-usr
+
+# private library. no -dev package is provided, nothing can link it
+binutils-hppa64-linux-gnu binary: no-shlibs-control-file
diff --git a/binutils-multiarch-dev.overrides b/binutils-multiarch-dev.overrides
new file mode 100644
index 000000000..1a81c37e4
--- /dev/null
+++ b/binutils-multiarch-dev.overrides
@@ -0,0 +1,2 @@
+# package only has symlinks
+binutils-multiarch-dev binary: control-file-is-empty md5sums
diff --git a/binutils-multiarch.overrides b/binutils-multiarch.overrides
new file mode 100644
index 000000000..010ad55bc
--- /dev/null
+++ b/binutils-multiarch.overrides
@@ -0,0 +1,13 @@
+# don't warn about missing man pages for diverted binaries
+binutils-multiarch binary: binary-without-manpage
+
+# the API of the shared libs is not public, don't care about the name
+binutils-multiarch binary: package-name-doesnt-match-sonames
+
+# the upstream name, we don't care
+binutils-multiarch binary: dev-pkg-without-shlib-symlink
+
+# not in binutils-multiarch, just move these away
+binutils-multiarch: diversion-for-unknown-file usr/lib/libopcodes.a preinst:19
+binutils-multiarch: diversion-for-unknown-file usr/lib/libbfd.a preinst:16
+
diff --git a/binutils-multiarch.postinst.in b/binutils-multiarch.postinst.in
new file mode 100644
index 000000000..a1a460ec3
--- /dev/null
+++ b/binutils-multiarch.postinst.in
@@ -0,0 +1,80 @@
+#! /bin/sh
+# Update .so symlinks and remove obsolete diversions.
+#
+# Removing a diversion requires a guarantee that the conflicting
+# file is not present any more, and we cannot guarantee that if
+# some other version of binutils-multiarch is installed.
+# So we remove the diversions in postinst, not preinst.
+set -e
+ma=@DEB_MULTIARCH@
+triplet=@DEB_TRIPLET@
+old_diversion() {
+	local divertto file
+	file=$1
+	divertto=${2-$file.single}
+	if
+		dpkg-divert --package binutils-multiarch --list |
+		grep -q -F "$divertto"
+	then
+		dpkg-divert --package binutils-multiarch \
+				--remove --rename \
+				--divert "$divertto" "$file"
+	fi
+}
+
+# remove obsolete diversions
+old_diversion /usr/bin/ld.bfd
+old_diversion /usr/bin/c++filt
+old_diversion /usr/lib/libbfd.a /usr/lib/libbfd-single.a
+old_diversion /usr/lib/libopcodes.a /usr/lib/libopcodes-single.a
+old_diversion /usr/bin/ld
+old_diversion /usr/bin/elfedit
+for f in elf32_sparc elf32ppc elf64alpha elf_i386 m68kelf \
+         alpha i386linux m68klinux sparclinux sun4
+do
+	for ext in x xbn xn xr xs xu
+	do
+		old_diversion /usr/lib/ldscripts/$f.$ext
+	done
+done
+old_diversion /usr/lib/libbfd-2.9.1.0.15.so.0.0.0 \
+              /usr/lib/libbfd-single-2.9.1.0.15.so.0.0.0
+old_diversion /usr/lib/libopcodes-2.9.1.0.15.so.0.0.0 \
+              /usr/lib/libopcodes-single-2.9.1.0.15.so.0.0.0
+old_diversion /usr/lib/libbfd.la /usr/lib/libbfd-single.la
+old_diversion /usr/lib/libopcodes.la /usr/lib/libopcodes-single.la
+old_diversion /usr/include/bfd.h /usr/include/bfd.single.h
+old_diversion /usr/lib/ldscripts
+
+rm -f /usr/lib/libbfd-*-multiarch.so.0
+rm -f /usr/lib/libopcodes-*-multiarch.so.0
+
+old_diversion /usr/bin/addr2line
+old_diversion /usr/bin/ar
+old_diversion /usr/bin/embedspu
+old_diversion /usr/bin/gprof
+old_diversion /usr/bin/nm
+old_diversion /usr/bin/objcopy
+old_diversion /usr/bin/objdump
+old_diversion /usr/bin/ranlib
+old_diversion /usr/bin/readelf
+old_diversion /usr/bin/size
+old_diversion /usr/bin/strings
+old_diversion /usr/bin/strip
+
+case "$ma" in i386-*)
+  if test -n "$context" && dpkg --compare-versions "$2" lt "2.27-8"; then
+    old_diversion /usr/bin/$ma-addr2line
+    old_diversion /usr/bin/$ma-ar
+    old_diversion /usr/bin/$ma-embedspu
+    old_diversion /usr/bin/$ma-gprof
+    old_diversion /usr/bin/$ma-nm
+    old_diversion /usr/bin/$ma-objcopy
+    old_diversion /usr/bin/$ma-objdump
+    old_diversion /usr/bin/$ma-ranlib
+    old_diversion /usr/bin/$ma-readelf
+    old_diversion /usr/bin/$ma-size
+    old_diversion /usr/bin/$ma-strings
+    old_diversion /usr/bin/$ma-strip
+  fi
+esac
diff --git a/binutils-multiarch.postrm.in b/binutils-multiarch.postrm.in
new file mode 100644
index 000000000..7b9438597
--- /dev/null
+++ b/binutils-multiarch.postrm.in
@@ -0,0 +1,47 @@
+#! /bin/sh
+set -e
+this_ver=@DEB_VER@; # this version
+ma=@DEB_MULTIARCH@
+triplet=@DEB_TRIPLET@
+# action: upgrade, abort-upgrade, remove, abort-install, disappear,
+# purge, or failed-upgrade.
+context=$1
+if
+	test "$context" = failed-upgrade &&
+	dpkg --compare-versions "$this_ver" lt "$2"
+then
+	# postrm of the future failed.
+	# Who knows what it was supposed to do?  Abort.
+	exit 1
+fi
+new_ver=; # version replacing this one, if any.
+case "$context" in
+failed-upgrade)
+	new_ver=$this_ver ;;
+abort-install|disappear)
+	new_ver= ;;
+*)
+	new_ver=$2 ;;
+esac
+
+diversion() {
+	local added_ver divertto file
+	added_ver=$1
+	file=$2
+	divertto=${3-$file.single}
+
+	if
+		test "$context" != purge &&
+		dpkg --compare-versions "$new_ver" lt "$added_ver"
+	then
+		dpkg-divert --package binutils-multiarch \
+			--remove --rename --divert "$divertto" "$file"
+	fi
+}
+
+
+for prog in nm objdump objcopy strings strip size \
+            ar ranlib addr2line gprof readelf
+do
+	diversion 2.27-8 "/usr/bin/$triplet-$prog"
+done
diff --git a/binutils-multiarch.preinst.in b/binutils-multiarch.preinst.in
new file mode 100644
index 000000000..385f62568
--- /dev/null
+++ b/binutils-multiarch.preinst.in
@@ -0,0 +1,29 @@
+#! /bin/sh
+set -e
+new_ver=@DEB_VER@; # this version
+ma=@DEB_MULTIARCH@
+triplet=@DEB_TRIPLET@
+context=$1; # why to install (install, upgrade, or abort-upgrade)
+old_ver=$2; # version being replaced, if any
+
+diversion() {
+	local added_ver divertto file
+	added_ver=$1
+	file=$2
+	divertto=${3-$file.single}
+
+	if
+		test "$context" = install ||
+		dpkg --compare-versions "$old_ver" lt "$added_ver" ||
+		dpkg --compare-versions "$new_ver" le "$old_ver"
+	then
+		dpkg-divert --package binutils-multiarch \
+			--add --rename --divert "$divertto" "$file"
+	fi
+}
+
+for prog in nm objdump objcopy strings strip size \
+            ar ranlib addr2line gprof readelf
+do
+	diversion 2.27-8 "/usr/bin/$triplet-$prog"
+done
diff --git a/binutils-multiarch.prerm.in b/binutils-multiarch.prerm.in
new file mode 100644
index 000000000..45e273b4a
--- /dev/null
+++ b/binutils-multiarch.prerm.in
@@ -0,0 +1,98 @@
+#! /bin/sh
+# Remove obsolete diversions.
+#
+# They are already removed in postinst, but if configuration fails,
+# they will still be around.  Removing the package without
+# configuring would then allow the diversions to leak.
+#
+# So we catch them here.  This cannot wait for postrm because that
+# would break error recovery during upgrades: after the old, working
+# version re-adds the diversion in preinst, the diversion would be removed
+# again in postrm.  More generally, removing a diversion requires
+# a guarantee that the conflicting file is not present any more,
+# and we cannot guarantee that if some other version of
+# binutils-multiarch is installed.
+set -e
+this_ver=@DEB_VER@; # this version
+ma=@DEB_MULTIARCH@
+triplet=@DEB_TRIPLET@
+context=$1; # action: upgrade, remove, deconfigure, or failed-upgrade.
+if
+	test "$context" = failed-upgrade &&
+	dpkg --compare-versions "$this_ver" lt "$2"
+then
+	# prerm of the future failed.
+	# Who knows what it was supposed to do?  Abort.
+	exit 1
+fi
+
+old_diversion() {
+	local divertto file
+	file=$1
+	divertto=${2-$file.single}
+	if
+		dpkg-divert --package binutils-multiarch --list |
+		grep -q -F "$divertto"
+	then
+		dpkg-divert --package binutils-multiarch \
+				--remove --rename \
+				--divert "$divertto" "$file"
+	fi
+}
+
+# remove obsolete diversions
+old_diversion /usr/bin/ld.bfd
+old_diversion /usr/bin/c++filt
+old_diversion /usr/lib/libbfd.a /usr/lib/libbfd-single.a
+old_diversion /usr/lib/libopcodes.a /usr/lib/libopcodes-single.a
+old_diversion /usr/bin/ld
+old_diversion /usr/bin/elfedit
+for f in elf32_sparc elf32ppc elf64alpha elf_i386 m68kelf \
+         alpha i386linux m68klinux sparclinux sun4
+do
+	for ext in x xbn xn xr xs xu
+	do
+		old_diversion /usr/lib/ldscripts/$f.$ext
+	done
+done
+old_diversion /usr/lib/libbfd-2.9.1.0.15.so.0.0.0 \
+              /usr/lib/libbfd-single-2.9.1.0.15.so.0.0.0
+old_diversion /usr/lib/libopcodes-2.9.1.0.15.so.0.0.0 \
+              /usr/lib/libopcodes-single-2.9.1.0.15.so.0.0.0
+old_diversion /usr/lib/libbfd.la /usr/lib/libbfd-single.la
+old_diversion /usr/lib/libopcodes.la /usr/lib/libopcodes-single.la
+old_diversion /usr/include/bfd.h /usr/include/bfd.single.h
+old_diversion /usr/lib/ldscripts
+
+rm -f /usr/lib/libbfd-*-multiarch.so.0
+rm -f /usr/lib/libopcodes-*-multiarch.so.0
+
+old_diversion /usr/bin/addr2line
+old_diversion /usr/bin/ar
+old_diversion /usr/bin/embedspu
+old_diversion /usr/bin/gprof
+old_diversion /usr/bin/nm
+old_diversion /usr/bin/objcopy
+old_diversion /usr/bin/objdump
+old_diversion /usr/bin/ranlib
+old_diversion /usr/bin/readelf
+old_diversion /usr/bin/size
+old_diversion /usr/bin/strings
+old_diversion /usr/bin/strip
+
+case "$ma" in i386-*)
+  if test -n "$context" && dpkg --compare-versions "$2" lt "2.27-8"; then
+    old_diversion /usr/bin/$ma-addr2line
+    old_diversion /usr/bin/$ma-ar
+    old_diversion /usr/bin/$ma-embedspu
+    old_diversion /usr/bin/$ma-gprof
+    old_diversion /usr/bin/$ma-nm
+    old_diversion /usr/bin/$ma-objcopy
+    old_diversion /usr/bin/$ma-objdump
+    old_diversion /usr/bin/$ma-ranlib
+    old_diversion /usr/bin/$ma-readelf
+    old_diversion /usr/bin/$ma-size
+    old_diversion /usr/bin/$ma-strings
+    old_diversion /usr/bin/$ma-strip
+  fi
+esac
diff --git a/binutils-multiarch.shlibs.in b/binutils-multiarch.shlibs.in
new file mode 100644
index 000000000..4fc004d09
--- /dev/null
+++ b/binutils-multiarch.shlibs.in
@@ -0,0 +1,4 @@
+libbfd @VER@-multiarch@DATE_EXT@ binutils-multiarch (>= @DEB_UVER@), binutils-multiarch (<< @DEB_NVER@)
+libopcodes @VER@-multiarch@DATE_EXT@ binutils-multiarch (>= @DEB_UVER@), binutils-multiarch (<< @DEB_NVER@)
+libctf-multiarch 0 binutils-multiarch (>= @DEB_UVER@)
+libctf-nobfd-multiarch 0 binutils-multiarch (>= @DEB_UVER@)
diff --git a/binutils-triplet.overrides b/binutils-triplet.overrides
new file mode 100644
index 000000000..9fba6aa37
--- /dev/null
+++ b/binutils-triplet.overrides
@@ -0,0 +1,4 @@
+# empty
+
+# silence lintian stupidity
+@PKG@ binary: spelling-error-in-binary usr/bin/as mmnemonic mnemonic
diff --git a/binutils.overrides b/binutils.overrides
new file mode 100644
index 000000000..38c836419
--- /dev/null
+++ b/binutils.overrides
@@ -0,0 +1,6 @@
+# manpages are in binutils-common
+binutils binary: binary-without-manpage usr/bin/ld.bfd
+binutils binary: binary-without-manpage usr/bin/ld.gold
+
+# silence lintian stupidity
+binutils binary: spelling-error-in-binary usr/bin/as mmnemonic mnemonic
diff --git a/binutils.presubj b/binutils.presubj
new file mode 100644
index 000000000..430e6e44c
--- /dev/null
+++ b/binutils.presubj
@@ -0,0 +1,25 @@
+When reporting binutils errors, please provide the actual input files
+and options given to the tool (gas, objcopy, ld, etc.) at run time.
+This can mean the difference between a pleasant debugging experience
+and a heisenbug that becomes unreproducible when gcc's code generation
+changes.
+
+For example, to create a testcase for an "ld" problem, first find the
+"gcc" command line that triggers the error:
+
+ $ make
+ ... output ending in an error ...
+ $ make V=1 VERBOSE=1 2>&1 | head -1
+
+Add "-v" after gcc and run it again.  One of the early output lines
+will be an invocation of collect2.  Replace collect2 with "ld" and
+it should reproduce the same error.  If you collect all the objects
+(including system libraries) mentioned on the "ld" command line in a
+tarball and send it along with the ld command line then that is a
+testcase.
+
+A possible step after that is to try omitting some objects from the
+ld command line and see if it still triggers the same error, but
+that's just icing on the cake.
+
+Happy debugging!
diff --git a/binutils.triggers b/binutils.triggers
new file mode 100644
index 000000000..dd8660367
--- /dev/null
+++ b/binutils.triggers
@@ -0,0 +1 @@
+activate-noawait ldconfig
diff --git a/changelog b/changelog
new file mode 100644
index 000000000..214814cb9
--- /dev/null
+++ b/changelog
@@ -0,0 +1,6276 @@
+binutils (2.37.90.20220130-2) unstable; urgency=medium
+
+  * Also ignore regressions for the cross packages.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 30 Jan 2022 17:51:18 +0100
+
+binutils (2.37.90.20220130-1) unstable; urgency=medium
+
+  * New upstream snapshot, taken from the 2.38 release branch.
+    - Fix PR ld/28743, PR ld/28819. Closes: #1004272. LP: #1958642.
+  * Configure with --with-isa-spec=2.2 on riscv64. LP: #1959325. Only change
+    to the new ISA when GCC 12 becomes the default.
+  * Fix PR ld/28827, taken from the trunk.
+  * Fix PR ld/28826 x86_64 ld segfaults building xen, taken from the trunk.
+    Closes: #1004269. LP: #1958389.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 30 Jan 2022 14:41:25 +0100
+
+binutils (2.37.90.20220123-2) unstable; urgency=medium
+
+  * Apply proposed patch for PR ld/28819.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 25 Jan 2022 16:57:38 +0100
+
+binutils (2.37.90.20220123-1) unstable; urgency=medium
+
+  * New upstream snapshot, taken from the 2.38 release branch.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 23 Jan 2022 17:51:30 +0100
+
+binutils (2.37.50.20220121-1) unstable; urgency=medium
+
+  * New upstream snapshot.
+  * Revert the last change, PR ld/28751 is fixed.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 21 Jan 2022 09:36:36 +0100
+
+binutils (2.37.50.20220106-2) unstable; urgency=medium
+
+  * Ignore known regressions on powerpc, ppc64, ppc64el, see PR ld/28751.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 07 Jan 2022 08:39:03 +0100
+
+binutils (2.37.50.20220106-1) unstable; urgency=medium
+
+  * New upstream snapshot.
+  * Configure with --disable-silent-rules.
+  * Disable LTO in mipsel to workaround timeouts during tests.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 06 Jan 2022 07:38:55 +0100
+
+binutils (2.37.50.20211201-1) experimental; urgency=medium
+
+  * New upstream snapshot.
+  * Ignore test regressions on mipsel, riscv64, sparc64.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 01 Dec 2021 10:52:43 +0100
+
+binutils (2.37.50.20211118-1) experimental; urgency=medium
+
+  * New upstream snapshot.
+  * Configure --with-gold-ldflags=-static-libstdc++.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 18 Nov 2021 09:20:55 +0100
+
+binutils (2.37.50.20211115-1) experimental; urgency=medium
+
+  * New upstream snapshot.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 15 Nov 2021 11:17:26 +0100
+
+binutils (2.37.50.20211102-1) experimental; urgency=medium
+
+  * New upstream snapshot.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 02 Nov 2021 13:47:31 +0200
+
+binutils (2.37-8) unstable; urgency=medium
+
+  * Update from the binutils 2.37 branch:
+    - PR28391, strip/objcopy --preserve-dates *.a: cannot set time.
+    - [GOLD] Got_offset_list: addend field.
+    - [GOLD] Remove addend from Local_got_entry_key.
+    - [GOLD] Output_data_got tidy.
+    - [GOLD] Output_data_got create entry method addends.
+    - [GOLD] Got_entry::write addends.
+    - [GOLD] PowerPC64 support for sym+addend GOT entries.
+    - ld: pru: Fix resource_table output section alignment.
+    - Fix PR28422, build_id use-after-free.
+    - Fix PR28459, readelf issues bogus warning.
+    - [GOLD] PowerPC64: Don't pretend to support multi-toc.
+    - [GOLD] Two GOT sections for PowerPC64.
+    - Fix PR gold/27625, powerpc64 gold __tls_get_addr calls.
+    - Fix PR28417, std::string no longer allows accepting nullptr_t.
+  * Bump standards version.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 02 Nov 2021 13:17:11 +0200
+
+binutils (2.37-7) unstable; urgency=medium
+
+  * Fix PR ld/28348, taken from the trunk. Closes: #994530.
+  * Revert the arc build, needs dpkg supporting this architecture.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 19 Sep 2021 17:23:57 +0200
+
+binutils (2.37-6) unstable; urgency=medium
+
+  * Add support to build for arc-linux-gnu. Closes: #994190.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 14 Sep 2021 08:41:56 +0200
+
+binutils (2.37-5) unstable; urgency=medium
+
+  * Update from the binutils 2.37 branch:
+    - [GOLD] PowerPC64 relocation overflow for -Os register save/restore funcs.
+  * Update libctf0 and libctf-nobsd0 symbols files.
+  * Rebuild man pages, included as empty files in the upstream tarball.
+    Closes: #992323. LP: #1940712.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 30 Aug 2021 10:51:17 +0200
+
+binutils (2.37-4) unstable; urgency=medium
+
+  * Update from the binutils 2.37 branch:
+    - Revert the ld script expression parsing changes.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 15 Aug 2021 16:51:18 +0200
+
+binutils (2.37-2) experimental; urgency=medium
+
+  * Update from the binutils 2.37 branch:
+    - Fix PR ld/28138, close the file descriptor if there is no archive fd.
+    - Fix PR 28144, man page generation.
+    - Fix ld script expression parsing.
+    - Fix build failures with clang.
+    - Revert: PowerPC: Don't generate unused section symbols, blindly
+      following x86 broken linux kernel builds.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 30 Jul 2021 13:49:51 +0200
+
+binutils (2.37-1) experimental; urgency=medium
+
+  * binutils 2.37 release.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 19 Jul 2021 08:11:10 +0200
+
+binutils (2.36.90.20210712-1) UNRELEASED; urgency=medium
+
+  * New upstream snapshot, taken from the 2.37 branch.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 12 Jul 2021 11:54:46 +0200
+
+binutils (2.36.90.20210705-1) experimental; urgency=medium
+
+  * New upstream snapshot, taken from the 2.37 branch.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 05 Jul 2021 09:17:21 +0200
+
+binutils (2.36.50.20210628-1) experimental; urgency=medium
+
+  * New upstream snapshot, taken from the trunk.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 28 Jun 2021 16:14:58 +0200
+
+binutils (2.36.50.20210618-1) experimental; urgency=medium
+
+  * New upstream snapshot, taken from the trunk.
+  * Apply a hack for mips. See #765710.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 18 Jun 2021 11:54:54 +0200
+
+binutils (2.36.50.20210601-1) experimental; urgency=medium
+
+  * New upstream snapshot, taken from the trunk.
+  * Refresh patches.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 01 Jun 2021 21:25:10 +0200
+
+binutils (2.36.1-6) experimental; urgency=medium
+
+  * Update from the binutils 2.36 branch:
+    - Add install dependencies for ld -> bfd and libctf -> bfd.
+  * Fix dangling symlinks in the cross packages. Closes: #985434.
+  * Ignore bootstrap test regressions on alpha and ia64.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 20 Mar 2021 15:59:45 +0100
+
+binutils (2.36.1-5) experimental; urgency=medium
+
+  * Update from the binutils 2.36 branch:
+    - PR ld/27441, inconsistency in weak definitions.
+    - PowerPC64 undefined weak visibility vs GOT optimisation.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 05 Mar 2021 20:59:07 +0100
+
+binutils (2.36.1-4) experimental; urgency=medium
+
+  * Update from the binutils 2.36 branch:
+    - binutils: Avoid renaming over existing files.
+    - PR 26945, PR 27456.
+  * When stripping packages, call debugedit before dwz to avoid warnings.
+  * Add a README.source file.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 26 Feb 2021 11:17:08 +0100
+
+binutils (2.36.1-2) experimental; urgency=medium
+
+  [ Matthias Klose ]
+  * Remove unused patch.
+  * Show available memory for autopkg tests.
+  * Fix libctf* symbols files, and dependency generation. Closes: #983220.
+  * Add debugedit as dependency for the build autopkg test.
+
+  [ Nicolas Boulenguez ]
+  * Various packaging changes. Closes: #979517.
+    - Fix details in clean Make target when TARGET architecture is specified.
+    - Fix a variable substition in debian/control.
+    - Refresh patches, sorting files in each patch.
+    - Compute D_CROSS from P_CROSS.
+    - Spare two subprocesses in control file generation.
+    - Replace Make foreach function with addprefix when possible.
+    - Remove apparently redundant test.
+    - Replace calls to dpkg-parsechangelog with /usr/share/dpkg/pkg-info.mk.
+    - Make flow of with_cross easyer to follow.
+    - Simplify definition of CROSS_ARCHS.
+    - Fix prerequisites of stamps/control.
+    - Fix an undefined reference when TARGET is defined.
+    - Wrap two calls to dpkg-architecture into the _gnu_type macro.
+    - Simplify a clean command.
+    - Drop two unused variable definitions.
+    - Distinguish TARGET, DEB_TARGET_ARCH and DEB_TARGET_GNU_TYPE.
+    - Improve the _gnu_type and _multiarch macros.
+  * README.cross: Document TARGET-driven cross build. Closes: #979516.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 21 Feb 2021 12:52:20 +0100
+
+binutils (2.36.1-1) experimental; urgency=medium
+
+  * binutils 2.36.1 release.
+  * Update from the binutils 2.36 branch:
+    - IBM Z: Implement instruction set extensions.
+    - PR27382, build failure if fileno() is a macro.
+    - ld: Remove x86 ISA level run-time tests.
+  * debian/patches/mips64-default-n64.diff: Update (YunQiang Su).
+    Patch never forwarded upstream.
+  * Build with Rules-Requires-Root: no.
+  * Bump standards version.
+  * Set unique build-ids for stripped files.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 19 Feb 2021 14:52:51 +0100
+
+binutils (2.36-2) experimental; urgency=medium
+
+  * Snapshot, taken from the 2.36 branch (20210130).
+
+ -- Matthias Klose <doko@debian.org>  Sat, 30 Jan 2021 16:04:47 +0100
+
+binutils (2.36-1) experimental; urgency=medium
+
+  * binutils 2.36 release.
+  * Update from the binutils 2.36 branch:
+    - DWARF-5: Ignore empty range in DWARF-5 line number tables.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 25 Jan 2021 11:43:44 +0100
+
+binutils (2.35.90.20210120-1) experimental; urgency=medium
+
+  * Snapshot, taken from the 2.36 branch (20210120).
+
+ -- Matthias Klose <doko@debian.org>  Wed, 20 Jan 2021 10:45:39 +0100
+
+binutils (2.35.90.20210113-1) experimental; urgency=medium
+
+  * Snapshot, taken from the 2.36 branch (20210113).
+
+ -- Matthias Klose <doko@debian.org>  Wed, 13 Jan 2021 12:00:22 +0100
+
+binutils (2.35.50.20210106-1) experimental; urgency=medium
+
+  * Snapshot, taken from the trunk (20210106).
+  * Fix FTCBFS: Disable pgo for cross builds (Helmut Grohne). Closes: #977822.
+  * 'nopgo' in DEB_BUILD_OPTIONS also disables the pgo builds.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 06 Jan 2021 13:35:29 +0100
+
+binutils (2.35.50.20201218-1) experimental; urgency=medium
+
+  * Snapshot, taken from the trunk (20201218).
+  * Configure the native builds with --enable-pgo-build=lto.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 18 Dec 2020 20:10:03 +0100
+
+binutils (2.35.50.20201209-1) experimental; urgency=medium
+
+  * Snapshot, taken from the trunk (20201209).
+  * Update libctf symbols files.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 09 Dec 2020 12:56:08 +0100
+
+binutils (2.35.50.20201206-1) experimental; urgency=medium
+
+  * Snapshot, taken from the trunk (20201206).
+
+ -- Matthias Klose <doko@debian.org>  Sun, 06 Dec 2020 10:35:20 +0100
+
+binutils (2.35.50.20201125-1) experimental; urgency=medium
+
+  * Snapshot, taken from the trunk (20201125).
+
+ -- Matthias Klose <doko@debian.org>  Wed, 25 Nov 2020 10:23:07 +0100
+
+binutils (2.35.50.20201125-1) experimental; urgency=medium
+
+  * Snapshot, taken from the trunk (20201125).
+
+ -- Matthias Klose <doko@debian.org>  Wed, 25 Nov 2020 10:23:07 +0100
+
+binutils (2.35.50.20201103-1) experimental; urgency=medium
+
+  * Snapshot, taken from the trunk (20201104).
+  * Ignore strip-nondeterminism errors.
+  * Configure with --enable-obsolete (ia64).
+
+ -- Matthias Klose <doko@debian.org>  Tue, 03 Nov 2020 09:30:21 +0100
+
+binutils (2.35.1-2) unstable; urgency=medium
+
+  * Update from the binutils 2.35 branch:
+    - ARM32: Add support for Neoverse N2 and V1 CPUs.
+    - AArch64: Add support for Neoverse V1 CPU.
+    - Various Power10 and Power gold fixes.
+    - Fix PR gas/26685, x86: Check register operand for AddrPrefixOpReg.
+    - Fix PR ld/26711, x86: Properly merge -z ibt and -z shstk.
+    - Fix PR gas/26699, aarch64: Fix bogus type punning in parse_barrier().
+    - Fix PR binutils/26520, fix decoding DWARF information in the BFD library.
+  * AArch64: Add support for Neoverse N2 CPU, taken from the trunk.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 09 Oct 2020 17:10:08 +0200
+
+binutils (2.35.1-1) unstable; urgency=medium
+
+  * binutils 2.35.1 release.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 21 Sep 2020 11:45:07 +0200
+
+binutils (2.35-3) unstable; urgency=medium
+
+  * Update from the binutils 2.35 branch:
+    - PowerPC TPREL_HA/LO optimisation.
+    - Partially fix PR gas/26406, quadratic slowdown when processing secondary
+      relocations.
+    - Fix PR binutils/26548, spurious overflow error when decoding negative
+      LEB128 values.
+    - mark's dwarf backports
+    - bpf: add xBPF ISA.
+    - Backport patches from the mainline to fix the handling of DWARF-5 debug
+      information
+    - PowerPC: Rename xvcvbf16sp to xvcvbf16spn.
+    - Fix PR binutils/26389, nm prints "c" for a common symbol with
+      -flto and -fcommon.
+    - Arm: Fix IT-predicated MVE vcvt.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 11 Sep 2020 12:34:43 +0200
+
+binutils (2.35-2) unstable; urgency=medium
+
+  * Update from the binutils 2.35 branch:
+    - Fixes for the eBPF ELF backend.
+    - Fix PR ld/26312, aarch64: set sh_entsize of .plt to 0.
+    - Fix PR gas/26305, x86: Add {disp16} pseudo prefix, handle {disp32}
+      for (%bp)/(%ebp)/(%rbp).
+    - Fix PR ld/26328, compilation warnings.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 13 Aug 2020 16:16:49 +0200
+
+binutils (2.35-1) unstable; urgency=medium
+
+  * binutils 2.35 release.
+    - Fix PR gas/26263. Closes: #965380.
+  * Explicitly configure with --disable-x86-used-note.
+  * Configure mipsel, mipsn32el, mips64el again with
+    --enable-mips-fix-loongson3-llsc=yes (YunQiang Su). Closes: #952737.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 24 Jul 2020 12:52:26 +0200
+
+binutils (2.34.90.20200706-1) unstable; urgency=medium
+
+  * New upstream snapshot, taken from the binutils 2.35 branch.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 06 Jul 2020 21:10:37 +0200
+
+binutils (2.34.50.20200605-1) experimental; urgency=medium
+
+  * New upstream snapshot.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 05 Jun 2020 10:56:37 +0200
+
+binutils (2.34.50.20200512-1) experimental; urgency=medium
+
+  * New upstream snapshot.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 12 May 2020 16:24:56 +0200
+
+binutils (2.34-6) unstable; urgency=medium
+
+  * Update from the binutils 2.34 branch:
+    - Fix PR lto/94249, typo in a macro usage, improve endianess detection.
+    - PR25745, powerpc64-ld overflows string buffer in --stats mode.
+    - plugin: Don't invoke LTO-wrapper.
+    - PR binutils/25640, plugin: Use LDPT_ADD_SYMBOLS_V2 to get symbol type.
+    - Fix dwarf.c build with GCC 10.
+    - PR binutils/25717, build failure with GCC 10.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 07 Apr 2020 13:29:21 +0200
+
+binutils (2.34-5) unstable; urgency=medium
+
+  * Update from the binutils 2.34 branch:
+    - Fix PR gas/25660, vadd/vsub with lt and le condition codes for MVE.
+    - Fix powerpc64-ld infinite loop.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 19 Mar 2020 20:45:59 +0100
+
+binutils (2.34-4) unstable; urgency=medium
+
+  * Update from the binutils 2.34 branch:
+    - Fix PR24511, nm should not mark symbols in .init_array as "t".
+    - Fix PR binutils/25584, don't call lto-wrapper for ar and ranlib.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 28 Feb 2020 11:18:34 +0100
+
+binutils (2.34-3) unstable; urgency=medium
+
+  * Update from the binutils 2.34 branch:
+    - Fix PR gas/25516, Accept Intel64 only instruction by default.
+    - Fix PR 25447, prevents a potential illegal memory access when parsing
+      PE binaries.
+    - Fix PR binutils/25355, import fixes for using the LTO plugin with nm.
+    - Fix PR 25585, PHDR segment not covered by LOAD segment.
+    - MSP430 updates.
+    - Mention x86 assembler options to align branches.
+    - AArch64: Fix MOVPRFX markup for bf16 conversions.
+  * Make the test summary files reproducible. Addresses: #950585.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 22 Feb 2020 09:49:46 +0100
+
+binutils (2.34-2) unstable; urgency=medium
+
+  * Regenerate the control file.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 02 Feb 2020 17:46:11 +0100
+
+binutils (2.34-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Bump standards version.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 02 Feb 2020 08:45:55 +0100
+
+binutils (2.33.90.20200122-2) unstable; urgency=medium
+
+  * libctf-nobfd0: Add Breaks/Replaces to libbinutils. Closes: #949454.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 22 Jan 2020 07:49:18 +0100
+
+binutils (2.33.90.20200122-1) unstable; urgency=medium
+
+  * New upstream snapshot, taken from the 2.34 release branch.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 22 Jan 2020 06:18:41 +0100
+
+binutils (2.33.50.20200115-2) unstable; urgency=high
+
+  [YunQiang Su]
+  * refresh and re-enable: mips64-default-n64.diff
+
+ -- YunQiang Su <syq@debian.org>  Thu, 16 Jan 2020 23:35:11 +0800
+
+binutils (2.33.50.20200115-1) unstable; urgency=medium
+
+  * New upstream snapshot.
+  * Tighten the build dependency to 2.33.50.20200114-1 for this upload.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 15 Jan 2020 21:18:18 +0100
+
+binutils (2.33.50.20200114-1) unstable; urgency=medium
+
+  * New upstream snapshot.
+  * Build on testing for arm64, and upload the binaries.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 14 Jan 2020 14:19:00 +0100
+
+binutils (2.33.50.20200111-1) unstable; urgency=medium
+
+  * New upstream snapshot.
+  * Make autopkgtests cross-test-friendly (Steve Langasek).
+
+ -- Matthias Klose <doko@debian.org>  Sat, 11 Jan 2020 14:24:29 +0100
+
+binutils (2.33.50.20200107-1) unstable; urgency=medium
+
+  * New upstream snapshot.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 07 Jan 2020 23:19:25 +0100
+
+binutils (2.33.50.20200105-2) experimental; urgency=medium
+
+  * New upstream snapshot.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 05 Jan 2020 11:33:49 +0100
+
+binutils (2.33.50.20191212-1) experimental; urgency=medium
+
+  * New upstream snapshot.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 12 Dec 2019 16:16:13 +0100
+
+binutils (2.33.50.20191205-1) experimental; urgency=medium
+
+  * New upstream snapshot.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 05 Dec 2019 21:22:15 +0100
+
+binutils (2.33.50.20191128-1) experimental; urgency=medium
+
+  * New upstream snapshot.
+  * Split out libctf packages.
+  * Save dejagnu log and sum files in binutils-dev.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 28 Nov 2019 09:57:31 +0100
+
+binutils (2.33.50.20191121-2) experimental; urgency=medium
+
+  * Fix packaging cross targets.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 21 Nov 2019 23:08:45 +0100
+
+binutils (2.33.50.20191121-1) experimental; urgency=medium
+
+  * New upstream snapshot.
+  * Remove the 012_check_ldrunpath_length patch.
+  * Don't apply the mips64-default-n64 patch.
+  * Refresh patches.
+  * Put libctf libctf libraries in libbinutils and binutils-dev for now.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 21 Nov 2019 18:50:25 +0100
+
+binutils (2.33.1-6) unstable; urgency=medium
+
+  * Update from the binutils 2.33 branch:
+    - [gas] Implement .cfi_negate_ra_state directive (AArch64).
+
+ -- Matthias Klose <doko@debian.org>  Thu, 12 Dec 2019 23:32:03 +0100
+
+binutils (2.33.1-5) unstable; urgency=medium
+
+  * Revert configuring with --enable-mips-fix-loongson3-llsc=yes on mipsel,
+    mips64el, mipsn32el. Causes GCC bootstrap comparison failures.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 02 Dec 2019 11:55:09 +0100
+
+binutils (2.33.1-4) unstable; urgency=medium
+
+  * Configure with --enable-mips-fix-loongson3-llsc=yes on mipsel, mips64el,
+    mipsn32el (YunQiang Su).
+  * Enable building mipsel and mips64el targets on arm64 and ppc64el (YunQiang
+    Su). Addresses: #938979.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 21 Nov 2019 15:28:14 +0100
+
+binutils (2.33.1-2) unstable; urgency=medium
+
+  * Update from the binutils 2.33 branch:
+    - Arm: Fix out of range conditional branch (PR/24991).
+    - [bfd] Revise import stubs on hppa.
+    - [bfd] Provide 8-byte minimum alignment for .plt section on hppa.
+  * Drop amd64 cross compiler from the build dependencies on x32.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 20 Oct 2019 21:28:38 +0200
+
+binutils (2.33.1-1) unstable; urgency=medium
+
+  * Binutils 2.33.1 release.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 15 Oct 2019 11:43:46 +0200
+
+binutils (2.33-2) unstable; urgency=medium
+
+  * Update from the binutils 2.33 branch:
+    - Fix PR25079, "ar s" stopped working. Closes: #941921.
+    - PowerPC TLS miscounting PLT for __tls_get_addr.
+    - PowerPC section flag tidy.
+    - PowerPC PIC vs. DLL TLS issues.
+    - PR25046, readelf "Reading xxx bytes extends past end of file for dynamic section".
+    - PR24262, plugin search dir doesn't respect --libdir.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 09 Oct 2019 10:42:29 +0200
+
+binutils (2.33-1) unstable; urgency=medium
+
+  * Binutils 2.33 release (taken from the binutils-2_33 tag).
+  * Update from the binutils 2.33 branch:
+    - Fix PR 24942, change objcopy's --set-section-alignment option so that it
+      takes a byte alignment value rather than a power of two alignment value.
+    - x86-64: fix handling of PUSH/POP of segment register. LP: #1843394.
+  * Merge changes from binutils-mipsen.
+  * Bump standards version.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 08 Oct 2019 11:43:29 +0200
+
+binutils (2.32.51.20190909-1) unstable; urgency=medium
+
+  * Snapshot, taken from the trunk (20190909).
+  * Build the mipsel and mips64el cross packages from the binutils-mipsen
+    source package.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 09 Sep 2019 08:50:20 +0200
+
+binutils (2.32.51.20190821-2) unstable; urgency=medium
+
+  * Drop build dependency on g++-mips-linux-gnu.
+  * Stop building mips binutils.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 22 Aug 2019 09:49:59 +0200
+
+binutils (2.32.51.20190821-1) unstable; urgency=medium
+
+  * Snapshot, taken from the trunk (20190821).
+  * Update test dependencies for added ppc64el, riscv64 and s390x builds.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 21 Aug 2019 11:32:58 +0200
+
+binutils (2.32.51.20190813-1) unstable; urgency=medium
+
+  * Snapshot, taken from the trunk (20190813).
+    - Fix PR ld/24857: ld: error adding symbols: bad value. Closes: #932847.
+  * binutils-source: Fix ftbfs when with_native is off (YunQiang Su).
+    Closes: #933358.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 13 Aug 2019 16:26:14 +0200
+
+binutils (2.32.51.20190727-1) unstable; urgency=medium
+
+  * Snapshot, taken from the trunk (20190727).
+    - Fix PR ld/24832. Closes: #932287.
+  * Build ppc64el packages on arm64.
+  * Build s390x packages on arm64 and ppc64el.
+  * Build riscv64 packages on arm64 and ppc64el. Closes: #932398.
+  * Bump standards version.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 27 Jul 2019 16:58:37 +0200
+
+binutils (2.32.51.20190707-1) unstable; urgency=medium
+
+  * Snapshot, taken from the trunk (20190707).
+
+ -- Matthias Klose <doko@debian.org>  Sun, 07 Jul 2019 12:20:11 +0200
+
+binutils (2.32.51.20190701-1) experimental; urgency=medium
+
+  * Snapshot, taken from the trunk (20190701).
+
+ -- Matthias Klose <doko@debian.org>  Mon, 01 Jul 2019 13:46:05 +0200
+
+binutils (2.32.51.20190624-1) experimental; urgency=medium
+
+  * Snapshot, taken from the trunk (20190624).
+    - Fix PR ld/24704, skiboot link failure. LP: #1833237.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 24 Jun 2019 07:59:05 +0000
+
+binutils (2.32.51.20190611-1) experimental; urgency=medium
+
+  * Snapshot, taken from the trunk (20190611).
+  * Simplify setting the soname for the various builds.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 11 Jun 2019 10:48:30 +0200
+
+binutils (2.32-8) experimental; urgency=medium
+
+  * Snapshot, taken from the 2.32 branch (20190424).
+    - Fix PR ld/24302 (AArch64): When DF_BIND_NOW don't use TLSDESC GOT value.
+    - Fix PR ld/24458 (x86): Also check x86 linker_def for non-shared
+      definition.
+    - AArch64: Add new LDGM/STGM instruction.
+    - AArch64: Update Store Allocation Tag instructions.
+    - AArch64: Fix disassembler bug with out-of-order sections.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 24 Apr 2019 09:25:48 +0200
+
+binutils (2.32-7) experimental; urgency=medium
+
+  * Snapshot, taken from the 2.32 branch (20190321).
+    - Fix PR ld/24355, segfault in function called from ppc_finish_symbols.
+  * Demote binutils-<target> from Multi-Arch: foreign to Multi-Arch: allowed
+    (Helmut Grohne). Closes: #920286.
+  * Let binutils-for-host Depends: binutils-<host>:any.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 21 Mar 2019 16:23:32 +0100
+
+binutils (2.32-6) experimental; urgency=medium
+
+  * Snapshot, taken from the 2.32 branch (20190313).
+    - S/390: arch13 instruction descriptions.
+  * Fix VCS attributes in the control file. Closes: #915982.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 13 Mar 2019 16:12:45 +0100
+
+binutils (2.32-5) experimental; urgency=medium
+
+  * Snapshot, taken from the 2.32 branch (20190213).
+    - S390: Revert "Add support to GNU ld to separate got related plt entries".
+  * binutils-source: Redact the build directory out of the tarball paths.
+    (Andrej Shadura). Closes: #920797.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 06 Mar 2019 11:11:50 +0100
+
+binutils (2.32-4) experimental; urgency=medium
+
+  * Remove mips64 build/check dependency.
+  * Fix PR binutils/23843, taken from the trunk.
+  * Fix PR ld/24276, taken from the trunk. Addresses: #923246.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 27 Feb 2019 22:34:34 +0100
+
+binutils (2.32-3) experimental; urgency=medium
+
+  * Snapshot, taken from the 2.32 branch (20190213).
+    - Fix PR ld/24151, PR gas/24165.
+  * Stop building cross packages now built by binutils-mipsen.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 13 Feb 2019 10:47:43 +0100
+
+binutils (2.32-2) experimental; urgency=medium
+
+  * Snapshot, taken from the 2.32 branch (20190208).
+    - Make inline plt reloc "unsupported for bss-plt" an error (ppc32).
+    - Arm: Backport hlt to all architectures.
+    - SPARC: fix PR ld/18841 (ld test failures).
+    - Visium: fix bogus overflow check on 32-bit hosts.
+    - Visium: align branch absolute instruction for the GR6.
+  * Stop building packages for powerpcspe.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 09 Feb 2019 13:12:21 +0100
+
+binutils (2.32-1) experimental; urgency=medium
+
+  * New upstream version.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 03 Feb 2019 10:34:56 +0100
+
+binutils (2.31.90.20190119-1) experimental; urgency=medium
+
+  * Snapshot, taken from the binutils 2.32 branch (20190119).
+
+ -- Matthias Klose <doko@debian.org>  Sat, 19 Jan 2019 18:30:02 +0100
+
+binutils (2.31.51.20181204-1) experimental; urgency=medium
+
+  * Snapshot, taken from the trunk (20181204).
+
+ -- Matthias Klose <doko@debian.org>  Tue, 04 Dec 2018 11:20:13 +0100
+
+binutils (2.31.51.20181022-1) experimental; urgency=medium
+
+  * Snapshot, taken from the trunk (20181022).
+  * Refresh patches.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 22 Oct 2018 12:08:04 +0200
+
+binutils (2.31.1-10) unstable; urgency=medium
+
+  * Snapshot, taken from the 2.31 branch (20181130).
+    - Fix PR ld/23937, powerpc64le local ifunc IRELATIVE relocs are wrong.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 30 Nov 2018 13:20:30 +0100
+
+binutils (2.31.1-9) unstable; urgency=medium
+
+  * Snapshot, taken from the 2.31 branch (20181127).
+    - Fix Pr ld/23904, regression in Cortex A53 erratum with PIE.
+      Closes: #911497.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 27 Nov 2018 14:25:35 +0100
+
+binutils (2.31.1-8) unstable; urgency=medium
+
+  * Snapshot, taken from the 2.31 branch (20181121).
+    - Fix PR gas/23854 (x86): Disable GOT relaxation with data prefix.
+    - Fix PR ld/23818, when assigning symbol version, hide debug symbols defined
+      in discarded sections from IR objects so that they can be removed later.
+    - ARC updates.
+    - ARM: Skip new binary decode tests on pe targets.
+    - ARM: Fix disassembler crashing on -b binary when thumb file and thumb not
+      forced.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 23 Nov 2018 09:02:12 +0100
+
+binutils (2.31.1-7) unstable; urgency=medium
+
+  * Snapshot, taken from the 2.31 branch (20181018).
+    - AArch64: Fix error checking for SIMD udot (by element).
+    - x86: Add Intel ENCLV to assembler and disassembler.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 18 Oct 2018 08:54:07 +0200
+
+binutils (2.31.1-6) unstable; urgency=medium
+
+  * Snapshot, taken from the 2.31 branch (20180919).
+    - PR ld/23499: elf: Check for corrupt symbol version info.
+    - Fix Aarch64 bug in warning filtering.
+    - Improve the code in the assembler to detect and reject a duplicate
+      input and output file.
+  * Don't reset CROSS_ARCHS when building in an autopkg tests (as done by
+    the cross-toolchain-base build test).
+
+ -- Matthias Klose <doko@debian.org>  Wed, 19 Sep 2018 13:48:13 +0200
+
+binutils (2.31.1-5) unstable; urgency=medium
+
+  * Fix the "build" autopkg test, depending on fakeroot and allowing output
+    on stderr.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 31 Aug 2018 11:56:41 +0200
+
+binutils (2.31.1-4) unstable; urgency=medium
+
+  * Rewrite. the "build" autopkg tests not to use the "build-needed"
+    restriction until #906125 is fixed. Closes: #884117.
+  * Build armel and armhf cross binutils on ppc64el.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 14 Aug 2018 20:43:44 +0200
+
+binutils (2.31.1-3) unstable; urgency=medium
+
+  * Snapshot, taken from the 2.31 branch (20180814).
+    - Fix PR ld/23428, properly add X86_ISA_1_NEEDED property.
+    - Fix PR ld/23486, properly merge GNU_PROPERTY_X86_ISA_1_USED.
+    - x32: Align the .note.gnu.property section to 4 bytes.
+    - PowerPC64 __tls_get_addr_opt stub .eh_frame fix.
+    - PowerPC64: __tls_get_addr_opt stubs and tocsave optimization.
+    - PR gas/23465, x86: don't mistakenly scale non-8-bit displacements.
+    - PR gold/23455, add --warn-drop-version option; by default, do not warn
+      when discarding version info.
+    - hppa: Fix unwind offset for call_info->start_symbol.
+  * Build arm64 cross binutils on ppc64el.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 14 Aug 2018 07:33:39 +0200
+
+binutils (2.31.1-2) unstable; urgency=medium
+
+  * Snapshot, taken from the 2.31 branch (20180726).
+    - S/390: Set the htm flag on PPA.
+    - x86: Add a GNU_PROPERTY_X86_ISA_1_USED note if needed.
+    - x86: Split vcvtps2{,u}qq and vcvttps2{,u}qq.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 26 Jul 2018 12:23:07 +0200
+
+binutils (2.31.1-1) unstable; urgency=medium
+
+  * Binutils 2.31.1 release.
+  * Remove the riscv64 build hack. Closes: #903857.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 18 Jul 2018 11:58:00 +0200
+
+binutils (2.31-1) unstable; urgency=medium
+
+  * Binutils 2.31 release.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 16 Jul 2018 11:40:18 +0200
+
+binutils (2.30.90.20180710-1) unstable; urgency=medium
+
+  * Snapshot, taken from the 2.31 branch (20180710).
+    - Fix PR ld/23388, configuration with --enable-separate-code on i386.
+      Closes: #903376.
+    - Fix PR ld/23372, Remove x86 ISA properties with empty bits.
+    - Fix PR binutils/23369, read/write flag for these registers on AArch64.
+    - Fix PR binutils/23242, SBO bit in disassembly mask for ldrah on AArch64.
+    - [GOLD] PowerPC .gnu.attributes support.
+    - CVE-2018-8945: PR binutils/22809, objdump segfault.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 10 Jul 2018 11:44:16 +0200
+
+binutils (2.30.90.20180705-1) unstable; urgency=medium
+
+  * Snapshot, taken from the 2.31 branch (20180705).
+    - Install the diagnostics.h header. Closes: #902765, #902823.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 05 Jul 2018 17:55:14 +0200
+
+binutils (2.30.90.20180627-1) unstable; urgency=medium
+
+  * Snapshot, taken from the 2.31 branch (20180627).
+    - CVE-2018-10372: PR binutils/23064, Fix illegal memory access when parsing
+      corrupt DWARF information.
+    - CVE-2018-10373: PR binutils/23065, nm segfault.
+    - CVE-2018-10534: PR binutils/23110, objcopy segfault.
+    - CVE-2018-10535: PR binutils/23113, objcopy segfault.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 27 Jun 2018 21:55:43 +0200
+
+binutils (2.30.52.20180613-1) experimental; urgency=medium
+
+  * Snapshot, taken from the trunk (20180613).
+
+ -- Matthias Klose <doko@debian.org>  Wed, 13 Jun 2018 14:20:30 +0200
+
+binutils (2.30.51.20180512-1) experimental; urgency=medium
+
+  * Snapshot, taken from the trunk (20180512).
+
+ -- Matthias Klose <doko@debian.org>  Sat, 12 May 2018 11:45:10 -0400
+
+binutils (2.30-22) unstable; urgency=medium
+
+  * Update, taken from the 2.30 branch 20180622.
+    - x86 gas: Replace CET bit with IBT and SHSTK bits.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 22 Jun 2018 08:11:21 +0200
+
+binutils (2.30-21) unstable; urgency=medium
+
+  * Update, taken from the 2.30 branch 20180529.
+    - x86-64: Add TLSDESC fields to elf_x86_lazy_plt_layout.
+    - PR binutils/23199, mark section in a section group with SHF_GROUP.
+    - PR ld/23194, x86: Don't set eh->local_ref to 1 for versioned symbol.
+    - PR ld/23189, x86: Don't set eh->local_ref to 1 for linker defined symbols.
+    - PR binutils/23199, Invalid SHT_GROUP entry leads to group confusion.
+  * Fix PR gprof/23056, memory corruption in gprof. LP: #1763098.
+  * Fix PR binutils/23054, memory corruption in as. LP: #1763096.
+  * Fix PR ld/23055, memory corruption in ld. LP: #1763094.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 29 May 2018 15:46:35 +0200
+
+binutils (2.30-20) unstable; urgency=medium
+
+  * Update, taken from the 2.30 branch 20180516.
+    - Fix PR binutils/23109, disassembly mask for vector sdot on AArch64.
+    - Fix uninitialised memory acccess in COFF bfd backend.
+    - Update Portuguese translations.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 16 May 2018 10:21:19 -0400
+
+binutils (2.30-19) unstable; urgency=medium
+
+  * Build-depend on procps.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 03 May 2018 07:44:55 +0200
+
+binutils (2.30-17) unstable; urgency=medium
+
+  * Update, taken from the 2.30 branch 20180502.
+    - Fix PR ld/23123, PR ld/22374, PowerPC32 ifunc regression.
+    - AArch64: Fix the mask for the sqrdml(a|s)h instructions.
+  * Fix unintialized memory in aarch64 opcodes, taken from the trunk.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 02 May 2018 14:11:28 +0200
+
+binutils (2.30-16) unstable; urgency=medium
+
+  * Update, taken from the 2.30 branch 20180425.
+    - Fix PR ld 22782, x86: Remove the unused _GLOBAL_OFFSET_TABLE_.
+    - Update spanish and russian translations.
+  * Add amd64, i386, x32 and riscv64 cross compilers as build (test)
+    dependencies.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 25 Apr 2018 06:53:58 +0200
+
+binutils (2.30-15) unstable; urgency=medium
+
+  * Update, taken from the 2.30 branch 20180408.
+  * Only build the basic package when running the autopkg tests.
+    Closes: #884117.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 08 Apr 2018 22:55:34 +0200
+
+binutils (2.30-14) unstable; urgency=medium
+
+  * Update, taken from the 2.30 branch 20180405.
+    - Fix PR binutils/23025, Clear vex instead of vex.evex (x86).
+  * Fix PR gold/22770, MIPS: Fix GOT page counter in multi-got links,
+    taken from the trunk. Closes: #886222.
+  * Fix PR ld/23030 (stop the IA64 linker from removing unwind tables
+    when garbage collecting), taken from the trunk. Closes: #894915, #894719.
+  * More work arounds to build natively on riscv64.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 05 Apr 2018 19:13:24 +0200
+
+binutils (2.30-13) unstable; urgency=medium
+
+  * Build cross binutils for i386 and x32 on arm64 and ppc64el.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 04 Apr 2018 10:32:15 +0200
+
+binutils (2.30-11) unstable; urgency=medium
+
+  * Filter out the host architecture when passed as a cross architecture.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 01 Apr 2018 17:01:49 +0200
+
+binutils (2.30-10) unstable; urgency=medium
+
+  * Update, taken from the 2.30 branch 20180330.
+    - Fix PR 22773, ARM assembler's parsing of an illegal ORR instruction.
+    - Fix PR gold/22868, PR ld/22972 on SPARC, .
+    - PR ld/23000, x86-64: Add ENDBR64 to the TLSDESC PLT entry.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 30 Mar 2018 18:55:59 +0800
+
+binutils (2.30-9) unstable; urgency=medium
+
+  * Update, taken from the 2.30 branch 20180325.
+    - Fix PowerPC64 out-of-line save/restore functions.
+    - Remove unnecessary power9 group terminating nop.
+    - Set non_ir_ref_dynamic if a symbol is made dynamic.
+    - Fix PR ld/22836, "-r -s" doesn't work with -g3 using GCC 7.
+  * Fix amd64, i386 and x32 cross builds.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 25 Mar 2018 14:53:41 +0800
+
+binutils (2.30-8) unstable; urgency=medium
+
+  * Update, taken from the 2.30 branch 20180318.
+    - [ARM] Fix bxns mask.
+    - Extend the fix for PR ld/20882.
+  * Fix PowerPC64 out-of-line save/restore functions. Closes: #886264.
+  * Revert the 2.30-7 change.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 18 Mar 2018 12:51:40 +0800
+
+binutils (2.30-7) unstable; urgency=medium
+
+  * Upload without build dependencies on the cross compilers and don't run
+    the testsuite for this upload.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 08 Mar 2018 12:04:10 +0700
+
+binutils (2.30-6) unstable; urgency=medium
+
+  * Update, taken from the 2.30 branch 20180308.
+    - Fix PR ld/15904, linker error with --no-keep-memory.
+    - Enable link time garbage collection for the IA64 target. Closes: #890909.
+    - Fix PR gas/22014, memory corruption in MIPS assembler.
+    - Fix PR ld/22758, a bug that would place executable and non-executables
+      pages in the same segment.
+    - Fix PR ld/22832 on SPARC.
+    - Fix AArch32 build attributes for Armv8.4-A.
+    - Update translations.
+  * CVE-2018-7208: Fix PR binutils/22741, taken from the trunk.
+  * CVE-2018-7568: Fix PR binutils/22894, taken from the trunk.
+  * CVE-2018-7569: Fix PR binutils/22895, taken from the trunk.
+  * CVE-2018-7642: Fix PR binutils/22887, taken from the trunk.
+  * CVE-2018-7643: Fix PR binutils/22905, taken from the trunk.
+  * CVE-2018-7570: PR binutils/22881 needs a proper backport.
+  * Update package descriptions for binutils-<target>. Closes: #891377.
+  * Build binutils-for-host for TARGET (Helmut Grohne). Closes: #891863.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 08 Mar 2018 09:56:54 +0700
+
+binutils (2.30-5) unstable; urgency=medium
+
+  * Update, taken from the 2.30 branch 20180215.
+    - gas: xtensa: fix trampoline placement.
+    - Fix PR gas/22738 (.dc.a directive has wrong size on SPARC 64-bit).
+    - Fix GOT relocation overflow on SPARC. Closes: #890359.
+  * strings --include-all-whitespace doesn't take an argument. Closes: #887894.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 15 Feb 2018 08:20:04 +0700
+
+binutils (2.30-4) unstable; urgency=high
+
+  * Update, taken from the 2.30 branch 20180209.
+    - Fix PR binutils/22788 (CVE-2018-6872).
+  * binutils-multiarch: Add riscv64 support.
+  * Bump dpkg version to a version supporting riscv64.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 09 Feb 2018 19:24:28 +0100
+
+binutils (2.30-3) unstable; urgency=high
+
+  * Update, taken from the 2.30 branch 20180208.
+    - Remove speculation barrier support, remove --speculate-indirect-jumps
+      support (PPC).
+    - Fix PR ld/22764.
+  * CVE-2018-6323: Fix PR binutils/22746, taken from the trunk.
+  * CVE-2018-6543: Fix PR binutils/22769, taken from the trunk.
+  * CVE-2018-6759: Fix PR binutils/22794, taken from the trunk.
+  * Build riscv64 cross packages. This is using a hack, making binutils
+    not building natively on riscv64. At the mercy of a dpkg update
+    to handle riscv64 in stretch ...
+
+ -- Matthias Klose <doko@debian.org>  Thu, 08 Feb 2018 10:22:10 +0100
+
+binutils (2.30-2) unstable; urgency=medium
+
+  * Update, taken from the 2.30 branch 20180205.
+    - Fix PR ld/22762.
+    - gold: Add support for DWARF-4 line number tables.
+    - Update Brazillian portuguese and Russian translations.
+  * Apply approved patch for PR ld/22764 (AArch64). LP: #1746765.
+    Closes: #888789.
+  * Fix PR binutils/22734, taken from the trunk. Closes: #887729.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 05 Feb 2018 16:22:40 +0100
+
+binutils (2.30-1) unstable; urgency=medium
+
+  * Binutils 2.30 release.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 29 Jan 2018 14:29:38 +0100
+
+binutils (2.29.90.20180122-1) unstable; urgency=medium
+
+  * Snapshot, taken from the binutils 2.30 branch (20180122).
+  * Security issues addressed in 2.30: CVE-2017-13716, CVE-2017-14930,
+    CVE-2017-14932, CVE-2017-14933, CVE-2017-14934, CVE-2017-14938,
+    CVE-2017-14939, CVE-2017-14940, CVE-2017-15020, CVE-2017-15021,
+    CVE-2017-15022, CVE-2017-15023, CVE-2017-15024, CVE-2017-15025,
+    CVE-2017-15225, CVE-2017-15938, CVE-2017-15996, CVE-2017-16826,
+    CVE-2017-16827, CVE-2017-16828, CVE-2017-16829, CVE-2017-16830,
+    CVE-2017-16831, CVE-2017-16832, CVE-2017-17080, CVE-2017-17121,
+    CVE-2017-17122, CVE-2017-17123, CVE-2017-17124, CVE-2017-17125,
+    CVE-2017-17126.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 23 Jan 2018 04:11:38 +0100
+
+binutils (2.29.51.20180110-1) experimental; urgency=medium
+
+  * Snapshot, taken from the trunk (20180110).
+
+ -- Matthias Klose <doko@debian.org>  Wed, 10 Jan 2018 16:54:44 +0100
+
+binutils (2.29.51.20171219-1) experimental; urgency=medium
+
+  * Snapshot, taken from the trunk (20171219).
+
+ -- Matthias Klose <doko@debian.org>  Tue, 19 Dec 2017 14:50:11 +0100
+
+binutils (2.29.51.20171208-1) experimental; urgency=medium
+
+  * Snapshot, taken from the trunk (20171208).
+  * binutils-source: Depend on python3 instead of python.
+  * Override m68k, powerpcspe and m68k buildd admins to run the testsuite.
+  * Build binutils-x86-64-linux-gnu on arm64 and ppc64el. See #883769.
+  * Revived from the tombs, build a binutils-ia64-linux-gnu package.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 08 Dec 2017 15:19:09 +0100
+
+binutils (2.29.51.20171128-1) experimental; urgency=medium
+
+  * Snapshot, taken from the trunk (20171128).
+
+ -- Matthias Klose <doko@debian.org>  Tue, 28 Nov 2017 08:59:33 +0100
+
+binutils (2.29.1-13) unstable; urgency=medium
+
+  * Update, taken from the 2.29 branch 20180105.
+    - Fix PR ld/22626, invalid dynindx used for dynamic relocs against
+      section symbols.
+  * Fix cross builds, use host tools (Helmut Grohne). Closes: #883865.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 05 Jan 2018 23:44:48 +0100
+
+binutils (2.29.1-12) unstable; urgency=medium
+
+  * Update, taken from the 2.29 branch 20171212.
+    - Fix PR binutils/21118, don't mask X_add_number containing
+      a register number.
+  * Revived from the tombs, build a binutils-ia64-linux-gnu package.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 13 Dec 2017 01:10:25 +0100
+
+binutils (2.29.1-11) unstable; urgency=medium
+
+  * Update, taken from the 2.29 branch 20171208.
+    - Fix PR gold/22309.
+  * Build binutils-x86-64-linux-gnu on arm64 and ppc64el. See #883769.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 08 Dec 2017 12:41:16 +0100
+
+binutils (2.29.1-10) unstable; urgency=medium
+
+  * Update, taken from the 2.29 branch 20171201.
+    - Fix PR gold/22233, segfault in relocate_erratum_stub on aarch64.
+    - Update local fix for PR gold/20765, internal error in fix_errata on
+      aarch64 (Peter Smith). LP: #1638902.
+  * binutils-source: Depend on python3 instead of python.
+  * Override m68k, powerpcspe and m68k buildd admins to run the testsuite.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 01 Dec 2017 02:34:24 +0100
+
+binutils (2.29.1-9) unstable; urgency=medium
+
+  * Update, taken from the 2.29 branch 20171128.
+    - Fix PR ld/22431, powerpc64 ld segfault when .plt discarded.
+    - Fix DWARF reader to use correct size for DW_FORM_ref_addr.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 28 Nov 2017 07:02:24 +0100
+
+binutils (2.29.1-8) unstable; urgency=medium
+
+  * Apply proposed patch for PR gold/22233. Closes: #876786.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 13 Nov 2017 15:45:39 +0100
+
+binutils (2.29.1-7) unstable; urgency=medium
+
+  * Update, taken from the 2.29 branch 20171107.
+    - Fix PR ld/22397, PR ld/22300, PR binutils/22348.
+  * Use dwz -m to compress the -dbg packages.
+  * Add a plethora of mips r6 packages ... Closes: #881060.
+  * Provide "long" description for -dbg packages. Closes: #880001.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 08 Nov 2017 12:17:38 +0100
+
+binutils (2.29.1-6) unstable; urgency=medium
+
+  * Update, taken from the 2.29 branch 20171022.
+    - [GOLD] Fix powerpc64 optimization of TOC accesses.
+  * Do the extra/optional dance ...
+  * Build debug packages. Closes: #863728.
+  * Fix stripping the binutils-<native triplet> packages.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 22 Oct 2017 22:41:34 +0200
+
+binutils (2.29.1-5) unstable; urgency=medium
+
+  * Update, taken from the 2.29 branch 20171017.
+    - Fix PR binutils/22245, undefined behavior in bfd_set_error.
+    - Correct ctor/dtor in init_array/fini_array error value.
+  * Stop installing i586 compat links for i386 builds. Closes: #877791.
+  * Build a binutils-i686-linux-gnu package on amd64 and x32 too.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 17 Oct 2017 11:29:33 +0200
+
+binutils (2.29.1-4) unstable; urgency=medium
+
+  * Update, taken from the 2.29 branch 20171001.
+    - PR ld/22220, BFD linker wrongly marks symbols as PREVAILING_DEF_IRONLY.
+    - PR ld/22199, x86-64: Don't pass output_bfd to info->callbacks->minfo.
+    - [GOLD] Set non-exec stack for ppc64.
+  * Move man/{go,}ld.1.gz to binutils-common (Helmut Grohne). Closes: #877266.
+  * Build-depend on target g++ compilers instead of target gcc compilers.
+  * Fail when string merge can't alloc memory, taken from the trunk.
+    Closes: #874674.
+  * Fix legacy cross builds. Closes: #876677.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 01 Oct 2017 20:16:22 +0200
+
+binutils (2.29.1-3) unstable; urgency=medium
+
+  * Update, taken from the 2.29 branch 20170923.
+    - gold: Add --no-relax option.
+    - readelf: Handle E_MIPS_MACH_5900.
+    - gold: PowerPC function address in non-PIC.
+    - Fix PR binutils/22163, PR binutils/22170.
+  * libbinutils: Fix generation of upper dependency for two-number versions.
+  * debian/rules. Remove the old cross build targets.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 23 Sep 2017 14:00:50 +0200
+
+binutils (2.29.1-1) unstable; urgency=medium
+
+  * binutils 2.29.1 release.
+  * Convert to package source format 3.0 (quilt).
+
+ -- Matthias Klose <doko@debian.org>  Wed, 20 Sep 2017 10:11:56 +0200
+
+binutils (2.29-13) unstable; urgency=medium
+
+  * Build again all cross packages.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 19 Sep 2017 13:11:06 +0200
+
+binutils (2.29-12) unstable; urgency=medium
+
+  * Update, taken from the 2.29 branch 20170919.
+    - Fix PR ld/21441, PowerPC64 stubs don't match calculated size.
+      Closes: #876134.
+    - Fix PR ld/22048, Incorrect .eh_frame section in libc.so.
+    - Fix PR ld/22150, ld keeps a version reference for gc'd symbols.
+      Closes: #874585. LP: #1715641.
+    - Fix PR ld/22148, Integer overflow in elf64-x86-64.c.
+    - Fix PR ld/21924, Require GCC 5 or above for 3 x86 tests.
+  * Fix installation of test summaries.
+  * Compare test summaries for cross builds.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 19 Sep 2017 13:04:07 +0200
+
+binutils (2.29-10) unstable; urgency=medium
+
+  * Update, taken from the 2.29 branch 20170915.
+    - Fix PR binutils/22047 (CVE-2017-14129), PR binutils/22018.
+  * gold on 32bit archs: Release mapped files after each pass.
+  * Build-depend on cross compilers to run the tests for the binutils
+    cross packages.
+  * Install the ldscripts into /usr/lib/<multiarch>/ldscripts and move
+    ldscripts into the binutils-<triplet> packages.
+  * Install the unprefixed manual packages into binutils-common and
+    derive the timestamps from the debian/changelog entry.
+  * binutils-<triplet>: Remove dependency on binutils.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 15 Sep 2017 11:55:58 +0200
+
+binutils (2.29-9) unstable; urgency=medium
+
+  * Update, taken from the 2.29 branch 20170906.
+    - Fix PR binutils/22032, PR binutils/21786 (CVE-2017-12451),
+      PR binutils/21787 (CVE-2017-12448), PR binutils/21813 (CVE-2017-12450,
+      CVE-2017-12452, CVE-2017-12453, CVE-2017-12454), PR ld/21824,
+      PR binutils/21916, PR ld/21441, PR ld/22067, PR ld/22064, PR ld/22061,
+      PR binutils/22059 (CVE-2017-14128), PR binutils/21933 (CVE-2017-12799),
+      PR binutils/22060, PR binutils/22058 (CVE-2017-14130), PR binutils/21995,
+      PR binutils/21861, PR binutils/21813 (CVE-2017-12456), PR binutils/21909,
+      PR binutils/21820, PR binutils/21990, PR binutils/21994, PR ld/21441,
+      PR ld/22064, PR ld/22061, PR lto/81968, PR lto/81968, PR lto/81925.
+  * Fix typo in control.in interpolation when TARGET is non-empty (Helmut
+    Grohne). Addresses: #873387.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 06 Sep 2017 08:14:12 +0200
+
+binutils (2.29-8) unstable; urgency=medium
+
+  * Update, taken from the 2.29 branch 20170830.
+    - Fix PR gold/21868. Closes: #830540, #869768.
+    - Fix address violation issues when parsing corrupt binaries.
+    - PR gold/21847: Provide symbol flag for PowerPC64 localentry:0 tracking.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 30 Aug 2017 08:03:09 +0200
+
+binutils (2.29-7) unstable; urgency=high
+
+  * Fix binutils dependency on binutils-<triplet> on non amd64 architectures.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 23 Aug 2017 23:51:26 +0200
+
+binutils (2.29-6) unstable; urgency=medium
+
+  * Update, taken from the 2.29 branch 20170823.
+    - Fix PR ld/21988, PR ld/21964, PR ld/21910.
+  * readelf: Add patch to read Infinity notes.
+  * Reorganize packages to provide binutils-for-host/binutils-for-build
+    packages (Helmut Grohne). Closes: #842439.
+    - Break out a binutils-common package.
+    - Refactor code to build with DEB_BUILD_OPTIONS=nogold.
+    - Rename gold, ld.gold, ld.bfd to their triplet prefixed equivalents.
+    - Remove shlibs files for hppa64 and cross packages.
+    - Set NATIVE_ARCHS explicitly.
+    - Split out a libbinutils package and binutils-<triplet> packages.
+    - Build binutils-for-host and binutils-for-build packages.
+  * Fix some issues in the above patches.
+  * Mark binutils-common and libbinutils as M-A: same.
+  * Remove obsolete Breaks/Conflicts/Replaces.
+  * Replace FIXME markers with TODO markers. Silly lintian ...
+
+ -- Matthias Klose <doko@debian.org>  Wed, 23 Aug 2017 12:01:12 +0200
+
+binutils (2.29-5) unstable; urgency=medium
+
+  * Update, taken from the 2.29 branch 20170820.
+    - Fix PR binutils/21962, buffer overrun when parsing a corrupt tekhex
+      binary.
+    - Fix PR ld/18808: [AArch64] Skip IFUNC relocations in debug sections.
+    - Fix PR ld/18841: [AArch64] ifunc relocation ordering.
+    - [AArch64] Turn lr, fp, ip0 and ip1 into proper aliases.
+    - Fix PR ld/21923.
+  * Build gold on s390x. LP: #1709873.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 20 Aug 2017 19:00:03 +0200
+
+binutils (2.29-4) unstable; urgency=medium
+
+  * Update, taken from the 2.29 branch 20170804.
+  * Fix PR ld/21884, taken from the trunk. Do not choose a non-ELF format
+    input file to hold the linker created GOT sections. Closes: #870611.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 07 Aug 2017 08:46:12 -0400
+
+binutils (2.29-3) unstable; urgency=medium
+
+  * Update, taken from the 2.29 branch 20170802.
+    - S390 testsuite fixes.
+  * Fix PR ld/21884, taken from the trunk. Closes: #870343.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 02 Aug 2017 14:16:35 +0200
+
+binutils (2.29-2) unstable; urgency=medium
+
+  * Update, taken from the 2.29 branch 20170731.
+    - Fix PR 21847, PowerPC64 --plt-localentry issues.
+    - Fix PR gold/21857, PR ld/21849 (AVR).
+  * Remove Daniel as an uploader. Closes: #869305.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 31 Jul 2017 09:17:30 +0200
+
+binutils (2.29-1) unstable; urgency=medium
+
+  * binutils 2.29 release.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 25 Jul 2017 11:02:19 +0200
+
+binutils (2.28.90.20170718-1) experimental; urgency=medium
+
+  * Snapshot, taken from the 2.29 branch (20170718).
+
+ -- Matthias Klose <doko@debian.org>  Tue, 18 Jul 2017 11:26:15 +0200
+
+binutils (2.28.51.20170703-1) experimental; urgency=medium
+
+  * Snapshot, taken from the trunk (20170703).
+    - Addresses CVE-2017-9040, CVE-2017-9042, CVE-2017-9043, CVE-2017-9044,
+      CVE-2017-9742, CVE-2017-9743, CVE-2017-9744, CVE-2017-9745,
+      CVE-2017-9746, CVE-2017-9747, CVE-2017-9748, CVE-2017-9749,
+      CVE-2017-9750, CVE-2017-9751, CVE-2017-9752, CVE-2017-9753,
+      CVE-2017-9754, CVE-2017-9755, CVE-2017-9756, CVE-2017-9954,
+      CVE-2017-9955. Closes: #863674.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 03 Jul 2017 16:08:53 +0200
+
+binutils (2.28.51.20170627-1) experimental; urgency=high
+
+  * Snapshot, taken from the trunk (20170627).
+
+ -- Matthias Klose <doko@debian.org>  Tue, 27 Jun 2017 14:53:24 +0200
+
+binutils (2.28.51.20170620-1) experimental; urgency=medium
+
+  * Snapshot, taken from the trunk (20170620).
+    - Addresses issues CVE-2017-9040, CVE-2017-9042, CVE-2017-9043.
+    - ILP32 patches applied upstream. Closes: #861833.
+    - Fixes PR ld/21334 (MIPS), undefined hidden symbols causing assertion
+      failure. Closes: #858898.
+  * Configure with --enable-new-dtags.
+  * Don't revert the commit causing PR 21074.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 20 Jun 2017 15:32:31 +0200
+
+binutils (2.28-6) unstable; urgency=medium
+
+  * Update, taken from the 2.28 branch 20170615.
+    - Fix PR ld/19579 (AArch64), handling of relocations against common symbols.
+      Closes: #863152.
+    - Fix PR ld/21523 (ARM32).
+    - Fix PR ld/21529 (ARM32), internal error in linker.
+    - Fix PR ld/21404 (AVR).
+    - Fix PR binutils/21034.
+    - Fix PR gold/21503, gold not creating linker stub symbols on ppc64.
+    - Remove linker option: -z prefix-nop (x86).
+  * Fix several crashes. Addresses: #863674.
+    - PR binutils/21343, readelf crash. CVE-2017-9038.
+    - PR binutils/21345, readelf crash. CVE-2017-9039.
+    - PR binutils/21344, readelf crash. CVE-2017-9041.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 15 Jun 2017 17:46:47 +0200
+
+binutils (2.28-5) unstable; urgency=medium
+
+  * Update, taken from the 2.28 branch 20170510.
+    - RISC-V updates.
+    - Fix PR ld/21334 (MIPS).
+    - VxWorks fix.
+    - Fix PR ld/16044 (CRIS).
+  * Fix PR binutils/21412, global-buffer-overflow in objcopy. CVE-2017-8393.
+  * Fix PR binutils/21414, segfault in objcopy. CVE-2017-8394.
+  * Fix PR binutils/21431, objcopy segfault - null pointer dereferencing.
+    CVE-2017-8395.
+  * Fix PR binutils/21432, heap buffer overflow in objdump. CVE-2017-8396.
+  * Fix PR binutils/21434, heap buffer overflow in objdump. CVE-2017-8397.
+  * Fix PR binutils/21438, heap buffer overflow in printf_common.
+    CVE-2017-8398.
+  * Fix PR binutils/21440, prevent memory exhaustion from a corrupt PE binary
+    with an overlarge number of relocs. CVE-2017-8421.
+  * gold (SPARC): Fix assertion failure relaxing TLS for position-independent
+    executables. Closes: #862017.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 10 May 2017 12:12:53 +0200
+
+binutils (2.28-4) unstable; urgency=medium
+
+  * Update, taken from the 2.28 branch 20170418.
+    - Fix PR ld/21233: Avoid sweeping forced-undefined symbols in section GC.
+    - BFD fix.
+    - Fix PR ld/19579, PR ld/21306, link error with PIE on s390x.
+  * Fix PR binutils/21342, null pointer dereferences when using a link built
+    with clang. Closes: #859989. CVE-2017-7614.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 18 Apr 2017 08:08:02 +0630
+
+binutils (2.28-3) unstable; urgency=medium
+
+  * Update, taken from the 2.28 branch 20170405.
+    - RISC-V updates.
+    - Fix PR binutils/21303 (PPC), objdump doesn't show e200z4 insns.
+    - S/390: Remove vx2 facility flag.
+    - Update -maltivec and -mvsx options to only enable their oldest
+      instructions (PPC).
+    - Add support for the new 'lnia' extended mnemonic (PPC).
+    - Fix ld uninitialized read of script ASSERT data structure.
+  * Fix incorrect library search order on PowerPC, taken from the trunk.
+  * Fix PR ld/21233 (MIPS only), taken from the trunk. Closes: #857017.
+  * Fix a french translation. Closes: #859503.
+  * Fix PR binutils/21157, handling of corrupt STABS enum type strings.
+    Closes: #858324. CVE-2017-7210.
+  * Fix PR binutils/21137, readelf writing to illegal addresses.
+    Closes: #858264. CVE-2017-6965.
+  * Fix PR binutils/21156, illegal memory accesses in readelf.
+    Closes: #858256. CVE-2017-6969.
+  * Fix PR binutils/21139, read-after-free error in readelf.
+    Closes: #858263. CVE-2017-6966.
+  * Fix PR binutils/21135, invalid read of section contents.
+    Closes: #858323. CVE-2017-7209.
+  * Fix PR demangler/70909, libiberty Demangler segfaults. CVE-2016-4491.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 05 Apr 2017 17:48:03 +0200
+
+binutils (2.28-2) unstable; urgency=medium
+
+  * Update, taken from the 2.28 branch 20170307.
+    - Fix PR ld/20519, PR binutils/21224, PR binutils/21124 (all PPC).
+
+ -- Matthias Klose <doko@debian.org>  Tue, 07 Mar 2017 11:09:19 +0100
+
+binutils (2.28-1) unstable; urgency=medium
+
+  * binutils 2.28 release.
+    - S/390: Add support for new cpu architecture - arch12.
+    - S/390: Issue error for overflowing relocs.
+    - Fix PR gas/20744 (PPC32): Correct VLE 16D and SDAREL relocations.
+    - Fix PowerPC ld segfault on script discarding dynamic sections.
+    - Sync libiberty sources with GCC mainline. Fixes PR PR c++/70182,
+      PR c++/77489, PR c++/78761.
+    - Nios2 dynobj handling fixes.
+    - Don't make dynamic .data.rel.ro SEC_READONLY.
+    - PowerPC addpcis fix.
+    - RISC-V updates.
+    - [AArch64] Additional SVE instructions, add a "compnum" feature,
+      add SVE system registers, fix +sve documentation, add separate
+      feature flag for weaker release consistent load insns.
+  * Don't install windows related man pages in cross packages. Closes: #855630.
+  * Fix ld.1 symlink for targets without gold.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 02 Mar 2017 14:39:24 +0100
+
+binutils (2.27.90.20170221-1) unstable; urgency=medium
+
+  * New upstream snapshot, taken from the binutils 2.28 branch.
+    - Fix Alpha executables segfaulting when linked with -z,now.
+  * Don't install windows related man pages in cross packages. Closes: #855630.
+  * Don't install the embedspu binary for powerpcspe. Closes: #850691.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 21 Feb 2017 13:06:04 +0100
+
+binutils (2.27.90.20170218-1) unstable; urgency=medium
+
+  * New upstream snapshot, taken from the binutils 2.28 branch.
+    - Fix PR ld/21000, PR ld/21132 (closes: #855095).
+    - Fix powerpc testsuite source errors.
+    - Fix PR ld/21168, i386: Allow "lea foo@GOT, %reg" in PIC
+    - opcodes: Fix use after free in cgen instruction lookup.
+    - MIPS/BFD: Respect the ELF gABI dynamic symbol table sort requirement.
+    - MIPS/BFD: Use `bfd_size_type' for dynamic symbol table indices.
+    - MIPS/BFD: Streamline hash table references in `mips_elf_sort_hash_table'.
+    - MIPS/BFD: Fix assertion in `mips_elf_sort_hash_table'.
+    - POWER9: Add scv/rfscv instruction support.
+    - RiscV updates.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 18 Feb 2017 05:37:06 +0100
+
+binutils (2.27.90.20170205-1) unstable; urgency=medium
+
+  * New upstream snapshot, taken from the binutils 2.28 branch.
+    - MIPS/LD/testsuite: Correct relocation addends in VxWorks tests.
+    - MIPS/LD/testsuite: Fix a `tls-multi-got-1-1.s' build failure.
+    - MIPS: Add options to control branch ISA checks.
+    - MIPS/GAS/testsuite: Convert branch local list tests to dump tests.
+    - Fix PR ld/20995 for cris-linux.
+    - gold: Fix PPC64 TOC indirect to TOC relative segfault.
+    - Fix PR ld/21000, support -z relro on hppa. Other hppa updates.
+    - PR binutils/19935: Fix fallout from now-default initfini-array.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 05 Feb 2017 21:05:07 +0100
+
+binutils (2.27.90.20170124-2) unstable; urgency=medium
+
+  * Revert the commit causing PR 21074. Works around #852035.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 26 Jan 2017 18:09:09 +0100
+
+binutils (2.27.90.20170124-1) unstable; urgency=medium
+
+  * New upstream snapshot, taken from the binutils 2.28 branch.
+    - Fix PR gold/21054 (closes: #851736).
+
+ -- Matthias Klose <doko@debian.org>  Tue, 24 Jan 2017 15:24:49 +0100
+
+binutils (2.27.90.20170118-1) unstable; urgency=medium
+
+  * New upstream snapshot, taken from the binutils 2.28 branch.
+    - Fix PR binutils/21059, PR gas/20992, PR gas/20649,
+      PR binutils/20828 (closes: #844227).
+
+ -- Matthias Klose <doko@debian.org>  Wed, 18 Jan 2017 20:05:43 +0100
+
+binutils (2.27.90.20170114-1) unstable; urgency=medium
+
+  * New upstream snapshot, taken from the binutils 2.28 branch.
+    - Fix PR ld/21038, PR ld/20830, PR gold/21040.
+  * Apply proposed patch for PR binutils/20828 (mips). Addresses: #844227.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 14 Jan 2017 11:43:57 +0100
+
+binutils (2.27.90.20170113-1) unstable; urgency=medium
+
+  * New upstream snapshot, taken from the binutils 2.28 branch.
+    - Fix PR binutils/20876 (closes: #838875), PR gold/21040,
+      PR gold/21039.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 13 Jan 2017 13:31:53 +0100
+
+binutils (2.27.90.20170109-1) unstable; urgency=medium
+
+  * New upstream snapshot, taken from the binutils 2.28 branch.
+    - Fix PR ld/20989.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 09 Jan 2017 11:03:34 +0100
+
+binutils (2.27.90.20161231-1) unstable; urgency=medium
+
+  * New upstream snapshot, taken from the binutils 2.28 branch.
+    - Fix PR ld/20995, PR binutils/20464, PR binutils/14625, PR gas/10946,
+      PR gold/20996, PR gold/17643.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 31 Dec 2016 02:10:21 +0100
+
+binutils (2.27.51.20161220-1) unstable; urgency=medium
+
+  * New upstream snapshot, taken from the trunk.
+    - Fix PR ld/20968 (closes: #848731), PR ld/20908, PR gold/20949,
+      PR gold/14676, PR gold/20983, PR gold/20976, PR gold/20749,
+      PR gold/20522, PR gold/14676, PR gold/16711, PR gold/20717, PR c++/78252.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 20 Dec 2016 09:11:49 +0100
+
+binutils (2.27.51.20161212-1) unstable; urgency=medium
+
+  * New upstream snapshot, taken from the trunk.
+    - Implements --push-state/--pop-state for gold.
+    - Fix PR ld/20908, PR ld/20909, PR gas/20898, PR gas/20897, PR gold/20717,
+      PR gold/20834, PR gold/18989, PR ld/20910, PR ld/20911, PR ld/20912,
+      PR ld/20932, PR binutils/20931, PR binutils/20929, PR binutils/20905,
+      PR binutils/20907, PR binutils/20921, PR binutils/20922, PR ld/20925,
+      PR ld/20924, PR binutils/20930, PR ld/20923, PR gas/20901, PR gas/20896,
+      PR gas/20902, PR gas/20904, PR gold/20717, PR gold/16711, PR gold/20878,
+      PR ld/20906.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 12 Dec 2016 13:49:47 +0100
+
+binutils (2.27.51.20161201-1) unstable; urgency=medium
+
+  * New upstream snapshot, taken from the trunk.
+    - Update PR ld/20815 (closes: #845690).
+    - Fix PR ld/20868 (AArch64), PR ld/16720 (mips), PR binutils/20891,
+      PR binutils/20892, PR ld/20886 (PPC64), PR gas/20895, PR binutils/20637,
+      PR binutils/20893.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 01 Dec 2016 15:55:10 +0100
+
+binutils (2.27.51.20161127-1) unstable; urgency=high
+
+  * New upstream snapshot, taken from the trunk.
+    - Fix PR target/20737 (ARM32), PR ld/20858.
+  * Revert the fix for PR ld/20815. Addresses: #845690.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 27 Nov 2016 21:00:36 +0100
+
+binutils (2.27.51.20161124-1) unstable; urgency=medium
+
+  * New upstream snapshot, taken from the trunk.
+    - Fix PR ld/20815, PR gas/20744, PR gas/20827, PR gold/20346,
+      PR gold/20693.
+  * Fix PR ld/20858, error handling $ORIGIN variable.
+    Closes: #845171, #844847.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 24 Nov 2016 03:34:06 +0100
+
+binutils (2.27.51.20161118-2) unstable; urgency=medium
+
+  * Revert problematic sparc64 GOT patch (closes: #844782).
+
+ -- Matthias Klose <doko@debian.org>  Sat, 19 Nov 2016 13:40:17 +0100
+
+binutils (2.27.51.20161118-1) unstable; urgency=medium
+
+  * New upstream snapshot, taken from the trunk.
+    - SPARC updates, ARMv8.3 updates.
+    - Fix PR ld/20675.
+  * Fix typo in debian changelog. Closes: #843710.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 18 Nov 2016 14:11:45 +0100
+
+binutils (2.27.51.20161116-2) unstable; urgency=medium
+
+  * Stop building the mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
+    variants; can't continue with this work, because package uploads with
+    these architectures are still rejected.
+  * Add homepage attribute to the control file: Closes: #841432.
+  * ld: enable new dtags by default for linux/gnu targets. Closes: #835859.
+  * Fix PR ld/20827, using proposed patch. Closes: #844378.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 17 Nov 2016 11:56:55 +0100
+
+binutils (2.27.51.20161116-1) unstable; urgency=medium
+
+  * New upstream snapshot, taken from the trunk.
+    - Fix PR ld/20789 (AVR), PR ld/20800 (x86), PR target/20737 (AArch64),
+      PR binutils/20801, PR binutils/20814, PR binutils/20751,
+      PR binutils/20794, PR gas/20803 (SPARC), PR gas/20732,
+      PR binutils/20799 (x86), PR binutils/20754 (x86), PR binutils/20701 (x86),
+
+ -- Matthias Klose <doko@debian.org>  Wed, 16 Nov 2016 11:50:32 +0100
+
+binutils (2.27.51.20161108-1) unstable; urgency=medium
+
+  * New upstream snapshot, taken from the trunk.
+    - Fix PR ld/20535 and PR ld/20784.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 08 Nov 2016 12:14:20 +0100
+
+binutils (2.27.51.20161105-2) unstable; urgency=medium
+
+  * Revert fix for PR ld/20535, causing PR ld/20784. Closes: #843339.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 06 Nov 2016 17:36:45 +0100
+
+binutils (2.27.51.20161105-1) unstable; urgency=medium
+
+  * New upstream snapshot, taken from the trunk.
+  * Disable the work around for the build failure on mips* targets.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 05 Nov 2016 13:12:01 +0100
+
+binutils (2.27.51.20161102-1) unstable; urgency=medium
+
+  * New upstream snapshot, taken from the trunk.
+    Security issues fixed: CVE-2016-6131, CVE-2016-4493, CVE-2016-4492,
+    CVE-2016-4490, CVE-2016-4489, CVE-2016-4488, CVE-2016-4487, CVE-2016-2226.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 02 Nov 2016 20:38:57 +0100
+
+binutils (2.27.51.20161027-2) experimental; urgency=medium
+
+  * Work around build failure on mips* targets.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 30 Oct 2016 19:35:41 +0200
+
+binutils (2.27.51.20161027-1) experimental; urgency=medium
+
+  * New upstream snapshot, taken from the trunk.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 27 Oct 2016 16:57:21 +0200
+
+binutils (2.27-9) unstable; urgency=medium
+
+  * Update, taken from the 2.27 branch 20161014.
+    - Fix PR ld/20608, PR ld/20545, PR gold/20238.
+  * Fix cross build for non-standard cross archs (Helmut Grohne).
+    Closes: #839956.
+  * Fix ld segfault on ARM32, taken from the trunk. Closes: #840374.
+  * Fix PR ld/20648, taken from the trunk. Closes: #835544.
+  * Fix PR ld/20649, using proposed patch. Closes: #834147.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 17 Oct 2016 13:12:51 +0200
+
+binutils (2.27-8) unstable; urgency=medium
+
+  * Fix diversion updates for 32bit x86 targets.
+  * Update Break for hardening-wrapper.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 31 Aug 2016 10:11:22 +0200
+
+binutils (2.27-7) unstable; urgency=medium
+
+  * Update, taken from the 2.27 branch 20160830.
+    - Fix PR ld/20531.
+  * Fix diversion updates. Closes: #834836.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 30 Aug 2016 16:24:37 +0200
+
+binutils (2.27-6) unstable; urgency=high
+
+  * Update, taken from the 2.27 branch 20160819.
+    - Fix PR ld/20472.
+  * binutils-multiarch: Divert the triplet-prefixed names. Closes: #834253.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 19 Aug 2016 07:02:50 +0200
+
+binutils (2.27-5) unstable; urgency=high
+
+  * Update, taken from the 2.27 branch 20160812.
+  * Fix unexecutable MIPS binaries with -Wl,-z,noexecstack (Aurelian Jarno).
+    Closes: #834096.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 12 Aug 2016 09:27:17 +0200
+
+binutils (2.27-4) unstable; urgency=medium
+
+  * Fix gold on mipsr6 targets (Aurelian Jarno).
+
+ -- Matthias Klose <doko@debian.org>  Tue, 09 Aug 2016 21:58:13 +0200
+
+binutils (2.27-3) unstable; urgency=medium
+
+  * Backport patches to fix gold on sparc64 (James Clarke). Closes: #833688.
+  * Fix gold on mips64 targets (Aurelian Jarno). Closes: #833654.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 09 Aug 2016 12:15:51 +0200
+
+binutils (2.27-2) unstable; urgency=medium
+
+  * Disable gold for all mips cross targets too.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 07 Aug 2016 16:30:20 +0200
+
+binutils (2.27-1) unstable; urgency=medium
+
+  * binutils 2.27 release.
+  * Update, taken from the 2.27 branch 20160807.
+  * Re-enable gold on sparc and sparc64. Closes: #818934.
+  * Disable SH64 support for the multilib build.
+  * Disable gold on all mips targets, currently fails to link.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 07 Aug 2016 13:38:27 +0200
+
+binutils (2.26.1-1) unstable; urgency=medium
+
+  * binutils 2.26.1 release.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 30 Jun 2016 10:37:37 +0200
+
+binutils (2.26-12) unstable; urgency=medium
+
+  * Update, taken from the 2.26 branch 20160624.
+    - Fix PR ld/20254 (AVR), PR ld/20221 (AVR), PR ld/20244 (x86).
+    - Support for three more new POWER9 instructions.
+  * Cherry pick backports for AArch64 vulcan support (Dann Frazier).
+    LP: #1594452.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 24 Jun 2016 10:42:57 +0200
+
+binutils (2.26-11) unstable; urgency=medium
+
+  * Update, taken from the 2.26 branch 20160610.
+    - Fix PR ld/20159, reverting the change for PR ld/16467. LP: #1588123.
+  * Use ldconfig triggers instead of calling ldconfig directly.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 10 Jun 2016 18:37:39 +0200
+
+binutils (2.26-10) unstable; urgency=medium
+
+  * Update, taken from the 2.26 branch 20160601.
+    - Fix PR ld/20117, PR ld/20030, PR ld/20093.
+    - Support for a few more new POWER9 instructions.
+  * Build for N32 and MIPS r6 (YunQiang Su). Closes: #807377.
+  * Mark cross binutils as M-A: foreign (Helmut Grohne). Closes: #824424.
+  * More reproducible build fixes (Chris Lamb). Closes: #824413.
+  * Fix PR ld/19886, --as-needed regression, taken from the trunk.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 01 Jun 2016 21:31:32 +0200
+
+binutils (2.26-9) unstable; urgency=medium
+
+  * Update, taken from the 2.26 branch 20160512.
+    - Fix PR ld/19878, PR ld/19827, PR gas/19909, PR ld/20006, PR gold/19047,
+      PR gas/20047,  PR 20060.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 12 May 2016 16:59:29 +0200
+
+binutils (2.26-8) unstable; urgency=medium
+
+  * Update, taken from the 2.26 branch 20160321.
+    - Fix PR ld/19827.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 21 Mar 2016 15:38:30 +0100
+
+binutils (2.26-7) unstable; urgency=medium
+
+  * Update, taken from the 2.26 branch 20160316.
+    - Fix PR ld/19623. Closes: #817891, PR ld/19539, PR binutils/19523.
+  * Fix cross-building from any-i386 (Samuel Thibault). Closes: #816128.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 16 Mar 2016 10:21:59 +0100
+
+binutils (2.26-6) unstable; urgency=medium
+
+  * Update, taken from the 2.26 branch 20160310.
+    - Fix PR ld/19579, PR ld/19752, PR ld/19739.
+    - Fix PR binutils/19775. Closes: #813006.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 10 Mar 2016 13:08:38 +0100
+
+binutils (2.26-5) unstable; urgency=medium
+
+  * Update, taken from the 2.26 branch 20160213.
+    - Fix PR ld/19698, PR ld/19553, ppc64 and AArch64 fixes.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 26 Feb 2016 17:07:29 +0100
+
+binutils (2.26-4) unstable; urgency=medium
+
+  * Update, taken from the 2.26 branch 20160213.
+    - Fix PR ld/19615, PR ld/19601 (closes: #812858), PR gas/19520.
+  * Fix stripping packages for cross builds. Closes: #813337.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 13 Feb 2016 17:13:00 +0100
+
+binutils (2.26-3) unstable; urgency=medium
+
+  * Update, taken from the 2.26 branch 20160203.
+  * Fix PR binutils/19523, objdump not supporting gnu_debuglink with
+    compressed debug sections; taken from the trunk. Closes: #812089.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 03 Feb 2016 15:11:43 +0100
+
+binutils (2.26-2) unstable; urgency=medium
+
+  * Do a release build, not enabled upstream for the release.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 27 Jan 2016 18:22:45 +0100
+
+binutils (2.26-1) unstable; urgency=medium
+
+  * binutils 2.26 release.
+    - Fix PR 19421, reverting the fix for PR 4317. Closes: #808246.
+  * Fix build failure with new coreutils. Closes: #812846.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 27 Jan 2016 12:36:00 +0100
+
+binutils (2.25.90.20160101-2) unstable; urgency=medium
+
+  * Apply proposed patch for PR ld/19368. Closes: #807974.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 05 Jan 2016 17:32:06 +0100
+
+binutils (2.25.90.20160101-1) unstable; urgency=medium
+
+  * Snapshot, taken from the 2.26 branch (20160101).
+  * PR gas/19359, work around a GCC issue on POWER8.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 01 Jan 2016 13:40:16 +0100
+
+binutils (2.25.90.20151209-1) unstable; urgency=medium
+
+  * Snapshot, taken from the 2.26 branch (20151209).
+  * Fix cross build dependencies. Closes: #807378.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 09 Dec 2015 12:41:22 +0100
+
+binutils (2.25.90.20151125-2) unstable; urgency=medium
+
+  * Add ARMv8.1 Virtualization Host Extensions support, taken from the trunk.
+  * Import zlib 1.2.8, taken from the trunk.
+  * Filter the date/user line from the cross binutils test results.
+    Closes: #806490.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 30 Nov 2015 11:52:26 +0100
+
+binutils (2.25.90.20151125-1) unstable; urgency=medium
+
+  * Snapshot, taken from the 2.26 branch (20151125).
+    - Fixed stack overflow TEMP-0000000-A2945B.
+  * Build ppc64el binutils on ppc64.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 25 Nov 2015 14:19:39 +0100
+
+binutils (2.25.51.20151113-2) unstable; urgency=medium
+
+  * Backport patches from the trunk:
+    - Fix PR ld/19263, segfault for s390_elf. Closes: #805237.
+    - Fix PR ld/19264, account for .tbss alignment when adjusting start
+      of relro. LP: #1516444.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 19 Nov 2015 14:16:15 +0100
+
+binutils (2.25.51.20151113-1) unstable; urgency=medium
+
+  * Snapshot, taken from the just created 2.26 branch (20151113).
+    - Fixed PR ld/19123. Closes: #801879.
+    - Ignore relocations in .data.rel.ro.local (hppa). Closes: #801531.
+    - Fix PR gas/19217, wrong use of MOVT to replace LDR (ARM32). LP: #1513985.
+  * Stop building gold on sparc and sparc64. Closes: #803474.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 13 Nov 2015 11:08:24 +0100
+
+binutils (2.25.51.20151106-1) experimental; urgency=medium
+
+  * Snapshot, taken from the trunk 20151106.
+  * Work around PR ld/19188, internal linker error. LP: #1511542.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 06 Nov 2015 18:44:09 +0100
+
+binutils (2.25.51.20151028-1) experimental; urgency=medium
+
+  * Snapshot, taken from the trunk 20151028.
+    - Fix PR ld/19171 (LP: #1510067), PR ld/19175 (LP: #1510270).
+  * Revert the fix for PR gold/19119, fixing gold on armhf, arm64 and powerpc.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 28 Oct 2015 09:34:03 +0100
+
+binutils (2.25.51.20151021-1) experimental; urgency=medium
+
+  * Snapshot, taken from the trunk 20151021.
+  * binutils-i686-gnu: Don't ship ldscripts.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 21 Oct 2015 19:46:24 +0200
+
+binutils (2.25.51.20151020-1) experimental; urgency=medium
+
+  * Snapshot, taken from the trunk 20151020.
+  * Build cross packages for debian port architectures.
+  * Move libraries into the multiarch libdir.
+  * Include gold on KFreeBSD.
+  * Install the gnu-triplet prefixed binaries and manual pages as files,
+    and provide non-prefixed symlinks.
+  * Add a breaks in binutils for hardening-wrapper (<< 2.8); the diversions
+    need to be adopted for the real files.
+  * Don't ship windows related manual pages.
+  * Change the search order for ld to first search in /usr/lib*,
+    then in /usr/<gnu-triplet>/lib*.
+  * Run the testsuite for all cross targets.
+  * Configure with --disable-compressed-debug-sections.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 21 Oct 2015 01:14:01 +0200
+
+binutils (2.25.51.20151014-1) experimental; urgency=medium
+
+  * Snapshot, taken from the trunk 20151014.
+  * Explicitly configure --with-system-zlib.
+  * Disable compressed debug sections on x86. See PR gas/19109.
+  * Configure cross builds with --enable-initfini-array.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 15 Oct 2015 01:18:36 +0200
+
+binutils (2.25.1-7) unstable; urgency=medium
+
+  * Fix PR ld/18867, ld reloc sorting causing glibc to crash on alpha.
+    Taken from the branch. Closes: #792555.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 11 Oct 2015 10:33:38 +0200
+
+binutils (2.25.1-6) unstable; urgency=medium
+
+  * Configure with --enable-initfini-array (not the default for cross builds).
+  * Backport PR gold/18855 (sparc).
+
+ -- Matthias Klose <doko@debian.org>  Fri, 09 Oct 2015 14:57:11 +0200
+
+binutils (2.25.1-5) unstable; urgency=medium
+
+  * Fix setting the default library path on i386.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 05 Oct 2015 13:03:39 +0200
+
+binutils (2.25.1-4) unstable; urgency=medium
+
+  * On i386, configure for i686-linux-gnu. Provide i585-linux-gnu symlinks.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 01 Oct 2015 19:19:24 +0200
+
+binutils (2.25.1-3) unstable; urgency=medium
+
+  * Regenerate the control file. Closes: #799234.
+  * Configure cross builds with --with-sysroot=/. Closes: #799703.
+  * Backport PR ld/18668 from the trunk. Closes: #797666.
+  * Fix lintian warnings for the binutils-hppa64-linux-gnu package.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 22 Sep 2015 18:38:07 +0200
+
+binutils (2.25.1-2) unstable; urgency=medium
+
+  * Build cross binutils packages targeting the release architectures.
+  * Rename shared libraries for the cross packages and install into
+    the standard location.
+  * Don't ship the header files and static libraries for the cross packages.
+  * Rename binutils-hppa64 to binutils-hppa64-linux-gnu.
+  * PR binutils/18750, fix stack buffer overflows when parsing corrupt
+    ihex files.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 15 Sep 2015 01:54:21 +0200
+
+binutils (2.25.1-1) unstable; urgency=medium
+
+  * Binutils 2.25.1 release.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 08 Aug 2015 00:36:12 +0200
+
+binutils (2.25-11) unstable; urgency=medium
+
+  * Fix broken -Bsymbolic-functions on ARM32, hppa, m68k. Taken from
+    the trunk.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 31 Jul 2015 12:40:32 +0200
+
+binutils (2.25-10) unstable; urgency=medium
+
+  * Snapshot, taken from the 2.25 branch 20150711.
+    - POWERPC fixes.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 11 Jul 2015 12:12:38 +0200
+
+binutils (2.25-9) unstable; urgency=medium
+
+  * Snapshot, taken from the 2.25 branch 20150622.
+    - ARM32, AArch64, POWERPC fixes.
+  * Fix PR gas/18427, gas slow on hppa, taken from the trunk. Closes: #787192.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 22 Jun 2015 11:45:36 +0200
+
+binutils (2.25-8) unstable; urgency=medium
+
+  * Snapshot, taken from the 2.25 branch 20150523.
+    - PPC and AArch64 backports from the trunk.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 23 May 2015 09:44:54 +0200
+
+binutils (2.25-7) unstable; urgency=medium
+
+  * Snapshot, taken from the 2.25 branch 20150411.
+  * More adjustments for reproducible builds. Closes: #774429.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 24 Apr 2015 13:18:01 +0200
+
+binutils (2.25-6) unstable; urgency=medium
+
+  * Apply patches from the 2.25 branch to address PR binutils/17512,
+    PR binutils/17531.
+  * Removal partial backports for PR binutils/17531.
+  * Configure with --enable-deterministic-archives. Closes: #774429.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 26 Mar 2015 16:40:36 +0100
+
+binutils (2.25-5) unstable; urgency=medium
+
+  * Remove '*.rej' files in the source package. Closes: #775679.
+  * Make the package build reproducibly (addresses: #774429):
+    - Fix mtimes before building binary packages.
+    - Stop recording the current time when creating gzip files.
+    - Sort file list in md5sums.
+    - Fix mtimes before building source tarball.
+    - Sort file list in binutils source tarball.
+    - If available, call strip-nondeterminism on static libraries.
+  * Fix PR ld/17827 - PIE copy relocations are broken with pointers.
+    Closes: #772958.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 25 Feb 2015 09:00:51 +0100
+
+binutils (2.25-4) unstable; urgency=medium
+
+  * Backport fixes for PR binutils/17531 up to 2014-12-22.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 15 Jan 2015 08:00:07 +0100
+
+binutils (2.25-3) unstable; urgency=medium
+
+  * Don't build as a release candidate, fixing the upper shlibs dependency.
+  * Refresh patches.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 25 Dec 2014 13:45:39 +0100
+
+binutils (2.25-2) unstable; urgency=medium
+
+  * Apply proposed patch for PR ld/17742 (don't create .eh_frame_hdr
+    on shared lib bfd).
+
+ -- Matthias Klose <doko@debian.org>  Thu, 25 Dec 2014 06:55:02 +0100
+
+binutils (2.25-1) unstable; urgency=medium
+
+  * binutils 2.25 release.
+    - MIPS specific gas update.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 25 Dec 2014 05:49:55 +0100
+
+binutils (2.24.90.20141219-1) unstable; urgency=medium
+
+  * Snapshot, taken from the 2.25 branch 20141219.
+    - Fix PR ld/17713 (segfault), PR ld/17689 (link error), PR ld/15228.
+  * Apply proposed patch for PR gold/17729 (fixing ~600 GCC test failures).
+
+ -- Matthias Klose <doko@debian.org>  Fri, 19 Dec 2014 18:59:30 +0100
+
+binutils (2.24.90.20141209-1) unstable; urgency=medium
+
+  * Snapshot, taken from the 2.25 branch 20141209.
+    - Fix PR binutils/17677, PR gold/17670 (powerpc),
+      PR gold/17566 (powerpc).
+
+ -- Matthias Klose <doko@debian.org>  Tue, 09 Dec 2014 09:31:53 +0100
+
+binutils (2.24.90.20141201-1) unstable; urgency=medium
+
+  * Snapshot, taken from the 2.25 branch 20141201.
+    - Fix PR ld/16452, PR/ld/16457: Don't output symbol version
+      requirement for non-DT_NEEDED libs. Closes: #728529.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 01 Dec 2014 21:53:10 +0100
+
+binutils (2.24.90.20141128-1) unstable; urgency=medium
+
+  * Snapshot, taken from the 2.25 branch 20141128.
+    - gold: Fix corrupted .eh_frame section with LTO and --gc-sections.
+    - gold: Fix PowerPC relaxation corner case.
+  * Relax upper shlibs version dependency to the next release candidate.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 28 Nov 2014 14:20:09 +0100
+
+binutils (2.24.90.20141124-1) unstable; urgency=medium
+
+  * Snapshot, taken from the 2.25 branch 20141124.
+    - ppc alignment fixes, Go fixes
+    - PR binutils/17597, PR binutils/17512, PR binutils/17521, PR binutils/17533,
+      trunk backports for fixing the recent CVE issues.
+    - One more fix for Cortex-A53 Erratum 835769 (AArch64).
+
+ -- Matthias Klose <doko@debian.org>  Mon, 24 Nov 2014 17:29:27 +0100
+
+binutils (2.24.90.20141111-2) unstable; urgency=medium
+
+  * Fix ld -r abort in _bfd_elf_write_section_eh_frame, taken from the trunk.
+    Closes: #769067.
+
+ -- Matthias Klose <doko@debian.org.org>  Tue, 11 Nov 2014 11:10:27 +0100
+
+binutils (2.24.90.20141111-1) unstable; urgency=medium
+
+  * Snapshot, taken from the 2.25 branch 20141111.
+    - Update .MIPS.abiflags to support MIPS R6.
+  * gold: Misc updates for the AArch64 backend, taken from the trunk.
+  * Mention some CVE issues, fixed in the 20141104 snapshot:
+    - CVE-2014-8484 (PR binutils/17509).
+    - CVE-2014-8485, CVE-2014-8504 (PR binutils/17510).
+    - CVE-2014-8501, CVE-2014-8502, CVE-2014-8503 (PR binutils/17512).
+  * Fix some lintian warnings.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 11 Nov 2014 07:55:51 +0100
+
+binutils (2.24.90.20141104-1) unstable; urgency=medium
+
+  * Snapshot, taken from the 2.25 branch 20141104.
+    - Fix PR bfd/17481.
+    - Fix PR17488, powerpc64-linux-ld segfault. LP: #1381580.
+    - Fix PR ld/17492. LP: #882353.
+    - Fix PR gas/17493. LP: #1051156.
+    - Add gcc-4.9 libgomp symbols requiring --plt-thread-safe for power7.
+    - PowerPC64 ELFv1 function symbol definition vs LTO and discarded sections.
+    - ppc: enable msgclr and msgsnd on Power8.
+    - Relax ppc64_elf_tls_optimize assertion.
+  * Pick patch from the trunk:
+    - Support relexation for the gold aarch64 backend.
+    - AArch64: move bogus assertion.
+    - Fix build configured with --enable-targets=aarch64-linux.
+    - Fix running ld-unique tests on ARM.
+    - gas: Recognize: AArch64 ThunderX processor.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 04 Nov 2014 02:14:45 +0100
+
+binutils (2.24.90.20141014-1) unstable; urgency=medium
+
+  * Snapshot, taken from the 2.25 branch 20141014.
+  * Remove patches picked from upstream.
+  * Build gold on AArch64.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 14 Oct 2014 12:46:08 +0200
+
+binutils (2.24.51.20141001-4) unstable; urgency=high
+
+  * Fix PR ld/17647, taken from upstream. Closes: #764573.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 13 Oct 2014 20:03:30 +0200
+
+binutils (2.24.51.20141001-3) unstable; urgency=medium
+
+  * Fix PR ld/17447, taken from upstream. LP: #1371636.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 07 Oct 2014 12:26:24 +0200
+
+binutils (2.24.51.20141001-1) unstable; urgency=medium
+
+  * Snapshot, taken from the trunk 20141001.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 01 Oct 2014 02:32:06 +0200
+
+binutils (2.24.51.20140918-1) unstable; urgency=medium
+
+  * Snapshot, taken from the trunk 20140918.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 18 Sep 2014 19:28:16 +0200
+
+binutils (2.24.51.20140903-1) unstable; urgency=medium
+
+  * Snapshot, taken from the trunk 20140903.
+  * Try to work around binutils-multiarch build failure on sh4 by disabling
+    hppa targets for the binutils-multiarch build. Addresses: #758830.
+  * Enable powerpc targets for ppc64el. Closes: #760395.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 03 Sep 2014 23:02:26 +0200
+
+binutils (2.24.51.20140818-1) unstable; urgency=high
+
+  * Snapshot, taken from the trunk 20140818.
+    - Fix GLIBC ifunc breakage on PowerPC64 ELFv2. LP: #1355962.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 18 Aug 2014 13:49:01 +0200
+
+binutils (2.24.51.20140814-2) unstable; urgency=medium
+
+  * Still provide i486-* symlinks.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 17 Aug 2014 17:06:36 +0200
+
+binutils (2.24.51.20140814-1) unstable; urgency=medium
+
+  * Snapshot, taken from the trunk 20140814.
+    - Add ld options --push-state and --pop-state.
+  * binutils-hppa64: Set architecture to hppa.
+  * Add aarch64_ilp32-linux-gnu multiarch directories to the search path.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 14 Aug 2014 13:28:40 +0200
+
+binutils (2.24.51.20140807-1) unstable; urgency=medium
+
+  * Snapshot, taken from the trunk 20140807.
+    - Remove patch for pr14918, integrated upstream.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 07 Aug 2014 11:41:44 +0200
+
+binutils (2.24.51.20140727-1) unstable; urgency=medium
+
+  * Snapshot, taken from the trunk 20140727.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 27 Jul 2014 15:44:40 +0200
+
+binutils (2.24.51.20140709-1) unstable; urgency=medium
+
+  * Snapshot, taken from the trunk 20140709.
+    - Fix PR gold/15639, -flto and ld.gold on ARM.
+      Closes: #712189. LP: #1191909.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 09 Jul 2014 19:44:18 +0200
+
+binutils (2.24.51.20140704-1) unstable; urgency=medium
+
+  * Snapshot, taken from the trunk 20140704.
+  * Build gold for mips* targets.
+  * Update the patch for the mips64el support. Closes: #750566, #753052.
+  * Update patches for the current trunk.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 04 Jul 2014 12:00:05 +0200
+
+binutils (2.24.51.20140617-1) unstable; urgency=medium
+
+  * Snapshot, taken from the trunk 20140617.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 17 Jun 2014 10:29:20 +0200
+
+binutils (2.24.51.20140604-3) unstable; urgency=medium
+
+  * Update the mips64-default-n64 patch (Yunqiang Su). Closes: #750566.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 07 Jun 2014 13:43:35 +0200
+
+binutils (2.24.51.20140604-2) unstable; urgency=medium
+
+  * Stop applying the mips64-default-n64 patch until it is updated.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 05 Jun 2014 11:20:39 +0200
+
+binutils (2.24.51.20140604-1) unstable; urgency=medium
+
+  * Snapshot, taken from the trunk 20140604.
+  * Refactor rules for consistent usage of the PF macro (Helmut Grohne).
+
+ -- Matthias Klose <doko@debian.org>  Wed, 04 Jun 2014 13:48:21 +0200
+
+binutils (2.24.51.20140425-1) unstable; urgency=medium
+
+  * Snapshot, taken from the trunk 20140425.
+  * Refactor rules for consistent usage of the PF macro (Helmut Grohne).
+  * On x86 targets provide gnu-type prefixed binaries with the cpu that GCC
+    is configured for.
+  * 129_multiarch_libpath.patch: Fix to search multiarch dirs, only needed
+    for a minority of packages still using ld directly for linking instead
+    of the recommended use of gcc.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 27 Apr 2014 21:52:56 +0200
+
+binutils (2.24.51.20140411-2) unstable; urgency=medium
+
+  * No-change rebuild to get rid off ftp-master mail storm.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 12 Apr 2014 15:23:31 +0200
+
+binutils (2.24.51.20140411-1) unstable; urgency=medium
+
+  * Snapshot, taken from the trunk 20140411.
+  * Provide $(DEB_HOST_GNU_TYPE)- prefixed binaries and man pages.
+  * Don't enable the spu targets on powerpc targets anymore.
+  * Build the gold linker on hurd-i386 (Svante Signell). Closes: #744020.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 11 Apr 2014 18:49:22 +0200
+
+binutils (2.24-5) unstable; urgency=medium
+
+  * Update from the 2.24 branch, 20140321.
+  * Stop building the binutils-spu package.
+  * Add a binutils-multiarch-dev package. Closes: #583160
+
+ -- Matthias Klose <doko@debian.org>  Fri, 21 Mar 2014 11:23:40 +0100
+
+binutils (2.24-4) unstable; urgency=medium
+
+  * Update from the 2.24 branch, 20140304.
+  * Update Aarch64 ilp32 linker and libdir names.
+  * Fix relocations for thread local variables on AArch64. Updated patch
+    taken from the trunk.
+  * Enable AArch64 big endian targets for AArch64 builds and for
+    binutils-multiarch.
+  * gas: Add entry for "xgene1" (AArch64).
+  * gas: Remove the alignment limit on AArch64.
+  * Add a Built-Using attribute for for the binutils-cross-* packages.
+    Closes: #738311.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 04 Mar 2014 02:21:00 +0100
+
+binutils (2.24-3) unstable; urgency=medium
+
+  * Update from the 2.24 branch, 20140124.
+  * Display the reference causing a shared library to be needed (taken from
+    the trunk).
+
+ -- Matthias Klose <doko@debian.org>  Fri, 24 Jan 2014 14:39:48 +0100
+
+binutils (2.24-2) unstable; urgency=medium
+
+  * Update from the 2.24 branch, 20131209.
+  * Remove versioned build dependencies which are not needed anymore
+    since 2005.
+  * Drop the ld_system_root patch.
+  * Fix PowerPC64 linking of --just-symbols objects (Alan Modra).
+
+ -- Matthias Klose <doko@debian.org>  Mon, 09 Dec 2013 13:57:43 +0100
+
+binutils (2.24-1) unstable; urgency=low
+
+  * Final upstream release.
+  * ifunc updates for AArch64, taken from the trunk.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 02 Dec 2013 11:21:16 +0200
+
+binutils (2.23.91.20131123-1) unstable; urgency=low
+
+  * New upstream snapshot, taken from the 2.24 branch.
+  * Stop shipping libiberty, now available in libiberty-dev.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 23 Nov 2013 08:27:51 +0100
+
+binutils (2.23.90.20131116-1) unstable; urgency=low
+
+  * New upstream snapshot, taken from the 2.24 branch.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 16 Nov 2013 12:40:28 +0100
+
+binutils (2.23.90.20131017-1) unstable; urgency=low
+
+  * New upstream snapshot, taken from the 2.24 branch.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 17 Oct 2013 14:22:05 +0200
+
+binutils (2.23.90.20130927-1) unstable; urgency=low
+
+  * New upstream snapshot, taken from the 2.24 branch.
+  * Add ifunc support for AArch64.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 27 Sep 2013 14:05:44 +0200
+
+binutils (2.23.52.20130828-1) unstable; urgency=low
+
+  * New upstream snapshot.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 28 Aug 2013 15:22:51 +0200
+
+binutils (2.23.52.20130727-1) unstable; urgency=low
+
+  * New upstream snapshot.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 27 Jul 2013 10:37:11 +0200
+
+binutils (2.23.52.20130722-1) unstable; urgency=low
+
+  * New upstream snapshot.
+    - Fix PR ld/15762, glibc being built without warning sections.
+  * Set the libdir for arm64 to lib, not lib64.
+  * Stop building the binutils-gold package, let binutils provide
+    binutils-gold.  Packages requiring gold should explicity pass
+    -fuse-ld=gold to the compiler, packages requiring the bfd linker
+    should pass -fuse-ld=bfd to the compiler.
+  * Refresh patches.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 22 Jul 2013 21:13:32 +0200
+
+binutils (2.23.52.20130620-1) unstable; urgency=low
+
+  * New upstream snapshot.
+  * Add conflicts with mingw binutils. Closes: #712057, #712063.
+  * Always compare the test results with the ones from the installed binutils.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 20 Jun 2013 12:27:31 +0200
+
+binutils (2.23.52.20130612-1) unstable; urgency=low
+
+  * New upstream snapshot.
+    - Fix issue #15323, redefining weak functions in -flto incrementally-linked
+      executable. Closes: #710936.
+  * Install libiberty.a again in binutils-dev, not installed anymore upstream
+    by default.
+  * Import the autopkg tests from Ubuntu.
+  * Enable i386pep emulation for the x86 builds. Closes: #703463.
+  * Fix typo in ld(1). Closes: #704867.
+  * Add mips64(el) support (YunQiang Su). Closes: #710214.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 12 Jun 2013 11:35:05 +0200
+
+binutils (2.23.52.20130522-1) experimental; urgency=low
+
+  * New upstream snapshot.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 22 May 2013 16:22:04 +0200
+
+binutils (2.23.2-2) experimental; urgency=low
+
+  * Add support for Cortex-A53 / Cortex-A57.
+  * Fix PR gas/14887 and PR gas/14987, gas syntax errors on ARM.
+    LP: #1166628.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 16 Apr 2013 02:21:44 +0200
+
+binutils (2.23.2-1) experimental; urgency=low
+
+  * binutils 2.23.2 release.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 26 Mar 2013 19:58:59 +0100
+
+binutils (2.23.1-1~exp6) experimental; urgency=low
+
+  * Update from the 2.23 branch (20130222).
+  * For cross builds, add the tool libdir to the library search path.
+  * Revert broken patch:
+    - Recognize DEB_TARGET_ARCH for cross builds.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 23 Feb 2013 01:57:30 +0100
+
+binutils (2.23.1-1~exp5) experimental; urgency=low
+
+  * Update from the 2.23 branch (20130213).
+    - AArch64 and PPC updates.
+  * Recognize DEB_TARGET_ARCH for cross builds. Closes: #695595.
+  * Fix srec_scan null dereference (Sang Kil Cha). Closes: #684903.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 13 Feb 2013 12:10:31 +0100
+
+binutils (2.23.1-1~exp4) experimental; urgency=low
+
+  * Fix PR ld/14918: linking with -flto always links in libgcc_s.so.
+    Closes: #650145.
+  * Fix build failure with texinfo 4.14. Closes: #697353.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 05 Jan 2013 14:06:23 +0100
+
+binutils (2.23.1-1~exp3) experimental; urgency=low
+
+  * Update from the 2.23 branch (20121204).
+  * Add fuse-ld= for GCC linker option compatibility in ld and gold.
+  * gold cross builds: Search the multiarch directories too.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 05 Dec 2012 08:35:10 +0100
+
+binutils (2.23.1-1~exp2) experimental; urgency=low
+
+  * Update from the 2.23 branch (20121121).
+    - arm, arm64 and x32 updates.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 21 Nov 2012 13:47:06 +0100
+
+binutils (2.23.1-1~exp1) experimental; urgency=low
+
+  * binutils 2.23.1 release.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 15 Nov 2012 13:50:55 +0100
+
+binutils (2.23-1) experimental; urgency=low
+
+  * Update multi-arch paths for x32 (x86_64-linux-gnux32) (Daniel Schepler).
+    Closes: #692138.
+  * Add new ARM hard-float/soft-float ABI flags for EABI_VER5 (Steve McIntyre).
+  * Silence lintian stupidity about interpreting every string in binaries
+    as text (Emmanuel Fleury). Closes: #661639.
+  * In ld.texi, remove cross reference to BFD internals documentation.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 06 Nov 2012 10:42:37 +0100
+
+binutils (2.23-1) experimental; urgency=low
+
+  * binutils 2.23 release.
+  * Don't include the documents licensed under GFDL with cover texts.
+    Closes: #650504.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 24 Oct 2012 10:29:50 +0200
+
+binutils (2.22.90.20120924-1) experimental; urgency=low
+
+  * New upstream snapshot (taken from the 2.23 branch).
+  * Fix bfd.h, removing the safety inclusion guard.
+  * Fix multilib conflicts of generated values by __WORDSIZE-based expressions.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 24 Sep 2012 18:39:51 +0200
+
+binutils (2.22.90.20120913-2) experimental; urgency=low
+
+  * Undo the reversion of the mips patches, unrelated issue.
+  * Build again with -marm on armhf. Testsuite still not ready for thumb mode.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 15 Sep 2012 03:00:10 +0200
+
+binutils (2.22.90.20120913-1) experimental; urgency=low
+
+  * New upstream snapshot (taken from the 2.23 branch).
+  * Add R_AARCH64_GOT_LD_PREL19 reloc implementation, taken from the trunk.
+  * Revert mips updates.
+    See http://sourceware.org/ml/binutils/2012-09/msg00158.html
+
+ -- Matthias Klose <doko@debian.org>  Thu, 13 Sep 2012 20:35:08 +0200
+
+binutils (2.22.90.20120907-2) experimental; urgency=low
+
+  * Fix build failure on kfreebsd.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 09 Sep 2012 15:41:54 +0200
+
+binutils (2.22.90.20120907-1) experimental; urgency=low
+
+  * New upstream snapshot (taken from the 2.23 branch).
+  * Don't build anymore with -marm on armhf.
+  * Work around `install' limitation not able to pass parameters
+    to the strip command. Closes: #686183.
+  * Generate md5sums file. Closes: #684079.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 08 Sep 2012 13:40:39 +0200
+
+binutils (2.22.90.20120816-2) experimental; urgency=low
+
+  * Some refactoring of debian/rules based on patches from Marcin:
+  * Introduce DEB_TARGET_* macros to unify native and cross builds.
+  * Build the control file as the first step for cross builds.
+  * Try again building without --disable-werror.
+  * Refactor stripping of binaries into a `strip_package' macro.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 21 Aug 2012 15:31:05 +0200
+
+binutils (2.22.90.20120816-1) experimental; urgency=low
+
+  * New upstream snapshot (taken from the 2.23 branch).
+  * Configure for aarch64 and x32 targets.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 16 Aug 2012 13:26:56 +0200
+
+binutils (2.22.90.20120731-1) experimental; urgency=low
+
+  * New upstream snapshot (taken from the 2.23 branch).
+
+ -- Matthias Klose <doko@debian.org>  Tue, 31 Jul 2012 22:20:22 +0200
+
+binutils (2.22.52.20120704-1) experimental; urgency=low
+
+  * New upstream snapshot.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 04 Jul 2012 14:40:01 +0200
+
+binutils (2.22-7) unstable; urgency=low
+
+  * Update from the binutils-2_22-branch 20120704.
+    - Fix PR ld/13991 and a gold issue on ARM.
+  * Fix warning building libiberty/md5.c. Closes: #674831.
+  * Enable x86_64-pep in binutils-multiarch. Closes: #675364.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 04 Jul 2012 11:00:14 +0200
+
+binutils (2.22-6.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix PR ld/14069 (hurd-i386) (Closes: #671804).
+
+ -- Samuel Thibault <sthibault@debian.org>  Fri, 18 May 2012 11:52:14 +0200
+
+binutils (2.22-6) unstable; urgency=low
+
+  * Update from the binutils-2_22-branch 20120307.
+    - Fix PR ld/12161 (avr), PR binutils/13622 (readelf crash),
+      PR binutils/13476 (hppa), PR ld/13387 (hppa), 
+  * Fix typo in elf64-x86-64.c, follow-up patch to PR ld/13302.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 08 Mar 2012 18:52:20 +0100
+
+binutils (2.22-5) unstable; urgency=low
+
+  * Update from the binutils-2_22-branch 20120124.
+    - Fix PR ld/13581 (x32).
+  * Fix PR gas/13449 (ARM), taken from the trunk.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 24 Jan 2012 21:26:43 +0100
+
+binutils (2.22-4) unstable; urgency=low
+
+  * Don't bump the soversion (revert the change in 2.22-3).
+  * Apply proposed patch for PR binutils/13534, allowing ar to handle
+    files bigger than 2GB (Francois Gouget). Closes: #652887).
+  * Recognize DW_LANG_Go in readelf (backport from trunk).
+
+ -- Matthias Klose <doko@debian.org>  Sat, 07 Jan 2012 09:07:25 +0100
+
+binutils (2.22-3) unstable; urgency=low
+
+  * Update from the binutils-2_22-branch 20120102.
+    - gold updates.
+    - mips updates.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 03 Jan 2012 06:06:20 +0100
+
+binutils (2.22-2) unstable; urgency=low
+
+  * Update from the binutils-2_22-branch 20111211.
+  * Fix build failure with make 3.82 (Daniel Schepler). Closes: #650064.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 11 Dec 2011 16:30:14 +0000
+
+binutils (2.22-1) unstable; urgency=low
+
+  * Binutils 2.22 release.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 21 Nov 2011 16:50:53 +0100
+
+binutils (2.21.90.20111025-1) unstable; urgency=low
+
+  * Snapshot, taken from the binutils-2_22-branch 20111025.
+  * Fix lintian warnings.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 25 Oct 2011 15:06:46 +0200
+
+binutils (2.21.90.20111019-3) unstable; urgency=low
+
+  * Fix PR ld/13302, taken from the trunk.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 23 Oct 2011 13:15:07 +0200
+
+binutils (2.21.90.20111019-2) unstable; urgency=low
+
+  * Fix PR ld/13287, taken from the trunk. LP: #872687.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 20 Oct 2011 12:29:18 +0200
+
+binutils (2.21.90.20111019-1) unstable; urgency=low
+
+  * Snapshot, taken from the binutils-2_22-branch 20111019.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 19 Oct 2011 22:25:05 +0200
+
+binutils (2.21.90.20111004-2) unstable; urgency=low
+
+  * Fix PR ld/13250, preserve the maximum alignment and size for common
+    symbols (H.J. Lu). Closes: #608901. LP: #697229.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 06 Oct 2011 08:06:04 +0200
+
+binutils (2.21.90.20111004-1) unstable; urgency=medium
+
+  * Snapshot, taken from the binutils-2_22-branch 20111004.
+  * Fix PR ld/13195, taken from the trunk. Closes: #643858, #644183.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 04 Oct 2011 12:12:16 +0200
+
+binutils (2.21.53.20110922-1) unstable; urgency=low
+
+  * Snapshot, taken from the binutils-2_22-branch 20110924.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 24 Sep 2011 09:55:38 +0200
+
+binutils (2.21.53.20110910-1) unstable; urgency=low
+
+  * Snapshot, taken from the trunk 20110910.
+    - Fix PR gas/13024. Closes: #635592.
+  * Build with proposed patch for PR ld/12965.
+  * Don't ship .la files in the cross binutils packages.
+  * For native builds, add the multiarch directories to the default
+    search path.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 10 Sep 2011 13:06:01 +0200
+
+binutils (2.21.53.20110823-3) unstable; urgency=low
+
+  * Revert the last change:
+    - Default to --hash-style=both in ld.bfd and ld.gold.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 25 Aug 2011 10:48:28 +0200
+
+binutils (2.21.53.20110823-2) unstable; urgency=low
+
+  * Default to --hash-style=both in ld.bfd and ld.gold.
+  * Fix s390x build (Aurelian Jarno). Closes: #635167.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 24 Aug 2011 13:06:48 +0200
+
+binutils (2.21.53.20110823-1) unstable; urgency=low
+
+  * Snapshot, taken from the trunk 20110823.
+    - ld --no-copy-dt-needed-entries/--no-add-needed is now the default.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 23 Aug 2011 21:23:38 +0200
+
+binutils (2.21.53.20110805-1) unstable; urgency=low
+
+  * Snapshot, taken from the trunk 20110805.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 05 Aug 2011 12:25:49 +0200
+
+binutils (2.21.53.20110729-1) unstable; urgency=low
+
+  * Snapshot, taken from the trunk 20110729.
+  * Fix s390x build (Aurelian Jarno). Closes: #635167.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 29 Jul 2011 19:04:46 +0200
+
+binutils (2.21.53.20110720-1) unstable; urgency=low
+
+  * Snapshot, taken from the trunk 20110720.
+    - Fix PR ld/12978. Closes: #632681.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 20 Jul 2011 20:54:51 +0200
+
+binutils (2.21.52.20110707-1) unstable; urgency=low
+
+  * Snapshot, taken from the trunk 20110707.
+    - Fix build failure on mips/mipsel. Closes: #632690.
+    - Fix issues on kfreebsd-amd64. Closes: #632671.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 07 Jul 2011 06:48:33 +0200
+
+binutils (2.21.52.20110703-1) unstable; urgency=low
+
+  * Snapshot, taken from the trunk 20110703.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 03 Jul 2011 21:56:44 +0200
+
+binutils (2.21.52.20110606-2) unstable; urgency=low
+
+  * Fix PR ld/12845, taken from the trunk. Closes: #628685.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 09 Jun 2011 12:45:15 +0200
+
+binutils (2.21.52.20110606-1) unstable; urgency=low
+
+  * Snapshot, taken from the trunk 20110606.
+    - Fix PR ld/12833. Closes: #628770.
+    - Fix spelling errors. Closes: #604696.
+  * Let gold accept a dummy -z buildd-<random-string> option.
+  * Add a /usr/share/bug/binutils/presubj file for reportbug (and symlinks
+    from the other /usr/share/bug/binutils-foo directories) explaining how
+    to make a self-contained testcase (Jonathan Nieder). Closes: #629147.
+  * Fix ld crash cause of invalid pointer in munmap_chunk. Closes: #628916.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 07 Jun 2011 00:03:47 +0200
+
+binutils (2.21.51.20110523-1) unstable; urgency=low
+
+  * Snapshot, taken from the trunk 20110523.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 23 May 2011 23:38:52 +0200
+
+binutils (2.21.51.20110421-6) unstable; urgency=low
+
+  [ Marcin Juszkiewicz ]
+  * Use pregenerated ld.gold.1 for cross builds.
+
+  [ Matthias Klose ]
+  * Redefine STRIP and install_binary for cross builds (Ken Werner).
+  * Apply fix for PR ld/12726, taken from the trunk.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 19 May 2011 15:51:22 +0200
+
+binutils (2.21.51.20110421-5) unstable; urgency=medium
+
+  * Use a symlink for /usr/bin/ld, even if gold is not built. Closes: #615262.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 17 May 2011 17:58:17 +0200
+
+binutils (2.21.51.20110421-4) unstable; urgency=low
+
+  * Fix PR ld/12730, taken from the trunk. Closes: #625616.
+  * Cortex A8 workarounds for PLT tail calls (Richard Sandiford).
+
+ -- Matthias Klose <doko@debian.org>  Sun, 08 May 2011 02:06:22 +0200
+
+binutils (2.21.51.20110421-3) unstable; urgency=low
+
+  * Fix segfault in ar, delete_members.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 01 May 2011 17:30:42 +0200
+
+binutils (2.21.51.20110421-2) unstable; urgency=low
+
+  * Fix typo in the patch for PR gas/12698.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 27 Apr 2011 21:33:47 +0200
+
+binutils (2.21.51.20110421-1) unstable; urgency=low
+
+  * Snapshot, taken from the trunk 20110421.
+  * Install a man page for ld.gold, generated by help2man. Closes: #619823.
+  * Apply proposed patch for PR gas/12698. Closes: #623964.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 27 Apr 2011 18:14:39 +0200
+
+binutils (2.21.51.20110419-2) unstable; urgency=low
+
+  * Fix powerpcspe and sparc builds.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 19 Apr 2011 13:47:56 +0200
+
+binutils (2.21.51.20110419-1) unstable; urgency=low
+
+  * Snapshot, taken from the trunk 20110419.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 19 Apr 2011 10:18:14 +0200
+
+binutils (2.21.51.20110409-1) experimental; urgency=low
+
+  * Snapshot, taken from the trunk 20110409.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 09 Apr 2011 13:53:24 +0200
+
+binutils (2.21.51.20110403-1) experimental; urgency=low
+
+  * Snapshot, taken from the trunk 20110403.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 03 Apr 2011 23:54:13 +0200
+
+binutils (2.21.0.20110327-3) unstable; urgency=high
+
+  * Fix architecture field for binutils-gold (powerpcspe).
+  * Add support for arm-*-gnueabihf targets. Closes: #621029.
+  * Fix PR ld/12654: Properly handle R_386_TLS_LDO_32 for PIE. LP: #663294.
+  * Fix PR ld/12637, reloc overflow for R_MIPS_TLS_LDM (Richard Sandiford),
+    taken from the trunk.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 10 Apr 2011 17:23:40 +0200
+
+binutils (2.21.0.20110327-2) unstable; urgency=low
+
+  * Fix architecture field for binutils-gold.
+  * Configure with --disable-werror on armhf.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 29 Mar 2011 19:38:55 +0200
+
+binutils (2.21.0.20110327-1) unstable; urgency=low
+
+  * Update from the 2.21 branch 20110327.
+  * Add multiarch directories to linker search path. Closes: #369064.
+    LP: #738098.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 27 Mar 2011 22:32:57 +0100
+
+binutils (2.21.0.20110322-1) unstable; urgency=low
+
+  * Update from the 2.21 branch 20110322.
+  * S/390: Make as to accept all instructions if no -march option given.
+    taken from the trunk (Aurelian Jarno). Closes: #618751.
+  * Extend support for armhf (Loic Minier).
+    - debian/control.in, debian/control, debian/rules: Enable gold for armhf.
+    - debian/rules: Introduce $(CROSS) (set to $(DEB_HOST_GNU_TYPE)- when
+      cross-building) and call $(CROSS)cpp to check whether -marm is needed or
+      not instead of testing for armel; an alternative would be to
+      unconditionally set -marm if DEB_HOST_ARCH_CPU is arm.
+    - debian/rules: commented out -fno-section-anchors CFLAGS handling would
+      also be enabled for armhf.
+    - debian/rules: ignore regressions on armhf as well; note that
+      ignore_regressions is set three times.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 22 Mar 2011 23:12:39 +0100
+
+binutils (2.21.0.20110302-2) unstable; urgency=low
+
+  [ Carlos O'Donell ]
+  * Fix binutils-hppa64 build.
+
+  [ Matthias Klose ]
+  * Fix PR ld/12376 (John David Anglin), taken from the trunk.
+  * Update to the 2.21 branch, 20110310.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 10 Mar 2011 21:35:07 +0100
+
+binutils (2.21.0.20110302-1) unstable; urgency=low
+
+  * Update from the 2.21 branch.
+
+  [ Thorsten Glaser ]
+  * patches/640_m68k_fix-TLS_GD-relocation: new, temp. Closes: #611768.
+
+  [ Matthias Klose ]
+  * On ppc64, look for 32 bit target libraries in /lib32, /usr/lib32 etc.,
+    first.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 02 Mar 2011 02:41:17 +0100
+
+binutils (2.21.0.20110216-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 22 Feb 2011 20:35:16 +0100
+
+binutils (2.21.0.20110216-1) experimental; urgency=low
+
+  * Update from the 2.21 branch.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 16 Feb 2011 15:54:15 +0100
+
+binutils (2.21-5) experimental; urgency=low
+
+  * Update gold to 1.11, taken from the 2.21 branch.
+  * Add the arm-linux-gnueabi target to binutils-multiarch (Loic Minier).
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 25 Jan 2011 00:51:38 +0100
+
+binutils (2.21-4) experimental; urgency=low
+
+  * Fix handling of writable .eh_frame section in gold, taken from the
+    2.21 branch.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 12 Jan 2011 00:42:15 +0100
+
+binutils (2.21-3) experimental; urgency=low
+
+  [ Matthias Klose ]
+  * Don't include `-system' in the bfd version identifier.
+
+  [ Sedat Dilek ]
+  * 160_pr12327.patch: Fix PR ld/12327, taken from the trunk.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 29 Dec 2010 23:51:35 +0100
+
+binutils (2.21-2) experimental; urgency=low
+
+  * Don't install ld.bfd in binutils-multiarch.
+  * Fix assembler bug blocking Thumb-2 kernel builds (CS issue #8775).
+
+ -- Matthias Klose <doko@debian.org>  Fri, 10 Dec 2010 13:45:00 +0100
+
+binutils (2.21-1) experimental; urgency=low
+
+  * binutils 2.21 release.
+
+  [ Marcin Juszkiewicz ]
+  * Enable building gold in cross builds. LP: #686530.
+  * Allow to build only the -source package, and include the version
+    in the package name. LP: #682646.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 09 Dec 2010 23:24:49 +0100
+
+binutils (2.20.90.20101121-1) experimental; urgency=low
+
+  * Update from the binutils 2.21 release branch.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 21 Nov 2010 14:03:14 +0100
+
+binutils (2.20.90.20101105-2) experimental; urgency=low
+
+  * binutils 2.21 prerelease 1.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 10 Nov 2010 01:04:59 +0100
+
+binutils (2.20.51.20101028-1) experimental; urgency=low
+
+  * Snapshot, taken from the trunk 20101028.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 28 Oct 2010 16:57:11 +0200
+
+binutils (2.20.51.20101009-1) experimental; urgency=low
+
+  * Snapshot, taken from the trunk 20101009.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 09 Oct 2010 14:41:08 +0200
+
+binutils (2.20.51.20100925-2) experimental; urgency=low
+
+  * Allow ar scripts to contain ~ in the filename (Zygmunt Krynicki, taken
+    from Linaro). LP: #641488.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 30 Sep 2010 10:20:41 +0200
+
+binutils (2.20.51.20100925-1) experimental; urgency=low
+
+  * Snapshot, taken from the trunk 20100925.
+  * Fix PR ld/10144, mips/ld: non-dynamic relocations refer to dynamic symbol
+    Closes: #519006.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 25 Sep 2010 16:24:20 +0200
+
+binutils (2.20.51.20100908-1) experimental; urgency=low
+
+  * Snapshot, taken from the trunk 20100908.
+  * Link executables statically when `static' is passed in DEB_BUILD_OPTIONS
+    (Jim Heck). Closes: #590101.
+  * Apply proposed patch for PR ld/10340 (ld doesn't honor sysroot prefix
+    for ldscripts). LP: #625320.
+  * Build binutils-hppa64 in cross builds (Al Viro). Closes: #595319.
+  * Fix some lintian warnings.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 08 Sep 2010 16:31:47 +0200
+
+binutils (2.20.51.20100813-1) experimental; urgency=low
+
+  * Snapshot, taken from the trunk 20100813.
+
+  [ Jonathan Nieder ]
+  * Remove ld.bfd from binutils-multiarch (not that useful without an
+    multiarch assembler).
+
+  [ Marcin Juszkiewicz ]
+  * Revert sysroot to / for cross builds. LP: #598389.
+  * Generate debian/control for native and cross builds. LP: #612629.
+  * Provide packaging rules in -source package. LP: #608745.
+
+  [ Matthias Klose ]
+  * Don't apply patches, when PATCHED_SOURCES is set to `yes'.
+  * Proposed patch for PR11889, readelf crashes for malformed binaries
+    (Dan Rosenberg). LP: #614206.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 13 Aug 2010 11:10:14 +0200
+
+binutils (2.20.51.20100710-2) experimental; urgency=medium
+
+  * Don't use configury for cross builds for native builds. LP: #604134.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 11 Jul 2010 10:24:28 +0200
+
+binutils (2.20.51.20100710-1) experimental; urgency=low
+
+  * Snapshot, taken from the trunk 20100710.
+    - Fix PR gas/10531. LP: #599485.
+  * debian/rules: Introduce PF macros (Jim Heck). Closes: #588357.
+
+  [ Marcin Juszkiewicz ]
+  * Don't install documentation files in -cross packages.  Closes: #586636.
+  * Set sysroot to /usr/$(TARGET) for cross builds. LP: #598389.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 10 Jul 2010 10:42:55 +0200
+
+binutils (2.20.51.20100617-1) experimental; urgency=low
+
+  * Snapshot, taken from the trunk 20100617.
+  * Merge 'binary-cross' target into 'binary' one (Marcin Juszkiewicz).
+  * debian/copyright: Update to GFDL 1.3.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 17 Jun 2010 15:20:34 +0200
+
+binutils (2.20.51.20100527-1) experimental; urgency=low
+
+  * Snapshot, taken from the trunk 20100527.
+
+  [ Jonathan Nieder ]
+  * debian/binutils-multiarch.preinst.in: Re-add diversions on reinstall.
+    Closes: #581156.
+  * Remove c++filt from binutils-multiarch.
+  * Rename /usr/bin/ld from multiarch build to ld.bfd. Closes: #582490.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 27 May 2010 10:40:48 +0200
+
+binutils (2.20.51.20100518-1) experimental; urgency=low
+
+  * Snapshot, taken from the trunk 20100518.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 18 May 2010 13:29:45 +0200
+
+binutils (2.20.51.20100428-1) experimental; urgency=low
+
+  * Snapshot, taken from the trunk 20100428.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 28 Apr 2010 10:07:28 +0200
+
+binutils (2.20.51.20100418-2) experimental; urgency=low
+
+  * Add upper dependency 
+
+ -- Matthias Klose <doko@debian.org>  Sun, 18 Apr 2010 20:52:41 +0200
+
+binutils (2.20.51.20100418-1) experimental; urgency=low
+
+  * Snapshot, taken from the trunk 20100418.
+  * debian/*.shlibs.in: Automate upstream version changes.
+  * Configure native build --with-sysroot=/. Closes: #556126.
+  * Move the ld.gold binary into the binutils package, just keep the
+    diversion (ld) in the binutils-gold package.
+  * Linker selection: ld is used by default, to use the gold linker,
+    pass -fuse-linker-plugin (no other side effects if -flto/-fwhopr
+    is not passed). To force ld.bfd or ld.gold, pass -B/usr/lib/compat-ld
+    for ld.bfd or /usr/lib/gold-ld for ld.gold.
+  * Apply proposed patch for ARM: Add option to disable merging of adjacent
+    exidx unwinder entries.
+
+  [ Jonathan Nieder ]
+  * Clean up diversion handling in binutils-multiarch:
+    - remove diversion of libbfd.a and libopcodes.a.  Closes: #545067.
+    - wait for the new version to be unpacked before removing old diversions
+    - avoid messages from re-adding diversions when upgrading from a version
+      that already has them
+    - remove diversions when downgrading to a version that does not have
+      them (for example, when recovering from an upgrade failure)
+  * Add diversion for ld.bfd in binutils-multiarch.
+  * Update comment in debian/rules to acknowledge that binutils-multiarch
+    includes a linker now.
+  * Add c++filt to binutils-multiarch.
+  * Remove elfedit from binutils-multiarch.
+    Its functionality does not depend on the list of supported targets.
+  * Fixup to version changes handling.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 18 Apr 2010 14:18:59 +0200
+
+binutils (2.20.51.20100405-1) experimental; urgency=low
+
+  * Snapshot, taken from the trunk 20100405.
+  * debian/*.shlibs: Update to the version from the trunk.
+  * Mangle the soname of the binutils libraries to be different than
+    the default name. Closes: #557620.
+    Packaged cross builds should do the same.
+  * Add diversion for elfedit in binutils-multiarch (Jonathan Nieder).
+    Closes: #576126.
+  * Convert to quilt (Sedat Dilek).
+  * Update to proposed patch to enable both gold and ld in a single toolchain.
+    The gold binary is now installed as `gold'. Keep the name `ld.gold'.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 05 Apr 2010 14:49:46 +0200
+
+binutils (2.20.51.20100227-1) experimental; urgency=low
+
+  * Snapshot, taken from the trunk 20100227.
+  * debian/*.shlibs: Update to the version from the trunk.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 27 Feb 2010 08:55:05 +0100
+
+binutils (2.20.51.20100222-1) experimental; urgency=low
+
+  * Snapshot, taken from the trunk 20100222.
+  * debian/*.shlibs: Update to the version from the trunk.
+  * binutils-dev: Install plugin-api.h.
+  * Ignore testsuite regressions on armel.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 23 Feb 2010 02:27:28 +0100
+
+binutils (2.20.51.20100216-1) experimental; urgency=low
+
+  * Snapshot, taken from the trunk 20100216.
+  * debian/*.shlibs: Update to the version from the trunk.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 16 Feb 2010 17:49:47 +0100
+
+binutils (2.20.51.20100112-1) experimental; urgency=low
+
+  * Snapshot, taken from the trunk 20100112.
+  * debian/*.shlibs: Update to the version from the trunk.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 12 Jan 2010 09:06:51 +0100
+
+binutils (2.20.51.20100109-2) experimental; urgency=low
+
+  * Regenerate ld/configure (includes ld in the binutils package).
+
+ -- Matthias Klose <doko@debian.org>  Mon, 11 Jan 2010 01:48:09 +0100
+
+binutils (2.20.51.20100109-1) experimental; urgency=low
+
+  * Snapshot, taken from the trunk 20100109.
+    - PR gold/10980: Support more options available by current GNU ld.
+      Closes: #555886.
+    - Fix PR gold/11072: Discard .gnu_debuglink sections, taken from the trunk.
+      Closes: #563366.
+  * debian/*.shlibs: Update to the version from the trunk.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 09 Jan 2010 14:32:33 +0100
+
+binutils (2.20.51.20100101-1) experimental; urgency=low
+
+  * Snapshot, taken from the trunk 20100101.
+  * debian/*.shlibs: Update to the version from the trunk.
+  * Remove patches available on the trunk.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 01 Jan 2010 18:49:42 +0100
+
+binutils (2.20.1-11) unstable; urgency=medium
+
+  * Fix PR gold/10893, IFUNC support for gold backported from the trunk
+    (Aurelian Jarno). Closes: #585051.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 14 Jun 2010 07:17:13 +0200
+
+binutils (2.20.1-10) unstable; urgency=low
+
+  * Drop build dependency on expect-tcl8.3. Closes: #472964.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 30 May 2010 12:23:46 +0200
+
+binutils (2.20.1-9) unstable; urgency=high
+
+  * [arm] branches to weak symbols, update patch from the trunk.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 06 May 2010 15:42:22 +0200
+
+binutils (2.20.1-8) unstable; urgency=low
+
+  * [arm] branches to weak symbols, patch taken from the trunk.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 29 Apr 2010 20:36:07 +0200
+
+binutils (2.20.1-7) unstable; urgency=low
+
+  * Apply proposed patch for ARM: Add option to disable merging of adjacent
+    exidx unwinder entries. Addresses PR libgcj/40860.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 20 Apr 2010 22:51:35 +0000
+
+binutils (2.20.1-6) unstable; urgency=low
+
+  * Move the ld.gold binary into the binutils package, just keep the
+    diversion (ld) in the binutils-gold package.
+  * Linker selection: ld is used by default, to use the gold linker,
+    pass -fuse-linker-plugin (no other side effects if -flto/-fwhopr
+    is not passed). To force ld.bfd or ld.gold, pass -B/usr/lib/compat-ld
+    for ld.bfd or /usr/lib/gold-ld for ld.gold.
+  * Disable building gold on arm. Use gold from the trunk, if needed.
+  * Backport fixups of Loongson2F from the trunk.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 17 Apr 2010 18:27:45 +0200
+
+binutils (2.20.1-5) unstable; urgency=medium
+
+  * Apply patch for PR gas/11456: Use memcpy to copy overlap memory.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 02 Apr 2010 01:36:07 +0200
+
+binutils (2.20.1-4) unstable; urgency=low
+
+  * Mangle the soname of the binutils libraries to be different than
+    the default name. Closes: #557620.
+    Packaged cross builds should do the same.
+  * Reduce ARM linking time (backport from the trunk).
+  * Apply fix for PR ld/11426, taken from the trunk.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 30 Mar 2010 22:32:12 +0200
+
+binutils (2.20.1-3) unstable; urgency=low
+
+  * binutils-gold: Install the gold binary as `gold' as well, as proposed
+    by a patch to enable both gold and ld in a single toolchain.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 21 Mar 2010 06:43:48 +0100
+
+binutils (2.20.1-2) unstable; urgency=low
+
+  * Fix version in debian/*shlibs to match the release version;
+    the 2.20.1 upstream release identifies as 2.20.1.20100303.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 08 Mar 2010 18:01:22 +0100
+
+binutils (2.20.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Don't set has_ifunc_symbols if the symbol comes from a shared library
+    (backport from the trunk).
+  * Don't include documentation files in the -cross packages. 
+    Closes: #571522. LP: #514509.
+  * Fix typo in ld documentation. LP: #497923.
+  * Add readelf --unwind support for ARM.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 08 Mar 2010 04:47:46 +0100
+
+binutils (2.20-6) unstable; urgency=low
+
+  * Apply updates from the 2.20 branch up to 20100205
+    - 135_arm_dis_thumb2.dpatch: Remove, applied upstream.
+    - 136_gold_gnu_debuglink.dpatch: Remove, applied upstream.
+  * armel: Fix ld-shared/shared.exp and ld-elfvsb/elfvsb.exp failures
+    (proposed patch, Matthew Gretton-Dann). Closes: #564685. LP: #446478.
+  * Fix PR other/42602: demangling a global constructors symbol.
+    Closes: #561150.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 05 Feb 2010 20:01:20 +0100
+
+binutils (2.20-5) unstable; urgency=low
+
+  * Apply updates from the 2.20 branch up to 20100109
+  * Apply patches from the trunk:
+    - [arm] Prevent disassembler from aborting on an invalid Thumb2 instruction.
+    - Fix PR gold/11072: Discard .gnu_debuglink sections.  Closes: #563366.
+    - Fix PR ld/11138: internal error when DSO is before object files.
+      Closes: #562822.
+    - Fix PR gold/11042: COPY relocs need for the dynamic object.
+      Closes: #559183.
+    - Fix PR gold/10916: Fix --exclude-libs with undefined symbol.
+      Closes: #555012.
+    - Fix PR gold/10979: gold linker crashes. Closes: #553916.
+    - Fix PR gas/10740: Intel syntax far jumps broken. Closes: #541535.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 09 Jan 2010 10:43:04 +0100
+
+binutils (2.20-4) unstable; urgency=low
+
+  * Fix binutils-gold update. Closes: #555734.
+  * Don't configure gold for spu on powerpc.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 11 Nov 2009 23:33:20 +0100
+
+binutils (2.20-3) unstable; urgency=low
+
+  * Apply updates from the 2.20 branch up to 20091108:
+    - Fix PR gold/10876 (closes: #553435), PR gold/10910, PR gold/10860,
+      PR gold/10880 (closes: #553512, #553436), PR gold/10887,
+      PR gold/10893, PR gold/10895 (thanks to Peter Fritzsche for tracking
+      the gold reports).
+  * Fix libiberty build failure on sh4 (Nobuhiro Iwamatsu). Closes: #550810.
+  * PR ld/10858: Fix pie on mips/mipsel. Closes: #526961.
+  * Ignore regressions on sparc; the proper fix is to fix the testcases
+    for v9.
+  * Remove the conflict between binutils-multiarch and binutils-gold.
+    Closes: #521106.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 10 Nov 2009 02:15:41 +0100
+
+binutils (2.20-2) unstable; urgency=high
+
+  * Apply updates from the 2.20 branch up to 20091028:
+    - Fix PR binutils/10802, PR binutils/10793, PR binutils/10792,
+      PR gas/10856.
+    - Remove local patches now in the branch.
+  * Ignore regressions on armel when building with gcc-4.4; the proper fix
+    is to build the testcases using -fno-section-anchors.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 29 Oct 2009 22:17:42 +0100
+
+binutils (2.20-1) unstable; urgency=low
+
+  * binutils 2.20 final release.
+    - Fix PR binutils/10785, memory corruptions.
+    - PR ld/10749, ia64 linker failure.
+    - PR gas/2117, ia64 assembler fix.
+    - gold updates.
+  * Configure with --enable-plugins. Closes: #550088.
+  * debian/test-suite-compare.py: Don't count untested test cases as
+    regressions.
+  * binutils-gold: Install /usr/lib/compat-ld/ld to point to the
+    old linker. To use the old linker when gold is installed, use
+    gcc -B/usr/lib/compat-ld/ (including the trailing slash).
+
+ -- Matthias Klose <doko@debian.org>  Sat, 17 Oct 2009 12:22:30 +0200
+
+binutils (2.19.91.20091006-1) unstable; urgency=low
+
+  * Snapshot, taken from the 2.20 release branch 20091006.
+    - cfi_sections changes applied.
+  * debian/*.shlibs: Update to the version from the branch.
+  * binutils-gold: Build the testsuite as part of the check target
+    instead of the build target to avoid build failures when the
+    installed binutils soname is the same as the one which is built
+    (gas is segfaulting). Just a workaround, not a solution.
+  * Add 150_gold_copyrelocs.dpatch, add -z copyrelocs option for gold.
+  * binutils-source: Depend on texinfo, zlib1g-dev.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 06 Oct 2009 22:13:24 +0200
+
+binutils (2.19.91.20091003-1) unstable; urgency=medium
+
+  * Snapshot, taken from the 2.20 release branch 20091003.
+    - Fix PR ld/9863, regression in testsuite on armel.
+    - Fix regressions seen in the GCC/libjava testsuite.
+  * debian/*.shlibs: Update to the version from the branch.
+  * No need to build libiberty_pic.a twice.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 03 Oct 2009 14:59:14 +0200
+
+binutils (2.19.91.20090927-1) unstable; urgency=low
+
+  * Snapshot, taken from the 2.20 release branch 20090927.
+  * debian/*.shlibs: Update to the version from the branch.
+  * On mips/mipsel disabled -pie/--pie-executable. Still broken,
+    see #526961. Add an option --force-pie on mips/mipsel only
+    for testing purposes.
+    Change requested by debian-release (Andreas Barth).
+
+ -- Matthias Klose <doko@debian.org>  Sun, 27 Sep 2009 11:56:06 +0200
+
+binutils (2.19.91.20090923-1) unstable; urgency=medium
+
+  * Snapshot, taken from the 2.20 release branch 20090923 (last upload
+    was taken from the trunk)..
+  * debian/*.shlibs: Update to the version from the branch.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 23 Sep 2009 09:50:04 +0200
+
+binutils (2.19.91.20090922-1) unstable; urgency=low
+
+  * Snapshot, taken from the 2.20 release branch 20090922.
+  * debian/*.shlibs: Update to the version from the branch.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 22 Sep 2009 19:36:50 +0200
+
+binutils (2.19.91.20090910-1) unstable; urgency=low
+
+  * Snapshot, taken from the 2.20 release branch 20090910, corresponding
+    to the 2.19.90 upstream snapshot.
+  * Fix Thumb-2 shared libraries (Daniel Jacobowitz), patch taken
+    from the trunk.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 10 Sep 2009 17:05:30 +0200
+
+binutils (2.19.90.20090909-1) unstable; urgency=low
+
+  * Snapshot, taken from the 2.20 release branch 20090909.
+  * debian/*.shlibs: Update to the version from the branch.
+  * Disable build failure for regressions on mips/mipsel.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 09 Sep 2009 09:50:36 +0200
+
+binutils (2.19.51.20090827-1) unstable; urgency=low
+
+  * Snapshot, taken from the trunk 20090827.
+    - Fix PR ld/10518: In linker scripts override a "*" match by any other
+      wildcard match. Closes: #540751.
+  * debian/*.shlibs: Update to the version from the trunk. Closes: #540800.
+  * Add sysroot support for cross builds (Hector Oron). Closes: #522480.
+  * Update long description of binutils-doc. Closes: #428764.
+  * Tighten build dependency on autoconf.
+  * Fix some lintian warnings.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 27 Aug 2009 17:09:28 +0200
+
+binutils (2.19.51.20090805-1) unstable; urgency=low
+
+  * Snapshot, taken from the trunk 20090805.
+    - Fix PR binutils/10364, strip not failing on unwritable files.
+      Closes: #276428.
+    - Fix PR binutils/10363, objdump -T crashing on corrupted file.
+      Closes: #487963.
+  * 129_cortex_a8.dpatch: Fix a couple of cortex-a8 erratum bugs.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 05 Aug 2009 10:24:40 +0200
+
+binutils (2.19.51.20090723-1) unstable; urgency=low
+
+  * Snapshot, taken from the trunk 20090723.
+  * debian/*.shlibs: Update to the version from the trunk.
+  * Undo the reversion in the last upload, use the upstream fix instead.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 23 Jul 2009 09:39:50 +0200
+
+binutils (2.19.51.20090722-2) unstable; urgency=low
+
+  * Apply build-id patch to avoid memory corruption (taken from Fedora).
+  * Revert ld/ldlang.c rev 1.312. Closes: #537389.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 22 Jul 2009 19:19:30 +0200
+
+binutils (2.19.51.20090722-1) unstable; urgency=low
+
+  * Snapshot, taken from the trunk 20090722.
+  * debian/*.shlibs: Update to the version from the trunk.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 22 Jul 2009 16:51:11 +0200
+
+binutils (2.19.51.20090714-1) unstable; urgency=low
+
+  * Snapshot, taken from the trunk 20090714.
+  * debian/*.shlibs: Update to the version from the trunk.
+  * Install a libiberty compiled with -fPIC as libiberty_pic.a.
+    Closes: #530888.
+  * Remove obsolete README.Debian. Closes: #324260.
+  * binutils-dev: Include demangle.h. Closes: #134985.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 14 Jul 2009 13:13:37 -0400
+
+binutils (2.19.51.20090704-1) unstable; urgency=low
+
+  * Snapshot, taken from the trunk 20090704.
+    - debian/patches/128_arm_eabi_auto_it.dpatch: Remove, applied upstream.
+  * debian/*.shlibs: Update to the version from the trunk.
+  * Bump standards version.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 04 Jul 2009 10:37:18 +0200
+
+binutils (2.19.51.20090613-1) experimental; urgency=low
+
+  * Snapshot, taken from the trunk 20090613.
+  * debian/*.shlibs: Update to the version from the trunk.
+  * Build binutils-gold on armel.
+  * Apply proposed patch for new option for automatically generating IT blocks.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 13 Jun 2009 14:39:41 +0000
+
+binutils (2.19.51.20090508-1) experimental; urgency=low
+
+  * Snapshot, taken from the trunk 20090508.
+    - Fix PR binutils/9743, relocation issues on arm.
+  * debian/*.shlibs: Update to the version from the trunk.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 08 May 2009 11:08:14 +0200
+
+binutils (2.19.51.20090419-1) experimental; urgency=low
+
+  * Snapshot, taken from the trunk 20090419.
+  * debian/*.shlibs: Update to the version from the trunk.
+  * debian/patches/013_bash_in_ld_testsuite.dpatch: Update.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 19 Apr 2009 22:12:19 +0200
+
+binutils (2.19.51.20090315-1) experimental; urgency=low
+
+  * Snapshot, taken from the trunk 20090315.
+  * debian/*.shlibs: Update to the version from the trunk.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 15 Mar 2009 11:38:58 +0100
+
+binutils (2.19.1-1) unstable; urgency=low
+
+  * Upload to unstable.
+  * binutils-source: Make .dpatch files executable.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 15 Feb 2009 22:46:34 +0100
+
+binutils (2.19.1-1~exp1) experimental; urgency=low
+
+  * Binutils 2.19.1 release.
+  * debian/*.shlibs: Update to the release version.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 04 Feb 2009 09:57:55 +0100
+
+binutils (2.19.0.20090110-1~exp1) experimental; urgency=low
+
+  * Update to the binutils-2_19-branch 20090110.
+    - Fix PR binutils/7011. LP: #254790.
+  * debian/*.shlibs: Update to the version from the branch.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 10 Jan 2009 13:56:09 +0100
+
+binutils (2.19-1~exp2) experimental; urgency=low
+
+  * debian/patches/129_scale-DW_CFA_advance_loc.dpatch: Scale
+    DW_CFA_advance_loc[124] output values.
+  * debian/patches/128_arm_relocs_against_weak.dpatch: Fix R_ARM_THM_CALL
+    relocations against undefined weak symbols in shared libraries.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 30 Nov 2008 13:22:11 +0100
+
+binutils (2.19-1~exp1) experimental; urgency=low
+
+  * Binutils 2.19 release.
+  * debian/*.shlibs: Update to the release version.
+  * Build binutils-gold on powerpc.
+  * debian/control: Update to GPL3, reference the GFDL.
+  * Fail the build if the testsuite shows regressions compared to the
+    last (installed) build.
+  * Make lintian more happy.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 26 Oct 2008 13:06:27 +0200
+
+binutils (2.18.93.20081009-1) experimental; urgency=low
+
+  * Snapshot, taken from the 2.19 branch 20081009 (corresponding to the
+    2.18.93 upstream snapshot.
+  * debian/*.shlibs: Update to the version from the branch.
+  * Add build dependency on zlib1g-dev.
+  * In gprof(1), remove references to monitor(3) and profil(2).
+    Closes: #293948.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 11 Oct 2008 16:45:35 +0000
+
+binutils (2.18.92.20081003-1) experimental; urgency=low
+
+  * Snapshot, taken from the 2.19 branch 20081003.
+  * debian/*.shlibs: Update to the version from the trunk.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 03 Oct 2008 11:29:16 +0000
+
+binutils (2.18.90.20080910-1) experimental; urgency=low
+
+  * Snapshot, taken from the 2.19 branch 20080910.
+  * debian/*.shlibs: Update to the version from the trunk.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 12 Sep 2008 19:23:07 +0200
+
+binutils (2.18.50.20080803-1) experimental; urgency=low
+
+  * Snapshot, taken from the trunk 20080803.
+  * debian/*.shlibs: Update to the version from the trunk.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 04 Aug 2008 00:53:47 +0200
+
+binutils (2.18.50.20080707-1) experimental; urgency=low
+
+  * Snapshot, taken from the trunk 20080707.
+  * debian/*.shlibs: Update to the version from the trunk.
+  * include/safe-ctype.h: Add #include of ctype.h before redefining
+    the ctype.h macros (proposed for the trunk).
+  * Add Daniel Jacobowitz as uploader.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 07 Jul 2008 01:08:13 +0200
+
+binutils (2.18.50.20080610-1) experimental; urgency=low
+
+  * Snapshot, taken from the trunk 20080610.
+  * debian/*.shlibs: Update to the version from the trunk.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 10 Jun 2008 16:21:02 +0200
+
+binutils (2.18.50.20080530-1) experimental; urgency=low
+
+  * Snapshot, taken from the trunk 20080530.
+  * Switch maintainer and uploader.
+  * debian/rules: Explicitely set SHELL to /bin/bash, build-depend on bash.
+  * debian/rules: Fix setting of TARGET for cross builds.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 30 May 2008 23:49:40 +0200
+
+binutils (2.18.50.20080507-1) experimental; urgency=low
+
+  * Snapshot, taken from the trunk 20080507.
+  * Remove patches applied upstream: 304_pr4476.dpatch, 305_arm-dis.dpatch,
+    306_pr4453.dpatch, 307_ld-pic.dpatch, 308_mips-pic.dpatch.
+  * debian/patches/013_bash_in_ld_testsuite.dpatch: Use bash in the ld
+    testsuite (some tests have bashisms).
+  * debian/*.shlibs: Update to the version from the trunk.
+  * On amd64, i386 and sparc, build a binutils-gold package,
+    diverting /usr/bin/ld.
+  * Use expect instead of expect-tcl8.3 on all architectures except hppa.
+  * Remove binutils and gcc build dependencies (versions are in oldstable).
+
+ -- Matthias Klose <doko@debian.org>  Thu, 08 May 2008 00:56:30 +0200
+
+binutils (2.18.1~cvs20080103-4) unstable; urgency=medium
+
+  * debian/rules: Remove libiberty in /usr/lib64; workaround for
+    `gcc -print-multi-os-directory' printing the symlink.
+    Closes: #473665, #473591.
+  * Don't include development files in binutils-spu.
+  * Fix binutils-spu build on ppc64 (Andreas Jochens). Closes: #474116.
+  * Build libiberty with -fPIC on mips/mipsel (Aurelian Jarno).
+
+ -- Matthias Klose <doko@debian.org>  Sat, 05 Apr 2008 11:21:08 +0200
+
+binutils (2.18.1~cvs20080103-3) unstable; urgency=low
+
+  [ Arthur Loiret ]
+  * Build a binutils for spu-elf target on powerpc and ppc64.
+    - debian/control: Add a binutils-spu package.
+    - debian/binutils-spu.{postinst,postrm,shlibs}: Add.
+  * Add sh64-linux-gnu to multiarch targets.
+  * Fix cross-compilation support.
+  * Make lintian happier:
+    - Use ${source:Version}, ${binary:Version} variables.
+    - Remove -1 from Build-Depends revisions.
+    - Bump Standards-Version to 3.7.3.
+
+  [ Matthias Klose ]
+  * Keep the spu elfscripts in bintutils, remove them from binutils-spu.
+  * debian/patches/307_ld-pic.dpatch: Fix failing ld-shared tests when built
+    with gcc-4.3.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 29 Mar 2008 20:32:35 +0100
+
+binutils (2.18.1~cvs20080103-2) unstable; urgency=low
+
+  * debian/patches/306_pr4453.dpatch: Fix PR binutils/4453, taken from
+    the trunk (Aurelian Jarno). Closes: #363423.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 21 Mar 2008 20:49:17 +0100
+
+binutils (2.18.1~cvs20080103-1) unstable; urgency=low
+
+  * Update to 20080103 from the binutils-2_18-branch.
+    - Set version number to 2.18.0 (smaller than the one from the trunk).
+    - Fix PR ld/5398. Closes: #452725.
+  * debian/*.shlibs: Update to version from the branch.
+  * debian/patches/305_arm-dis.dpatch: Fix segfault when disassembling ARM
+    code. Closes: #438956.
+  * Support kfreebsd-amd64-gnu and i486-kfreebsd-gnu (Aurilian Jarno):
+    - debian/patches/127_x86_64_i386_biarch.dpatch: Extend for kfreebsd.
+    - debian/rules: biarch enabled binutils for kfreebsd-{amd64,i486}-gnu,
+      kfreebsd-{amd64,i486}-gnu support for cross-builds,
+      kfreebsd-{amd64,i486}-gnu enabled for binutils-multiarch.
+    - Closes: #380373.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 03 Jan 2008 21:57:51 +0100
+
+binutils (2.18.1~cvs20071027-2) unstable; urgency=low
+
+  * Do not include static libraries in the multiarch package.
+  * Don't include /usr/lib64 in cross packages. Closes: #450429.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 24 Nov 2007 12:13:22 +0100
+
+binutils (2.18.1~cvs20071027-1) unstable; urgency=low
+
+  * Update to 20071027 from the binutils-2_18-branch.
+    - Fix PR ld/4988, assertion failures in ld. Closes: #440015.
+  * debian/*.shlibs: Update to version from the branch.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 27 Oct 2007 17:55:41 +0200
+
+binutils (2.18-1) unstable; urgency=low
+
+  [ Matthias Klose ]
+  * New upstream release.
+    - Remove patches applied upstream: 100_warning_arm, 400_gcc42_fix,
+      401_builddoc.
+  * debian/*.shlibs: Update to release version.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 29 Aug 2007 01:07:31 +0200
+
+binutils (2.18~cvs20070812-1) unstable; urgency=low
+
+  [ Matthias Klose ]
+  * New upstream CVS snapshot, taken from the binutils-2_18-branch.
+  * debian/rules: Support parallel=<n> with comma separated keywords
+    in DEB_BUILD_OPTIONS.
+  * debian/rules (clean): Remove stamp files.
+  * debian/*.shlibs: Update to snapshot version.
+  * debian/patches/401_builddoc.dpatch: Fix doc build failure on the branch.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 12 Aug 2007 10:56:18 +0200
+
+binutils (2.17cvs20070804-1) unstable; urgency=low
+
+  [ Matthias Klose ]
+  * New upstream CVS snapshot.
+    - PR binutils/4888, fixes objcopy --only-keep-debug. Closes: #435444.
+  * debian/rules: Support parallel=<n> in DEB_BUILD_OPTIONS (see #209008).
+  * debian/*.shlibs: Update to snapshot version.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 04 Aug 2007 12:45:07 +0200
+
+binutils (2.17cvs20070801-1) unstable; urgency=medium
+
+  [ Matthias Klose ]
+  * New upstream CVS snapshot.
+    - Fixes objcopy --only-keep-debug on amd64. Closes: #435444.
+  * binutils-multiarch: Enable the armel-linux-gnu target. Closes: #408805.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 01 Aug 2007 18:24:51 +0200
+
+binutils (2.17cvs20070718-1) unstable; urgency=low
+
+  [ Matthias Klose ]
+  * New upstream CVS snapshot.
+    - Fix build failure on m68k.
+  * debian/patches/400_gcc42_fix.dpatch: Fix build failure with gcc-4.2.
+    Closes: #433062.
+  * Fix cross build failure while stripping binaries. Closes: #432907.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 18 Jul 2007 20:25:03 +0200
+
+binutils (2.17cvs20070713-1) unstable; urgency=low
+
+  [ Matthias Klose ]
+  * New upstream CVS snapshot.
+    - Remove patches applied upstream: 301_pr4436.dpatch, 302_pr4448.dpatch,
+      303_pr4454.dpatch, 305_pr4497.dpatch, 306_ld_demangler_segfault.dpatch,
+      307_pr4558.dpatch.
+    - Fix build failure with gcc-4.2. Closes: #429738.
+    - Fix kernel build with grsecurity patch. Closes: #430041.
+  * debian/copyright: Include GPL-3.
+  * debian/rules: Fix version extraction.
+  * debian/rules: Honor `noopt' in DEB_BUILD_OPTIONS.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 13 Jul 2007 14:45:21 +0200
+
+binutils (2.17cvs20070426-8) unstable; urgency=low
+
+  * Fix PR gas/4558.
+  * debian/rules: Add empty NJOBS macro.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 28 May 2007 09:06:35 +0000
+
+binutils (2.17cvs20070426-7) unstable; urgency=low
+
+  * 306_ld_demangler_segfault.dpatch: new CVS patch from Alan Modra to fix
+    segfaults in ld seen when building, e.g. openipmi.
+
+  * debian/copyright: update source location and copyright years.
+  * debian/rules: idem.
+  
+ -- James Troup <james@nocrew.org>  Wed, 23 May 2007 02:19:09 +0100
+
+binutils (2.17cvs20070426-6) unstable; urgency=low
+
+  * Fix PR ld/4497, regression introduced with the fix for PR ld/4454.
+    Closes: #423496.
+  * Fix binutils/4476, readelf support for --hash-style=gnu.  Closes: #421790.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 14 May 2007 10:51:40 +0200
+
+binutils (2.17cvs20070426-5) unstable; urgency=low
+
+  * Fix PR ld/4454.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 06 May 2007 09:50:29 +0200
+
+binutils (2.17cvs20070426-4) unstable; urgency=low
+
+  * Fix PR gas/4448, overstrict check for powerpc lswi. Closes: #421799.
+
+ -- Matthias Klose <doko@debian.org>  Wed,  2 May 2007 18:26:03 +0200
+
+binutils (2.17cvs20070426-3) unstable; urgency=low
+
+  * Update debian/*.shlibs files. Closes: #421454.
+  * Fix PR gas/4436, wrong reject in powerpc opcode table checks.
+    Closes: #421455.
+  * Fix build failure on arm (Aurelian Jarno). Closes: #421365.
+  * Compare testsuite results of the installed binutils with the built one.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 30 Apr 2007 07:47:09 +0200
+
+binutils (2.17cvs20070426-2) unstable; urgency=low
+
+  * Fix typo preparing the binutils-hppa64 package.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 27 Apr 2007 08:06:49 +0200
+
+binutils (2.17cvs20070426-1) unstable; urgency=low
+
+  [ James Troup ]
+  * New upstream CVS snapshot.
+  * debian/test-suite-compare.py: simplistic comparator for binutils test
+    suite runs.
+
+  [ Matthias Klose ]
+  * Merge changes from the experimental uploads:
+   * debian/patches/121_i386_x86_64_biarch.dpatch: Remove, applied upstream.
+   * Build a binutils-source package (containing the patched sources).
+   * Check for a working expect before building the package.
+   * Configure the multiarch build for x86_64-linux-gnu instead of
+     x86_64-linux.
+   * debian/rules: Don't strip binaries if nostrip is in DEB_BUILD_OPTIONS.
+   * debian/rules: Don't try to strip shell scripts.
+   * Configure --with-pkgversion to include the distribution name.
+   * debian/patches/000_print_debian_version.dpatch: Remove.
+   * debian/control: Build-depend on lsb-release.
+   * Enable spu target in powerpc and binutils-multiarch build.
+   * Don't include embedspu in binutils-multiarch on powerpc.
+   * debian/control: Set priority for source package to optional.
+
+ -- James Troup <james@nocrew.org>  Fri, 27 Apr 2007 01:29:57 +0100
+
+binutils (2.17-3) unstable; urgency=low
+
+  * debian/rules (configure-multi-stamp): drop i486-kfreebsd-gnu again as
+    it breaks objdump for i386 on amd64.  Closes: #380539
+
+ -- James Troup <james@nocrew.org>  Tue,  3 Oct 2006 00:53:17 +0100
+
+binutils (2.17-2) unstable; urgency=low
+
+  * The "Laisse le Wookie gagner" release.
+
+  * 127_x86_64_i386_biarch.dpatch: new patch from Aurelien Jarno
+    <aurelien@aurel32.net> to add (/usr)/lib32 to the search paths on
+    amd64.  Closes: #369052
+
+  * debian/rules (configure-multi-stamp): add i486-kfreebsd-gnu at request
+    of Aurelien Jarno.  Closes: #315306
+
+ -- James Troup <james@nocrew.org>  Wed, 26 Jul 2006 20:33:13 +0100
+
+binutils (2.17-1) unstable; urgency=low
+
+  * New upstream release.
+   * 120_mips_xgot_multigot_workaround.dpatch: removed - superseded by a
+     proper fix upstream.  Closes: #274738
+   * debian/binutils.shlibs, debian/binutils-multiarch.shlibs,
+     debian/binutils-hppa64.shlibs: updated SONAME to 2.17.
+
+ -- James Troup <james@nocrew.org>  Mon, 26 Jun 2006 13:17:36 +0100
+
+binutils (2.16.1cvs20060507-1) unstable; urgency=low
+
+  * New upstream CVS snapshot of 'binutils-2_17-branch'.
+
+  * debian/control (Standards-Version): bump to 3.7.2.0.
+
+ -- James Troup <james@nocrew.org>  Sun,  7 May 2006 19:57:08 +0100
+
+binutils (2.16.1cvs20060413-1) unstable; urgency=low
+
+  * New upstream CVS snapshot.
+   * 120_mips_xgot_multigot_workaround.dpatch: updated to work with CVS
+     r1.163 of bfd/elfxx-mips.c, pass 'info' instead of 'output_bfd' to
+     MIPS_ELF_GOT_MAX_SIZE().
+
+  * Patch from NIIBE Yutaka <gniibe@fsij.org> in #280884:
+    * debian/rules (configure-multi-stamp): Support m32r-linux.  Closes:
+      #340264
+    * debian/rules: Run 'make check' only if build == host.
+  
+  * debian/rules: Also don't run 'make check' if nocheck is in
+    DEB_BUILD_OPTIONS.  Based on a patch from Michael Banck
+    <mbanck@debian.org>.  Closes: #315290
+
+  * Integrate most of a patch to build arbitrary binutils-$TARGET
+    cross-packages from #231707.  Thanks to Nikita V. Youshchenko
+    <yoush@cs.msu.su> and Josh Triplett <josh@freedesktop.org>.
+
+  * debian/copyright: update to include GFDL.  Closes: #81950
+  * debian/copyright: update FSF address.
+
+  * debian/rules: move non-architecture specific conflicts (gas,
+    elf-binutils, modutils (<< 2.4.19-1)) out of a substitued variable and
+    into the control file.  Rename variable to extraConflicts.
+  * debian/control: likewise.
+
+ -- James Troup <james@nocrew.org>  Sat, 15 Apr 2006 03:05:41 +0100
+
+binutils (2.16.1cvs20060117-1) unstable; urgency=low
+
+  * New upstream CVS snapshot.
+
+  * 118_arm_pass_all.dpatch, 125_fix_tc_arm_cast.dpatch: merged upstream -
+    removed.
+
+ -- James Troup <james@nocrew.org>  Wed, 18 Jan 2006 02:25:25 +0000
+
+binutils (2.16.1cvs20051214-1) unstable; urgency=low
+
+  * New upstream CVS snapshot.
+   * Fix ld segfaults on ia64.  Closes: #342777
+
+  * 126_fix_PROVIDE_HIDDEN.dpatch: merged upstream - removed.
+
+ -- James Troup <james@nocrew.org>  Wed, 14 Dec 2005 08:06:37 +0000
+
+binutils (2.16.1cvs20051206-1) unstable; urgency=low
+
+  * New upstream CVS snapshot.
+   * Fixes linking of qemu.  Closes: #340328
+
+  * 126_fix_PROVIDE_HIDDEN.dpatch: new patch from Thiemo Seufer to fix
+    handling of hidden symbols which were provided by a linker
+    script. Closes: #342307
+
+  * debian/control (Standards-Version): updated to 3.6.2.1.
+
+ -- James Troup <james@nocrew.org>  Sat, 10 Dec 2005 05:23:34 +0000
+
+binutils (2.16.1cvs20051117-1) unstable; urgency=low
+
+  * New upstream CVS snapshot.
+   * Fixes c++filt's flushing of stdout which broke gcj.  Closes: #339287
+
+  * debian/control (Build-Depends): switch from expect to expect-tcl8.3
+    since tcl8.4's broken threading causes the testsuite to fail entirely
+    on hppa.  Closes: #339509
+
+ -- James Troup <james@nocrew.org>  Thu, 17 Nov 2005 13:15:15 +0000
+
+binutils (2.16.1cvs20051109-1) unstable; urgency=low
+
+  * New upstream CVS snapshot.
+   * Fixes broken PLT handling on m68k.  Closes: #327780
+   * Don't compile flex files with -Werror, fixing mips builds.
+     Closes: #333980
+   * Don't check undefined symbols introduced by "ld -u" for TLS. Closes:
+     #326103
+
+  * 117_mips_symbolic_link.dpatch: merged upstream - removed.
+
+  * debian/rules: pass --disable-werror on ia64 as current gcc generates
+    too many false positives.  Closes: #336939
+
+  * 125_fix_tc_arm_cast.dpatch: new patch from Lennert Buytenhek to fix
+    cast warning and arm builds.  Closes: #336175
+
+  * 121_i386_x86_64_biarch.dpatch: imported from Ubuntu at request of
+    Daniel Jacobwitz to fix biarch linking on i386/amd64.  Closes:
+    #334626, #334673
+
+  * debian/rules: remove any reference to pkgstriptranslations - an
+    Ubuntu-ism that shouldn't have been in the Debian package in the first
+    place but that isn't needed in Ubuntu any more in any event.
+
+  * debian/rules: MAKEOVERRIDES is now clobbered by the top level
+    Makefile, so switch to overriding MAKE itself (sic) to pass the
+    customized VERSION variable/string down to sub-directories for
+    -multiarch and -hppa64 builds.  Thanks to Daniel Silverstone for the
+    suggestion.
+
+ -- James Troup <james@nocrew.org>  Fri, 11 Nov 2005 20:38:22 +0000
+
+binutils (2.16.1cvs20050902-1) unstable; urgency=low
+
+  * New upstream CVS snapshot.
+   * Fixes --as-needed on sparc and hppa.  Closes: #320697
+   * Fixes buffer overflows and other crashes.  Closes: #311975
+
+  * 124_readelf_robustify.dpatch: merged upstream - removed.
+  * 001_ld_makefile_patch: regenerated with help of wiggle.
+
+  * debian/*.shlibs: update to version 2.16.91.
+
+  * debian/copyright: use canonical GNU URL.  Update copyright years.
+  * debian/rules: update version and copyright.
+
+  * debian/rules (pre-build): not relevant with a CVS snapshot which
+    doesn't have pre-generated info files - removed.
+  * debian/rules (clean): don't save info files for the same reason, in
+    fact explicitly remove them.
+  * debian/rules (build_stamps): drop pre-build.
+
+ -- James Troup <james@nocrew.org>  Sat,  3 Sep 2005 00:30:56 +0100
+
+binutils (2.16.1-3) unstable; urgency=low
+
+  * debian/rules: remove powerpc libc header hack.
+  * debian/include/sys/procfs.h: remove.
+
+  * 124_readelf_robustify.dpatch: new patch from Jakub Jelinek to
+    robustify readelf.  Thanks to Thiemo Seufer <ths@networkno.de>.
+    Closes: #318344
+
+ -- James Troup <james@nocrew.org>  Wed, 31 Aug 2005 05:03:11 +0100
+
+binutils (2.16.1-2) unstable; urgency=low
+
+  * debian/include/sys/procfs.h: Include fixed powerpc libc header, to fix
+    FTBFS on powerpc. Temporary fix, to be removed with glibc-2.3.5.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 10 Jul 2005 16:35:17 +0200
+
+binutils (2.16.1-1) unstable; urgency=medium
+
+  * New upstream version.
+  * debian/patches/117_mips_symbolic_link.dpatch: Updated, apply it again.
+    (Thiemo Seufer).
+  * debian/patches/130_bfd_doc_makefile.dpatch: Remove, applied upstream.
+  * debian/control: Build depend on dpkg-dev (>= 1.13.9), needed to determine
+    the GNU architecture type.
+  * The symlinks for the tools change to the the new output of
+    dpkg-architecture -qDEB_HOST_GNU_TYPE (i.e. i386-linux-ld becomes
+    i486-linux-gnu-ld).
+  * Change the values for --enable-targets according to the dpkg-architecture
+    update.
+  * Configure the hppa64 cross compiler for hppa64-linux-gnu. Adjust
+    the hppa64 install target.
+  * debian/*shlibs: Update to version 2.16.1.
+  * Make restoring of saved pregenerated info files more robust.
+
+ -- Matthias Klose <doko@debian.org>  Sat,  9 Jul 2005 14:58:49 +0200
+
+binutils (2.16-1) unstable; urgency=low
+
+  * Update to CVS 2.16 branch 20050612.
+  * debian/patches/130_bfd_doc_makefile.dpatch: New patch to fix
+    build failure in bfd/doc.
+  * debian/watch: New file.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 12 Jun 2005 12:29:12 +0200
+
+binutils (2.16-0) experimental; urgency=low
+
+  * New upstream release.
+    - Fixes build failure using gcc-4.0 (closes: #299671).
+  * debian/patches:
+    - 000_print_debian_version.dpatch: Updated.
+    - 001_ld_makefile_patch.dpatch, 002_gprof_profile_arcs.dpatch,
+      002_gprof_profile_arcs.dpatch: Regenerated.
+    - 012_check_ldrunpath_length.dpatch: Updated.
+    - 112_fix_reloc_sizing.dpatch, 113_elf_backend_hide_symbol.dpatch,
+      114_mips_delay_slots_in_branch.dpatch, 115_fix_sparc_fmov.dpatch,
+      116_ar_nonexistent_files.dpatch: Removed, applied upstream.
+    - 117_mips_symbolic_link.dpatch: Disabled. Needs an update.
+    - 118_arm_pass_all.dpatch: Regenerated.
+    - 119_fix_gas_double_negative.dpatch: Removed, applied upstream.
+    - 120_mips_xgot_multigot_workaround.dpatch: Updated.
+    - 121_ia64_unwind_fixes.dpatch, 122_m68k_undefweak_symbols.dpatch:
+      Removed, applied upstream.
+  * Merge Ubuntu changes:
+    - debian/patches:
+      - 123_dont_add_to_undefs_twice.dpatch: Removed, applied upstream.
+    - debian/rules: Call pkgstriptranslations if present.
+  * debian/rules: 
+    - Fix VERSION extraction.
+    - Save info files before build and restore them in clean target.
+  * debian/control:
+    - Add me as an uploader.
+	
+ -- Matthias Klose <doko@ubuntu.com>  Fri,  6 May 2005 18:43:09 +0200
+
+binutils (2.15-6) unstable; urgency=low
+
+  * 123_bfd_overflow_fix.dpatch: new patch from Alan Modra to fix BFD
+    overflows.  Closes: #308625
+
+ -- James Troup <james@nocrew.org>  Sat, 21 May 2005 20:20:01 +0100
+
+binutils (2.15-5ubuntu2) hoary; urgency=low
+
+  * debian/rules: Call pkgstriptranslations if present (the package does not
+    use debhelper, thus it does not happen automatically).
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri, 18 Mar 2005 13:07:52 +0000
+
+binutils (2.15-5ubuntu1) hoary; urgency=low
+
+  * 123_dont_add_to_undefs_twice.dpatch: new patch from Alan Modra (PR338) to
+    not add symbols to the undefined list twice, causing an assertion failure
+    in ld when building the kernel on amd64.
+
+ -- Daniel Stone <daniel.stone@canonical.com>  Tue,  7 Dec 2004 09:29:31 +0100
+
+binutils (2.15-5) unstable; urgency=low
+
+  * 121_ia64_unwind_fixes.dpatch: new patch from David Mosberger to fix
+    unwind related bugs.  Closes: #278836
+  * 122_m68k_undefweak_symbols: new patch from Andreas Schwab to fix undef
+    weak symbols with non-default visibilty on m68k.  Closes: #278388
+
+ -- James Troup <james@nocrew.org>  Thu, 25 Nov 2004 00:13:28 +0000
+
+binutils (2.15-4) unstable; urgency=low
+
+  * 120_mips_xgot_multigot_workaround.dpatch: new patch from Thiemo Seufer
+    to make multigot/xgot handling exclusive and fix mozilla builds on
+    mipsen.  Closes: #272149
+
+ -- James Troup <james@nocrew.org>  Thu, 23 Sep 2004 22:44:03 +0100
+
+binutils (2.15-3) unstable; urgency=low
+
+  * 112_fix_reloc_sizing.dpatch: update patch based on revised change from
+    Alan Modra.
+
+  * 116_ar_nonexistent_files.dpatch: new patch from Nick Clifton to fix
+    ar's handling of non-existent files.  Closes: #267139
+
+  * 117_mips_symbolic_link.dpatch: new patch from Thiemo Seufer to fix the
+    "final link failed: Bad value" error on mips.  Closes: #270619
+
+  * 118_arm_pass_all.dpatch: new kludge patch to fix broken libtool pass_all
+    handling on arm and other arches.
+
+  * 119_fix_gas_double_negative.dpatch: new patch from Alan Modra via
+    Daniel Jacobowitz to fix gas' handling of -- and ++.  Closes: #266772
+
+ -- James Troup <james@nocrew.org>  Thu,  9 Sep 2004 22:24:08 +0100
+
+binutils (2.15-2) unstable; urgency=low
+
+  * 112_fix_reloc_sizing.dpatch: new patch from Daniel Jacobowitz to fix
+    objcopy relocation sections.  Closes: #252719
+
+  * 113_elf_backend_hide_symbol.dpatch: new patch from Alan Modra to fix
+    ld internal error on hppa.  Closes: #254549
+
+  * 114_mips_delay_slots_in_branch.dpatch: new patch from Thiemo Seufer to
+    handle delay slots in branch correctly on mips.  Closes: #266660
+
+  * 115_fix_sparc_fmov.dpatch: new patch from Jakub Jelinek via Dave
+    Miller to fix bogus fmov* SPARC opcodes.  Closes: #267824
+
+ -- James Troup <james@nocrew.org>  Tue, 31 Aug 2004 22:45:13 +0100
+
+binutils (2.15-1) unstable; urgency=low
+
+  * New upstream release.  Closes: #248990, #259458
+   * Fixes -Wl,-z,defs to correctly abort builds with unresolved
+     symbols.  Closes: #256481
+   * Better error message for truncation of bignums in as.  
+     Closes: #219933
+   * strip(1) no longer corrupts binaries for architectures it doesn't
+     recognise.  Closes: #211052
+   * nm -C /usr/lib/libcrypto++.a no longer segfaults.  Closes: #247917
+  
+  * 105_alpha_rpcc_opcode_fix.dpatch, 106_arm_pic.dpatch,
+    107_powerpc_ld_segfault.dpatch, 108_m68k_fmoveml_fix.dpatch,
+    109_objcopy_keep_debug.dpatch, 110_hppa64_local_symbols.dpatch,
+    111_objcopy_vs_unstripped.dpatch, 906_hjl_libtool_dso.dpatch: merged
+    upstream - removed.
+  * 012_check_ldrunpath_length.dpatch: resynced with wiggle(1).
+
+  * debian/binutils.shlibs, debian/binutils-hppa64.shlibs,
+    debian/binutils-multiarch.shlibs: update for 2.15.
+
+  * debian/rules (install): remove gas.info hack as no longer needed
+    (fixed properly upstream).
+  * debian/rules (clean): remove gas/doc/as.info which doesn't seem to be
+    in the upstream tar ball.
+
+  * debian/rules (binary-arch): install $pkg/ChangeLog.linux only if they
+    exist (because they don't in GNU releases).
+
+ -- James Troup <james@nocrew.org>  Thu, 29 Jul 2004 22:44:04 +0100
+
+binutils (2.14.90.0.7-8) unstable; urgency=low
+
+  * debian/rules: don't use gcc-2.95 on m68k.  Thanks to Adam Conrad for
+    pointing this out.
+
+ -- James Troup <james@nocrew.org>  Wed, 19 May 2004 10:35:44 +0100
+
+binutils (2.14.90.0.7-7) unstable; urgency=low
+
+  * 111_objcopy_vs_unstripped.dpatch: new patch from Alan Modra via Daniel
+    Jacobowitz to fix objcopy on unstripped libraries on alpha and arm.
+    Closes: #234021
+
+  * debian/control (Build-Depends): remove m68k specific build-depends on
+    gcc-2.95 and libc6-dev (<< 2.3).  Many thanks to Michael Schmitz for
+    testing this.
+
+ -- James Troup <james@nocrew.org>  Tue, 30 Mar 2004 18:00:54 +0100
+
+binutils (2.14.90.0.7-6) unstable; urgency=low
+
+  * 110_hppa64_local_symbols.dpatch: new patch from Randolph Chung to fix
+    dynamic name generation of local symbols on hppa64 - needed to build
+    64-bit hppa kernels. Closes: #238176
+
+ -- James Troup <james@nocrew.org>  Fri, 26 Mar 2004 15:52:27 +0000
+
+binutils (2.14.90.0.7-5) unstable; urgency=low
+
+  * 109_objcopy_keep_debug.dpatch: new patch from Daniel Jacobowitz
+    <dan@debian.org>, objcopy --only-keep-debug and readelf SHT_NOBITS
+    fixes.
+
+ -- James Troup <james@nocrew.org>  Mon, 26 Jan 2004 16:25:25 +0000
+
+binutils (2.14.90.0.7-4) unstable; urgency=low
+
+  * debian/control: add binutils-hppa64 package.
+  * debian/rules: add support for binutils-hppa64 package and don't enable
+    hppa64-linux for binutils or binutils-multiarch.
+  * debian/binutils-hppa64.postinst: new file.
+  * debian/binutils-hppa64.postrm: likewise.
+  * debian/binutils-hppa64.shlibs: likewise.
+  * Above changes largely based on a patch from Matthias Klose
+    <doko@cs.tu-berlin.de>.  Closes: #225892
+
+  * debian/control (Build-Depends): drop bzip2.
+
+  * debian/rules (install-stamp): remove empty /usr/include directory in
+    binutils.
+  * debian/rules (install-stamp): remove /usr/share/info/dir* to
+    workaround install-info brain damage (cf #213524).
+
+ -- James Troup <james@nocrew.org>  Thu, 22 Jan 2004 21:32:44 +0000
+
+binutils (2.14.90.0.7-3) unstable; urgency=low
+
+  * 108_m68k_fmoveml_fix.dpatch: new patch from H.J. Lu
+    <hongjiu.lu@intel.com> to fix fmoveml disassembly and associated
+    testsuite regression on m68k.
+
+ -- James Troup <james@nocrew.org>  Tue, 18 Nov 2003 14:35:23 +0000
+
+binutils (2.14.90.0.7-2) unstable; urgency=low
+
+  * 107_powerpc_ld_segfault.dpatch: new patch from Alan Modra
+    <amodra@bigpond.net.au> to fix ld segfault on powerpc.  Thanks to
+    Josselin Mouette <joss@debian.org> for the report.  Closes: #219187
+
+ -- James Troup <james@nocrew.org>  Wed,  5 Nov 2003 13:32:17 +0000
+
+binutils (2.14.90.0.7-1) unstable; urgency=low
+
+  * New upstream release.
+  * 100_null_owner_ld_fix.dpatch, 101_ppc_as_shf_and_rel_fix.dpatch,
+    102_alpha_null_got_ld_fix.dpatch,
+    103_static_linking_elf_eh_frame.dpatch,
+    104_elf_eh_frame_alpha_fix.dpatch: removed; merged upstream.
+  * debian/rules: update version number.
+  * debian/binutils.shlibs: likewise.
+  * debian/binutils-multiarch.shlibs: likewise.
+
+  * 009_signed_char_fix.dpatch: removed; this was fixed upstream correctly
+    (http://sources.redhat.com/ml/binutils/2003-05/msg00304.html) and this
+    patch is breaking that fix.  Thanks to Daniel Jacobowitz
+    <dan@debian.org>.
+
+  * 003_gmon_manpage_fix.dpatch -> 002_gprof_profile_arcs.dpatch.
+  * 014_gprof_manpage_fix.dpatch -> 003_gprof_see_also_monitor.dpatch.
+
+  * 300_alpha_rpcc_opcode_fix.dpatch -> 105_alpha_rpcc_opcode_fix.dpatch
+    (committed to trunk).
+
+  * debian/rules (configure-multi-stamp): also enable mips64{el,}-linux
+    for binutils-multiarch.  Alphabetize target list.
+
+  * 106_arm_pic: new patch from Phil Blundell <pb@debian.org> and Daniel
+    Jacobowitz <dan@debian.org> which implements GC for GOT and PLT relocs
+    in the elf32-arm backend.
+
+  * debian/rules (install-stamp): work around upstream bug which causes
+    as.info and as.1 to disappear by explicitly calling "make
+    install-info-am install-am" in builddir-single/gas/doc.
+
+ -- James Troup <james@nocrew.org>  Sat,  1 Nov 2003 18:14:04 +0000
+
+binutils (2.14.90.0.6-5) unstable; urgency=low
+
+  * 104_elf_eh_frame_alpha_fix.dpatch: new patch from H.J. Lu
+    <hongjiu.lu@intel.com> to fix regressions on alpha caused by
+    103_static_linking_elf_eh_frame.  Thanks to Thimo Neubauer
+    <thimo@debian.org> for the original report.  Closes: #215636
+
+ -- James Troup <james@nocrew.org>  Fri, 17 Oct 2003 00:02:09 +0100
+
+binutils (2.14.90.0.6-4) unstable; urgency=low
+
+  * 103_static_linking_elf_eh_frame.dpatch: new patch from H.J. Lu
+    <hongjiu.lu@intel.com> to fix static linking of C++ binaries.
+
+  * 200_alpha_null_got_ld_fix.dpatch: renamed...
+  * 102_alpha_null_got_ld_fix.dpatch: to this.
+
+  * debian/rules: patch from Guido Guenther <agx@debian.org> to enable
+    mips64 support.  Closes: #213448
+
+ -- James Troup <james@nocrew.org>  Sun, 12 Oct 2003 14:26:26 +0100
+
+binutils (2.14.90.0.6-3) unstable; urgency=low
+
+  * 100_null_owner_ld_fix.dpatch: new patch from Alan Modra
+    <amodra@bigpond.net.au> to fix an ld crash with null owner sections.
+    Closes: #212029
+
+  * debian/rules: don't compile with gcc-2.95 on arm; the only failures
+    are a) testsuite-only (i.e. don't appear to affect real world
+    applications) and b) fixed by upcoming gcc patches by Phil Blundell
+    <pb@debian.org> in any event.
+  * debian/control (Build-Depends): likewise don't build-depend on
+    gcc-2.95 for arm.
+
+  * 101_ppc_as_shf_and_rel_fix.dpatch: new patch from Alan Modra
+    <amodra@bigpond.net.au> to fix an as regression where it refused to
+    compile utils.S from Linux/PPC 2.6.  Closes: #211668
+
+ -- James Troup <james@nocrew.org>  Tue, 23 Sep 2003 01:32:08 +0100
+
+binutils (2.14.90.0.6-2) unstable; urgency=low
+
+  * debian/rules (CONFLICTS): remove spurious "--", left over from
+    debhelper based-rules.  Fixes build failure on sparc.
+
+  * 200_alpha_null_got_ld_fix.dpatch: new patch from Daniel Jacobowitz
+    <dan@debian.org> to fix an ld crash on alpha with null .got sections.
+    Closes: #204615
+
+  * scripts/dpkg-arch.mk: remove.
+  * debian/rules: define DEB_BUILD_GNU_TYPE, DEB_HOST_ARCH and
+    DEB_HOST_GNU_TYPE here instead.
+
+  * debian/rules (binary-indep): use ':' as a separator to chown, rather
+    than '.' which is a legal character for a username.
+  * debian/rules (binary-arch): likewise.
+
+  * debian/rules: further trivial cleanups.
+
+ -- James Troup <james@nocrew.org>  Thu, 18 Sep 2003 22:13:36 +0100
+
+binutils (2.14.90.0.6-1) unstable; urgency=low
+
+  * New "upstream" release.
+   * Fixes core dump of nm -C on certain object files. Closes: #205616
+
+  * New maintainer.
+  * debian/control (Maintainer): adjust accordingly.
+  * debian/copyright: likewise.  Update copyright years, URL.
+  * debian/control (Standards-Version): bump to 3.6.1.0.
+
+  * 011_disable_combreloc_ARM_ONLY.diff: dropped on request of Phil
+    Blundell <pb@debian.org> - this is obsolete, it was working around a
+    bug in ld since fixed by Daniel Jacobowitz <dan@debian.org> upstream.
+
+  * 890-elf64_alpha_segfault.diff: dropped as bogus
+    (http://sources.redhat.com/ml/binutils/2003-04/msg00399.html); rth's
+    correct fix is already in the upstream source.
+
+  * debian/README.Debian: migrate nearly-obsolete debconf notes to here.
+  * debian/control (Depends): drop debconf.
+  * binutils.config, binutils.templates, binutils.templates.ca,
+    binutils.templates.fr, binutils.templates.ja,
+    binutils.templates.pt_BR, postrm.debhelper: obsolete, removed.
+    Closes: #189641, #198222
+
+  * Migrated from dbs...
+  * debian/README.build: obsolete; removed.
+  * debian/rules: remove $(BUILD_TREE)/, $(STAMP_DIR)/, $(unpacked), $(patched) and other references
+    to DBS.
+  * debian/rules (clean): remove build tree directories.
+  * debian/scripts/dbs-build.mk: unused, remove.
+  * debian/scripts/file2cat: likewise.
+
+  * ... to dpatch.
+  * debian/rules: include /usr/share/dpatch/dpatch.make.
+  * debian/rules (configure-single-stamp): depend on patch-stamp.
+  * debian/rules (configure-multi-stamp): likewise.
+  * debian/rules (clean): depend on unpatch.  Remove debian/patched.
+  * debian/control (Build-Depends): add dpatch.
+
+  * binutils-doc.postinst, binutils-doc.prerm,
+    binutils-multiarch.postinst, binutils-multiarch.postrm,
+    binutils-multiarch.preinst, binutils-multiarch.shlibs,
+    binutils.postinst, binutils.postrm, binutils.shlibs: new files based
+    on .deb and packages.d/.
+  * scripts/dh_split: obsolete, removed.
+  * debian/packages.d/binutils-dev.in, debian/packages.d/binutils-doc.in,
+    debian/packages.d/binutils-multiarch.in,
+    debian/packages.d/binutils.in: likewise.
+
+  * debian/rules: rewritten, de-debhelper-ized.
+  * debian/control (Build-Depends): drop debhelper and add file.
+
+ -- James Troup <james@nocrew.org>  Thu, 11 Sep 2003 22:08:18 +0100
+
+binutils (2.14.90.0.5-0.2) unstable; urgency=low
+
+  * NMU.
+  * Rebuild using fixed gcc on sparc (closes: #202924).
+
+ -- Matthias Klose <doko@debian.org>  Mon, 28 Jul 2003 20:12:00 +0200
+
+binutils (2.14.90.0.5-0.1) unstable; urgency=low
+
+  * NMU.
+  * New upstream version.
+  * Remove patches applied upstream:
+    - debian/patches/500_s390_gas.diff
+    - debian/patches/905-hppa_visibility.diff
+    - debian/patches/906-mips_ld_fix.diff
+  * Updated patch:
+    - debian/patches/906-hjl_libtool_dso.diff
+
+ -- Matthias Klose <doko@debian.org>  Wed, 23 Jul 2003 20:09:51 +0200
+
+binutils (2.14.90.0.4-0.1) unstable; urgency=low
+
+  * NMU
+  * New upstream version.
+    1. Work around the brain dead libtool.
+  * New patches:
+    - debian/patches/500_s390_gas.diff (closes: #194929).
+    - debian/patches/905-hppa_visibility.diff (closes: #195203).
+    - debian/patches/906-mips_ld_fix.diff (closes: #195207).
+    - debian/patches/906-hjl_libtool_dso.diff
+
+ -- Matthias Klose <doko@debian.org>  Sat, 31 May 2003 12:12:10 +0200
+
+binutils (2.14.90.0.3-0.1) unstable; urgency=low
+
+  * NMU
+  * New upstream version.
+    1. Update from binutils 2003 0523.
+    2. Fix 2 ELF visibility bugs.
+    3. Fix ELF/ppc linker bugs.
+  * Remove patches applied upstream:
+    - debian/patches/903-hjl_ld-dso-test.diff
+    - debian/patches/904_hjl_hppa_whitespace.diff
+
+ -- Matthias Klose <doko@debian.org>  Sat, 24 May 2003 09:02:54 +0200
+
+binutils (2.14.90.0.2-0.1) unstable; urgency=low
+
+  * NMU
+  * New upstream version.
+    1. Update from binutils 2003 0515.
+    2. Fix various ELF visibility bugs.
+    3. Fix some ia64 linker bugs.
+    4. Add more IAS compatibilities to ia64 assembler.
+  * New patches:
+    - debian/patches/903-hjl_ld-dso-test.diff (closes: #193505).
+    - debian/patches/904_hjl_hppa_whitespace.diff.
+  * Remove patches applied upstream:
+    - debian/patches/900_binutils-2.14.90.0.1-empty-test.diff
+    - debian/patches/901-hjl_weaksymfix.diff
+
+ -- Matthias Klose <doko@debian.org>  Sun, 18 May 2003 10:50:00 +0200
+
+binutils (2.14.90.0.1-0.1) unstable; urgency=low
+
+  * NMU
+  * New upstream version.
+    - Fix: MIPS branch-to-global bug (closes: #189031).
+    - Fix: Crash on alpha with --gdwarf2 and bad file number (closes: #187211).
+    - Fix: objdump -R BFD ICE on prelinked binaries (closes: #180088).
+  * New patches:
+    - debian/patches/900_binutils-2.14.90.0.1-empty-test.diff
+    - debian/patches/901-hjl_weaksymfix.diff
+  * Remove patches applied upstream:
+    - debian/patches/002_ldlex_inflexible_transition.diff
+    - debian/patches/013_objdump_doc_fix.diff
+    - debian/patches/850_hppa_stub_fix.diff
+    - debian/patches/860_m68k_elf.diff
+    - debian/patches/861_m68k_elf.diff
+    - debian/patches/870-sparc64-update.diff
+    - debian/patches/880-alpha-update.diff
+  * Remove obsolete patch:
+    - debian/patches/patches/800_hjl_mips_fixes.diff
+  * Add x86_64 for the i386 binutils package and the binutils-multiarch
+    package (closes: #189350).
+  * Set CFLAGS to -g -O2 for build (closes: #181268).
+
+ -- Matthias Klose <doko@debian.org>  Tue,  6 May 2003 09:58:14 +0200
+
+binutils (2.13.90.0.18-1.7) unstable; urgency=high
+
+  * NMU
+  * Fixed ld segv (replaced yy_current_buffer by YY_CURRENT_BUFFER)
+    (Closes: #188876, 188900, 188912)
+
+ -- Julien LEMOINE <speedblue@debian.org>  Mon, 14 Apr 2003 04:45:03 +0200
+
+binutils (2.13.90.0.18-1.6) unstable; urgency=high
+
+  * NMU
+  * [002_ldlex_inflexible_transition.diff] New. Make ld buildable again with
+    sid's current flex.
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Sun, 13 Apr 2003 16:54:46 +0200
+
+binutils (2.13.90.0.18-1.5) unstable; urgency=medium
+
+  * NMU
+  * [890-elf64_alpha_segfault.diff] Patch from Julien LEMOINE
+    <speedblue@debian.org> to fix the segfault encountered while building
+    gal on alpha. (Closes: #185556)
+  * sid's current flex breaks the building of several packages, including this
+    one; see #188665. The i386 upload is built using a pbuilder sid chroot
+    with flex downgraded to the sarge version.
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Sun, 13 Apr 2003 13:44:17 +0200
+
+binutils (2.13.90.0.18-1.4) unstable; urgency=low
+
+  * NMU
+  * ld/emulparams/elf64_sparc.sh: Set LIBPATH_SUFFIX instead of suffix
+    for emulation. Patch from current CVS suggested by Clint Adams,
+    needed for sparc64 glibc build.
+  * bfd/elf64-alpha.c: Patch from current CVS suggested by Falk Hueffner,
+    needed to build xstow, kdegames (#181623), sfs.
+  * Explicitely fail, when trying to build with glibc-2.3 on arm and
+    m68k. See #184048 for m68k ld failures.
+
+ -- Matthias Klose <doko@debian.org>  Tue,  8 Apr 2003 23:27:46 +0200
+
+binutils (2.13.90.0.18-1.3) unstable; urgency=low
+
+  * NMU
+  * Another fix for ELF/m68k (__bb_exit_func initialization).
+
+ -- Matthias Klose <doko@debian.org>  Tue, 18 Mar 2003 00:05:47 +0100
+
+binutils (2.13.90.0.18-1.2) unstable; urgency=high
+
+  * NMU
+  * Apply upstream fix for ELF/m68k.  Closes: #182313.
+  * Use gcc-2.95 on m68k-linux. Built on testing (glibc-2.2).
+
+ -- Matthias Klose <doko@debian.org>  Sun,  9 Mar 2003 01:02:39 +0100
+
+binutils (2.13.90.0.18-1.1) unstable; urgency=low
+
+  * NMU
+  * Apply upstream fix for hppa stubs.  Closes: #181397
+
+ -- LaMont Jones <lamont@debian.org>  Wed, 19 Feb 2003 12:34:58 -0700
+
+binutils (2.13.90.0.18-1) unstable; urgency=low
+
+  * New upstream version (synced with CVS 2002-01-21)
+  * Upstream: Fix an ia64 gas bug
+  * Upstream: Fix some TLS bugs
+  * Upstream: Fix ELF/ppc bugs
+  * Upstream: Fix an ELF/m68k bug
+  * Corrected ARM combreloc disabling patch
+    (closes: Bug#175204)
+  * Upstream fixes take care of TEXTREL bug
+    on powerpc (closes: Bug#176084)
+  * Fixed shellutils dependency problem
+    (closes: Bug#175673)
+  * Removed mention of the monitor manpage
+    from the gprof manpage (closes: Bug#160654)
+
+ -- Christopher C. Chimelis <chris@debian.org>  Sun, 2 Feb 2003 23:17:29 -0500
+
+binutils (2.13.90.0.16-1) unstable; urgency=low
+
+  * New upstream version (synced with CVS 2002-11-26)
+  * Upstream: Include /usr/bin/c++filt
+  * Upstream: Fix "ld -r" with exception handling
+
+ -- Christopher C. Chimelis <chris@debian.org>  Mon, 9 Dec 2002 19:14:02 -0500
+
+binutils (2.13.90.0.14-1) unstable; urgency=low
+
+  * New upstream version (synced with CVS 2002-11-14)
+  * Upstream: Fix ELF/alpha bugs
+  * Upstream: Fix an ELF/i386 assembler bug
+  * Updated package MIPS patch from HJ Lu
+  * Added s390 patches from Gerhard Tonn.
+    Actually, the patches to support s390x were
+    already included upstream, so I just enabled
+    it in the rules script (closes: Bug#168074, Bug#168974)
+  * Since powerpc64-linux support was already
+    added in a prior upload, I'm closing the
+    wishlist bug for it (closes: Bug#156955)
+
+ -- Christopher C. Chimelis <chris@debian.org>  Tue, 20 Nov 2002 05:36:21 -0500
+
+binutils (2.13.90.0.10-2) unstable; urgency=low
+
+  * Added two patches from upstream to fix alpha BFD.
+    (closes: Bug#165633)
+
+ -- Christopher C. Chimelis <chris@debian.org>  Sun, 27 Oct 2002 14:21:51 -0400
+
+binutils (2.13.90.0.10-1) unstable; urgency=low
+
+  * New upstream version (synced with CVS 2002-10-10)
+  * Upstream: More ELF/PPC linker bug fixes.
+  * Upstream: Fix an ELF/alpha linker bug.
+  * Upstream: Fix an ELF/sparc linker bug to support
+    Solaris.
+  * Upstream: More TLS updates.
+  * Updated m68k gcc 3.1 patch since it wasn't applying
+    cleanly. Is this still needed?
+  * Added patches to allow building with new bison
+    (closes: Bug#164436, Bug#164042)
+  * Should be better for prelink support, which is coming
+    soon (closes: Bug#161427)
+  * Removed windres manpage from all packages
+    (closes: Bug#157415)
+  * Fixed download location in copyright file
+    (closes: Bug#158028)
+  * Added i386-gnu to multiarch build targets
+    (closes: Bug#157057)
+  * Add alpha opcode patch from Falk Hueffner
+    (closes: Bug#164201)
+  * Remove .la files from packages
+    (closes: Bug#160455)
+
+ -- Christopher C. Chimelis <chris@debian.org>  Mon, 15 Oct 2002 20:22:29 -0400
+
+binutils (2.13.90.0.4-1) unstable; urgency=low
+
+  * New upstream version (synced with CVS 2002-08-)
+  * Upstream: Update from binutils 2002 0814
+  * Upstream: Fix symbol versioning bugs for gcc 3.2
+  * Upstream: Fix mips gas
+  * Upstream: Fix an x86 TLS bfd bug
+  * Upstream: Fix an x86 PIC gas bug
+
+ -- Christopher C. Chimelis <chris@debian.org>  Thu, 15 Aug 2002 20:13:44 -0400
+
+binutils (2.12.90.0.15-2) unstable; urgency=low
+
+  * Fix combreloc disabling patch for ARM
+    (closes: Bug#156315)
+  * Remove S390 patch since it is no longer
+    needed (thanks to Gerhard Tonn for checking
+    this out)
+  * Fix BFD version string escaping
+    (closes: Bug#154989)
+  * Add SH patch from Yaegashi Takeshi
+    (closes: Bug#156230)
+  * Added conflicts for older modutils
+    (closes: Bug#155324)
+  * Forgot to apply MIPS patch from HJ Lu
+    (apologies to MIPS folks)
+
+ -- Christopher C. Chimelis <chris@debian.org>  Wed, 14 Aug 2002 13:09:12 -0400
+
+binutils (2.12.90.0.15-1) unstable; urgency=low
+
+  * New upstream version (synced with CVS 2002-07-17)
+  * Upstream: Fix an ia64 assembler bug
+  * Upstream: Fix a symbol versioning bug
+  * Upstream: You have to apply the modutils patch
+    enclosed here in order to support System.map
+    generated by the new nm (bug filed)
+  * The symbol visibility patch is included
+    upstream, as is the alpha PLT/GOT patch, so
+    both removed from my packaging.
+  * Included patch from upstream to fix RELA targets
+    (closes: Bug#153729)
+
+ -- Christopher C. Chimelis <chris@debian.org>  Thu, 2 Aug 2002 02:24:29 -0400
+
+binutils (2.12.90.0.14-2) unstable; urgency=low
+
+  * The "Let's Get This Party Started Right" upload
+    (since I'm closing as many old bugs as possible)
+  * Removed sparc patch altogether
+  * Added a small alpha patch from upstream to fix
+    some obscure PLT/GOT issues.
+  * Manpages are now fixed finally -- no more
+    I<symbol> (closes: Bug#108369)
+  * Have not gotten another report of the
+    debconf message being cut off, so I'm closing
+    the debconf-related bug.  I suspect this may
+    have been a problem in the debconf front-end
+    being used, but I have not been able to reproduce
+    it (closes: Bug#149045)
+  * Closing a bug report that I had tagged moreinfo
+    a LONG time ago (over one year), but never got
+    more info on.  I have not heard of this kind
+    of problem since, nor have I been able to
+    reproduce it at any time since (closes: Bug#105986).
+    For interested parties, it revolved around
+    allowing gcc to show a linker error, but the
+    reporter didn't know about the -v option for
+    gcc.  There was a linker problem, but it appeared
+    to be either hardware failure or user error.
+  * Closing a demangler 'bug' that revolved around
+    stripping @PLT from symbol names.  Since the
+    PLT suffix is documented, I'm going to close
+    this bug.  Also, it doesn't help that the symbol
+    in the bug report uses an obsolete mangling style,
+    so I can't test this even if I wanted to
+    (closes: Bug#45889)
+
+ -- Christopher C. Chimelis <chris@debian.org>  Mon, 22 Jul 2002 12:54:01 -0400
+
+binutils (2.12.90.0.14-1) unstable; urgency=low
+
+  * New upstream version (synced with CVS 2002-06-27)
+  * Upstream: Fix a mips assembler bug
+  * Upstream: Fix an ELF/mips SHF_MERGE bug
+  * Upstream:  Fix a linker bug which leads to the
+    incorrect Linux 2.2 kernel.
+  * PE patch removed since it is included
+    in upstream source now
+  * Includes some patches which allow for
+    more true testsuite results from gcc-3.1
+  * Fix sparc ld emulation script patches to get
+    rid of the lib/64 silliness (now uses lib64)
+  * Removed the L word from the package description
+    since Debian is no longer linux-only
+    (closes: Bug#150575)
+  * The strings dereferencing problem with
+    some Windows binaries seems to also be fixed now
+    (closes: Bug#121366)
+  * Added a patch to only generate an RPATH entry
+    if LD_RUN_PATH is not empty, for cases where
+    -rpath isn't specified (closes: Bug#151024)
+  * Fixed arch detection problem in the build
+    scripts.
+  * Fixed bad capitalisation of -g in the objdump
+    manpage (closes: Bug#152697)
+  * Added patch from HJ Lu to fix a symbol
+    visibility issue.
+
+ -- Christopher C. Chimelis <chris@debian.org>  Wed, 17 Jul 2002 14:23:42 -0400
+
+binutils (2.12.90.0.9-1) unstable; urgency=low
+
+  * New upstream version (synced with CVS 2002-05-26).
+  * Upstream: Supports "-z muldefs"
+  * Updated PE bfd from CVS to fix auto-import
+    segfaults (closes: Bug#131407)
+  * Remove the PE-removing patch for i386 targets
+    due to the above
+
+ -- Christopher C. Chimelis <chris@debian.org>  Thu, 6 Jun 2002 15:52:29 -0400
+
+binutils (2.12.90.0.7-1) unstable; urgency=low
+
+  * New upstream version (synced with CVS 2002-04-23).
+  * Upstream: ELF EH frame bug fix
+  * Upstream: MIPS ELF visibility bug fix
+  * Upstream: Bug fixes for ELF/sparc
+  * Upstream: Bug fixes for ELF/cris
+  * Upstream: Fix linking a.out relocatable files
+    with ELF
+  * Upstream: Fix a PPC altivec assembler bug
+  * Numerous upstream changes since I have
+    deliberately not updated in awhile so that
+    I could stabilise the package for woody
+    release
+  * Fixed a glaring typo in the Debian additions
+    to the version string.
+  * Upstream incorporated --oformat
+    documentation patch; removed.
+  * Added a patch from upstream involving
+    relative relocs on Alpha
+  * Removed configure.info-[1-3] from -doc
+    (closes: Bug#146205)
+
+ -- Christopher C. Chimelis <chris@debian.org>  Sun, 5 Apr 2002 04:52:33 -0400
+
+binutils (2.12.90.0.1-5) unstable; urgency=high
+
+  * Added a patch to m68k bits for gas to allow
+    gcc 3.1 to build
+  * Added Brazilian Portuguese translation for
+    debconf (closes: Bug#144677)
+  * Removed unneeded gasp manpage since gasp
+    was eliminated as a distinct binary
+    (closes: Bug#144583)
+
+ -- Christopher C. Chimelis <chris@debian.org>  Mon, 29 Apr 2002 14:40:21 -0400
+
+binutils (2.12.90.0.1-4) unstable; urgency=low
+
+  * Added patch from Gerhardt Tonn
+    to fix s390 merge problem (closes: Bug#143187)
+  * Corrected DOW of my last changelog entry :-P
+
+ -- Christopher C. Chimelis <chris@debian.org>  Thu, 18 Apr 2002 13:03:49 -0400
+
+binutils (2.12.90.0.1-3) unstable; urgency=low
+
+  * Oops...I used dpkg-architecture from dpkg-dev
+    in the postinst and didn't add a dependency
+    for it.  It was a bad choice anyway and I'm
+    going to use uname -s instead
+    (closes: Bug#142744, Bug#142915)
+
+ -- Christopher C. Chimelis <chris@debian.org>  Mon, 15 Apr 2002 12:41:10 -0400
+
+binutils (2.12.90.0.1-2) unstable; urgency=low
+
+  * Added Catalan debconf translation
+    (closes: Bug#139740)
+  * Ensure that info entries are removed from the
+    texinfo dirfile when binutils-doc is removed
+    (closes: Bug#126557)
+  * Ensure that the kernel link debconf warning
+    only shows up on linux systems
+    (closes: Bug#142360)
+
+ -- Christopher C. Chimelis <chris@debian.org>  Thu, 13 Mar 2002 01:30:22 -0400
+
+binutils (2.12.90.0.1-1) unstable; urgency=high
+
+  * New upstream version (synced with CVS 2002-03-07).
+  * Upstream: Add the .preinit_array/.init_array/.fini_array
+    support.
+  * Upstream: Fix eh_frame.
+  * Upstream: Turn on combreloc by default.
+  * Upstream: Enable gprof for Linux/mips.
+  * Turn combreloc off for ARM explicitely until
+    I can confirm that PIC is not still broken
+    by using it.
+  * Remove IA-64 unwind patch and objcopy fix
+    since they are included in the upstream sources
+    now.
+  * Re-enable testsuite run since Randolph did the NMU
+    on dejagnu (thank you!).
+  * Appears to fix sparc64 linking problems.  I'm
+    still looking into exactly what was going on with
+    that (closes: Bug#137850)
+  * Enabled hppa64-linux support in main binutils
+    package (closes: Bug#137955)
+  * Added Japanese debconf template.  Thanks to
+    Tomohiro KUBOTA for supplying that
+    (closes: Bug#138112)
+  * Added patch for ld to fix dosemu problems
+    (closes: Bug#126863)
+
+ -- Christopher C. Chimelis <chris@debian.org>  Mon, 11 Mar 2002 14:02:45 -0500
+
+binutils (2.11.93.0.2-3) unstable; urgency=high
+
+  * Split translated debconf templates out.
+    I apparently misunderstood the instructions
+    on integrating the French translation since
+    this is my first real attempt at using
+    debconf (closes: Bug#136295)
+  * Disable combreloc default on ARM since it
+    breaks PIC, apparently (closes: Bug#134241)
+    Please test other ARM bugs against this
+    version and inform me of the results!
+
+ -- Christopher C. Chimelis <chris@debian.org>  Fri, 8 Mar 2002 19:10:10 -0500
+
+binutils (2.11.93.0.2-2) unstable; urgency=high
+
+  * Include a patch from upstream to fix stripping
+    archives containing multiple files with the
+    same name (like libgcj, unfortunately).
+    (closes: Bug#107812)
+  * Include IA64 unwind fix from CVS to fix kernel
+    linking on IA64. (closes: Bug#135143)
+  * Added French translation of the debconf
+    bits.  Thanks to Denis Barbier for the
+    work on that. (closes: Bug#134626)
+  * Disabled testsuite run until dejagnu is
+    fixed.  I'm leaving the build-dep for dejagnu
+    in, though, since I know I'll forget to
+    reinsert it when I do re-enable the testsuite
+    run.
+
+ -- Christopher C. Chimelis <chris@debian.org>  Fri, 22 Feb 2002 14:05:22 -0500
+
+binutils (2.11.93.0.2-1) unstable; urgency=high
+
+  * New upstream version (synced with CVS 2002-02-07).
+  * Upstream: Fix a weak symbol alpha linker bug for glibc.
+  * Upstream: More support for gcc 3.1.
+  * Keep on disabling efi-app-ia32 type targets
+    since the segfault is still unfixed in CVS and
+    I haven't had the time to go back and really
+    debug and fix this.
+  * Updated standards version.
+  * Corrected some of the lintian problems (all except
+    the ones involving Changelog.linux, the .comment
+    section, and the missing manpages for
+    binutils-multiarch's binaries since that package
+    depends on binutils, which provides those).
+
+ -- Christopher C. Chimelis <chris@debian.org>  Wed, 13 Feb 2002 13:41:47 -0500
+
+binutils (2.11.92.0.12.3-7) unstable; urgency=high
+
+  * The "Remind Me To Think Next Time" upload.
+  * Fix the postinst to only compare versions on
+    upgrade rather than during configure.
+    (closes: Bug#133349, Bug#133514)
+  * Still working on the other bugs...if only
+    I could get a day off of work...
+
+ -- Christopher C. Chimelis <chris@debian.org>  Tue, 12 Feb 2002 06:15:02 -0500
+
+binutils (2.11.92.0.12.3-6) unstable; urgency=high
+
+  * The "Make The Bad Man Stop" upload.
+  * Revert patch to bfd/elf32-sparc.c (already
+    reverted upstream) that broke UA32 relocs on sparc
+    and caused bus errors with C++/Java binaries
+    (closes: Bug#126162)
+  * Remove i486-mingw32 target from the enabled
+    in multiarch and removed efi-app-ia32 from the
+    BFD config for Intel linux targets until I can find
+    and fixthe segfaults that seem to keep coming up when
+    reading Windows files and viruses with objdump or
+    strings.  This is only temporary, so I'm not closing
+    the bugs until the problem gets fixed, but
+    I am going to bump them down to wishlist, merge
+    them, and note the above in them.
+    (debian/patches/010_disable_efi_app_ia32_TEMPORARY.diff
+    disables the efi-app-ia32 BFD in case someone
+    wants to revert this change easily)
+  * Added debconf warning about the kernel linking
+    situation since it keeps coming up and people
+    keep initially disagreeing with me about this
+    being a kernel bug.  Also, merged prior warning
+    about -oformat change into the same debconf warning
+    (it's two, two, two warnings in one).  This makes
+    the DEBIAN_FRONTEND case bug moot (closes: Bug#131801)
+  * Added powerpc64-linux target to multiarch since
+    work is progressing on that target and the machines
+    are due to hit the shelves Very Soon(TM).
+
+ -- Christopher C. Chimelis <chris@debian.org>  Fri, 1 Feb 2002 17:06:29 -0500
+
+binutils (2.11.92.0.12.3-5) unstable; urgency=high
+
+  * Fix signed char assumption in i386 disassembly bits
+    (closes: Bug#126993)
+
+ -- Christopher C. Chimelis <chris@debian.org>  Mon, 8 Jan 2002 17:27:17 -0500
+
+binutils (2.11.92.0.12.3-4) unstable; urgency=high
+
+  * Go back to enabling archs by enumeration for
+    multiarch.  Apparently, a few aren't enabled
+    with --enable-targets=all (sparc64-linux, namely).
+    Besides, multiarch was incredibly large, which
+    was probably unneeded.
+
+ -- Christopher C. Chimelis <chris@debian.org>  Wed, 26 Dec 2001 13:53:49 -0500
+
+binutils (2.11.92.0.12.3-3) unstable; urgency=high
+
+  * Include patch from Alan Modra to fix more
+    refcount problems on hppa.
+
+ -- Christopher C. Chimelis <chris@debian.org>  Fri, 7 Dec 2001 05:42:04 -0500
+
+binutils (2.11.92.0.12.3-2) unstable; urgency=high
+
+  * Include patch from Alan Modra to fix hppa linking
+    woes wrt undefined symbols (closes: Bug#121993)
+
+ -- Christopher C. Chimelis <chris@debian.org>  Wed, 5 Dec 2001 04:14:51 -0500
+
+binutils (2.11.92.0.12.3-1) unstable; urgency=high
+
+  * New upstream version (synced with CVS 2001-11-21)
+  * Upstream: Fix a linker symbol version bug
+    for common symbols.
+  * Upstream: Update handling relocations against
+    the discarded sections. You may need to apply
+    the kernel patch enclosed here to your kernel
+    source.
+  * Upstream: Support "-march=xxx -mipsN" for mips
+    gas if they are compatible.
+  * Upstream: Fix a regression when linking with
+    non-ELF object files.
+  * Includes Alan Modra's patch to reduce stub sizes
+    on HPPA.  Should help C++ on HPPA.
+  * Once again includes a mips patch from HJ Lu.
+  * My documentation changes were cleaned up and
+    accepted upstream, so the gas manpage fixes go
+    away (hurray!).
+  * Stopped iterating targets for binutils-multiarch
+    and started enabling all of them.  This saves
+    maintenance time since new targets will be
+    automatically supported in future uploads
+    and existing targets that I didn't include
+    before will be supported from now on.  This may
+    grow build time and the libbfd in the multiarch
+    package, but it's worth it.
+  * Also, started using the --enable-64-bit-bfd
+    flag for configuring multiarch.  I don't know
+    why I didn't realise this wasn't there before
+    since I test with it all of the time.
+
+ -- Christopher C. Chimelis <chris@debian.org>  Fri, 30 Nov 2001 20:11:42 -0500
+
+binutils (2.11.92.0.10-4) unstable; urgency=high
+
+  * The "Fingers crossed" upload.
+  * Enable combreloc by default for s390 again.
+    Rumour has it that it worked before, but there
+    was a misunderstanding in the s390 developer
+    community, hence the disabling in the past.
+  * Fix the ld texinfo file to not mention the old
+    oformat invocation (closes: Bug#116182)
+  * Next upload should include the mips updates and
+    some powerpc updates.  I just need time to test
+    those out first.
+
+ -- Christopher C. Chimelis <chris@debian.org>  Fri, 23 Nov 2001 23:23:22 -0500
+
+binutils (2.11.92.0.10-3) unstable; urgency=high
+
+  * Replace HPPA reloc patch with patches from Alan
+    Modra upstream.
+  * Add upstream patch to fix quoted -rpath bug
+    (closes: Bug#107214)
+
+ -- Christopher C. Chimelis <chris@debian.org>  Sat, 10 Nov 2001 18:19:05 -0400
+
+binutils (2.11.92.0.10-2) unstable; urgency=high
+
+  * Disable -z combreloc enable patch on S/390
+    since it's not supported there yet
+    (closes: Bug#117087)
+
+ -- Christopher C. Chimelis <chris@debian.org>  Fri, 26 Oct 2001 00:07:01 -0400
+
+binutils (2.11.92.0.10-1) unstable; urgency=high
+
+  * New upstream version (synced with CVS 2001-10-21)
+  * Upstream: Fix the ELF/PPC linker.
+  * Upstream: Fix the ELF/cris linker.
+  * Upstream: Fix ELF strip.
+  * Includes beginnings of Altivec support
+    (closes: Bug#98617)
+  * Fixes use of BookE instruction format on 4xx
+    PowerPC (closes: Bug#116627)
+  * Includes patches from Alan Modra to fix hppa
+    relocations.
+  * Forgot to close the previous PPC bug with last
+    upload (closes: Bug#116454)
+  * Moved to enclosing a bzipped tarball rather than
+    a gzipped one to save download time for everyone
+    involved.  Build-deps adjusted accordingly.
+
+ -- Christopher C. Chimelis <chris@debian.org>  Tue, 23 Oct 2001 03:29:49 -0400
+
+binutils (2.11.92.0.7-2) unstable; urgency=high
+
+  * Include a patch from H.J Lu to fix a powerpc
+    issue not shown in the testsuite results.
+
+ -- Christopher C. Chimelis <chris@debian.org>  Fri, 19 Oct 2001 00:49:04 -0400
+
+binutils (2.11.92.0.7-1) unstable; urgency=high
+
+  * New upstream release (synced with CVS 2001-10-16)
+  * Upstream:  Fix all breakages introduced in 2.11.92.0.5
+  * No mips/ dir patches need to be applied with this one.
+    Woohoo!
+  * Removed patches from debian/patches that are already
+    applied upstream.
+  * Patched version strings to reflect that this is a
+    Debian release at the request of upstream (to prevent
+    confusion, apparently).
+  * Applied patch from H.J. Lu to fix mips section
+    misalignment.
+  * Applied patch from Jakub Jelinek to fix kernel linking
+    on i386 and possibly other archs (closes: Bug#116041)
+  * Fixed postinst and prerm for binutils-doc to test that
+    the files exist before calling install-info.  This should
+    fix the odd circumstance when binutils-doc is packaged on
+    an arch that doesn't support gprof (or any other dir for
+    that matter) and, therefore, the docs that are usually
+    made in that dir aren't made.  This is particularly true
+    with gprof on mips.
+
+ -- Christopher C. Chimelis <chris@debian.org>  Wed, 17 Oct 2001 18:56:51 -0400
+
+binutils (2.11.92.0.5-3) unstable; urgency=high
+
+  * Enable -z combreloc on all targets. This will make
+    prelinking possible with the prelink package.  Please
+    test this on all archs prior to upload.  If it fails, file
+    a bug immediately and I'll disable the patch for that
+    platform.
+  * Added patches from Alan Modra (from CVS) to fix other
+    archs after the refcount patch broke them.  This supercedes
+    the powerpc patch, so I replaced that with this.
+    (closes: Bug#115218)
+  * Added patch from H.J. Lu (from CVS) to fix IA64 linker
+    problems as well.
+  * Added patch from David Kimdon to specify which filename is
+    causing an error if that filename is a dir (closes: Bug#45832).
+  * Removed workaround patch for stabs problem on Alpha since
+    it appears to be causing problems on mips and is no longer
+    needed on Alpha anyway.
+  * Now runs the testsuite and includes the results in the
+    binutils package for reference.
+
+ -- Christopher C. Chimelis <chris@debian.org>  Sat, 13 Oct 2001 15:10:20 -0400
+
+binutils (2.11.92.0.5-2) unstable; urgency=high
+
+  * Applied fix from H.J. Lu to fix PowerPC target
+    (closes: Bug#115285).  Thanks to Jack Howarth
+    for forcing the issue upstream.
+
+ -- Christopher C. Chimelis <chris@debian.org>  Fri, 12 Oct 2001 23:14:51 -0400
+
+binutils (2.11.92.0.5-1) unstable; urgency=high
+
+  * New upstream release (synced with CVS 2001-10-05)
+  * Upstream: Support gcc 3.1 for IA64.
+  * Upstream: Support prelink for ELF/PPC.
+  * Upstream: Fix an ELF/x86 linker bug for Oracle
+    (closes: Bug#113614)
+  * Upstream: Fix a weak symbol bug.
+  * Upstream: Support locale.
+
+ -- Christopher C. Chimelis <chris@debian.org>  Tue, 9 Oct 2001 19:53:49 -0400
+
+binutils (2.11.90.0.31-2) unstable; urgency=high
+
+  * Applied IA64 patch from CVS to fix gcc issues
+    on IA64.
+
+ -- Christopher C. Chimelis <chris@debian.org>  Mon, 24 Sep 2001 12:45:29 -0400
+
+binutils (2.11.90.0.31-1) unstable; urgency=high
+
+  * New upstream source (synced with CVS 2001-08-30)
+  * Upstream: Fix a MIPS linker bug.
+  * Now applying mips diffs from H.J. Lu (upstream)
+    for better MIPS and MIPS64 support.
+  * Applied patch from Christopher Cramer to fix
+    gasp .REG issue (closes: Bug#110560)
+
+ -- Christopher C. Chimelis <chris@debian.org>  Sat, 1 Sep 2001 23:42:22 -0400
+
+binutils (2.11.90.0.29-1) unstable; urgency=high
+
+  * New upstream source (synced with CVS 2001-08-27)
+  * Upstream: Fix an Alpha assembler bug.
+  * Upstream: Fix an IA64 linker bug.
+  * Upstream: Fix a MIPS linker bug.
+  * Upstream: Support '-z combreloc|nocombreloc' in linker.
+
+ -- Christopher C. Chimelis <chris@debian.org>  Thu, 30 Aug 2001 04:48:04 -0400
+
+binutils (2.11.90.0.27-4) unstable; urgency=high
+
+  * Argh.  Really remove the manpages from multiarch
+    this time (closes: Bug#110410)
+
+ -- Christopher C. Chimelis <chris@debian.org>  Tue, 28 Aug 2001 14:32:34 -0400
+
+binutils (2.11.90.0.27-3) unstable; urgency=high
+
+  * Include hppa patch to force error
+    (closes: Bug#109173)
+  * Fix manpages - seems that I accidentally included
+    the multiarch manpages rather than the target
+    manpages (sorry).
+  * Partial update to as manpage to denote arch options
+    and added options for the rest of the targets
+    Still need to elaborate on them, though.  More
+    changes are forthcoming (closes: Bug#110127)
+
+ -- Christopher C. Chimelis <chris@debian.org>  Mon, 27 Aug 2001 10:13:27 -0400
+
+binutils (2.11.90.0.27-2) unstable; urgency=high
+
+  * Remove bash dependency...ash's behaviour has
+    already been modified, so it should be able
+    to build binutils now (closes: Bug#106992)
+  * Includes new S/390 patch (closes: Bug#109300)
+  * Could never reproduce objdump segfault and
+    never got a reply on the bug report
+    (closes: Bug#93884)
+  * Can't reproduce m68k segfault either
+    (closes: Bug#87714)
+
+ -- Christopher C. Chimelis <chris@debian.org>  Mon, 20 Aug 2001 23:07:30 -0400
+
+binutils (2.11.90.0.27-1) unstable; urgency=high
+
+  * New upstream source (synced with 20010810 CVS)
+  * Upstream: Fixed x86 linker bug.
+  * Reverted a patch to gas to dodge a bug in STABS output
+    on Alpha using gcc 2.95.4, so alpha can be in sync
+    with the rest of the archs now.
+  * Fixes strip problems with busybox (closes: Bug#106593)
+  * Kernels should compile ok again on i386
+    (closes: Bug#107190)
+
+ -- Christopher C. Chimelis <chris@debian.org>  Thu, 16 Aug 2001 08:24:49 -0400
+
+binutils (2.11.90.0.25-1) unstable; urgency=high
+
+  * New upstream source (synced with 20010726 CVS)
+  * Upstream: fix i386 assembler bug.
+  * Upstream: "make check" has 2 failures in the
+    ld-selective test in ld on Linux/alpha. They
+    should be marked xfail. Fixed in the next release.
+  * Removed m68k patch (closes: Bug#106431)
+  * Man pages appear to be correctly generated now
+    (closes: Bug#98569, Bug# 98938)
+  * Added bash build dependency (closes: Bug#106992)
+  * Should compile ok on powerpc (the last one did
+    also...don't know why voltaire's build daemon failed).
+    I won't close this bug until I build it myself
+    on voltaire or hear back from the autobuilder folks
+    on PPC.
+  * Looking into the whole LD_LIBRARY_PATH issue that
+    keeps being brought up.  I think the docs are wrong
+    because the templates say that it shouldn't obey that
+    at all.  Can we please stop filing duplicate bugs for
+    this?  I would greatly appreciate it...
+
+ -- Christopher C. Chimelis <chris@debian.org>  Wed, 1 Aug 2001 07:06:52 -0400
+
+binutils (2.11.90.0.24-1) unstable; urgency=high
+
+  * New upstream source (synced with 20010714 CVS)
+  * DO NOT COMPILE FOR ALPHA.  I need to fix gcc 2.95.4
+    prior to this release working on Alpha correctly
+    (long story).
+  * Upstream: Avoid COPY relocs on i386
+  * Upstream: Fix IA64 assembler (please try this and let me know)
+  * Upstream: Fix a static linking the PIC object files on ia32
+  * Upstream: Add the version script support for --export-dynamic
+  * Upstream: Fix sparc/elf for linux/sparc
+  * Upstream: Fix alpha/elf for gcc 3.0
+  * Supposedly required for gcc-3.0 usage on many platforms
+  * Add s390 to multiarch list (closes: Bug#98095)
+  * Supposedly good on mips, but please check.  I emailed Ryan
+    to see if bug 98095 still happens, but never got a reply.
+    If I get around it, I'll check it myself since my mips
+    lives once again.
+  * Retake my package from Matt (next time we agree to an NMU,
+    please don't change the maintainer name...no wonder I didn't
+    get any bug reports!)
+  * Cross-compilation support will be added in the next upload
+    (I'll be uploading alpha debs with the next release as well,
+    the alpha problem outweighs cross-compilation support in
+    priority right now).
+
+ -- Christopher C. Chimelis <chris@debian.org>  Thu, 19 Jul 2001 05:12:05 -0400
+
+binutils (2.11.90.0.7-2) unstable; urgency=high
+
+  * Applied patch from Alan Modra to fix m68k
+    assertion problems (closes: Bug#96352)
+  * Applied srec patch from Richard Henderson for
+    alpha.
+
+ -- Christopher C. Chimelis <chris@debian.org>  Wed, 9 May 2001 03:11:19 -0400
+
+binutils (2.11.90.0.7-1) unstable; urgency=high
+
+  * New upstream source (synced with 20010425 CVS)
+  * Upstream: Fix the -Bsymbolic bug introduced in
+    binutils 2.11.90.0.5 (closes: Bug#95168)
+
+ -- Christopher C. Chimelis <chris@debian.org>  Sun, 29 Apr 2001 20:03:22 -0400
+
+binutils (2.11.90.0.5-1) unstable; urgency=high
+
+  * New upstream source (synced with 20010414 CVS)
+  * Upstream: Fix in IA64 assembler
+  * Upstream: Change Linux/MIPS to use SVR4 MIPS ABI
+    rather than IRIX ABI.
+  * The above change may cause problems for MIPS.
+    If so, please file a bug and I'll revert those
+    changes if need be.  I suspect that glibc, gcc,
+    and the kernel may eventually follow suit, though
+    to fit in with this change (it makes sense...
+    see the symbol ordering problems threads on the
+    binutils list for more info).
+  * Upstream: IA32 gas bug fixed...no further details
+    provided, unfortunately.
+  * Reportedly fixes core dumping when trying to link
+    object files from other platforms (now warns)
+    (closes: Bug#60502)
+  * Includes Philip Blundell's ARM PLT patch finally...
+    sorry for the delay (closes: Bug#94181)
+  * m68k problems should be fixed by now.  Wish I had
+    gotten more feedback, but I didn't so I'm assuming it
+    works at this point (closes: Bug#74396)
+  * Stopped compiling cross-compiler packages until we
+    work out a better system for the entire toolchain.
+    Sorry, but it was taking far too long on even fast
+    machines and I've gotten more complaints about the
+    current arrangement than I have positive feedback.
+    (closes: Bug#91120, Bug#91119, Bug#91118, Bug#91117,
+     Bug#91116, Bug#88311, Bug#78028, Bug#90177)
+  * Fixed readelf manpage so that it no longer says that
+    it is a preprocessor for assembly programs
+    (closes: Bug#90798)
+
+ -- Christopher C. Chimelis <chris@debian.org>  Tue, 17 Apr 2001 20:07:14 -0400
+
+binutils (2.11.90.0.1-1) unstable; urgency=high
+
+  * New upstream source (synced with 20010309
+    CVS).
+  * Fixed misapplied m68k ld patch.
+    I am hoping that this almost totally fixes
+    m68k ELF for now.
+  * Fixed typo in mips patch and applied another
+    mips patch from Daniel Jacobowitz.
+  * Should no longer build same-arch cross
+    packages.  Please let me know if this fix
+    worked so that I can close the bugs (I have
+    no access to such an arch at the moment)
+  * Made urgency high since m68k really needs
+    this if the bugs are truly fixed.  Even if
+    not, this version is infinitely better on
+    at least two platforms than prior ones were.
+
+ -- Christopher C. Chimelis <chris@debian.org>  Thu, 15 Mar 2001 16:29:32 -0500
+
+binutils (2.10.91.0.2-4) unstable; urgency=low
+
+  * Applied m68k ld and bfd patches from
+    Michael Fedrowitz to hopefully make things
+    better on m68k.
+
+ -- Christopher C. Chimelis <chris@debian.org>  Sun, 11 Mar 2001 20:16:44 -0500
+
+binutils (2.10.91.0.2-3) unstable; urgency=low
+
+  * Adjusted the priority of binutils-doc to
+    optional.
+  * Added debhelper build-depends (closes: Bug#87690)
+  * Fixed postinst problem for new binutils
+    installations (closes: Bug#87911)
+
+ -- Christopher C. Chimelis <chris@debian.org>  Thu, 1 Mar 2001 15:06:50 -0500
+
+binutils (2.10.91.0.2-2) unstable; urgency=low
+
+  * Add support for SH and IA64 to binutils-multiarch.
+  * Applied m68k gas patch from Michael Fedrowitz
+    in hopes that this will fix the grave bug that
+    has been such a pain to m68k folks.  I'll leave
+    the bug open until it's verified that it works
+    ok.
+  * Applied IA-64 printf patch (closes: Bug#82702)
+  * Kernels appear to be building fine with this
+    release on all archs available to me
+    (closes: Bug#77610)
+  * Added text during postinst that informs users
+    to modify their i386 kernel Makefiles for the
+    --oformat change (closes: Bug#86995)
+  * Incorporated remaining mips diffs that weren't
+    already applied upstream (closes: Bug#81280)
+  * Sparc/sparc64 patch seems to be doing fine, so
+    closing the bug (closes: Bug#86781)
+  * Added non-linux cross- package support to rules
+    (closes: Bug#79948)
+  * Close misc bugs:
+    Missing info file in binutils-doc (closes: Bug#78754)
+
+ -- Christopher C. Chimelis <chris@debian.org>  Thu, 22 Feb 2001 19:36:12 -0500
+
+binutils (2.10.91.0.2-1) unstable; urgency=low
+
+  * New upstream version.
+  * Added weak symbol relocation patch for sparc/sparc64.
+  * Included m68k ELF fix from Michael Fedrowitz.
+  * BIG NOTE: any i386 kernels compiled with this will need
+    to be patched to change the ld option '-oformat' to
+    '--oformat' (extra hyphen).
+
+ -- Christopher C. Chimelis <chris@debian.org>  Tue, 20 Feb 2001 21:32:44 -0500
+
+binutils (2.10.1.0.2-1) unstable; urgency=low
+
+  * New upstream release (really prerel, but better than
+    using a CVS version).
+  * Should re-add Compaq demangling style to all
+    tools (alpha-only).
+  * Again, hopefully fixes m68k ELF support...still have
+    no idea why or how this was broken before.
+
+ -- Christopher C. Chimelis <chris@debian.org>  Mon, 20 Nov 2000 16:25:44 -0500
+
+binutils (2.10.0.27-0.cvs20001011.2) unstable; urgency=low
+
+  * Applied another PowerPC patch to correct the
+    implementation of .protected and .hidden in the
+    linker.  This should also aid in the glibc
+    transition on PowerPC.
+
+ -- Christopher C. Chimelis <chris@debian.org>  Tue, 17 Oct 2000 13:23:40 -0400
+
+binutils (2.10.0.27-0.cvs20001011.1) unstable; urgency=low
+
+  * Applied PowerPC weak symbol patch from CVS to aid
+    in glibc transition on that platform.
+
+ -- Christopher C. Chimelis <chris@debian.org>  Sun, 15 Oct 2000 19:12:22 -0400
+
+binutils (2.10.0.27-0.cvs20001011) unstable; urgency=low
+
+  * Grabbed a new CVS version since it backs out a
+    change that prevented current gcc snapshots from
+    linking properly to libstdc++v3.  This may also
+    solve some other problems related to global
+    section symbols (feedback appreciated).
+  * Finally changed my email address in the control
+    file (how I overlooked this after all of this
+    time I'll never know).
+
+ -- Christopher C. Chimelis <chris@debian.org>  Wed, 11 Oct 2000 08:59:36 -0400
+
+binutils (2.10.0.27-0.cvs20001008) unstable; urgency=low
+
+  * Removed configure.info.gz from binutils-doc since
+    it didn't really belong there. (closes: Bug#72746)
+  * Update for hppa/hppa64 targets (included testsuite
+    changes committed on 07-Oct-2000). (closes: Bug#71524)
+  * Upstream change to elflink.h to hopefully stop
+    segfaults on some archs when linking binaries to
+    shared libs.
+
+ -- Christopher C. Chimelis <chris@debian.org>  Sun,  8 Oct 2000 16:14:08 -0400
+
+binutils (2.10.0.27-0.cvs20000923.1) unstable; urgency=low
+
+  * Fixed rules file so that builds don't fail when compiling the
+    binary-arch target (added binary-cross to binary-arch).
+  * Fixed harmless attempt at removing builddir-avr twice.
+
+ -- Christopher C. Chimelis <chris@debian.org>  Thu, 28 Sep 2000 10:39:12 -0400
+
+binutils (2.10.0.27-0.cvs20000923) unstable; urgency=low
+
+  * CVS snapshot from 2000-09-23.
+  * Should fix some (most) HPPA issues.
+  * Adds binutils-m68k cross-assembler.
+
+ -- Christopher C. Chimelis <chris@debian.org>  Sun, 24 Sep 2000 10:19:20 -0400
+
+binutils (2.10.0.26-2) unstable; urgency=low
+
+  * Added the avr target for Amtel's AVR MCU's
+  * Applied Frank I. Smith <smith@amirix.com> to generate packages for
+	  multiple cross targets:
+	    + Bump rev number, NOP.
+      + Testing out bumping up the rev number.
+      + Added powerpc, arm, mipsel cross binutils packages.
+	
+ -- Christopher C. Chimelis <chris@debian.org>  Fri, 22 Sep 2000 17:31:44 -0400
+
+binutils (2.10.0.26-1) unstable; urgency=low
+
+  * New upstream source.
+  * Added mips-linux, hppa-linux, and hppa64-linux to multiarch targets
+
+ -- Christopher C. Chimelis <chris@debian.org>  Sun, 17 Sep 2000 01:05:49 -0400
+
+binutils (2.10.0.24-1) unstable; urgency=low
+
+  * New upstream source.
+  * Fixes ia32 assembler buglet.
+  * (Hopefully) fixes PPC visibility problems with
+    glibc 2.2
+
+ -- Christopher C. Chimelis <chris@debian.org>  Thu, 24 Aug 2000 16:52:44 -0400
+
+binutils (2.10.0.18-3) unstable; urgency=low
+
+  * Added build depends stuff.
+
+ -- Christopher C. Chimelis <chris@debian.org>  Sat, 5 Aug 2000 21:09:04 -0400
+
+binutils (2.10.0.18-2) unstable; urgency=low
+
+  * Added proviso to control file saying that -multiarch
+    should not be installed by the average user.
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Sat, 29 Jul 2000 20:07:15 -0400
+
+binutils (2.10.0.18-1) unstable; urgency=low
+
+  * New upstream source.
+  * Should address some needed things for glibc 2.2
+    (added new DT_XXXX dynamic tags and fixes DT_NEEDED
+    link bug)
+  * Reapplied the now-infamous "ObjC patch" until
+    we can figure out why we still have this problem
+    (hint hint hint...we really need to do this).
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Sat, 22 Jul 2000 13:18:27 -0400
+
+binutils (2.10.0.9-4) unstable; urgency=low
+
+  * Applied a patch from Ben Collins to fix sparc64
+    linker scripts
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Sat, 8 Jul 2000 07:24:10 -0400
+
+binutils (2.10.0.9-3) unstable; urgency=low
+
+  * Applied a patch from the libstdc++ mailing list to
+    make sure that the linker doesn't eat the eh_frame
+    section.
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Fri, 7 Jul 2000 10:26:59 -0400
+
+binutils (2.10.0.9-2) unstable; urgency=low
+
+  * Wow, already a bug fix.
+  * binutils-dev now provides libiberty.h
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Fri, 23 Jun 2000 19:54:39 -0400
+
+binutils (2.10.0.9-1) unstable; urgency=low
+
+  * New upstream version (more linux-specific).
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Fri, 23 Jun 2000 14:31:04 -0400
+
+binutils (2.10-1) unstable; urgency=low
+
+  * New upstream version (finally, a real release!)
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Wed, 21 Jun 2000 19:08:14 -0400
+
+binutils (2.9.5.0.46-1) unstable; urgency=low
+
+  * New upstream source.
+  * ELF visibility attribute should work correctly now.
+  * ia32 "jmp" instructions are now assembled differently
+    to use relocation for global jumps (affects PIC asm
+    code).
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Thu, 8 Jun 2000 21:34:42 -0400
+
+binutils (2.9.5.0.42-1) unstable; urgency=low
+
+  * New upstream source.
+  * Includes a testcase for hidden symbol support.
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Fri, 19 May 2000 20:48:52 -0400
+
+binutils (2.9.5.0.41-1) unstable; urgency=high
+
+  * New upstream source.
+  * Now includes patch to enable hidden symbol support
+    needed for gcc 3.0 testing.
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Fri,  5 May 2000 20:38:41 -0400
+
+binutils (2.9.5.0.37-1) frozen unstable; urgency=high
+
+  * Was forced to bring the current frozen version up to
+    upstream 2.9.5.0.37 in order to fix a rather nasty
+    i386 gas bug and also since the existing ARM patch
+    applied in 2.9.5.0.31-3 has been superceded upstream
+    (closes:Bug#62119)
+  * Includes proper demangler support for Compaq compiler
+    usage on Alpha (may be superceded upstream shortly,
+    but is good enough for potato and for Compaq's usage)
+    (closes:Bug#62079)
+  * Added cross-compilation support for individual use.
+    Please note that the binary packages do not support
+    this.  If you require this feature, you need to compile
+    the source package changing debian/rules.  Also, if
+    you do this, YMMV since things on this front are changing
+    rapidly upstream and also because cross-compiling from
+    certain platforms to others may not work (i386->alpha,
+    for example).  (closes:Bug#59246)
+  * Fixed replaces statement in binutils-multiarch
+    (closes:Bug#62496)
+  * Release Manager: I once again beg that this be included
+    in potato.  I've freed up some time to deal with bug
+    reports quickly if needed.
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Sat, 29 Apr 2000 04:03:39 -0400
+
+binutils (2.9.5.0.31-3) frozen unstable; urgency=high
+
+  * Applied patch to fix broken ARM code generation (closes:Bug#61977)
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Fri,  7 Apr 2000 15:50:42 -0400
+
+binutils (2.9.5.0.31-2) frozen unstable; urgency=high
+
+  * Remove ld from binutils-multiarch since it doesn't want to
+    link kernels on several archs properly (fixes severity:important bug)
+    (closes: Bug#61719, Bug#61615, Bug#51625)
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Mon,  3 Apr 2000 22:48:55 -0400
+
+binutils (2.9.5.0.31-1) frozen unstable; urgency=high
+
+  * Yet another patch (this time from H.J. Lu upstream) to fix
+    the unlink race condition bug.  This is VERY important and
+    needs to be in potato.  It also fixes the temp file creation
+    problem with objcopy on PPC (closes: Bug#60934)
+  * New upstream release.  Fixes a serious Alpha bug along
+    with a demangler bug and several others (closes: Bug#61121)
+  * Should fix apt-get upgrade problem...please test
+    (closes: Bug#56175)
+  * Release manager: can we squeeze this in?  I know it's a
+    new version, but the ELF bug on Alpha really needs to
+    be fixed along with the rest of the above and some others
+    not mentioned here.
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Wed, 22 Mar 2000 05:05:12 -0500
+
+binutils (2.9.5.0.22-5) frozen unstable; urgency=high
+
+  * Applied fixed patch from Colin Phipps to seal the unlink
+    race condition in bfd/cache.c (closes: Bug#58865, Bug#57831)
+  * Installed a proper changelog in binutils-doc
+    (closes: Bug#58522)
+  * Closes other older bug (closes: Bug#55801)
+  * Included bbconv.pl in binutils main package in the doc dir
+    under the gprof subdir (closes: Bug#57521)
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Tue, 14 Mar 2000 10:32:52 -0500
+
+binutils (2.9.5.0.22-4) frozen unstable; urgency=high
+
+  * Patched gprof/hertz.h to allow binutils to actually
+    build and work on Hurd (closes: Bug#57564)
+  * Patched bfd/cache.c to avoid a rare, but possible
+    security problem when as is creating/opening temp
+    files (closes: Bug#57831)
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Thu, 17 Feb 2000 10:31:05 -0500
+
+binutils (2.9.5.0.22-3) frozen unstable; urgency=high
+
+  * Removed standards.info...do we really need seven
+    bugs filed for the same problem
+    (closes: Bug#54521, Bug#54546, Bug#54614, Bug#54682, Bug#55402, Bug#55582, Bug#55602)
+  * Changed binutils-multiarch extended description
+    to mention that a cross-assembling gas is not
+    included (closes: Bug#49308)
+  * Closing a bug because it related to lack of disk space
+    (closes: Bug#52714)
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Wed, 19 Jan 2000 19:28:09 -0500
+
+binutils (2.9.5.0.22-2) unstable; urgency=high
+
+  * Added getopt.h include that was omitted in the -taso patch
+    (closes: Bug#52380)
+  * Fixed table misalignment when calling objdump --info
+    (closes: Bug#51517)
+  * Added Debian changelog to binutils-doc (closes: Bug#52574)
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Wed, 15 Dec 1999 19:14:05 -0500
+
+binutils (2.9.5.0.22-1) unstable; urgency=high
+
+  * New upstream version.
+  * More MIPS fixes.
+  * Added support for -taso linker flag for Alpha.
+  * Reapplied all previous patches.
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Wed,  7 Dec 1999 01:08:51 -0600
+
+binutils (2.9.5.0.19-1) unstable; urgency=high
+
+  * New upstream version
+  * Fixes some MIPS problems
+  * Reapplied the ObjC patch (is this ever going to be fixed upstream)
+    since it's badly needed right now
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Thu, 4 Nov 1999 15:00:35 -0400
+
+binutils (2.9.5.0.16-3) unstable; urgency=low
+
+  * Added support for mipsel-linux in binutils-multiarch
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Thu, 4 Nov 1999 15:00:35 -0400
+
+binutils (2.9.5.0.16-2) unstable; urgency=low
+
+  * Added a replaces field in the control file to fix
+    previous file overwrite problems (closes: Bug#47518, Bug#47938)
+  * Verified manpages are up to date (closes: Bug#18483)
+  * Added m68k-rtems to targets in -multiarch in hopes
+    that it will actually work as advertised (closes: Bug#47468)
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Mon, 25 Oct 1999 15:58:55 -0400
+
+binutils (2.9.5.0.16-1) unstable; urgency=low
+
+  * New upstream version.
+  * Massive bugfix upload on the Debian side:
+  * Fixes changelog problems between all of the binutils
+    debs (closes: Bug#47133, Bug#47208, Bug#47211)
+  * Fixes other overwrite problems (closes: Bug#46991, Bug#47024, Bug#46074)
+  * Multiarch should now make good diversions when
+    upgrading (closes: Bug#47359)
+  * Applied patch from Kevin Buhr to fix ld segfaults with
+    empty archives (closes: Bug#47019)
+  * Should have fixed info install problems by now
+    (closes: Bug#35935)
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Fri,  15 Oct 1999 03:18:55 -0400
+
+binutils (2.9.5.0.14-1) unstable; urgency=low
+
+  * New upstream version.
+  * Thanks to Matthias Klose for the following:
+  * Separate documentation to binutils-doc package.
+  * debian/rules:
+    - Remove extra /usr/share/doc/binutils/changelog.gz file.
+    - Move bfd docs to binutils-dev package.
+    - Move upstream changelogs to binutils-doc package.
+    - Remove standard GNU info files left in /usr/share/info.
+    - Call dh_installdocs for all packages.
+  * debian/*{dirs,files}: Remove. Mention explicitely in debian/rules.
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Wed,  6 Oct 1999 03:18:55 -0400
+
+binutils (2.9.5.0.12-2) unstable; urgency=low
+
+  * Applied patch from Matthias Klose to fix many issues including architecture detection.
+  * Rules file is now much prettier and easier to manage.
+  * Binutils is now built for i386 rather than i486 in the rules file (oops).
+  * Added diversion for readelf in binutils-multiarch.
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Tue, 21 Sep 1999 03:39:08 -0400
+
+binutils (2.9.5.0.12-1) unstable; urgency=low
+
+  * Massive bugfix release.
+  * New upstream source (finally) (closes: Bug#44934)
+  * Fixes upstream bugs on many platforms.
+  * Gives powerpc a working binutils again. (closes: Bug#45052)
+  * Now provides .code16 support on i386 (please test)
+  * Manpage for objdump should now be complete (closes: Bug#27039)
+  * Put together manpages for gasp and the new binary readelf (closes: Bug#21918)
+  * Fixes nm core dump problem (closes: Bug#41999)
+  * Applied patches from Ben Collins to add sparc64 support (closes: Bug#44426)
+  * Update Standards version
+  * FHS compliance
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Sat, 18 Sep 1999 01:21:05 -0400
+
+binutils (2.9.5.0.12-0.2) experimental; urgency=low
+
+  * Added Sparc/Sparc64 changes from Ben Collins (I really need a Sparc one of these days).
+  * Again, this should be the last experimental before a new release.
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Fri, 17 Aug 1999 16:32:05 -0400
+
+binutils (2.9.5.0.12-0.1) experimental; urgency=low
+
+  * New upstream version.
+  * Should be the last experimental before a new release.
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Thu, 9 Aug 1999 23:12:52 -0400
+
+binutils (2.9.5.0.10-0.1) experimental; urgency=low
+
+  * New upstream version.
+  * Didn't apply PPC patches...let me know if still needed
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Thu, 9 Aug 1999 23:12:52 -0400
+
+binutils (2.9.5.0.6-0.1) experimental; urgency=low
+
+  * New upstream version.
+  * Didn't apply PPC patches...let me know if still needed
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Thu, 9 Aug 1999 23:12:52 -0400
+
+binutils (2.9.4.0.8-0.1) unstable; urgency=low
+
+  * New upstream version.
+  * Applied as much of the PPC patches as I could.
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Thu, 15 Jul 1999 12:46:45 -0400
+
+binutils (2.9.4.0.3-0.1) unstable; urgency=low
+
+  * New upstream version.
+  * Apply patch from Richard Henderson to fix PPC's libpath.
+  * Apply patch from Franz Sirl to fix Richard Henderson.
+
+ -- Daniel Jacobowitz <dan@debian.org>  Sun, 6 Jun 1999 01:27:10 -0400
+
+binutils (2.9.4.0.2-0.1) unstable; urgency=low
+
+  * New upstream version.  2.9.4.0.1 was hurriedly recalled.
+
+ -- Daniel Jacobowitz <dan@debian.org>  Sun, 6 Jun 1999 01:27:10 -0400
+
+binutils (2.9.4.0.1-0.1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Daniel Jacobowitz <dan@debian.org>  Sun, 6 Jun 1999 01:27:10 -0400
+
+binutils (2.9.1.0.25-2) unstable; urgency=low
+
+  * Added ObjC patch AGAIN...sorry about that
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Sun, 23 May 1999 15:14:35 -0400
+
+binutils (2.9.1.0.25-1) unstable; urgency=low
+
+  * New upstream version - Fixes a PIII asm optimisation bug
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Sun, 23 May 1999 00:36:55 -0400
+
+binutils (2.9.1.0.24-2) unstable; urgency=low
+
+  * Reapplied ObjC patch...apparently it's still needed.
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Mon, 10 May 1999 19:53:15 -0400
+
+binutils (2.9.1.0.24-1) unstable; urgency=low
+
+  * New upstream release - fixes too many little things to mention.
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Tue,  3 May 1999 16:35:08 -0400
+
+binutils (2.9.1.0.23-1) unstable; urgency=low
+
+  * New upstream release - incorporates sparc64 and arm patches.
+  * Added RPATH patch from Joel Klecker since my last upload failed.
+  * Removed ObjC patch.  Let me know if it is still needed (doubtful, but
+    still might be).
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Mon,  5 Apr 1999 13:26:55 -0500
+
+binutils (2.9.1.0.22b-2) unstable; urgency=low
+
+  * Added patch from Joel Klecker to finally (properly) fix the rpath issue
+    (Thanks, Joel!).
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Fri,  2 Apr 1999 18:14:05 -0600
+
+binutils (2.9.1.0.22b-1) unstable; urgency=low
+
+  * Converted package to CVS (so bear with any delays in handling
+    bug fixes; I'm new to CVS ironically)
+  * New upstream version (sparc64 and ARM patches again added).
+  * Added support for mingw32 target in binutils-multiarch
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Fri, 12 Mar 1999 03:51:44 -0600
+
+binutils (2.9.1.0.19a-4) frozen unstable; urgency=high
+  * Added sparc64 patches from Steve Dunham to fix sparc64 targets
+  * Modified rules to add support for gcc/egcs by arch.
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Mon,  1 Feb 1999 15:51:19 -0600
+
+binutils (2.9.1.0.19a-3) frozen unstable; urgency=high
+
+  * Reverted a patch to elflink.h that caused problems for
+    Obj-C code (symbols weren't exported with a size or
+    type).
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Thu, 21 Jan 1999 19:25:17 -0600
+
+binutils (2.9.1.0.19a-2) frozen unstable; urgency=low
+
+  * Added arm-linux as multiarch target (sorry Jim).
+  * Uploaded to frozen to fix strange intermittant kernel
+    compilation problems (Fixes #31434).
+  * Fixed multiarch's postinst script to check for
+    c++filt.single before trying to remove it to prevent
+    warning messages if using g++ from egcs.
+  * Fixed typo in multiarch's postrm (addr2line) (Fixes: #31533)
+  * Added links to .so's for clean removal in the future (Fixes: #31536)
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Fri,  8 Jan 1999 15:28:32 -0600
+
+binutils (2.9.1.0.19a-1) unstable; urgency=low
+
+  * New upstream version; fixes some Alpha problems and other archs
+    should benefit also.
+  * Added ARM target patch from Corel again (still not in upstream).
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Mon,  4 Jan 1999 20:24:36 -0600
+
+binutils (2.9.1.0.16-1) unstable; urgency=low
+
+  * New upstream version; merges some ARM patches for Netwinders
+  * Added patch for ARM target from Corel (thanks Jim Pick)
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Mon, 30 Nov 1998 16:59:25 -0600
+
+binutils (2.9.1.0.15-5) frozen unstable; urgency=low
+
+  * Reuploaded to frozen (why it wasn't there earlier....)
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Mon, 30 Nov 1998 16:37:08 -0600
+
+binutils (2.9.1.0.15-4) unstable frozen; urgency=low
+
+  * Removed c++filt diversion in -multiarch to prevent conflicting
+    diversions when using egcs' g++ (which also wants to divert c++filt)
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Wed, 25 Nov 1998 18:06:17 -0600
+
+binutils (2.9.1.0.15-3) unstable frozen; urgency=low
+
+  * Made Roman's changes "official" (thanks Roman).
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Mon, 2 Nov 1998 05:46:56 -0600
+
+binutils (2.9.1.0.15-2.1) unstable; urgency=low
+
+  * Non-maintainer upload with agreement from Chris.
+  * Use a different soname for multi-arch libbfd and libopcodes; this
+    fixes the problem that the single-arch binaries (as and the diverted
+    ones) will all dump core because they're runtime-linked against the
+    multi-arch libs. (Fixes: #28656)
+  * Due to the above, binutils-multiarch also needs ldconfig in postinst
+    now.
+  * Fixup diversions once again: Do not even package the ldscripts for the
+    native architecture, so diversions for files in /usr/lib/ldscripts
+    aren't necessary.
+  * Also remove diversions on abort-install.
+  * Remove now obsolete diversions in preinst.
+  * Also symlink /usr/doc/binutils-multiarch to binutils, and do not
+    put /usr/doc/binutils in the package again.
+  * Put the symlinks libbfd.so and libopcode.so into binutils-dev, so one
+    can link to them.
+
+ -- Roman Hodek <Roman.Hodek@informatik.uni-erlangen.de>  Sat, 31 Oct 1998 11:31:14 +0100
+
+binutils (2.9.1.0.15-2) unstable; urgency=low
+
+  * Fixed binutils-multiarch diversions
+  * Reverted elf.c to .13 version to fix bug in strip
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Tue, 27 Oct 1998 05:26:28 -0600
+
+binutils (2.9.1.0.15-1) unstable; urgency=low
+
+  * New upstream version.
+  * Moved over to debhelper and updated standards version to 2.4.1.4.
+  * Adds 3DNow instruction support for AMD processors.
+  * Fixes MANY Alpha bugs and a few for Sparc, PPC, and m68k reportedly.
+  * Added binutils-multiarch package to allow for multiple-arch support
+    (fixes bug #19471).
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Thu, 14 Oct 1998 19:30:10 -0500
+
+binutils (2.9.1.0.13-1) unstable; urgency=low
+
+  * New upstream version, fixes bug #25354.
+  * Hopefully, all requested docs are included, fixes bug #21325.
+  * Fixes MANY Alpha problems.
+  * Reportedly may fix MIPS and Sparc problems also...see changelogs.
+  * Has been tested on x86's with great success.
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Mon,  5 Oct 1998 23:02:08 -0500
+
+binutils (2.9.1-0.2) frozen unstable; urgency=low
+
+  * Fixed binutils-dev dependencies.
+
+ -- Joel Klecker <jk@espy.org>  Tue, 05 May 1998 09:24:04 -0700
+
+binutils (2.9.1-0.1) frozen unstable; urgency=medium
+
+  * Non-maintainer release.
+  * New upstream release.
+  * Moved docs into subdirs where appropriate.
+  * Integrated the following changes from J.H.M. Dassen:
+    * Updated FSF address in copyright file. (lintian).
+    * Reported lack of "gasp" manpage (# ....), and link it to
+      undocumented(7). (lintian).
+    * Added a TODO list.
+
+ -- Joel Klecker <jk@espy.org>  Thu, 30 Apr 1998 10:43:42 -0700
+
+binutils (2.9-0.3) frozen unstable; urgency=medium
+
+  * Added upstream patch which fixes a problem with strip
+    and netscape (#17971).
+
+ -- Joel Klecker <jk@espy.org>  Tue, 28 Apr 1998 08:58:27 -0700
+
+binutils (2.9-0.2) frozen unstable; urgency=low
+
+  * Added more of the upstream docs (#21325).
+  * Put a changelog.gz symlink in /usr/doc/binutils
+    to satisfy policy.
+
+ -- Joel Klecker <jk@espy.org>  Tue, 21 Apr 1998 09:02:22 -0700
+
+binutils (2.9-0.1) frozen unstable; urgency=low
+
+  * Non-maintainer release.
+  * New upstream release (bugfixes only).
+
+ -- Joel Klecker <jk@espy.org>  Sun, 12 Apr 1998 04:11:07 -0700
+
+binutils (2.8.1.0.23-1) unstable; urgency=low
+
+  * New upstream version
+  * -dev replaces libc5-dev (#17840)
+  * No longer possible to link against shared libbbfd/opcodes (#18121)
+
+ -- Galen Hazelwood <galenh@micron.net>  Sat, 14 Mar 1998 18:19:10 -0700
+
+binutils (2.8.1.0.19-1) unstable; urgency=low
+
+  * New upstream version (#17296)
+  * Fixed typo in description (#16481)
+  * Fully replaces libbfd-dev (#16619)
+
+ -- Galen Hazelwood <galenh@micron.net>  Sun, 25 Jan 1998 15:37:03 -0700
+
+binutils (2.8.1.0.17-1) unstable; urgency=low
+
+  * New upstream version
+  * Rejoined libbfd and binutils packages (#15486)
+  * Added "SHELL=bash" to rules file (#14528)
+  * bfd info docs seem to be broken, don't install for now
+
+ -- Galen Hazelwood <galenh@micron.net>  Sat,  6 Dec 1997 14:55:26 -0700
+
+binutils (2.8.1.0.15-1) unstable; urgency=low
+
+  * New upstream version (#14250)
+  * Updated to Standard 2.3.0.0
+  * Restored ansidecl.h to libbfd-dev (#14116)
+
+ -- Galen Hazelwood <galenh@micron.net>  Thu, 30 Oct 1997 20:04:24 -0700
+
+binutils (2.8.1-2) unstable; urgency=low
+
+  * Added 2.8.1.0.4 patch
+
+ -- Galen Hazelwood <galenh@micron.net>  Thu, 12 Jun 1997 20:49:57 -0600
+
+binutils (2.8.1-1) unstable; urgency=low
+
+  * New upstream version
+  * Added 2.8.1.0.1 patch
+
+ -- Galen Hazelwood <galenh@micron.net>  Fri,  30 May 1997 14:48:42 -0600
+
+binutils (2.8-1) unstable; urgency=low
+
+  * New upstream version
+  * Smarter debian build environment (automatic version handling)
+  * Added 2.8.0.3 patch
+  * Built with libc6
+
+ -- Galen Hazelwood <galenh@micron.net>  Sun, 4 May 1997 11:16:12 -0600
+
+binutils (2.7.0.9-3) frozen unstable; urgency=low
+
+  * Patched for alpha support
+  * Distribute libiberty.a with -dev package (#8376)
+  * libbfd[x]-dev now has standard Provides/Conflicts behavior (#8377)
+
+ -- Galen Hazelwood <galenh@micron.net>  Fri, 28 Mar 1997 11:45:58 -0700
+
+binutils (2.7.0.9-2) unstable; urgency=low
+
+  * Moved 2.7.0.9 out of experimental (no longer unreleased beta)
+
+ -- Galen Hazelwood <galenh@micron.net>  Sun, 9 Mar 1997 23:43:19 -0700
+
+binutils (2.7.0.9-1) experimental; urgency=low
+
+  * New upstream beta version (fixes bug #7336)
+  * Split shared libraries (bfd) out of binutils (fixes bug #7244)
+  * No longer builds aout-binutils
+
+ -- Galen Hazelwood <galenh@micron.net>  Thu, 13 Feb 1997 00:27:18 -0700
+
+binutils (2.7-6) unstable; urgency=low
+
+  * Uses dpkg --print-gnu-build-architecture for build
+  * Demoted aout-binutils to priority "extra"
+
+ -- Galen Hazelwood <galenh@micron.net>  Mon, 27 Jan 1997 13:34:08 -0700
+
+binutils (2.7-5) unstable; urgency=low (HIGH for m68k)
+
+  * Added patch for m68k, will now compile X68 and kernel 2.1.15
+
+ -- Galen Hazelwood <galenh@micron.net>  Tue, 31 Dec 1996 22:15:03 -0700
+
+binutils (2.7-4) unstable; urgency=low
+
+  * New maintainer
+  * Updated to new source format
+  * Fixed typo in script.1 (Fixes bug #4558)
+  * Fixed typo in as.1 (Fixes bug #5567)
+  * Postinst now calls ldconfig without explicit pathname (Fixes bug #6151)
+
+ -- Galen Hazelwood <galenh@micron.net>  Mon, 30 Dec 1996 12:10:25 -0700
+
+binutils (2.7-3):
+
+Remove lib*.so links so the libs are not used for develpment.
+gzip manpages
+
+Changes made by Michael Meskes <meskes@debian.org> in consent with David Engel.
+
+binutils (2.7-2):
+
+Include shared libraries
+Strip shared libraries
+Also update AOUT version
+Minor changes to debian.rules
+
+binutils (2.7-1):
+
+Updated to new upstream version.
+
+Added a simple extended description (Bug#3574).
+
+Don't call ldconfig from postrm script (Bug#4246).
+    
+   LocalWords:  Aurelien Jarno
+  
diff --git a/control b/control
new file mode 100644
index 000000000..723ab5d1b
--- /dev/null
+++ b/control
@@ -0,0 +1,1057 @@
+Source: binutils
+Section: devel
+Priority: optional
+Maintainer: Matthias Klose <doko@debian.org>
+Uploaders: James Troup <binutils@elmo.tasta.io>
+Standards-Version: 4.6.0
+Build-Depends: autoconf (>= 2.64), dpkg-dev (>= 1.19.0.5),
+  bison, flex, gettext, texinfo, dejagnu, quilt, chrpath, dwz, debugedit (>= 4.16),
+  python3:any, file, xz-utils, lsb-release, zlib1g-dev, procps,
+  g++-aarch64-linux-gnu [amd64 i386 x32] <!nocheck>,
+  g++-arm-linux-gnueabi [amd64 arm64 i386 x32] <!nocheck>,
+  g++-arm-linux-gnueabihf [amd64 arm64 i386 x32] <!nocheck>,
+  g++-powerpc64le-linux-gnu [amd64 arm64 i386 ppc64 x32] <!nocheck>,
+  g++-s390x-linux-gnu [amd64 arm64 i386 ppc64el x32] <!nocheck>,
+  g++-alpha-linux-gnu [amd64 i386 x32] <!nocheck>,
+  g++-hppa-linux-gnu [amd64 i386 x32] <!nocheck>,
+  g++-m68k-linux-gnu [amd64 i386 x32] <!nocheck>,
+  g++-powerpc-linux-gnu [amd64 i386 ppc64el x32] <!nocheck>,
+  g++-powerpc64-linux-gnu [amd64 i386 x32] <!nocheck>,
+  g++-riscv64-linux-gnu [amd64 arm64 i386 ppc64el x32] <!nocheck>,
+  g++-sh4-linux-gnu [amd64 i386 x32] <!nocheck>,
+  g++-sparc64-linux-gnu [amd64 i386 x32] <!nocheck>,
+  g++-i686-linux-gnu [amd64 arm64 ppc64el x32] <!nocheck>,
+  g++-x86-64-linux-gnu [arm64 i386 ppc64el] <!nocheck>,
+  g++-x86-64-linux-gnux32 [amd64 arm64 i386 ppc64el] <!nocheck>,
+Build-Conflicts: libelf-dev
+Rules-Requires-Root: no
+Homepage: https://www.gnu.org/software/binutils/
+Vcs-Browser: https://salsa.debian.org/toolchain-team/binutils
+Vcs-Git: https://salsa.debian.org/toolchain-team/binutils.git
+XS-Testsuite: autopkgtest
+
+Package: binutils-for-host
+Architecture: any
+Depends: ${binutils:native}:any (>= ${binutils:minver}),
+  binutils-common (= ${binary:Version}),
+Multi-Arch: same
+Description: GNU assembler, linker and binary utilities for the host architecture
+ The programs in this package are used to assemble, link and manipulate
+ binary and object files for the architecture of this package.  They may be
+ used in conjunction with a matching compiler and various libraries to build
+ programs. When using binutils through this metapackage, all tools must be
+ used with an architecture prefix.
+
+Package: binutils-for-build
+Architecture: all
+Depends: binutils (>= ${binutils:minver}),
+  binutils-common (>= ${binutils:minver})
+Multi-Arch: foreign
+Description: GNU assembler, linker and binary utilities for the build architecture
+ The programs in this package are used to assemble, link and manipulate
+ binary and object files for the native architecture.  They may be used in
+ conjunction with a build architecture compiler and various libraries to build
+ programs. When using binutils through this metapackage, tools without an
+ architecture prefix must be used.
+
+Package: binutils
+Architecture: any
+Depends: ${shlibs:Depends}, binutils-common (= ${binary:Version}),
+  libbinutils (= ${binary:Version}), ${binutils:native} (= ${binary:Version})
+Conflicts: modutils (<< 2.4.19-1), ${extraConflicts},
+  binutils-multiarch (<< 2.27-8)
+Provides: elf-binutils, ${gold:Provides}
+Suggests: binutils-doc (>= ${source:Version})
+Description: GNU assembler, linker and binary utilities
+ The programs in this package are used to assemble, link and manipulate
+ binary and object files.  They may be used in conjunction with a compiler
+ and various libraries to build programs.
+
+Package: libctf-nobfd0
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}
+Breaks: libbinutils (<< 2.33.50.20191128-1~)
+Replaces: libbinutils (<< 2.33.50.20191128-1~)
+Description: Compact C Type Format library (runtime, no BFD dependency)
+ This package includes the libctf-nobfd shared library.  The Compact C Type
+ Format (CTF) is a way of representing information about a binary program
+
+Package: libctf-nobfd0-dbg
+Section: debug
+Architecture: any
+Multi-Arch: same
+Depends: libctf-nobfd0 (= ${binary:Version})
+Description: Compact C Type Format library (debug symbols, no BFD dependency)
+ This package includes the libctf-nobfd shared library.  The Compact C Type
+ Format (CTF) is a way of representing information about a binary program
+
+Package: libctf0
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, libbinutils (= ${binary:Version})
+Description: Compact C Type Format library (runtime, BFD dependency)
+ This package includes the libctf-nobfd shared library.  The Compact C Type
+ Format (CTF) is a way of representing information about a binary program
+
+Package: libctf0-dbg
+Section: debug
+Architecture: any
+Multi-Arch: same
+Depends: libctf0 (= ${binary:Version})
+Description: Compact C Type Format library (debug symbols, BFD dependency)
+ This package includes the libctf-nobfd shared library.  The Compact C Type
+ Format (CTF) is a way of representing information about a binary program
+
+Package: libbinutils
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, binutils-common (= ${binary:Version})
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Description: GNU binary utilities (private shared library)
+ This package includes the private shared libraries libbfd and libopcodes.
+
+Package: libbinutils-dbg
+Section: debug
+Architecture: any
+Multi-Arch: same
+Depends: libbinutils (= ${binary:Version})
+Description: GNU binary utilities (private shared library, debug symbols)
+ This package provides debug symbols for libbinutils.
+
+Package: binutils-dev
+Architecture: any
+Priority: optional
+Depends: binutils (= ${binary:Version}), libbinutils (= ${binary:Version}),
+  libctf0 (= ${binary:Version}), libctf-nobfd0 (= ${binary:Version})
+Conflicts: libbfd-dev
+Provides: libbfd-dev
+Replaces: libbfd-dev, libc5-dev
+Description: GNU binary utilities (BFD development files)
+ This package includes header files and static libraries necessary to build
+ programs which use the GNU BFD library, which is part of binutils.  Note
+ that building Debian packages which depend on the shared libbfd is Not
+ Allowed.
+
+Package: binutils-multiarch
+Architecture: any
+Priority: optional
+Depends: ${shlibs:Depends}, binutils (= ${binary:Version}),
+  binutils-common (= ${binary:Version})
+Description: Binary utilities that support multi-arch targets
+ The programs in this package are used to manipulate binary and object
+ files that may have been created on other architectures.  This package
+ is primarily for multi-architecture developers and cross-compilers and
+ is not needed by normal users or developers.  Note that a cross-assembling
+ version of gas is not included in this package, just the binary utilities.
+ .
+ NORMAL USERS SHOULD NOT INSTALL THIS PACKAGE.  It's meant only for those
+ requiring support for reading info from binaries from other architectures.
+
+Package: binutils-multiarch-dbg
+Section: debug
+Architecture: any
+Priority: optional
+Depends: binutils-multiarch (= ${binary:Version})
+Description: Binary utilities that support multi-arch targets (debug symbols)
+ This package provides debug symbols for binutils-multiarch.
+
+Package: binutils-multiarch-dev
+Architecture: any
+Priority: optional
+Depends: ${shlibs:Depends},
+ binutils-dev (= ${binary:Version}), binutils-multiarch (= ${binary:Version})
+Replaces: binutils-multiarch (<< 2.24-5)
+Description: GNU binary utilities that support multi-arch targets (BFD development files)
+ This package includes header files, static and shared libraries necessary
+ to build programs which use the GNU BFD library for multi-arch targets,
+ which is part of binutils. Note that building Debian packages which depend
+ on the shared libbfd is Not Allowed.
+ .
+ NORMAL USERS SHOULD NOT INSTALL THIS PACKAGE.  It's meant only for those
+ requiring support for reading info from binaries from other architectures.
+
+Package: binutils-hppa64-linux-gnu
+Architecture: amd64 i386 x32 hppa
+Depends: ${shlibs:Depends}, binutils (= ${binary:Version}),
+  binutils-common (= ${binary:Version})
+Recommends: libc6-dev
+Provides: binutils-hppa64
+Suggests: binutils-doc (>= ${source:Version})
+Breaks: binutils-hppa64 (<< 2.25.1-2)
+Replaces: binutils-hppa64 (<< 2.25.1-2)
+Description: GNU assembler, linker and binary utilities targeted for hppa64-linux
+ The programs in this package are used to assemble, link and manipulate
+ binary and object files.  They may be used in conjunction with a compiler
+ and various libraries to build programs.
+ .
+ This package is needed to build an 64-bit kernel for 64-bit hppa machines.
+
+Package: binutils-hppa64-linux-gnu-dbg
+Section: debug
+Architecture: amd64 i386 x32 hppa
+Depends: binutils-hppa64-linux-gnu (= ${binary:Version})
+Description: GNU binutils targeted for hppa64-linux (debug symbols)
+ This package provides debug symbols for binutils-hppa64-linux-gnu.
+
+Package: binutils-doc
+Section: doc
+Architecture: all
+Multi-Arch: foreign
+Priority: optional
+Suggests: binutils (= ${binary:Version})
+Description: Documentation for the GNU assembler, linker and binary utilities
+ This package consists of the documentation for the GNU assembler,
+ linker and binary utilities in info format.
+
+Package: binutils-source
+Architecture: all
+Multi-Arch: foreign
+Priority: optional
+Depends: texinfo, zlib1g-dev, make, python3
+Description: GNU assembler, linker and binary utilities (source)
+ This package contains the sources and patches which are needed to
+ build binutils.
+
+Package: binutils-common
+Architecture: any
+Multi-Arch: same
+Breaks: binutils (<< 2.29.1-3.1~)
+Replaces: binutils (<< 2.29.1-3.1~)
+Description: Common files for the GNU assembler, linker and binary utilities
+ This package contains the localization files used by binutils packages for
+ various target architectures and parts of the binutils documentation. It is
+ not useful on its own.
+
+Package: binutils-x86-64-linux-gnu
+Priority: optional
+Architecture: amd64 arm64 i386 ppc64el x32
+Multi-Arch: allowed
+Depends: binutils-common (= ${binary:Version}),
+  ${shlibs:Depends}, ${extraDepends}
+Suggests: binutils-doc (= ${source:Version})
+Provides: 
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Description: GNU binary utilities, for x86-64-linux-gnu target
+ This package provides GNU assembler, linker and binary utilities
+ for the x86-64-linux-gnu target.
+ .
+ You don't need this package unless you plan to cross-compile programs
+ for x86-64-linux-gnu and x86-64-linux-gnu is not your native platform.
+
+Package: binutils-x86-64-linux-gnu-dbg
+Section: debug
+Priority: optional
+Architecture: amd64 arm64 i386 ppc64el x32
+Multi-Arch: foreign
+Depends: binutils-x86-64-linux-gnu (= ${binary:Version})
+Description: GNU binary utilities, for x86-64-linux-gnu target (debug symbols)
+ This package provides debug symbols for binutils-x86-64-linux-gnu.
+
+Package: binutils-i686-linux-gnu
+Priority: optional
+Architecture: i386 amd64 arm64 ppc64el x32
+Multi-Arch: allowed
+Depends: binutils-common (= ${binary:Version}),
+  ${shlibs:Depends}, ${extraDepends}
+Suggests: binutils-doc (= ${source:Version})
+Provides: binutils-i586-linux-gnu
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Description: GNU binary utilities, for i686-linux-gnu target
+ This package provides GNU assembler, linker and binary utilities
+ for the i686-linux-gnu target.
+ .
+ You don't need this package unless you plan to cross-compile programs
+ for i686-linux-gnu and i686-linux-gnu is not your native platform.
+
+Package: binutils-i686-linux-gnu-dbg
+Section: debug
+Priority: optional
+Architecture: i386 amd64 arm64 ppc64el x32
+Multi-Arch: foreign
+Depends: binutils-i686-linux-gnu (= ${binary:Version})
+Description: GNU binary utilities, for i686-linux-gnu target (debug symbols)
+ This package provides debug symbols for binutils-i686-linux-gnu.
+
+Package: binutils-aarch64-linux-gnu
+Priority: optional
+Architecture: arm64 amd64 i386 x32 ppc64el
+Multi-Arch: allowed
+Depends: binutils-common (= ${binary:Version}),
+  ${shlibs:Depends}, ${extraDepends}
+Suggests: binutils-doc (= ${source:Version})
+Provides: 
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Description: GNU binary utilities, for aarch64-linux-gnu target
+ This package provides GNU assembler, linker and binary utilities
+ for the aarch64-linux-gnu target.
+ .
+ You don't need this package unless you plan to cross-compile programs
+ for aarch64-linux-gnu and aarch64-linux-gnu is not your native platform.
+
+Package: binutils-aarch64-linux-gnu-dbg
+Section: debug
+Priority: optional
+Architecture: arm64 amd64 i386 x32 ppc64el
+Multi-Arch: foreign
+Depends: binutils-aarch64-linux-gnu (= ${binary:Version})
+Description: GNU binary utilities, for aarch64-linux-gnu target (debug symbols)
+ This package provides debug symbols for binutils-aarch64-linux-gnu.
+
+Package: binutils-arm-linux-gnueabihf
+Priority: optional
+Architecture: armhf amd64 i386 x32 arm64 ppc64el
+Multi-Arch: allowed
+Depends: binutils-common (= ${binary:Version}),
+  ${shlibs:Depends}, ${extraDepends}
+Suggests: binutils-doc (= ${source:Version})
+Provides: 
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Description: GNU binary utilities, for arm-linux-gnueabihf target
+ This package provides GNU assembler, linker and binary utilities
+ for the arm-linux-gnueabihf target.
+ .
+ You don't need this package unless you plan to cross-compile programs
+ for arm-linux-gnueabihf and arm-linux-gnueabihf is not your native platform.
+
+Package: binutils-arm-linux-gnueabihf-dbg
+Section: debug
+Priority: optional
+Architecture: armhf amd64 i386 x32 arm64 ppc64el
+Multi-Arch: foreign
+Depends: binutils-arm-linux-gnueabihf (= ${binary:Version})
+Description: GNU binary utilities, for arm-linux-gnueabihf target (debug symbols)
+ This package provides debug symbols for binutils-arm-linux-gnueabihf.
+
+Package: binutils-arm-linux-gnueabi
+Priority: optional
+Architecture: armel amd64 i386 x32 arm64 ppc64el
+Multi-Arch: allowed
+Depends: binutils-common (= ${binary:Version}),
+  ${shlibs:Depends}, ${extraDepends}
+Suggests: binutils-doc (= ${source:Version})
+Provides: 
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Description: GNU binary utilities, for arm-linux-gnueabi target
+ This package provides GNU assembler, linker and binary utilities
+ for the arm-linux-gnueabi target.
+ .
+ You don't need this package unless you plan to cross-compile programs
+ for arm-linux-gnueabi and arm-linux-gnueabi is not your native platform.
+
+Package: binutils-arm-linux-gnueabi-dbg
+Section: debug
+Priority: optional
+Architecture: armel amd64 i386 x32 arm64 ppc64el
+Multi-Arch: foreign
+Depends: binutils-arm-linux-gnueabi (= ${binary:Version})
+Description: GNU binary utilities, for arm-linux-gnueabi target (debug symbols)
+ This package provides debug symbols for binutils-arm-linux-gnueabi.
+
+Package: binutils-powerpc64le-linux-gnu
+Priority: optional
+Architecture: ppc64el amd64 i386 x32 ppc64 arm64
+Multi-Arch: allowed
+Depends: binutils-common (= ${binary:Version}),
+  ${shlibs:Depends}, ${extraDepends}
+Suggests: binutils-doc (= ${source:Version})
+Provides: 
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Description: GNU binary utilities, for powerpc64le-linux-gnu target
+ This package provides GNU assembler, linker and binary utilities
+ for the powerpc64le-linux-gnu target.
+ .
+ You don't need this package unless you plan to cross-compile programs
+ for powerpc64le-linux-gnu and powerpc64le-linux-gnu is not your native platform.
+
+Package: binutils-powerpc64le-linux-gnu-dbg
+Section: debug
+Priority: optional
+Architecture: ppc64el amd64 i386 x32 ppc64 arm64
+Multi-Arch: foreign
+Depends: binutils-powerpc64le-linux-gnu (= ${binary:Version})
+Description: GNU binary utilities, for powerpc64le-linux-gnu target (debug symbols)
+ This package provides debug symbols for binutils-powerpc64le-linux-gnu.
+
+Package: binutils-s390x-linux-gnu
+Priority: optional
+Architecture: s390x amd64 i386 x32 arm64 ppc64el
+Multi-Arch: allowed
+Depends: binutils-common (= ${binary:Version}),
+  ${shlibs:Depends}, ${extraDepends}
+Suggests: binutils-doc (= ${source:Version})
+Provides: 
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Description: GNU binary utilities, for s390x-linux-gnu target
+ This package provides GNU assembler, linker and binary utilities
+ for the s390x-linux-gnu target.
+ .
+ You don't need this package unless you plan to cross-compile programs
+ for s390x-linux-gnu and s390x-linux-gnu is not your native platform.
+
+Package: binutils-s390x-linux-gnu-dbg
+Section: debug
+Priority: optional
+Architecture: s390x amd64 i386 x32 arm64 ppc64el
+Multi-Arch: foreign
+Depends: binutils-s390x-linux-gnu (= ${binary:Version})
+Description: GNU binary utilities, for s390x-linux-gnu target (debug symbols)
+ This package provides debug symbols for binutils-s390x-linux-gnu.
+
+Package: binutils-alpha-linux-gnu
+Priority: optional
+Architecture: alpha amd64 i386 x32
+Multi-Arch: allowed
+Depends: binutils-common (= ${binary:Version}),
+  ${shlibs:Depends}, ${extraDepends}
+Suggests: binutils-doc (= ${source:Version})
+Provides: 
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Description: GNU binary utilities, for alpha-linux-gnu target
+ This package provides GNU assembler, linker and binary utilities
+ for the alpha-linux-gnu target.
+ .
+ You don't need this package unless you plan to cross-compile programs
+ for alpha-linux-gnu and alpha-linux-gnu is not your native platform.
+
+Package: binutils-alpha-linux-gnu-dbg
+Section: debug
+Priority: optional
+Architecture: alpha amd64 i386 x32
+Multi-Arch: foreign
+Depends: binutils-alpha-linux-gnu (= ${binary:Version})
+Description: GNU binary utilities, for alpha-linux-gnu target (debug symbols)
+ This package provides debug symbols for binutils-alpha-linux-gnu.
+
+Package: binutils-hppa-linux-gnu
+Priority: optional
+Architecture: hppa amd64 i386 x32
+Multi-Arch: allowed
+Depends: binutils-common (= ${binary:Version}),
+  ${shlibs:Depends}, ${extraDepends}
+Suggests: binutils-doc (= ${source:Version})
+Provides: 
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Description: GNU binary utilities, for hppa-linux-gnu target
+ This package provides GNU assembler, linker and binary utilities
+ for the hppa-linux-gnu target.
+ .
+ You don't need this package unless you plan to cross-compile programs
+ for hppa-linux-gnu and hppa-linux-gnu is not your native platform.
+
+Package: binutils-hppa-linux-gnu-dbg
+Section: debug
+Priority: optional
+Architecture: hppa amd64 i386 x32
+Multi-Arch: foreign
+Depends: binutils-hppa-linux-gnu (= ${binary:Version})
+Description: GNU binary utilities, for hppa-linux-gnu target (debug symbols)
+ This package provides debug symbols for binutils-hppa-linux-gnu.
+
+Package: binutils-ia64-linux-gnu
+Priority: optional
+Architecture: ia64 amd64 i386 x32
+Multi-Arch: allowed
+Depends: binutils-common (= ${binary:Version}),
+  ${shlibs:Depends}, ${extraDepends}
+Suggests: binutils-doc (= ${source:Version})
+Provides: 
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Description: GNU binary utilities, for ia64-linux-gnu target
+ This package provides GNU assembler, linker and binary utilities
+ for the ia64-linux-gnu target.
+ .
+ You don't need this package unless you plan to cross-compile programs
+ for ia64-linux-gnu and ia64-linux-gnu is not your native platform.
+
+Package: binutils-ia64-linux-gnu-dbg
+Section: debug
+Priority: optional
+Architecture: ia64 amd64 i386 x32
+Multi-Arch: foreign
+Depends: binutils-ia64-linux-gnu (= ${binary:Version})
+Description: GNU binary utilities, for ia64-linux-gnu target (debug symbols)
+ This package provides debug symbols for binutils-ia64-linux-gnu.
+
+Package: binutils-m68k-linux-gnu
+Priority: optional
+Architecture: m68k amd64 i386 x32
+Multi-Arch: allowed
+Depends: binutils-common (= ${binary:Version}),
+  ${shlibs:Depends}, ${extraDepends}
+Suggests: binutils-doc (= ${source:Version})
+Provides: 
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Description: GNU binary utilities, for m68k-linux-gnu target
+ This package provides GNU assembler, linker and binary utilities
+ for the m68k-linux-gnu target.
+ .
+ You don't need this package unless you plan to cross-compile programs
+ for m68k-linux-gnu and m68k-linux-gnu is not your native platform.
+
+Package: binutils-m68k-linux-gnu-dbg
+Section: debug
+Priority: optional
+Architecture: m68k amd64 i386 x32
+Multi-Arch: foreign
+Depends: binutils-m68k-linux-gnu (= ${binary:Version})
+Description: GNU binary utilities, for m68k-linux-gnu target (debug symbols)
+ This package provides debug symbols for binutils-m68k-linux-gnu.
+
+Package: binutils-powerpc-linux-gnu
+Priority: optional
+Architecture: powerpc amd64 i386 x32 ppc64el
+Multi-Arch: allowed
+Depends: binutils-common (= ${binary:Version}),
+  ${shlibs:Depends}, ${extraDepends}
+Suggests: binutils-doc (= ${source:Version})
+Provides: 
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Description: GNU binary utilities, for powerpc-linux-gnu target
+ This package provides GNU assembler, linker and binary utilities
+ for the powerpc-linux-gnu target.
+ .
+ You don't need this package unless you plan to cross-compile programs
+ for powerpc-linux-gnu and powerpc-linux-gnu is not your native platform.
+
+Package: binutils-powerpc-linux-gnu-dbg
+Section: debug
+Priority: optional
+Architecture: powerpc amd64 i386 x32 ppc64el
+Multi-Arch: foreign
+Depends: binutils-powerpc-linux-gnu (= ${binary:Version})
+Description: GNU binary utilities, for powerpc-linux-gnu target (debug symbols)
+ This package provides debug symbols for binutils-powerpc-linux-gnu.
+
+Package: binutils-powerpc64-linux-gnu
+Priority: optional
+Architecture: ppc64 amd64 i386 x32 ppc64el
+Multi-Arch: allowed
+Depends: binutils-common (= ${binary:Version}),
+  ${shlibs:Depends}, ${extraDepends}
+Suggests: binutils-doc (= ${source:Version})
+Provides: 
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Description: GNU binary utilities, for powerpc64-linux-gnu target
+ This package provides GNU assembler, linker and binary utilities
+ for the powerpc64-linux-gnu target.
+ .
+ You don't need this package unless you plan to cross-compile programs
+ for powerpc64-linux-gnu and powerpc64-linux-gnu is not your native platform.
+
+Package: binutils-powerpc64-linux-gnu-dbg
+Section: debug
+Priority: optional
+Architecture: ppc64 amd64 i386 x32 ppc64el
+Multi-Arch: foreign
+Depends: binutils-powerpc64-linux-gnu (= ${binary:Version})
+Description: GNU binary utilities, for powerpc64-linux-gnu target (debug symbols)
+ This package provides debug symbols for binutils-powerpc64-linux-gnu.
+
+Package: binutils-riscv64-linux-gnu
+Priority: optional
+Architecture: riscv64 amd64 i386 x32 arm64 ppc64el
+Multi-Arch: allowed
+Depends: binutils-common (= ${binary:Version}),
+  ${shlibs:Depends}, ${extraDepends}
+Suggests: binutils-doc (= ${source:Version})
+Provides: 
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Description: GNU binary utilities, for riscv64-linux-gnu target
+ This package provides GNU assembler, linker and binary utilities
+ for the riscv64-linux-gnu target.
+ .
+ You don't need this package unless you plan to cross-compile programs
+ for riscv64-linux-gnu and riscv64-linux-gnu is not your native platform.
+
+Package: binutils-riscv64-linux-gnu-dbg
+Section: debug
+Priority: optional
+Architecture: riscv64 amd64 i386 x32 arm64 ppc64el
+Multi-Arch: foreign
+Depends: binutils-riscv64-linux-gnu (= ${binary:Version})
+Description: GNU binary utilities, for riscv64-linux-gnu target (debug symbols)
+ This package provides debug symbols for binutils-riscv64-linux-gnu.
+
+Package: binutils-sh4-linux-gnu
+Priority: optional
+Architecture: sh4 amd64 i386 x32
+Multi-Arch: allowed
+Depends: binutils-common (= ${binary:Version}),
+  ${shlibs:Depends}, ${extraDepends}
+Suggests: binutils-doc (= ${source:Version})
+Provides: 
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Description: GNU binary utilities, for sh4-linux-gnu target
+ This package provides GNU assembler, linker and binary utilities
+ for the sh4-linux-gnu target.
+ .
+ You don't need this package unless you plan to cross-compile programs
+ for sh4-linux-gnu and sh4-linux-gnu is not your native platform.
+
+Package: binutils-sh4-linux-gnu-dbg
+Section: debug
+Priority: optional
+Architecture: sh4 amd64 i386 x32
+Multi-Arch: foreign
+Depends: binutils-sh4-linux-gnu (= ${binary:Version})
+Description: GNU binary utilities, for sh4-linux-gnu target (debug symbols)
+ This package provides debug symbols for binutils-sh4-linux-gnu.
+
+Package: binutils-sparc64-linux-gnu
+Priority: optional
+Architecture: sparc64 amd64 i386 x32
+Multi-Arch: allowed
+Depends: binutils-common (= ${binary:Version}),
+  ${shlibs:Depends}, ${extraDepends}
+Suggests: binutils-doc (= ${source:Version})
+Provides: 
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Description: GNU binary utilities, for sparc64-linux-gnu target
+ This package provides GNU assembler, linker and binary utilities
+ for the sparc64-linux-gnu target.
+ .
+ You don't need this package unless you plan to cross-compile programs
+ for sparc64-linux-gnu and sparc64-linux-gnu is not your native platform.
+
+Package: binutils-sparc64-linux-gnu-dbg
+Section: debug
+Priority: optional
+Architecture: sparc64 amd64 i386 x32
+Multi-Arch: foreign
+Depends: binutils-sparc64-linux-gnu (= ${binary:Version})
+Description: GNU binary utilities, for sparc64-linux-gnu target (debug symbols)
+ This package provides debug symbols for binutils-sparc64-linux-gnu.
+
+Package: binutils-x86-64-linux-gnux32
+Priority: optional
+Architecture: x32 amd64 arm64 i386 ppc64el
+Multi-Arch: allowed
+Depends: binutils-common (= ${binary:Version}),
+  ${shlibs:Depends}, ${extraDepends}
+Suggests: binutils-doc (= ${source:Version})
+Provides: 
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Description: GNU binary utilities, for x86-64-linux-gnux32 target
+ This package provides GNU assembler, linker and binary utilities
+ for the x86-64-linux-gnux32 target.
+ .
+ You don't need this package unless you plan to cross-compile programs
+ for x86-64-linux-gnux32 and x86-64-linux-gnux32 is not your native platform.
+
+Package: binutils-x86-64-linux-gnux32-dbg
+Section: debug
+Priority: optional
+Architecture: x32 amd64 arm64 i386 ppc64el
+Multi-Arch: foreign
+Depends: binutils-x86-64-linux-gnux32 (= ${binary:Version})
+Description: GNU binary utilities, for x86-64-linux-gnux32 target (debug symbols)
+ This package provides debug symbols for binutils-x86-64-linux-gnux32.
+
+Package: binutils-i686-gnu
+Priority: optional
+Architecture: hurd-i386 amd64 i386 x32
+Multi-Arch: allowed
+Depends: binutils-common (= ${binary:Version}),
+  ${shlibs:Depends}, ${extraDepends}
+Suggests: binutils-doc (= ${source:Version})
+Provides: binutils-i586-gnu
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Description: GNU binary utilities, for i686-gnu target
+ This package provides GNU assembler, linker and binary utilities
+ for the i686-gnu target.
+ .
+ You don't need this package unless you plan to cross-compile programs
+ for i686-gnu and i686-gnu is not your native platform.
+
+Package: binutils-i686-gnu-dbg
+Section: debug
+Priority: optional
+Architecture: hurd-i386 amd64 i386 x32
+Multi-Arch: foreign
+Depends: binutils-i686-gnu (= ${binary:Version})
+Description: GNU binary utilities, for i686-gnu target (debug symbols)
+ This package provides debug symbols for binutils-i686-gnu.
+
+Package: binutils-x86-64-kfreebsd-gnu
+Priority: optional
+Architecture: kfreebsd-amd64 amd64 i386 x32
+Multi-Arch: allowed
+Depends: binutils-common (= ${binary:Version}),
+  ${shlibs:Depends}, ${extraDepends}
+Suggests: binutils-doc (= ${source:Version})
+Provides: 
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Description: GNU binary utilities, for x86-64-kfreebsd-gnu target
+ This package provides GNU assembler, linker and binary utilities
+ for the x86-64-kfreebsd-gnu target.
+ .
+ You don't need this package unless you plan to cross-compile programs
+ for x86-64-kfreebsd-gnu and x86-64-kfreebsd-gnu is not your native platform.
+
+Package: binutils-x86-64-kfreebsd-gnu-dbg
+Section: debug
+Priority: optional
+Architecture: kfreebsd-amd64 amd64 i386 x32
+Multi-Arch: foreign
+Depends: binutils-x86-64-kfreebsd-gnu (= ${binary:Version})
+Description: GNU binary utilities, for x86-64-kfreebsd-gnu target (debug symbols)
+ This package provides debug symbols for binutils-x86-64-kfreebsd-gnu.
+
+Package: binutils-i686-kfreebsd-gnu
+Priority: optional
+Architecture: kfreebsd-i386 amd64 i386 x32
+Multi-Arch: allowed
+Depends: binutils-common (= ${binary:Version}),
+  ${shlibs:Depends}, ${extraDepends}
+Suggests: binutils-doc (= ${source:Version})
+Provides: binutils-i586-kfreebsd-gnu
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Description: GNU binary utilities, for i686-kfreebsd-gnu target
+ This package provides GNU assembler, linker and binary utilities
+ for the i686-kfreebsd-gnu target.
+ .
+ You don't need this package unless you plan to cross-compile programs
+ for i686-kfreebsd-gnu and i686-kfreebsd-gnu is not your native platform.
+
+Package: binutils-i686-kfreebsd-gnu-dbg
+Section: debug
+Priority: optional
+Architecture: kfreebsd-i386 amd64 i386 x32
+Multi-Arch: foreign
+Depends: binutils-i686-kfreebsd-gnu (= ${binary:Version})
+Description: GNU binary utilities, for i686-kfreebsd-gnu target (debug symbols)
+ This package provides debug symbols for binutils-i686-kfreebsd-gnu.
+
+Package: binutils-mips-linux-gnu
+Priority: optional
+Architecture: mips
+Multi-Arch: allowed
+Depends: binutils-common (= ${binary:Version}),
+  ${shlibs:Depends}, ${extraDepends}
+Suggests: binutils-doc (= ${source:Version})
+Provides: 
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Description: GNU binary utilities, for mips-linux-gnu target
+ This package provides GNU assembler, linker and binary utilities
+ for the mips-linux-gnu target.
+ .
+ You don't need this package unless you plan to cross-compile programs
+ for mips-linux-gnu and mips-linux-gnu is not your native platform.
+
+Package: binutils-mips-linux-gnu-dbg
+Section: debug
+Priority: optional
+Architecture: mips
+Multi-Arch: foreign
+Depends: binutils-mips-linux-gnu (= ${binary:Version})
+Description: GNU binary utilities, for mips-linux-gnu target (debug symbols)
+ This package provides debug symbols for binutils-mips-linux-gnu.
+
+Package: binutils-mipsel-linux-gnu
+Priority: optional
+Architecture: mipsel
+Multi-Arch: allowed
+Depends: binutils-common (= ${binary:Version}),
+  ${shlibs:Depends}, ${extraDepends}
+Suggests: binutils-doc (= ${source:Version})
+Provides: 
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Description: GNU binary utilities, for mipsel-linux-gnu target
+ This package provides GNU assembler, linker and binary utilities
+ for the mipsel-linux-gnu target.
+ .
+ You don't need this package unless you plan to cross-compile programs
+ for mipsel-linux-gnu and mipsel-linux-gnu is not your native platform.
+
+Package: binutils-mipsel-linux-gnu-dbg
+Section: debug
+Priority: optional
+Architecture: mipsel
+Multi-Arch: foreign
+Depends: binutils-mipsel-linux-gnu (= ${binary:Version})
+Description: GNU binary utilities, for mipsel-linux-gnu target (debug symbols)
+ This package provides debug symbols for binutils-mipsel-linux-gnu.
+
+Package: binutils-mips64-linux-gnuabi64
+Priority: optional
+Architecture: mips64
+Multi-Arch: allowed
+Depends: binutils-common (= ${binary:Version}),
+  ${shlibs:Depends}, ${extraDepends}
+Suggests: binutils-doc (= ${source:Version})
+Provides: 
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Description: GNU binary utilities, for mips64-linux-gnuabi64 target
+ This package provides GNU assembler, linker and binary utilities
+ for the mips64-linux-gnuabi64 target.
+ .
+ You don't need this package unless you plan to cross-compile programs
+ for mips64-linux-gnuabi64 and mips64-linux-gnuabi64 is not your native platform.
+
+Package: binutils-mips64-linux-gnuabi64-dbg
+Section: debug
+Priority: optional
+Architecture: mips64
+Multi-Arch: foreign
+Depends: binutils-mips64-linux-gnuabi64 (= ${binary:Version})
+Description: GNU binary utilities, for mips64-linux-gnuabi64 target (debug symbols)
+ This package provides debug symbols for binutils-mips64-linux-gnuabi64.
+
+Package: binutils-mips64el-linux-gnuabi64
+Priority: optional
+Architecture: mips64el
+Multi-Arch: allowed
+Depends: binutils-common (= ${binary:Version}),
+  ${shlibs:Depends}, ${extraDepends}
+Suggests: binutils-doc (= ${source:Version})
+Provides: 
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Description: GNU binary utilities, for mips64el-linux-gnuabi64 target
+ This package provides GNU assembler, linker and binary utilities
+ for the mips64el-linux-gnuabi64 target.
+ .
+ You don't need this package unless you plan to cross-compile programs
+ for mips64el-linux-gnuabi64 and mips64el-linux-gnuabi64 is not your native platform.
+
+Package: binutils-mips64el-linux-gnuabi64-dbg
+Section: debug
+Priority: optional
+Architecture: mips64el
+Multi-Arch: foreign
+Depends: binutils-mips64el-linux-gnuabi64 (= ${binary:Version})
+Description: GNU binary utilities, for mips64el-linux-gnuabi64 target (debug symbols)
+ This package provides debug symbols for binutils-mips64el-linux-gnuabi64.
+
+Package: binutils-mips64-linux-gnuabin32
+Priority: optional
+Architecture: mipsn32
+Multi-Arch: allowed
+Depends: binutils-common (= ${binary:Version}),
+  ${shlibs:Depends}, ${extraDepends}
+Suggests: binutils-doc (= ${source:Version})
+Provides: 
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Description: GNU binary utilities, for mips64-linux-gnuabin32 target
+ This package provides GNU assembler, linker and binary utilities
+ for the mips64-linux-gnuabin32 target.
+ .
+ You don't need this package unless you plan to cross-compile programs
+ for mips64-linux-gnuabin32 and mips64-linux-gnuabin32 is not your native platform.
+
+Package: binutils-mips64-linux-gnuabin32-dbg
+Section: debug
+Priority: optional
+Architecture: mipsn32
+Multi-Arch: foreign
+Depends: binutils-mips64-linux-gnuabin32 (= ${binary:Version})
+Description: GNU binary utilities, for mips64-linux-gnuabin32 target (debug symbols)
+ This package provides debug symbols for binutils-mips64-linux-gnuabin32.
+
+Package: binutils-mips64el-linux-gnuabin32
+Priority: optional
+Architecture: mipsn32el
+Multi-Arch: allowed
+Depends: binutils-common (= ${binary:Version}),
+  ${shlibs:Depends}, ${extraDepends}
+Suggests: binutils-doc (= ${source:Version})
+Provides: 
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Description: GNU binary utilities, for mips64el-linux-gnuabin32 target
+ This package provides GNU assembler, linker and binary utilities
+ for the mips64el-linux-gnuabin32 target.
+ .
+ You don't need this package unless you plan to cross-compile programs
+ for mips64el-linux-gnuabin32 and mips64el-linux-gnuabin32 is not your native platform.
+
+Package: binutils-mips64el-linux-gnuabin32-dbg
+Section: debug
+Priority: optional
+Architecture: mipsn32el
+Multi-Arch: foreign
+Depends: binutils-mips64el-linux-gnuabin32 (= ${binary:Version})
+Description: GNU binary utilities, for mips64el-linux-gnuabin32 target (debug symbols)
+ This package provides debug symbols for binutils-mips64el-linux-gnuabin32.
+
+Package: binutils-mipsisa64r6-linux-gnuabin32
+Priority: optional
+Architecture: mipsn32r6
+Multi-Arch: allowed
+Depends: binutils-common (= ${binary:Version}),
+  ${shlibs:Depends}, ${extraDepends}
+Suggests: binutils-doc (= ${source:Version})
+Provides: 
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Description: GNU binary utilities, for mipsisa64r6-linux-gnuabin32 target
+ This package provides GNU assembler, linker and binary utilities
+ for the mipsisa64r6-linux-gnuabin32 target.
+ .
+ You don't need this package unless you plan to cross-compile programs
+ for mipsisa64r6-linux-gnuabin32 and mipsisa64r6-linux-gnuabin32 is not your native platform.
+
+Package: binutils-mipsisa64r6-linux-gnuabin32-dbg
+Section: debug
+Priority: optional
+Architecture: mipsn32r6
+Multi-Arch: foreign
+Depends: binutils-mipsisa64r6-linux-gnuabin32 (= ${binary:Version})
+Description: GNU binary utilities, for mipsisa64r6-linux-gnuabin32 target (debug symbols)
+ This package provides debug symbols for binutils-mipsisa64r6-linux-gnuabin32.
+
+Package: binutils-mipsisa64r6el-linux-gnuabin32
+Priority: optional
+Architecture: mipsn32r6el
+Multi-Arch: allowed
+Depends: binutils-common (= ${binary:Version}),
+  ${shlibs:Depends}, ${extraDepends}
+Suggests: binutils-doc (= ${source:Version})
+Provides: 
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Description: GNU binary utilities, for mipsisa64r6el-linux-gnuabin32 target
+ This package provides GNU assembler, linker and binary utilities
+ for the mipsisa64r6el-linux-gnuabin32 target.
+ .
+ You don't need this package unless you plan to cross-compile programs
+ for mipsisa64r6el-linux-gnuabin32 and mipsisa64r6el-linux-gnuabin32 is not your native platform.
+
+Package: binutils-mipsisa64r6el-linux-gnuabin32-dbg
+Section: debug
+Priority: optional
+Architecture: mipsn32r6el
+Multi-Arch: foreign
+Depends: binutils-mipsisa64r6el-linux-gnuabin32 (= ${binary:Version})
+Description: GNU binary utilities, for mipsisa64r6el-linux-gnuabin32 target (debug symbols)
+ This package provides debug symbols for binutils-mipsisa64r6el-linux-gnuabin32.
+
+Package: binutils-mipsisa32r6-linux-gnu
+Priority: optional
+Architecture: mipsr6
+Multi-Arch: allowed
+Depends: binutils-common (= ${binary:Version}),
+  ${shlibs:Depends}, ${extraDepends}
+Suggests: binutils-doc (= ${source:Version})
+Provides: 
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Description: GNU binary utilities, for mipsisa32r6-linux-gnu target
+ This package provides GNU assembler, linker and binary utilities
+ for the mipsisa32r6-linux-gnu target.
+ .
+ You don't need this package unless you plan to cross-compile programs
+ for mipsisa32r6-linux-gnu and mipsisa32r6-linux-gnu is not your native platform.
+
+Package: binutils-mipsisa32r6-linux-gnu-dbg
+Section: debug
+Priority: optional
+Architecture: mipsr6
+Multi-Arch: foreign
+Depends: binutils-mipsisa32r6-linux-gnu (= ${binary:Version})
+Description: GNU binary utilities, for mipsisa32r6-linux-gnu target (debug symbols)
+ This package provides debug symbols for binutils-mipsisa32r6-linux-gnu.
+
+Package: binutils-mipsisa32r6el-linux-gnu
+Priority: optional
+Architecture: mipsr6el
+Multi-Arch: allowed
+Depends: binutils-common (= ${binary:Version}),
+  ${shlibs:Depends}, ${extraDepends}
+Suggests: binutils-doc (= ${source:Version})
+Provides: 
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Description: GNU binary utilities, for mipsisa32r6el-linux-gnu target
+ This package provides GNU assembler, linker and binary utilities
+ for the mipsisa32r6el-linux-gnu target.
+ .
+ You don't need this package unless you plan to cross-compile programs
+ for mipsisa32r6el-linux-gnu and mipsisa32r6el-linux-gnu is not your native platform.
+
+Package: binutils-mipsisa32r6el-linux-gnu-dbg
+Section: debug
+Priority: optional
+Architecture: mipsr6el
+Multi-Arch: foreign
+Depends: binutils-mipsisa32r6el-linux-gnu (= ${binary:Version})
+Description: GNU binary utilities, for mipsisa32r6el-linux-gnu target (debug symbols)
+ This package provides debug symbols for binutils-mipsisa32r6el-linux-gnu.
+
+Package: binutils-mipsisa64r6-linux-gnuabi64
+Priority: optional
+Architecture: mips64r6
+Multi-Arch: allowed
+Depends: binutils-common (= ${binary:Version}),
+  ${shlibs:Depends}, ${extraDepends}
+Suggests: binutils-doc (= ${source:Version})
+Provides: 
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Description: GNU binary utilities, for mipsisa64r6-linux-gnuabi64 target
+ This package provides GNU assembler, linker and binary utilities
+ for the mipsisa64r6-linux-gnuabi64 target.
+ .
+ You don't need this package unless you plan to cross-compile programs
+ for mipsisa64r6-linux-gnuabi64 and mipsisa64r6-linux-gnuabi64 is not your native platform.
+
+Package: binutils-mipsisa64r6-linux-gnuabi64-dbg
+Section: debug
+Priority: optional
+Architecture: mips64r6
+Multi-Arch: foreign
+Depends: binutils-mipsisa64r6-linux-gnuabi64 (= ${binary:Version})
+Description: GNU binary utilities, for mipsisa64r6-linux-gnuabi64 target (debug symbols)
+ This package provides debug symbols for binutils-mipsisa64r6-linux-gnuabi64.
+
+Package: binutils-mipsisa64r6el-linux-gnuabi64
+Priority: optional
+Architecture: mips64r6el
+Multi-Arch: allowed
+Depends: binutils-common (= ${binary:Version}),
+  ${shlibs:Depends}, ${extraDepends}
+Suggests: binutils-doc (= ${source:Version})
+Provides: 
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Description: GNU binary utilities, for mipsisa64r6el-linux-gnuabi64 target
+ This package provides GNU assembler, linker and binary utilities
+ for the mipsisa64r6el-linux-gnuabi64 target.
+ .
+ You don't need this package unless you plan to cross-compile programs
+ for mipsisa64r6el-linux-gnuabi64 and mipsisa64r6el-linux-gnuabi64 is not your native platform.
+
+Package: binutils-mipsisa64r6el-linux-gnuabi64-dbg
+Section: debug
+Priority: optional
+Architecture: mips64r6el
+Multi-Arch: foreign
+Depends: binutils-mipsisa64r6el-linux-gnuabi64 (= ${binary:Version})
+Description: GNU binary utilities, for mipsisa64r6el-linux-gnuabi64 target (debug symbols)
+ This package provides debug symbols for binutils-mipsisa64r6el-linux-gnuabi64.
diff --git a/control.cross.in b/control.cross.in
new file mode 100644
index 000000000..20142c751
--- /dev/null
+++ b/control.cross.in
@@ -0,0 +1,27 @@
+
+Package: binutils-@target@
+Priority: optional
+Architecture: @host_archs@
+Multi-Arch: allowed
+Depends: binutils-common (= ${binary:Version}),
+  ${shlibs:Depends}, ${extraDepends}
+Suggests: binutils-doc (= ${source:Version})
+Provides: @binutils_alt_triplet@
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Built-Using: ${Built-Using}
+Description: GNU binary utilities, for @target@ target
+ This package provides GNU assembler, linker and binary utilities
+ for the @target@ target.
+ .
+ You don't need this package unless you plan to cross-compile programs
+ for @target@ and @target@ is not your native platform.
+
+Package: binutils-@target@-dbg
+Section: debug
+Priority: optional
+Architecture: @host_archs@
+Multi-Arch: foreign
+Depends: binutils-@target@ (= ${binary:Version})
+Description: GNU binary utilities, for @target@ target (debug symbols)
+ This package provides debug symbols for binutils-@target@.
diff --git a/control.in b/control.in
new file mode 100644
index 000000000..2e66f8035
--- /dev/null
+++ b/control.in
@@ -0,0 +1,225 @@
+Source: binutils
+Section: devel
+Priority: optional
+Maintainer: Matthias Klose <doko@debian.org>
+Uploaders: James Troup <binutils@elmo.tasta.io>
+Standards-Version: 4.6.0
+Build-Depends: autoconf (>= 2.64), @dpkg_dev@
+  bison, flex, gettext, texinfo, dejagnu, quilt, chrpath, dwz, debugedit (>= 4.16),
+  python3:any, file, xz-utils, lsb-release, zlib1g-dev, procps,
+  g++-aarch64-linux-gnu [amd64 i386 x32] <!nocheck>,
+  g++-arm-linux-gnueabi [amd64 arm64 i386 x32] <!nocheck>,
+  g++-arm-linux-gnueabihf [amd64 arm64 i386 x32] <!nocheck>,
+  g++-powerpc64le-linux-gnu [amd64 arm64 i386 ppc64 x32] <!nocheck>,
+  g++-s390x-linux-gnu [amd64 arm64 i386 ppc64el x32] <!nocheck>,
+  g++-alpha-linux-gnu [amd64 i386 x32] <!nocheck>,
+  g++-hppa-linux-gnu [amd64 i386 x32] <!nocheck>,
+  g++-m68k-linux-gnu [amd64 i386 x32] <!nocheck>,
+  g++-powerpc-linux-gnu [amd64 i386 ppc64el x32] <!nocheck>,
+  g++-powerpc64-linux-gnu [amd64 i386 x32] <!nocheck>,
+  g++-riscv64-linux-gnu [amd64 arm64 i386 ppc64el x32] <!nocheck>,
+  g++-sh4-linux-gnu [amd64 i386 x32] <!nocheck>,
+  g++-sparc64-linux-gnu [amd64 i386 x32] <!nocheck>,
+  g++-i686-linux-gnu [amd64 arm64 ppc64el x32] <!nocheck>,
+  g++-x86-64-linux-gnu [arm64 i386 ppc64el] <!nocheck>,
+  g++-x86-64-linux-gnux32 [amd64 arm64 i386 ppc64el] <!nocheck>,
+Build-Conflicts: libelf-dev
+Rules-Requires-Root: no
+Homepage: https://www.gnu.org/software/binutils/
+Vcs-Browser: https://salsa.debian.org/toolchain-team/binutils
+Vcs-Git: https://salsa.debian.org/toolchain-team/binutils.git
+XS-Testsuite: autopkgtest
+
+Package: binutils-for-host
+Architecture: any
+Depends: ${binutils:native}:any (>= ${binutils:minver}),
+  binutils-common (= ${binary:Version}),
+Multi-Arch: same
+Description: GNU assembler, linker and binary utilities for the host architecture
+ The programs in this package are used to assemble, link and manipulate
+ binary and object files for the architecture of this package.  They may be
+ used in conjunction with a matching compiler and various libraries to build
+ programs. When using binutils through this metapackage, all tools must be
+ used with an architecture prefix.
+
+Package: binutils-for-build
+Architecture: all
+Depends: binutils (>= ${binutils:minver}),
+  binutils-common (>= ${binutils:minver})
+Multi-Arch: foreign
+Description: GNU assembler, linker and binary utilities for the build architecture
+ The programs in this package are used to assemble, link and manipulate
+ binary and object files for the native architecture.  They may be used in
+ conjunction with a build architecture compiler and various libraries to build
+ programs. When using binutils through this metapackage, tools without an
+ architecture prefix must be used.
+
+Package: binutils
+Architecture: any
+Depends: ${shlibs:Depends}, binutils-common (= ${binary:Version}),
+  libbinutils (= ${binary:Version}), ${binutils:native} (= ${binary:Version})
+Conflicts: modutils (<< 2.4.19-1), ${extraConflicts},
+  binutils-multiarch (<< 2.27-8)
+Provides: elf-binutils, ${gold:Provides}
+Suggests: binutils-doc (>= ${source:Version})
+Description: GNU assembler, linker and binary utilities
+ The programs in this package are used to assemble, link and manipulate
+ binary and object files.  They may be used in conjunction with a compiler
+ and various libraries to build programs.
+
+Package: libctf-nobfd0
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}
+Breaks: libbinutils (<< 2.33.50.20191128-1~)
+Replaces: libbinutils (<< 2.33.50.20191128-1~)
+Description: Compact C Type Format library (runtime, no BFD dependency)
+ This package includes the libctf-nobfd shared library.  The Compact C Type
+ Format (CTF) is a way of representing information about a binary program
+
+Package: libctf-nobfd0-dbg
+Section: debug
+Architecture: any
+Multi-Arch: same
+Depends: libctf-nobfd0 (= ${binary:Version})
+Description: Compact C Type Format library (debug symbols, no BFD dependency)
+ This package includes the libctf-nobfd shared library.  The Compact C Type
+ Format (CTF) is a way of representing information about a binary program
+
+Package: libctf0
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, libbinutils (= ${binary:Version})
+Description: Compact C Type Format library (runtime, BFD dependency)
+ This package includes the libctf-nobfd shared library.  The Compact C Type
+ Format (CTF) is a way of representing information about a binary program
+
+Package: libctf0-dbg
+Section: debug
+Architecture: any
+Multi-Arch: same
+Depends: libctf0 (= ${binary:Version})
+Description: Compact C Type Format library (debug symbols, BFD dependency)
+ This package includes the libctf-nobfd shared library.  The Compact C Type
+ Format (CTF) is a way of representing information about a binary program
+
+Package: libbinutils
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, binutils-common (= ${binary:Version})
+Breaks: binutils (<< 2.29-6)
+Replaces: binutils (<< 2.29-6)
+Description: GNU binary utilities (private shared library)
+ This package includes the private shared libraries libbfd and libopcodes.
+
+Package: libbinutils-dbg
+Section: debug
+Architecture: any
+Multi-Arch: same
+Depends: libbinutils (= ${binary:Version})
+Description: GNU binary utilities (private shared library, debug symbols)
+ This package provides debug symbols for libbinutils.
+
+Package: binutils-dev
+Architecture: any
+Priority: optional
+Depends: binutils (= ${binary:Version}), libbinutils (= ${binary:Version}),
+  libctf0 (= ${binary:Version}), libctf-nobfd0 (= ${binary:Version})
+Conflicts: libbfd-dev
+Provides: libbfd-dev
+Replaces: libbfd-dev, libc5-dev
+Description: GNU binary utilities (BFD development files)
+ This package includes header files and static libraries necessary to build
+ programs which use the GNU BFD library, which is part of binutils.  Note
+ that building Debian packages which depend on the shared libbfd is Not
+ Allowed.
+
+Package: binutils-multiarch
+Architecture: any
+Priority: optional
+Depends: ${shlibs:Depends}, binutils (= ${binary:Version}),
+  binutils-common (= ${binary:Version})
+Description: Binary utilities that support multi-arch targets
+ The programs in this package are used to manipulate binary and object
+ files that may have been created on other architectures.  This package
+ is primarily for multi-architecture developers and cross-compilers and
+ is not needed by normal users or developers.  Note that a cross-assembling
+ version of gas is not included in this package, just the binary utilities.
+ .
+ NORMAL USERS SHOULD NOT INSTALL THIS PACKAGE.  It's meant only for those
+ requiring support for reading info from binaries from other architectures.
+
+Package: binutils-multiarch-dbg
+Section: debug
+Architecture: any
+Priority: optional
+Depends: binutils-multiarch (= ${binary:Version})
+Description: Binary utilities that support multi-arch targets (debug symbols)
+ This package provides debug symbols for binutils-multiarch.
+
+Package: binutils-multiarch-dev
+Architecture: any
+Priority: optional
+Depends: ${shlibs:Depends},
+ binutils-dev (= ${binary:Version}), binutils-multiarch (= ${binary:Version})
+Replaces: binutils-multiarch (<< 2.24-5)
+Description: GNU binary utilities that support multi-arch targets (BFD development files)
+ This package includes header files, static and shared libraries necessary
+ to build programs which use the GNU BFD library for multi-arch targets,
+ which is part of binutils. Note that building Debian packages which depend
+ on the shared libbfd is Not Allowed.
+ .
+ NORMAL USERS SHOULD NOT INSTALL THIS PACKAGE.  It's meant only for those
+ requiring support for reading info from binaries from other architectures.
+
+Package: binutils-hppa64-linux-gnu
+Architecture: amd64 i386 x32 hppa
+Depends: ${shlibs:Depends}, binutils (= ${binary:Version}),
+  binutils-common (= ${binary:Version})
+Recommends: libc6-dev
+Provides: binutils-hppa64
+Suggests: binutils-doc (>= ${source:Version})
+Breaks: binutils-hppa64 (<< 2.25.1-2)
+Replaces: binutils-hppa64 (<< 2.25.1-2)
+Description: GNU assembler, linker and binary utilities targeted for hppa64-linux
+ The programs in this package are used to assemble, link and manipulate
+ binary and object files.  They may be used in conjunction with a compiler
+ and various libraries to build programs.
+ .
+ This package is needed to build an 64-bit kernel for 64-bit hppa machines.
+
+Package: binutils-hppa64-linux-gnu-dbg
+Section: debug
+Architecture: amd64 i386 x32 hppa
+Depends: binutils-hppa64-linux-gnu (= ${binary:Version})
+Description: GNU binutils targeted for hppa64-linux (debug symbols)
+ This package provides debug symbols for binutils-hppa64-linux-gnu.
+
+Package: binutils-doc
+Section: doc
+Architecture: all
+Multi-Arch: foreign
+Priority: optional
+Suggests: binutils (= ${binary:Version})
+Description: Documentation for the GNU assembler, linker and binary utilities
+ This package consists of the documentation for the GNU assembler,
+ linker and binary utilities in info format.
+
+Package: binutils-source
+Architecture: all
+Multi-Arch: foreign
+Priority: optional
+Depends: texinfo, zlib1g-dev, make, python3
+Description: GNU assembler, linker and binary utilities (source)
+ This package contains the sources and patches which are needed to
+ build binutils.
+
+Package: binutils-common
+Architecture: any
+Multi-Arch: same
+Breaks: binutils (<< 2.29.1-3.1~)
+Replaces: binutils (<< 2.29.1-3.1~)
+Description: Common files for the GNU assembler, linker and binary utilities
+ This package contains the localization files used by binutils packages for
+ various target architectures and parts of the binutils documentation. It is
+ not useful on its own.
diff --git a/copyright b/copyright
new file mode 100644
index 000000000..6bb0089d6
--- /dev/null
+++ b/copyright
@@ -0,0 +1,45 @@
+This is the Debian GNU/Linux prepackaged version of the GNU assembler,
+linker, and binary utilities.
+
+This package was put together by me, James Troup <james@nocrew.org>,
+from sources, which I obtained from:
+
+  ftp://ftp.gnu.org/pub/gnu/binutils/
+
+and:
+
+  cvs://:pserver:anoncvs@sources.redhat.com:/cvs/src
+
+It was previously maintained by Christopher C. Chimelis <chris@debian.org>
+
+GNU Binutils is Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
+1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+2011, 2012, 2013, 2014, 2015, 2015, 2016, 2017, 2018, 2019 Free Software
+Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'
+and `/usr/share/common-licenses/LGPL'.
+
+The binutils manuals and associated documentation are also Copyright
+(C) Free Software Foundation, Inc.  They are distributed under the GNU
+Free Documentation License Version 1.3 or any later version published
+by the Free Software Foundation, with no Invariant Sections, with no
+with no Front-Cover Texts, and with no Back-Cover Texts.
+On Debian GNU/Linux systems, the complete text of the GFDL can be found
+in `/usr/share/common-licenses/GFDL'.
diff --git a/dwp.1 b/dwp.1
new file mode 100644
index 000000000..fe7585c34
--- /dev/null
+++ b/dwp.1
@@ -0,0 +1,33 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.5.
+.TH DWP "1" "January 2022" "GNU dwp (GNU Binutils for Debian) 2.37.90.20220123" "User Commands"
+.SH NAME
+dwp \- The DWARF packaging utility
+.SH SYNOPSIS
+.B dwp
+[\fI\,options\/\fR] [\fI\,file\/\fR...]
+.SH DESCRIPTION
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print this help message
+.TP
+\fB\-e\fR EXE, \fB\-\-exec\fR EXE
+Get list of dwo files from EXE (defaults output to EXE.dwp)
+.TP
+\fB\-o\fR FILE, \fB\-\-output\fR FILE
+Set output dwp file name
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+Verbose output
+.TP
+\fB\-\-verify\-only\fR
+Verify output file against exec file
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+Print version number
+.SH "REPORTING BUGS"
+Report bugs to <https://sourceware.org/bugzilla/>
+.SH COPYRIGHT
+Copyright \(co 2022 Free Software Foundation, Inc.
+This program is free software; you may redistribute it under the terms of
+the GNU General Public License version 3 or (at your option) any later version.
+This program has absolutely no warranty.
diff --git a/gfdl.texi b/gfdl.texi
new file mode 100644
index 000000000..695e4ae72
--- /dev/null
+++ b/gfdl.texi
@@ -0,0 +1,41 @@
+\input texinfo  @c -*-texinfo-*-
+@c %**start of header
+
+@settitle BFD/ld internal documentation
+
+@c Create a separate index for command line options.
+@defcodeindex op
+@c Merge the standard indexes into a single one.
+@syncodeindex fn cp
+@syncodeindex vr cp
+@syncodeindex ky cp
+@syncodeindex pg cp
+@syncodeindex tp cp
+
+@paragraphindent 1
+
+@c %**end of header
+
+@copying
+The current documentation is licensed under the same terms as the Debian packaging.
+@end copying
+@ifnottex
+@dircategory Programming
+@direntry
+* @name@: (@name@).                  BFD/ld internal documentation (@name@).
+@end direntry
+@sp 1
+@end ifnottex
+
+@summarycontents
+@contents
+@page
+
+@node Top
+@top Introduction
+@cindex introduction
+The official BFD, BFD internals and ld internals documentation is released
+under the terms of the GNU Free Documentation License with cover texts.
+This has been considered non free by the Debian Project. Thus you will find
+it in the non-free section of the Debian archive.
+@bye
diff --git a/ld.gold.1 b/ld.gold.1
new file mode 100644
index 000000000..dd87c5261
--- /dev/null
+++ b/ld.gold.1
@@ -0,0 +1,893 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.5.
+.TH GOLD "1" "January 2022" "GNU gold (GNU Binutils for Debian 2.37.90.20220123) 1.16" "User Commands"
+.SH NAME
+gold \- The GNU ELF linker
+.SH SYNOPSIS
+.B ld.gold
+[\fI\,options\/\fR] \fI\,file\/\fR...
+.SH OPTIONS
+.TP
+\fB\-\-help\fR
+Report usage information
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Report version information
+.TP
+\fB\-V\fR
+Report version and target information
+.TP
+\fB\-\-add\-needed\fR
+Not supported
+.TP
+\fB\-\-no\-add\-needed\fR
+Do not copy DT_NEEDED tags from shared libraries (default)
+.HP
+\fB\-\-allow\-multiple\-definition\fR Allow multiple definitions of symbols
+.TP
+\fB\-\-no\-allow\-multiple\-definition\fR
+Do not allow multiple definitions (default)
+.TP
+\fB\-\-allow\-shlib\-undefined\fR
+Allow unresolved references in shared libraries
+.TP
+\fB\-\-no\-allow\-shlib\-undefined\fR
+Do not allow unresolved references in shared libraries (default)
+.TP
+\fB\-\-apply\-dynamic\-relocs\fR
+Apply link\-time values for dynamic relocations (default)
+.TP
+\fB\-\-no\-apply\-dynamic\-relocs\fR
+(aarch64 only) Do not apply link\-time values for dynamic relocations
+.TP
+\fB\-\-as\-needed\fR
+Use DT_NEEDED only for shared libraries that are used
+.TP
+\fB\-\-no\-as\-needed\fR
+Use DT_NEEDED for all shared libraries (default)
+.TP
+\fB\-assert\fR [ignored]
+Ignored
+.TP
+\fB\-b\fR [elf,binary], \fB\-\-format\fR [elf,binary]
+Set input format
+.TP
+\fB\-\-be8\fR
+Output BE8 format image
+.TP
+\fB\-\-build\-id\fR [=STYLE]
+Generate build ID note
+.TP
+\fB\-\-build\-id\-chunk\-size\-for\-treehash\fR SIZE
+Chunk size for '\-\-build\-id=tree'
+.TP
+\fB\-\-build\-id\-min\-file\-size\-for\-treehash\fR SIZE
+Minimum output file size for '\-\-build\-id=tree' to work differently than '\-\-build\-id=sha1'
+.HP
+\fB\-Bdynamic\fR                   \fB\-l\fR searches for shared libraries (default)
+.HP
+\fB\-Bstatic\fR                    \fB\-l\fR does not search for shared libraries
+.TP
+\fB\-dy\fR
+alias for \fB\-Bdynamic\fR (default)
+.TP
+\fB\-dn\fR
+alias for \fB\-Bstatic\fR
+.TP
+\fB\-Bgroup\fR
+Use group name lookup rules for shared library
+.TP
+\fB\-Bshareable\fR
+Generate shared library (alias for \fB\-G\fR/\-shared)
+.TP
+\fB\-Bno\-symbolic\fR
+Don't bind default visibility defined symbols locally for \fB\-shared\fR (default)
+.TP
+\fB\-Bsymbolic\-functions\fR
+Bind default visibility defined function symbols locally for \fB\-shared\fR
+.TP
+\fB\-Bsymbolic\fR
+Bind default visibility defined symbols locally for \fB\-shared\fR
+.TP
+\fB\-\-check\-sections\fR
+Check segment addresses for overlaps (default)
+.TP
+\fB\-\-no\-check\-sections\fR
+Do not check segment addresses for overlaps
+.TP
+\fB\-\-compress\-debug\-sections\fR [none,zlib,zlib\-gnu,zlib\-gabi]
+Compress .debug_* sections in the output file
+.TP
+\fB\-\-copy\-dt\-needed\-entries\fR
+Not supported
+.HP
+\fB\-\-no\-copy\-dt\-needed\-entries\fR Do not copy DT_NEEDED tags from shared libraries (default)
+.TP
+\fB\-\-cref\fR
+Output cross reference table
+.TP
+\fB\-\-no\-cref\fR
+Do not output cross reference table (default)
+.TP
+\fB\-\-ctors\-in\-init\-array\fR
+Use DT_INIT_ARRAY for all constructors (default)
+.TP
+\fB\-\-no\-ctors\-in\-init\-array\fR
+Handle constructors as directed by compiler
+.TP
+\fB\-d\fR, \fB\-\-define\-common\fR
+Define common symbols
+.TP
+\fB\-\-no\-define\-common\fR
+Do not define common symbols in relocatable output (default)
+.TP
+\fB\-dc\fR
+Alias for \fB\-d\fR
+.TP
+\fB\-dp\fR
+Alias for \fB\-d\fR
+.TP
+\fB\-\-debug\fR [all,files,script,task][,...]
+Turn on debugging
+.TP
+\fB\-\-defsym\fR SYMBOL=EXPRESSION
+Define a symbol
+.TP
+\fB\-\-demangle\fR [=STYLE]
+Demangle C++ symbols in log messages
+.TP
+\fB\-\-no\-demangle\fR
+Do not demangle C++ symbols in log messages
+.TP
+\fB\-\-dependency\-file\fR FILE
+Write a dependency file listing all files read
+.TP
+\fB\-\-detect\-odr\-violations\fR
+Look for violations of the C++ One Definition Rule
+.TP
+\fB\-\-no\-detect\-odr\-violations\fR
+Do not look for violations of the C++ One Definition Rule (default)
+.TP
+\fB\-\-dynamic\-list\-data\fR
+Add data symbols to dynamic symbols
+.TP
+\fB\-\-dynamic\-list\-cpp\-new\fR
+Add C++ operator new/delete to dynamic symbols
+.HP
+\fB\-\-dynamic\-list\-cpp\-typeinfo\fR Add C++ typeinfo to dynamic symbols
+.TP
+\fB\-\-dynamic\-list\fR FILE
+Read a list of dynamic symbols
+.TP
+\fB\-\-emit\-stub\-syms\fR
+(PowerPC only) Label linker stubs with a symbol (default)
+.TP
+\fB\-\-no\-emit\-stub\-syms\fR
+(PowerPC only) Do not label linker stubs with a symbol
+.HP
+\fB\-e\fR ADDRESS, \fB\-\-entry\fR ADDRESS Set program start address
+.TP
+\fB\-\-eh\-frame\-hdr\fR
+Create exception frame header
+.TP
+\fB\-\-no\-eh\-frame\-hdr\fR
+Do not create exception frame header (default)
+.TP
+\fB\-\-enable\-new\-dtags\fR
+Enable use of DT_RUNPATH (default)
+.TP
+\fB\-\-disable\-new\-dtags\fR
+Disable use of DT_RUNPATH
+.TP
+\fB\-\-no\-enum\-size\-warning\fR
+(ARM only) Do not warn about objects with incompatible enum sizes
+.TP
+\fB\-\-exclude\-libs\fR lib,lib ...
+Exclude libraries from automatic export
+.TP
+\fB\-E\fR, \fB\-\-export\-dynamic\fR
+Export all dynamic symbols
+.TP
+\fB\-\-no\-export\-dynamic\fR
+Do not export all dynamic symbols (default)
+.TP
+\fB\-\-export\-dynamic\-symbol\fR SYMBOL
+Export SYMBOL to dynamic symbol table
+.TP
+\fB\-EB\fR
+Link big\-endian objects.
+.TP
+\fB\-EL\fR
+Link little\-endian objects.
+.HP
+\fB\-f\fR SHLIB, \fB\-\-auxiliary\fR SHLIB Auxiliary filter for shared object symbol table
+.TP
+\fB\-F\fR SHLIB, \fB\-\-filter\fR SHLIB
+Filter for shared object symbol table
+.TP
+\fB\-\-fatal\-warnings\fR
+Treat warnings as errors
+.TP
+\fB\-\-no\-fatal\-warnings\fR
+Do not treat warnings as errors (default)
+.TP
+\fB\-fini\fR SYMBOL
+Call SYMBOL at unload\-time
+.TP
+\fB\-\-fix\-arm1176\fR
+(ARM only) Fix binaries for ARM1176 erratum (default)
+.TP
+\fB\-\-no\-fix\-arm1176\fR
+(ARM only) Do not fix binaries for ARM1176 erratum
+.TP
+\fB\-\-fix\-cortex\-a8\fR
+(ARM only) Fix binaries for Cortex\-A8 erratum
+.TP
+\fB\-\-no\-fix\-cortex\-a8\fR
+(ARM only) Do not fix binaries for Cortex\-A8 erratum (default)
+.TP
+\fB\-\-fix\-cortex\-a53\-843419\fR
+(AArch64 only) Fix Cortex\-A53 erratum 843419
+.TP
+\fB\-\-no\-fix\-cortex\-a53\-843419\fR
+(AArch64 only) Do not fix Cortex\-A53 erratum 843419 (default)
+.TP
+\fB\-\-fix\-cortex\-a53\-835769\fR
+(AArch64 only) Fix Cortex\-A53 erratum 835769
+.TP
+\fB\-\-no\-fix\-cortex\-a53\-835769\fR
+(AArch64 only) Do not fix Cortex\-A53 erratum 835769 (default)
+.TP
+\fB\-\-fix\-v4bx\fR
+(ARM only) Rewrite BX rn as MOV pc, rn for ARMv4
+.TP
+\fB\-\-fix\-v4bx\-interworking\fR
+(ARM only) Rewrite BX rn branch to ARMv4 interworking veneer
+.TP
+\fB\-fuse\-ld\fR [gold,bfd]
+Ignored for GCC linker option compatibility
+.TP
+\fB\-g\fR
+Ignored
+.TP
+\fB\-\-gc\-sections\fR
+Remove unused sections
+.TP
+\fB\-\-no\-gc\-sections\fR
+Don't remove unused sections (default)
+.TP
+\fB\-\-gdb\-index\fR
+Generate .gdb_index section
+.TP
+\fB\-\-no\-gdb\-index\fR
+Do not generate .gdb_index section (default)
+.TP
+\fB\-\-gnu\-unique\fR
+Enable STB_GNU_UNIQUE symbol binding (default)
+.TP
+\fB\-\-no\-gnu\-unique\fR
+Disable STB_GNU_UNIQUE symbol binding
+.TP
+\fB\-G\fR, \fB\-shared\fR
+Generate shared library
+.TP
+\fB\-h\fR FILENAME, \fB\-soname\fR FILENAME
+Set shared library name
+.TP
+\fB\-\-hash\-bucket\-empty\-fraction\fR FRACTION
+Min fraction of empty buckets in dynamic hash
+.TP
+\fB\-\-hash\-style\fR [sysv,gnu,both]
+Dynamic hash style
+.TP
+\fB\-i\fR
+Alias for \fB\-r\fR
+.TP
+\fB\-\-icf\fR [none,all,safe]
+Identical Code Folding. '\-\-icf=safe' Folds ctors, dtors and functions whose pointers are definitely not taken
+.TP
+\fB\-\-icf\-iterations\fR COUNT
+Number of iterations of ICF (default 3)
+.TP
+\fB\-\-incremental\fR
+Do an incremental link if possible; otherwise, do a full link and prepare output for incremental linking
+.TP
+\fB\-\-no\-incremental\fR
+Do a full link (default)
+.TP
+\fB\-\-incremental\-full\fR
+Do a full link and prepare output for incremental linking
+.TP
+\fB\-\-incremental\-update\fR
+Do an incremental link; exit if not possible
+.TP
+\fB\-\-incremental\-base\fR FILE
+Set base file for incremental linking (default is output file)
+.TP
+\fB\-\-incremental\-changed\fR
+Assume files changed
+.TP
+\fB\-\-incremental\-unchanged\fR
+Assume files didn't change
+.TP
+\fB\-\-incremental\-unknown\fR
+Use timestamps to check files (default)
+.TP
+\fB\-\-incremental\-startup\-unchanged\fR
+Assume startup files unchanged (files preceding this option)
+.HP
+\fB\-\-incremental\-patch\fR PERCENT Amount of extra space to allocate for patches (default 10)
+.TP
+\fB\-init\fR SYMBOL
+Call SYMBOL at load\-time
+.TP
+\fB\-I\fR PROGRAM, \fB\-\-dynamic\-linker\fR PROGRAM
+Set dynamic linker path
+.TP
+\fB\-\-just\-symbols\fR FILE
+Read only symbol values from FILE
+.TP
+\fB\-\-keep\-files\-mapped\fR
+Keep files mapped across passes (default)
+.TP
+\fB\-\-no\-keep\-files\-mapped\fR
+Release mapped files after each pass
+.TP
+\fB\-\-keep\-unique\fR SYMBOL
+Do not fold this symbol during ICF
+.TP
+\fB\-l\fR LIBNAME, \fB\-\-library\fR LIBNAME
+Search for library LIBNAME
+.TP
+\fB\-\-ld\-generated\-unwind\-info\fR
+Generate unwind information for PLT (default)
+.TP
+\fB\-\-no\-ld\-generated\-unwind\-info\fR
+Do not generate unwind information for PLT
+.TP
+\fB\-L\fR DIR, \fB\-\-library\-path\fR DIR
+Add directory to search path
+.TP
+\fB\-\-long\-plt\fR
+(ARM only) Generate long PLT entries
+.TP
+\fB\-\-no\-long\-plt\fR
+(ARM only) Do not generate long PLT entries (default)
+.TP
+\fB\-m\fR EMULATION
+Set GNU linker emulation; obsolete
+.TP
+\fB\-\-map\-whole\-files\fR
+Map whole files to memory (default)
+.TP
+\fB\-\-no\-map\-whole\-files\fR
+Map relevant file parts to memory
+.TP
+\fB\-\-merge\-exidx\-entries\fR
+(ARM only) Merge exidx entries in debuginfo (default)
+.TP
+\fB\-\-no\-merge\-exidx\-entries\fR
+(ARM only) Do not merge exidx entries in debuginfo
+.TP
+\fB\-\-mmap\-output\-file\fR
+Map the output file for writing (default)
+.TP
+\fB\-\-no\-mmap\-output\-file\fR
+Do not map the output file for writing
+.TP
+\fB\-M\fR, \fB\-\-print\-map\fR
+Write map file on standard output
+.TP
+\fB\-Map\fR MAPFILENAME
+Write map file
+.TP
+\fB\-n\fR, \fB\-\-nmagic\fR
+Do not page align data
+.TP
+\fB\-N\fR, \fB\-\-omagic\fR
+Do not page align data, do not make text readonly
+.TP
+\fB\-\-no\-omagic\fR
+Page align data, make text readonly (default)
+.TP
+\fB\-\-no\-keep\-memory\fR
+Use less memory and more disk I/O (included only for compatibility with GNU ld)
+.TP
+\fB\-\-no\-undefined\fR
+Report undefined symbols (even with \fB\-\-shared\fR)
+.TP
+\fB\-\-noinhibit\-exec\fR
+Create an output file even if errors occur
+.TP
+\fB\-nostdlib\fR
+Only search directories specified on the command line
+.TP
+\fB\-o\fR FILE, \fB\-\-output\fR FILE
+Set output file name
+.TP
+\fB\-\-oformat\fR [binary]
+Set output format
+.TP
+\fB\-O\fR LEVEL, \fB\-optimize\fR LEVEL
+Optimize output file size
+.TP
+\fB\-\-orphan\-handling\fR [place,discard,warn,error]
+Orphan section handling
+.TP
+\fB\-p\fR
+Ignored for ARM compatibility
+.TP
+\fB\-pie\fR
+Create a position independent executable
+.TP
+\fB\-no\-pie\fR
+Do not create a position independent executable (default)
+.TP
+\fB\-\-pic\-executable\fR
+Create a position independent executable
+.TP
+\fB\-\-no\-pic\-executable\fR
+Do not create a position independent executable (default)
+.TP
+\fB\-\-pic\-veneer\fR
+Force PIC sequences for ARM/Thumb interworking veneers
+.TP
+\fB\-no\-pipeline\-knowledge\fR
+(ARM only) Ignore for backward compatibility (default)
+.TP
+\fB\-\-plt\-align\fR [=P2ALIGN]
+(PowerPC only) Align PLT call stubs to fit cache lines
+.TP
+\fB\-\-plt\-localentry\fR
+(PowerPC64 only) Optimize calls to ELFv2 localentry:0 functions
+.TP
+\fB\-\-no\-plt\-localentry\fR
+(PowerPC64 only) Don't optimize ELFv2 calls (default)
+.TP
+\fB\-\-plt\-static\-chain\fR
+(PowerPC64 only) PLT call stubs should load r11
+.TP
+\fB\-\-no\-plt\-static\-chain\fR
+(PowerPC64 only) PLT call stubs should not load r11 (default)
+.TP
+\fB\-\-plt\-thread\-safe\fR
+(PowerPC64 only) PLT call stubs with load\-load barrier
+.TP
+\fB\-\-no\-plt\-thread\-safe\fR
+(PowerPC64 only) PLT call stubs without barrier (default)
+.TP
+\fB\-\-plugin\fR PLUGIN
+Load a plugin library
+.TP
+\fB\-\-plugin\-opt\fR OPTION
+Pass an option to the plugin
+.TP
+\fB\-\-posix\-fallocate\fR
+Use posix_fallocate to reserve space in the output file (default)
+.TP
+\fB\-\-no\-posix\-fallocate\fR
+Use fallocate or ftruncate to reserve space
+.TP
+\fB\-\-power10\-stubs\fR [=auto,no,yes]
+(PowerPC64 only) stubs use power10 insns
+.TP
+\fB\-\-no\-power10\-stubs\fR
+(PowerPC64 only) stubs do not use power10 insns
+.TP
+\fB\-\-preread\-archive\-symbols\fR
+Preread archive symbols when multi\-threaded
+.TP
+\fB\-\-print\-gc\-sections\fR
+List removed unused sections on stderr
+.TP
+\fB\-\-no\-print\-gc\-sections\fR
+Do not list removed unused sections (default)
+.TP
+\fB\-\-print\-icf\-sections\fR
+List folded identical sections on stderr
+.TP
+\fB\-\-no\-print\-icf\-sections\fR
+Do not list folded identical sections (default)
+.TP
+\fB\-\-print\-output\-format\fR
+Print default output format
+.TP
+\fB\-\-print\-symbol\-counts\fR FILENAME
+Print symbols defined and used for each input
+.TP
+\fB\-\-push\-state\fR
+Save the state of flags related to input files
+.TP
+\fB\-\-pop\-state\fR
+Restore the state of flags related to input files
+.TP
+\fB\-q\fR, \fB\-\-emit\-relocs\fR
+Generate relocations in output
+.TP
+\fB\-Qy\fR
+Ignored for SVR4 compatibility
+.TP
+\fB\-r\fR, \fB\-relocatable\fR
+Generate relocatable output
+.TP
+\fB\-\-relax\fR
+Relax branches on certain targets
+.TP
+\fB\-\-no\-relax\fR
+Do not relax branches (default)
+.TP
+\fB\-\-retain\-symbols\-file\fR FILE
+keep only symbols listed in this file
+.TP
+\fB\-\-rosegment\fR
+Put read\-only non\-executable sections in their own segment
+.TP
+\fB\-\-no\-rosegment\fR
+Do not put read\-only non\-executable sections in their own segment (default)
+.TP
+\fB\-\-rosegment\-gap\fR OFFSET
+Set offset between executable and read\-only segments
+.TP
+\fB\-R\fR DIR
+Add DIR to runtime search path
+.TP
+\fB\-rpath\fR DIR
+Add DIR to runtime search path
+.TP
+\fB\-\-rpath\-link\fR DIR
+Add DIR to link time shared library search path
+.TP
+\fB\-s\fR, \fB\-\-strip\-all\fR
+Strip all symbols
+.TP
+\fB\-S\fR, \fB\-\-strip\-debug\fR
+Strip debugging information
+.TP
+\fB\-\-strip\-debug\-non\-line\fR
+Emit only debug line number information
+.TP
+\fB\-\-strip\-debug\-gdb\fR
+Strip debug symbols that are unused by gdb (at least versions <= 7.4)
+.TP
+\fB\-\-strip\-lto\-sections\fR
+Strip LTO intermediate code sections (default)
+.TP
+\fB\-\-section\-ordering\-file\fR FILENAME
+Layout sections in the order specified
+.TP
+\fB\-\-section\-start\fR SECTION=ADDRESS
+Set address of section
+.TP
+\fB\-\-secure\-plt\fR
+(PowerPC only) Use new\-style PLT (default)
+.TP
+\fB\-\-sort\-common\fR [={ascending,descending}]
+Sort common symbols by alignment
+.TP
+\fB\-\-sort\-section\fR [none,name]
+Sort sections by name.  '\-\-no\-text\-reorder' will override '\-\-sort\-section=name' for .text
+.TP
+\fB\-\-spare\-dynamic\-tags\fR COUNT
+Dynamic tag slots to reserve (default 5)
+.TP
+\fB\-\-stub\-group\-size\fR SIZE
+(ARM, PowerPC only) The maximum distance from instructions in a group of sections to their stubs. Negative values mean stubs are always after the group. 1 means use default size
+.TP
+\fB\-\-stub\-group\-multi\fR
+(PowerPC only) Allow a group of stubs to serve multiple output sections (default)
+.TP
+\fB\-\-no\-stub\-group\-multi\fR
+(PowerPC only) Each output section has its own stubs
+.TP
+\fB\-\-split\-stack\-adjust\-size\fR SIZE
+Stack size when \fB\-fsplit\-stack\fR function calls non\-split
+.TP
+\fB\-static\fR
+Do not link against shared libraries
+.TP
+\fB\-\-start\-lib\fR
+Start a library
+.TP
+\fB\-\-end\-lib\fR
+End a library
+.TP
+\fB\-\-stats\fR
+Print resource usage statistics
+.TP
+\fB\-\-sysroot\fR DIR
+Set target system root directory
+.TP
+\fB\-t\fR, \fB\-\-trace\fR
+Print the name of each input file
+.TP
+\fB\-\-target1\-abs\fR
+(ARM only) Force R_ARM_TARGET1 type to R_ARM_ABS32
+.TP
+\fB\-\-target1\-rel\fR
+(ARM only) Force R_ARM_TARGET1 type to R_ARM_REL32
+.TP
+\fB\-\-target2\fR [rel, abs, got\-rel
+(ARM only) Set R_ARM_TARGET2 relocation type
+.TP
+\fB\-\-text\-reorder\fR
+Enable text section reordering for GCC section names (default)
+.TP
+\fB\-\-no\-text\-reorder\fR
+Disable text section reordering for GCC section names
+.TP
+\fB\-\-threads\fR
+Run the linker multi\-threaded
+.TP
+\fB\-\-no\-threads\fR
+Do not run the linker multi\-threaded (default)
+.TP
+\fB\-\-thread\-count\fR COUNT
+Number of threads to use
+.TP
+\fB\-\-thread\-count\-initial\fR COUNT
+Number of threads to use in initial pass
+.HP
+\fB\-\-thread\-count\-middle\fR COUNT Number of threads to use in middle pass
+.TP
+\fB\-\-thread\-count\-final\fR COUNT
+Number of threads to use in final pass
+.TP
+\fB\-\-tls\-optimize\fR
+(PowerPC/64 only) Optimize GD/LD/IE code to IE/LE (default)
+.TP
+\fB\-\-no\-tls\-optimize\fR
+(PowerPC/64 only) Don'''t try to optimize TLS accesses
+.TP
+\fB\-\-tls\-get\-addr\-optimize\fR
+(PowerPC/64 only) Use a special __tls_get_addr call (default)
+.TP
+\fB\-\-no\-tls\-get\-addr\-optimize\fR
+(PowerPC/64 only) Don't use a special __tls_get_addr call
+.TP
+\fB\-\-toc\-optimize\fR
+(PowerPC64 only) Optimize TOC code sequences (default)
+.TP
+\fB\-\-no\-toc\-optimize\fR
+(PowerPC64 only) Don't optimize TOC code sequences
+.TP
+\fB\-\-toc\-sort\fR
+(PowerPC64 only) Sort TOC and GOT sections (default)
+.TP
+\fB\-\-no\-toc\-sort\fR
+(PowerPC64 only) Don't sort TOC and GOT sections
+.TP
+\fB\-T\fR FILE, \fB\-\-script\fR FILE
+Read linker script
+.TP
+\fB\-Tbss\fR ADDRESS
+Set the address of the bss segment
+.TP
+\fB\-Tdata\fR ADDRESS
+Set the address of the data segment
+.TP
+\fB\-Ttext\fR ADDRESS
+Set the address of the text segment
+.TP
+\fB\-Ttext\-segment\fR ADDRESS
+Set the address of the text segment
+.TP
+\fB\-Trodata\-segment\fR ADDRESS
+Set the address of the rodata segment
+.TP
+\fB\-u\fR SYMBOL, \fB\-\-undefined\fR SYMBOL
+Create undefined reference to SYMBOL
+.TP
+\fB\-\-unresolved\-symbols\fR ignore\-all,report\-all,ignore\-in\-object\-files,ignore\-in\-shared\-libs
+How to handle unresolved symbols
+.TP
+\fB\-\-verbose\fR
+Alias for \fB\-\-debug\fR=\fI\,files\/\fR
+.TP
+\fB\-\-version\-script\fR FILE
+Read version script
+.TP
+\fB\-\-warn\-common\fR
+Warn about duplicate common symbols
+.TP
+\fB\-\-no\-warn\-common\fR
+Do not warn about duplicate common symbols (default)
+.TP
+\fB\-\-warn\-constructors\fR
+Ignored
+.TP
+\fB\-\-no\-warn\-constructors\fR
+Ignored
+.TP
+\fB\-\-warn\-drop\-version\fR
+Warn when discarding version information
+.TP
+\fB\-\-no\-warn\-drop\-version\fR
+Do not warn when discarding version information (default)
+.TP
+\fB\-\-warn\-execstack\fR
+Warn if the stack is executable
+.TP
+\fB\-\-no\-warn\-execstack\fR
+Do not warn if the stack is executable (default)
+.TP
+\fB\-\-no\-warn\-mismatch\fR
+Don't warn about mismatched input files
+.TP
+\fB\-\-warn\-multiple\-gp\fR
+Ignored
+.TP
+\fB\-\-warn\-search\-mismatch\fR
+Warn when skipping an incompatible library (default)
+.TP
+\fB\-\-no\-warn\-search\-mismatch\fR
+Don't warn when skipping an incompatible library
+.TP
+\fB\-\-warn\-shared\-textrel\fR
+Warn if text segment is not shareable
+.TP
+\fB\-\-no\-warn\-shared\-textrel\fR
+Do not warn if text segment is not shareable (default)
+.TP
+\fB\-\-warn\-unresolved\-symbols\fR
+Report unresolved symbols as warnings
+.TP
+\fB\-\-error\-unresolved\-symbols\fR
+Report unresolved symbols as errors (default)
+.TP
+\fB\-z\fR buildd
+Dummy z option
+.TP
+\fB\-\-no\-wchar\-size\-warning\fR
+(ARM only) Do not warn about objects with incompatible wchar_t sizes
+.TP
+\fB\-\-weak\-unresolved\-symbols\fR
+Convert unresolved symbols to weak references
+.TP
+\fB\-\-whole\-archive\fR
+Include all archive contents
+.TP
+\fB\-\-no\-whole\-archive\fR
+Include only needed archive contents (default)
+.TP
+\fB\-\-wrap\fR SYMBOL
+Use wrapper functions for SYMBOL
+.TP
+\fB\-x\fR, \fB\-\-discard\-all\fR
+Delete all local symbols
+.TP
+\fB\-X\fR, \fB\-\-discard\-locals\fR
+Delete all temporary local symbols
+.TP
+\fB\-\-discard\-none\fR
+Keep all local symbols
+.TP
+\fB\-y\fR SYMBOL, \fB\-\-trace\-symbol\fR SYMBOL
+Trace references to symbol
+.TP
+\fB\-\-undefined\-version\fR
+Allow unused version in script (default)
+.TP
+\fB\-\-no\-undefined\-version\fR
+Do not allow unused version in script
+.TP
+\fB\-Y\fR PATH
+Default search path for Solaris compatibility
+.TP
+\-(, \fB\-\-start\-group\fR
+Start a library search group
+.TP
+\-), \fB\-\-end\-group\fR
+End a library search group
+.TP
+\fB\-z\fR bndplt
+(x86\-64 only) Generate a BND PLT for Intel MPX
+.TP
+\fB\-z\fR nobndplt
+Generate a regular PLT (default)
+.TP
+\fB\-z\fR combreloc
+Sort dynamic relocs (default)
+.TP
+\fB\-z\fR nocombreloc
+Do not sort dynamic relocs
+.TP
+\fB\-z\fR common\-page\-size=SIZE
+Set common page size to SIZE
+.TP
+\fB\-z\fR defs
+Report undefined symbols (even with \fB\-\-shared\fR)
+.TP
+\fB\-z\fR execstack
+Mark output as requiring executable stack
+.TP
+\fB\-z\fR global
+Make symbols in DSO available for subsequently loaded objects
+.TP
+\fB\-z\fR initfirst
+Mark DSO to be initialized first at runtime
+.TP
+\fB\-z\fR interpose
+Mark object to interpose all DSOs but executable
+.TP
+\fB\-z\fR unique
+Mark DSO to be loaded at most once, and only in the main namespace
+.TP
+\fB\-z\fR nounique
+Do not mark the DSO as one to be loaded only in the main namespace (default)
+.TP
+\fB\-z\fR lazy
+Mark object for lazy runtime binding (default)
+.TP
+\fB\-z\fR loadfltr
+Mark object requiring immediate process
+.TP
+\fB\-z\fR max\-page\-size=SIZE
+Set maximum page size to SIZE
+.TP
+\fB\-z\fR muldefs
+Allow multiple definitions of symbols
+.TP
+\fB\-z\fR nocopyreloc
+Do not create copy relocs
+.TP
+\fB\-z\fR nodefaultlib
+Mark object not to use default search paths
+.TP
+\fB\-z\fR nodelete
+Mark DSO non\-deletable at runtime
+.TP
+\fB\-z\fR nodlopen
+Mark DSO not available to dlopen
+.TP
+\fB\-z\fR nodump
+Mark DSO not available to dldump
+.TP
+\fB\-z\fR noexecstack
+Mark output as not requiring executable stack
+.TP
+\fB\-z\fR now
+Mark object for immediate function binding
+.TP
+\fB\-z\fR origin
+Mark DSO to indicate that needs immediate $ORIGIN processing at runtime
+.TP
+\fB\-z\fR relro
+Where possible mark variables read\-only after relocation (default)
+.TP
+\fB\-z\fR norelro
+Don't mark variables read\-only after relocation
+.TP
+\fB\-z\fR stack\-size=SIZE
+Set PT_GNU_STACK segment p_memsz to SIZE
+.TP
+\fB\-z\fR start\-stop\-visibility=[default,internal,hidden,protected]
+ELF symbol visibility for synthesized __start_* and __stop_* symbols
+.TP
+\fB\-z\fR text
+Do not permit relocations in read\-only segments
+.TP
+\fB\-z\fR notext
+Permit relocations in read\-only segments (default)
+.TP
+\fB\-z\fR textoff
+Permit relocations in read\-only segments (default)
+.TP
+\fB\-z\fR text\-unlikely\-segment
+Move .text.unlikely sections to a separate segment.
+.TP
+\fB\-z\fR notext\-unlikely\-segment
+Do not move .text.unlikely sections to a separate segment. (default)
+.HP
+\fB\-z\fR keep\-text\-section\-prefix Keep .text.hot, .text.startup, .text.exit and .text.unlikely as separate sections in the final binary.
+.TP
+\fB\-z\fR nokeep\-text\-section\-prefix
+Merge all .text.* prefix sections. (default)
+.PP
+debian/tmp/usr/bin/ld.gold: supported targets: elf32\-x86\-64 elf32\-x86\-64\-freebsd elf32\-x86\-64\-nacl elf64\-x86\-64 elf64\-x86\-64\-freebsd elf64\-x86\-64\-nacl elf32\-iamcu elf32\-i386 elf32\-i386\-freebsd elf32\-i386\-nacl
+debian/tmp/usr/bin/ld.gold: supported emulations: elf32_x86_64 elf32_x86_64_nacl elf_x86_64 elf_x86_64_nacl elf_iamcu elf_i386 elf_i386_nacl
+.SH "REPORTING BUGS"
+Report bugs to <https://sourceware.org/bugzilla/>
+.SH COPYRIGHT
+Copyright \(co 2022 Free Software Foundation, Inc.
+This program is free software; you may redistribute it under the terms of
+the GNU General Public License version 3 or (at your option) a later version.
+This program has absolutely no warranty.
diff --git a/libbinutils.overrides b/libbinutils.overrides
new file mode 100644
index 000000000..67e71e719
--- /dev/null
+++ b/libbinutils.overrides
@@ -0,0 +1,5 @@
+# the API of the shared libs is not public, don't care about the name
+libbinutils binary: package-name-doesnt-match-sonames
+
+# the upstream name, we don't care
+libbinutils binary: dev-pkg-without-shlib-symlink
diff --git a/libbinutils.shlibs.in b/libbinutils.shlibs.in
new file mode 100644
index 000000000..6964e2919
--- /dev/null
+++ b/libbinutils.shlibs.in
@@ -0,0 +1,2 @@
+libbfd @VER@-system@DATE_EXT@ libbinutils (>= @DEB_UVER@), libbinutils (<< @DEB_NVER@)
+libopcodes @VER@-system@DATE_EXT@ libbinutils (>= @DEB_UVER@), libbinutils (<< @DEB_NVER@)
diff --git a/libctf-nobfd0.symbols b/libctf-nobfd0.symbols
new file mode 100644
index 000000000..062632b3e
--- /dev/null
+++ b/libctf-nobfd0.symbols
@@ -0,0 +1,4 @@
+libctf-nobfd.so.0 libctf-nobfd0 #MINVER#
+ (symver)LIBCTF_1.0 2.34
+ (symver)LIBCTF_1.1 2.36
+ (symver)LIBCTF_1.2 2.37
diff --git a/libctf0.symbols b/libctf0.symbols
new file mode 100644
index 000000000..3b564ddd7
--- /dev/null
+++ b/libctf0.symbols
@@ -0,0 +1,4 @@
+libctf.so.0 libctf0 #MINVER#
+ (symver)LIBCTF_1.0 2.34
+ (symver)LIBCTF_1.1 2.36
+ (symver)LIBCTF_1.2 2.37
diff --git a/patches/001_ld_makefile_patch.patch b/patches/001_ld_makefile_patch.patch
new file mode 100644
index 000000000..2680287ff
--- /dev/null
+++ b/patches/001_ld_makefile_patch.patch
@@ -0,0 +1,27 @@
+Author: 
+Description: Description: correct where ld scripts are installed
+Author: Chris Chimelis <chris@debian.org>
+Upstream status: N/A
+Date: ??
+--- a/ld/Makefile.am
++++ b/ld/Makefile.am
+@@ -50,7 +50,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ 
+ EMUL = @EMUL@
+ EMULATION_OFILES = @EMULATION_OFILES@
+--- a/ld/Makefile.in
++++ b/ld/Makefile.in
+@@ -563,7 +563,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ BASEDIR = $(srcdir)/..
+ BFDDIR = $(BASEDIR)/bfd
+ INCDIR = $(BASEDIR)/include
diff --git a/patches/002_gprof_profile_arcs.patch b/patches/002_gprof_profile_arcs.patch
new file mode 100644
index 000000000..73bf47b4a
--- /dev/null
+++ b/patches/002_gprof_profile_arcs.patch
@@ -0,0 +1,27 @@
+Author: Chris Chimelis <chris@debian.org>
+Description: Add more documentation about profiling and -fprofile-arcs.
+--- a/gprof/gprof.texi
++++ b/gprof/gprof.texi
+@@ -145,6 +145,10 @@ its symbol table and the call graph prof
+ If more than one profile file is specified, the @code{gprof}
+ output shows the sum of the profile information in the given profile files.
+ 
++If you use gcc 2.95.x or 3.0 to compile your binaries, you may need
++to add the @samp{-fprofile-arcs} to the compile command line in order
++for the call graphs to be properly stored in gmon.out.
++
+ @code{Gprof} calculates the amount of time spent in each routine.
+ Next, these times are propagated along the edges of the call graph.
+ Cycles are discovered, and calls into a cycle are made to share the time
+@@ -276,6 +280,11 @@ to do the linking, simply specify @samp{
+ options.  The same option, @samp{-pg}, alters either compilation or linking
+ to do what is necessary for profiling.  Here are examples:
+ 
++If you use gcc 2.95.x or 3.0.x, you may need to add the
++@samp{-fprofile-arcs} option to the compile line along with @samp{-pg}
++in order to allow the call-graphs to be properly included in the gmon.out
++file.
++
+ @example
+ cc -g -c myprog.c utils.c -pg
+ cc -o myprog myprog.o utils.o -pg
diff --git a/patches/003_gprof_see_also_monitor.patch b/patches/003_gprof_see_also_monitor.patch
new file mode 100644
index 000000000..5e2eb61ad
--- /dev/null
+++ b/patches/003_gprof_see_also_monitor.patch
@@ -0,0 +1,13 @@
+Author: Chris Chimelis <chris@debian.org>
+Description: Don't mention monitor(3) which doesn't exist in Debian. (#160654)
+--- a/gprof/gprof.texi
++++ b/gprof/gprof.texi
+@@ -193,7 +193,7 @@ summarized dynamic call graph and profil
+ @c man end
+ 
+ @c man begin SEEALSO
+-monitor(3), profil(2), cc(1), prof(1), and the Info entry for @file{gprof}.
++cc(1), prof(1), and the Info entry for @file{gprof}.
+ 
+ ``An Execution Profiler for Modular Programs'',
+ by S. Graham, P. Kessler, M. McKusick;
diff --git a/patches/006_better_file_error.patch b/patches/006_better_file_error.patch
new file mode 100644
index 000000000..326c43da2
--- /dev/null
+++ b/patches/006_better_file_error.patch
@@ -0,0 +1,19 @@
+Author: David Kimdon <dwhedon@gordian.com>
+Description: Specify which filename is causing an error if the filename is a
+directory. (#45832)
+--- a/bfd/opncls.c
++++ b/bfd/opncls.c
+@@ -222,6 +222,13 @@ bfd_fopen (const char *filename, const c
+ {
+   bfd *nbfd;
+   const bfd_target *target_vec;
++  struct stat s;
++
++  if (stat (filename, &s) == 0)
++    if (S_ISDIR(s.st_mode)) {
++      bfd_set_error (bfd_error_file_not_recognized);
++      return NULL;
++    }
+ 
+   nbfd = _bfd_new_bfd ();
+   if (nbfd == NULL)
diff --git a/patches/013_bash_in_ld_testsuite.patch b/patches/013_bash_in_ld_testsuite.patch
new file mode 100644
index 000000000..f515bcca3
--- /dev/null
+++ b/patches/013_bash_in_ld_testsuite.patch
@@ -0,0 +1,13 @@
+Author: Matthias Klose <doko@ubuntu.com>
+Description: Explicitly use bash for the ld testsuite.
+--- a/ld/testsuite/config/default.exp
++++ b/ld/testsuite/config/default.exp
+@@ -171,7 +171,7 @@ load_lib ld-lib.exp
+ proc get_target_emul {} {
+     global target_triplet
+     global srcdir
+-    set status [catch "exec sh -c \"targ='$target_triplet' && . $srcdir/../configure.tgt && echo \\\$targ_emul\"" result]
++    set status [catch "exec bash -c \"targ='$target_triplet' && . $srcdir/../configure.tgt && echo \\\$targ_emul\"" result]
+     if $status { error "Error getting emulation name: $result" }
+     return $result
+ }
diff --git a/patches/014_hash_style-both.patch b/patches/014_hash_style-both.patch
new file mode 100644
index 000000000..61c3e6132
--- /dev/null
+++ b/patches/014_hash_style-both.patch
@@ -0,0 +1,30 @@
+# DP: Default to --hash-style=both in ld.bfd and ld.gold.
+
+--- a/ld/ldmain.c
++++ b/ld/ldmain.c
+@@ -287,6 +288,14 @@
+   emulation = get_emulation (argc, argv);
+   ldemul_choose_mode (emulation);
+   default_target = ldemul_choose_target (argc, argv);
++
++  /* Default to --hash-style=gnu */
++  if (strcmp (default_target, "elf32-tradbigmips") != 0
++      && strcmp (default_target, "elf32-tradlittlemips") != 0)
++    {
++      link_info.emit_gnu_hash = TRUE;
++    }
++
+   config.maxpagesize = bfd_emul_get_maxpagesize (default_target);
+   config.commonpagesize = bfd_emul_get_commonpagesize (default_target);
+   lang_init ();
+--- a/gold/options.h
++++ b/gold/options.h
+@@ -794,7 +794,7 @@
+ 		N_("Min fraction of empty buckets in dynamic hash"),
+ 		N_("FRACTION"));
+ 
+-  DEFINE_enum(hash_style, options::TWO_DASHES, '\0', "sysv",
++  DEFINE_enum(hash_style, options::TWO_DASHES, '\0', "both",
+ 	      N_("Dynamic hash style"), N_("[sysv,gnu,both]"),
+ 	      {"sysv", "gnu", "both"});
+ 
diff --git a/patches/014_hash_style-gnu.patch b/patches/014_hash_style-gnu.patch
new file mode 100644
index 000000000..b43b718e9
--- /dev/null
+++ b/patches/014_hash_style-gnu.patch
@@ -0,0 +1,31 @@
+# DP: Default to --hash-gnu=both in ld.bfd and ld.gold.
+
+--- a/ld/ldmain.c
++++ b/ld/ldmain.c
+@@ -287,6 +288,15 @@
+   emulation = get_emulation (argc, argv);
+   ldemul_choose_mode (emulation);
+   default_target = ldemul_choose_target (argc, argv);
++
++  /* Default to --hash-style=gnu */
++  if (strcmp (default_target, "elf32-tradbigmips") != 0
++      && strcmp (default_target, "elf32-tradlittlemips") != 0)
++    {
++      link_info.emit_gnu_hash = TRUE;
++      link_info.emit_hash = FALSE;
++    }
++
+   config.maxpagesize = bfd_emul_get_maxpagesize (default_target);
+   config.commonpagesize = bfd_emul_get_commonpagesize (default_target);
+   lang_init ();
+--- a/gold/options.h
++++ b/gold/options.h
+@@ -794,7 +794,7 @@
+ 		N_("Min fraction of empty buckets in dynamic hash"),
+ 		N_("FRACTION"));
+ 
+-  DEFINE_enum(hash_style, options::TWO_DASHES, '\0', "sysv",
++  DEFINE_enum(hash_style, options::TWO_DASHES, '\0', "gnu",
+ 	      N_("Dynamic hash style"), N_("[sysv,gnu,both]"),
+ 	      {"sysv", "gnu", "both"});
+ 
diff --git a/patches/127_x86_64_i386_biarch.patch b/patches/127_x86_64_i386_biarch.patch
new file mode 100644
index 000000000..b75ac8271
--- /dev/null
+++ b/patches/127_x86_64_i386_biarch.patch
@@ -0,0 +1,20 @@
+Author: 
+Description: Description: Add (/usr)/lib32 to the search paths on x86_64.
+Author: Aurelien Jarno <aurel32.debian.org>
+Upstream status: Debian specific
+--- a/ld/emulparams/elf_i386.sh
++++ b/ld/emulparams/elf_i386.sh
+@@ -13,3 +13,13 @@
+ NO_SMALL_DATA=yes
+ SEPARATE_GOTPLT="SIZEOF (.got.plt) >= 12 ? 12 : 0"
+ IREL_IN_PLT=
++
++# Linux modify the default library search path to first include
++# a 32-bit specific directory.
++case "$target" in
++  x86_64*-linux* | i[3-7]86*-linux* | x86_64*-kfreebsd*-gnu | i[3-7]86*-kfreebsd*-gnu)
++    case "$EMULATION_NAME" in
++      *i386*) LIBPATH_SUFFIX=32 ;;
++    esac
++    ;;
++esac
diff --git a/patches/128_build_id.patch b/patches/128_build_id.patch
new file mode 100644
index 000000000..cba02de07
--- /dev/null
+++ b/patches/128_build_id.patch
@@ -0,0 +1,42 @@
+Author: 
+Description: Description: Fix ld corrupt build ID generation
+Author: Nick Clifton
+Upstream status: Taken from Fedora (BZ 501582)
+--- a/bfd/compress.c
++++ b/bfd/compress.c
+@@ -174,7 +174,7 @@
+     case COMPRESS_SECTION_NONE:
+       if (p == NULL)
+ 	{
+-	  p = (bfd_byte *) bfd_malloc (sz);
++	  p = (bfd_byte *) bfd_zmalloc (sz);
+ 	  if (p == NULL)
+ 	    return FALSE;
+ 	  need_free = TRUE;
+--- a/bfd/elfcode.h
++++ b/bfd/elfcode.h
+@@ -1158,6 +1158,24 @@
+ 
+       if (i_shdr.contents)
+ 	(*process) (i_shdr.contents, i_shdr.sh_size, arg);
++      else
++	{
++	  asection *sec;
++
++	  sec = bfd_section_from_elf_index (abfd, count);
++	  if (sec != NULL)
++	    {
++	      if (sec->contents == NULL)
++		{
++		  /* Force rereading from file.  */
++		  sec->flags &= ~SEC_IN_MEMORY;
++		  if (! bfd_malloc_and_get_section (abfd, sec, & sec->contents))
++		    continue;
++		}
++	      if (sec->contents != NULL)
++		(*process) (sec->contents, i_shdr.sh_size, arg);
++	    }
++	}
+     }
+ 
+   return TRUE;
diff --git a/patches/128_ppc64_powerpc_biarch.patch b/patches/128_ppc64_powerpc_biarch.patch
new file mode 100644
index 000000000..4bb43cd19
--- /dev/null
+++ b/patches/128_ppc64_powerpc_biarch.patch
@@ -0,0 +1,15 @@
+--- a/ld/emulparams/elf32ppccommon.sh
++++ b/ld/emulparams/elf32ppccommon.sh
+@@ -56,3 +56,12 @@ case `echo "$target" | sed -e 's/-.*//'`
+   *:*64*) LIBPATH_SUFFIX=64 ;;
+   *:*32*) LIBPATH_SUFFIX=32 ;;
+ esac
++
++# On 64bit, look for 32 bit target libraries in /lib32, /usr/lib32 etc., first.
++case "$target" in
++  powerpc64-*-linux* | ppc64-*-linux*)
++    case "$EMULATION_NAME" in
++      *32*) LIBPATH_SUFFIX=32 ;;
++    esac
++    ;;
++esac
diff --git a/patches/129_multiarch_libpath.patch b/patches/129_multiarch_libpath.patch
new file mode 100644
index 000000000..9c4519122
--- /dev/null
+++ b/patches/129_multiarch_libpath.patch
@@ -0,0 +1,341 @@
+# DP: Add multiarch directories to linker search path for ld and gold.
+
+--- a/gold/configure
++++ b/gold/configure
+@@ -625,6 +625,7 @@ LTLIBOBJS
+ MAINT
+ MAINTAINER_MODE_FALSE
+ MAINTAINER_MODE_TRUE
++MULTIARCH_DIRNAME
+ DLOPEN_LIBS
+ CXXCPP
+ HAVE_NO_USE_LINKER_PLUGIN_FALSE
+@@ -10310,6 +10311,14 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >>
+   fi
+ 
+ 
++if test x$DEB_TARGET_MULTIARCH != x; then
++  multiarch=$DEB_TARGET_MULTIARCH
++  if test -n "$multiarch"; then
++    MULTIARCH_DIRNAME='-DMULTIARCH_DIRNAME=\"'$multiarch'\"'
++  fi
++fi
++
++
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
+ $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+--- a/gold/configure.ac
++++ b/gold/configure.ac
+@@ -706,6 +706,14 @@ AC_CHECK_HEADERS(locale.h)
+ AC_CHECK_FUNCS(setlocale)
+ AM_LC_MESSAGES
+ 
++if test x$DEB_TARGET_MULTIARCH != x; then
++  multiarch=$DEB_TARGET_MULTIARCH
++  if test -n "$multiarch"; then
++    MULTIARCH_DIRNAME='-DMULTIARCH_DIRNAME=\"'$multiarch'\"'
++  fi
++fi
++AC_SUBST(MULTIARCH_DIRNAME)
++
+ AM_MAINTAINER_MODE
+ 
+ AC_OUTPUT(Makefile testsuite/Makefile po/Makefile.in:po/Make-in)
+--- a/gold/Makefile.am
++++ b/gold/Makefile.am
+@@ -42,6 +42,7 @@ AM_CPPFLAGS = \
+ 	-I$(srcdir) -I$(srcdir)/../include -I$(srcdir)/../elfcpp \
+ 	-DLOCALEDIR="\"$(datadir)/locale\"" \
+ 	-DBINDIR="\"$(bindir)\"" -DTOOLBINDIR="\"$(tooldir)/bin\"" \
++	@MULTIARCH_DIRNAME@ $(if $(APPEND_TOOLLIBDIR),-DAPPEND_TOOLLIBDIR) \
+ 	-DTOOLLIBDIR="\"$(tooldir)/lib\"" @INCINTL@
+ 
+ LIBIBERTY = ../libiberty/libiberty.a
+--- a/gold/Makefile.in
++++ b/gold/Makefile.in
+@@ -674,6 +674,7 @@ AM_CPPFLAGS = \
+ 	-I$(srcdir) -I$(srcdir)/../include -I$(srcdir)/../elfcpp \
+ 	-DLOCALEDIR="\"$(datadir)/locale\"" \
+ 	-DBINDIR="\"$(bindir)\"" -DTOOLBINDIR="\"$(tooldir)/bin\"" \
++	@MULTIARCH_DIRNAME@ $(if $(APPEND_TOOLLIBDIR),-DAPPEND_TOOLLIBDIR) \
+ 	-DTOOLLIBDIR="\"$(tooldir)/lib\"" @INCINTL@
+ 
+ LIBIBERTY = ../libiberty/libiberty.a
+--- a/gold/options.cc
++++ b/gold/options.cc
+@@ -1297,8 +1297,15 @@ General_options::finalize()
+ 	       || this->user_set_sysroot()
+ 	       || *TARGET_SYSTEM_ROOT != '\0')
+ 	{
++#ifdef MULTIARCH_DIRNAME
++	  this->add_to_library_path_with_sysroot("/lib/" MULTIARCH_DIRNAME);
++	  this->add_to_library_path_with_sysroot("/usr/lib/" MULTIARCH_DIRNAME);
++#endif
+ 	  this->add_to_library_path_with_sysroot("/lib");
+ 	  this->add_to_library_path_with_sysroot("/usr/lib");
++#ifdef APPEND_TOOLLIBDIR
++	  this->add_to_library_path_with_sysroot(TOOLLIBDIR);
++#endif
+ 	}
+       else
+ 	this->add_to_library_path_with_sysroot(TOOLLIBDIR);
+--- a/ld/genscripts.sh
++++ b/ld/genscripts.sh
+@@ -235,6 +235,104 @@ append_to_lib_path()
+   fi
+ }
+ 
++# set the multiarch tuples
++multiarch_name=
++multiarch_name_32=
++multiarch_name_64=
++multiarch_name_n32=
++multiarch_name_x32=
++
++if true; then
++  # based on TOOL_LIB
++  multiarch_name=$DEB_TARGET_MULTIARCH
++  multiarch_name_32=$DEB_TARGET_MULTIARCH32
++  multiarch_name_64=$DEB_TARGET_MULTIARCH64
++  multiarch_name_n32=$DEB_TARGET_MULTIARCHN32
++  multiarch_name_x32=$DEB_TARGET_MULTIARCHX32
++else
++  # based on the emulation name; using TOOL_LIB seems to unreliable, when
++  # configuring with --enable-targets=powerpc-linux-gnu,powerpc64-linux-gnu
++  # only the first one (?) wins.
++  # FIXME: should this go into ld/emulparams/*.sh ?
++  case "$EMULATION_NAME" in
++    aarch64linux)
++      multiarch_name=aarch64-linux-gnu
++      ;;
++    aarch64linux32)
++      multiarch_name=aarch64_ilp32-linux-gnu
++      ;;
++    aarch64linux32b)
++      multiarch_name=aarch64_be_ilp32-linux-gnu
++      ;;
++    aarch64linuxb)
++      multiarch_name=aarch64_be-linux-gnu
++      ;;
++    armelf_linux_eabi)
++      # FIXME: TOOL_LIB can be arm-linux-gnueabi, arm-linux-gnueabihf, aarch64-linux-gnu
++      multiarch_name=arm-linux-gnueabi
++      ;;
++    armelfb_linux_eabi)
++      # FIXME: TOOL_LIB can be arm-linux-gnueabi, arm-linux-gnueabihf, aarch64-linux-gnu
++      multiarch_name=armeb-linux-gnueabi
++      ;;
++    elf32_sparc)
++      multiarch_name=sparc-linux-gnu
++      multiarch_name_64=sparc64-linux-gnu
++      ;;
++    elf32_x86_64)
++      multiarch_name=x86_64-linux-gnux32
++      multiarch_name_32=i386-linux-gnu
++      multiarch_name_64=x86_64-linux-gnu
++      ;;
++    elf32btsmip)
++      ;;
++    elf32btsmipn32)
++      ;;
++    elf32ltsmip)
++      ;;
++    elf32ltsmipn32)
++      ;;
++    elf32elflppc) # necessary?
++      multiarch_name=powerpcle-linux-gnu
++      multiarch_name_64=powerpc64le-linux-gnu
++      ;;
++    elf32elflppclinux)
++      multiarch_name=powerpcle-linux-gnu
++      multiarch_name_64=powerpc64le-linux-gnu
++      ;;
++    elf32ppc) # necessary?
++      multiarch_name=powerpc-linux-gnu
++      multiarch_name_64=powerpc64-linux-gnu
++      ;;
++    elf32ppclinux)
++      multiarch_name=powerpc-linux-gnu
++      multiarch_name_64=powerpc64-linux-gnu
++      ;;
++    elf64ppc)
++      multiarch_name=powerpc64-linux-gnu
++      multiarch_name_32=powerpc-linux-gnu
++      ;;
++  esac
++fi
++
++if [ "x${LIB_PATH}" = "x" ] && [ "x${USE_LIBPATH}" = xyes ] ; then
++  libs=${NATIVE_LIB_DIRS}
++  if [ "x${NATIVE}" = "xyes" ] ; then
++    case " ${libs} " in
++      *" ${libdir} "*) ;;
++      *) libs="${libdir} ${libs}" ;;
++    esac
++  fi
++  append_to_lib_path ${libs}
++fi
++
++case :${lib_path1}:${lib_path2}: in
++  *:: | ::*) LIB_PATH=${lib_path1}${lib_path2} ;;
++  *) LIB_PATH=${lib_path1}:${lib_path2} ;;
++esac
++lib_path1=
++lib_path2=
++
+ # Always search $(tooldir)/lib, aka /usr/local/TARGET/lib when native
+ # except when LIBPATH=":".
+ if [ "${LIB_PATH}" != ":" ] ; then
+@@ -253,6 +351,13 @@ if [ "${LIB_PATH}" != ":" ] ; then
+       case "${NATIVE}:${libpath_suffix}:${TOOL_LIB}" in
+ 	:* | *::* | *:*:*${libpath_suffix}) ;;
+ 	*) libs="${exec_prefix}/${target_alias}/lib${libpath_suffix}" ;;
++	*)
++	  # FIXME:
++	  # For the binutils-multiarch build on x86_64-linux-gnu configured
++          # with --enable-targets=powerpc-linux-gnu, /usr/x86_64-linux-gnu/lib64
++          # is added instead of /usr/powerpc64-linux-gnu/lib64. However this
++	  # probably wanted for the "default" emulation. How to detect that?
++	  libs="${exec_prefix}/${target_alias}/lib${libpath_suffix}" ;;
+       esac
+     done
+     libs="${exec_prefix}/${TOOL_LIB}/lib ${libs}"
+@@ -260,24 +365,124 @@ if [ "${LIB_PATH}" != ":" ] ; then
+   append_to_lib_path ${libs}
+ fi
+ 
+-if [ "x${LIB_PATH}" = "x" ] && [ "x${USE_LIBPATH}" = xyes ] ; then
+-  libs=${NATIVE_LIB_DIRS}
+-  if [ "x${NATIVE}" = "xyes" ] ; then
+-    case " ${libs} " in
+-      *" ${libdir} "*) ;;
+-      *) libs="${libdir} ${libs}" ;;
+-    esac
+-  fi
+-  append_to_lib_path ${libs}
+-fi
+-
+ case :${lib_path1}:${lib_path2}: in
+-  *:: | ::*) LIB_PATH=${lib_path1}${lib_path2} ;;
+-  *) LIB_PATH=${lib_path1}:${lib_path2} ;;
++  *:: | ::*) LIB_PATH=${LIB_PATH}:${lib_path1}${lib_path2} ;;
++  *) LIB_PATH=${LIB_PATH}:${lib_path1}:${lib_path2} ;;
+ esac
+ 
++# We use the $tool_lib variable in our multiarch mangling:
++if [ "x${TOOL_LIB}" = "x" ] ; then
++  tool_lib=${exec_prefix}/${target_alias}/lib
++else
++  tool_lib=${exec_prefix}/${TOOL_LIB}/lib
++fi
++
++# FIXME: why again? These already should be in LIBPATH
++if [ "x${APPEND_TOOLLIBDIR}" = "xyes" ] ; then
++  LIB_PATH=${LIB_PATH}:${tool_lib}
++  # For multilib targets, search both $tool_lib dirs
++  if [ "x${LIBPATH_SUFFIX}" != "x" ] ; then
++    LIB_PATH=${LIB_PATH}:${tool_lib}${LIBPATH_SUFFIX}
++  fi
++fi
++
+ LIB_SEARCH_DIRS=`echo ${LIB_PATH} | sed -e 's/:/ /g' -e 's/\([^ ][^ ]*\)/SEARCH_DIR(\\"\1\\");/g'`
+ 
++if [ -n "$multiarch_name" ]; then
++    temp_dirs=' '
++    ma_dirs=' '
++    for dir in `echo ${LIB_PATH} | sed -e 's/:/ /g'`; do
++	case "$dir" in
++	    *${tool_lib}*|*/${target_alias}/*)
++	        ;;
++	    */lib)
++		if [ -n "$multiarch_name_32" ]; then
++		    case $EMULATION_NAME in
++			elf_i386|elf32*)
++			    ma_dirs="${ma_dirs}${dir}/$multiarch_name_32 ";;
++			*)
++			    ma_dirs="${ma_dirs}${dir}/$multiarch_name "
++		    esac
++		elif [ -n "$multiarch_name_64" ]; then
++		    case $EMULATION_NAME in
++			elf*_64|elf64*)
++			    ma_dirs="${ma_dirs}${dir}/$multiarch_name_64 ";;
++			*)
++			    ma_dirs="${ma_dirs}${dir}/$multiarch_name "
++		    esac
++		else
++		    ma_dirs="${ma_dirs}${dir}/$multiarch_name "
++		fi
++		;;
++	    */lib32)
++	        if [ -n "$multiarch_name_32" ]; then
++		    dir2=$(echo $dir | sed "s,32$,,")
++		    ma_dirs="${ma_dirs}${dir2}/$multiarch_name_32 "
++		fi
++		;;
++	    */lib64)
++	        case "${target}" in
++		    aarch64*-*-*|powerpc64-*-*|s390x-*-*|sparc64-*-*|x86_64-*-linux-gnu|mips64-*-gnuabi64)
++			#dir=$(echo $dir | sed "s,64$,,")
++			dir2=$(echo $dir | sed "s,64$,,")
++			ma_dirs="${ma_dirs}${dir2}/$multiarch_name "
++			;;
++		    *)
++			if [ -n "$multiarch_name_64" ]; then
++			    dir2=$(echo $dir | sed "s,64$,,")
++			    ma_dirs="${ma_dirs}${dir2}/$multiarch_name_64 "
++			fi
++			;;
++		esac
++	        ;;
++	    */libx32)
++		case "${target}" in
++		    x86_64-*-linux-gnux32)
++			dir2=$(echo $dir | sed "s,x32$,,")
++			ma_dirs="${ma_dirs}${dir2}/$multiarch_name "
++			;;
++		    *)
++			if [ -n "$multiarch_name_x32" ]; then
++			    dir2=$(echo $dir | sed "s,x32$,,")
++			    ma_dirs="${ma_dirs}${dir2}/$multiarch_name_x32 "
++			fi
++			;;
++		esac
++		;;
++	    */libn32)
++		case "${target}" in
++		    mips64*-*-linux-gnuabin32)
++			dir2=$(echo $dir | sed "s,n32$,,")
++			ma_dirs="${ma_dirs}${dir2}/$multiarch_name "
++			;;
++		    *)
++			if [ -n "$multiarch_name_n32" ]; then
++			    dir2=$(echo $dir | sed "s,n32$,,")
++			    ma_dirs="${ma_dirs}${dir2}/$multiarch_name_n32 "
++			fi
++			;;
++		esac
++		;;
++	    */libilp32)
++	        if [ -n "$multiarch_name_32" ]; then
++		    dir2=$(echo $dir | sed "s,ilp32$,,")
++		    ma_dirs="${ma_dirs}${dir2}/$multiarch_name_32 "
++		fi
++		;;
++	    *)
++		;;
++	esac
++	temp_dirs="${temp_dirs}${dir} "
++    done
++    LIB_SEARCH_DIRS=
++    for dir in $ma_dirs $temp_dirs; do
++	if echo "$LIB_SEARCH_DIRS" | fgrep -q "\"$dir\""; then
++	    continue
++	fi
++	LIB_SEARCH_DIRS="${LIB_SEARCH_DIRS}SEARCH_DIR(\"$dir\"); "
++    done
++fi
++
+ # We need it for testsuite.
+ set $EMULATION_LIBPATH
+ if [ "x$1" = "x$EMULATION_NAME" ]; then
diff --git a/patches/130_gold_disable_testsuite_build.patch b/patches/130_gold_disable_testsuite_build.patch
new file mode 100644
index 000000000..7e1d1afa1
--- /dev/null
+++ b/patches/130_gold_disable_testsuite_build.patch
@@ -0,0 +1,26 @@
+Author: 
+Description: Description: Disable build of gold/testsuite
+Author: Matthias Klose
+Upstream status: local
+--- a/gold/Makefile.am
++++ b/gold/Makefile.am
+@@ -19,7 +19,7 @@
+ 
+ AUTOMAKE_OPTIONS = foreign
+ 
+-SUBDIRS = po testsuite
++SUBDIRS = po
+ 
+ tooldir = $(exec_prefix)/$(target_alias)
+ 
+--- a/gold/Makefile.in
++++ b/gold/Makefile.in
+@@ -656,7 +656,7 @@ top_srcdir = @top_srcdir@
+ zlibdir = @zlibdir@
+ zlibinc = @zlibinc@
+ AUTOMAKE_OPTIONS = foreign
+-SUBDIRS = po testsuite
++SUBDIRS = po
+ tooldir = $(exec_prefix)/$(target_alias)
+ ACLOCAL_AMFLAGS = -I ../bfd -I ../config
+ 
diff --git a/patches/131_ld_bootstrap_testsuite.patch b/patches/131_ld_bootstrap_testsuite.patch
new file mode 100644
index 000000000..bc294fa1d
--- /dev/null
+++ b/patches/131_ld_bootstrap_testsuite.patch
@@ -0,0 +1,45 @@
+Author: 
+Description: Description: Fix ld-bootstrap testsuite when configured with --enable-plugins
+Author: Rafael Espindola
+Upstream status: proposed patch
+--- a/ld/testsuite/ld-bootstrap/bootstrap.exp
++++ b/ld/testsuite/ld-bootstrap/bootstrap.exp
+@@ -50,6 +50,15 @@ if [check_plugin_api_available] {
+     set plugins "yes"
+ }
+ 
++remote_exec host "$nm --help" "" "/dev/null" "plugin-support"
++set tmp [file_contents "plugin-support"]
++regexp ".*\(--plugin\).*\n" $tmp foo plugins
++if [info exists plugins] then {
++    set plugins "yes"
++} else {
++    set plugins "no"
++}
++
+ # Bootstrap ld.  First link the object files together using -r, in
+ # order to test -r.  Then link the result into an executable, ld1, to
+ # really test -r.  Use ld1 to link a fresh ld, ld2.  Use ld2 to link a
+@@ -118,6 +127,11 @@ foreach flags $test_flags {
+ 	continue
+     }
+ 
++    if { $flags == "--static" && $plugins == "yes" } then {
++	untested $testname
++	continue
++    }
++
+     # If we only have a shared libbfd, we probably can't run the
+     # --static test.
+     if { $flags == "--static" && ! [string match "*libbfd.a*" $BFDLIB] } then {
+@@ -162,6 +176,10 @@ foreach flags $test_flags {
+ 	}
+     }
+ 
++    if { $plugins == "yes" } {
++	set extralibs "$extralibs -ldl"
++    }
++
+     # On Irix 5, linking with --static only works if all the files are
+     # compiled using -non_shared.
+     if {"$flags" == "--static"} {
diff --git a/patches/135_bfd_soversion.patch b/patches/135_bfd_soversion.patch
new file mode 100644
index 000000000..f339098fb
--- /dev/null
+++ b/patches/135_bfd_soversion.patch
@@ -0,0 +1,38 @@
+--- a/bfd/Makefile.am
++++ b/bfd/Makefile.am
+@@ -978,14 +978,14 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/
+ 	$(AM_V_GEN)\
+ 	bfd_version=`echo "$(VERSION)" | $(SED) -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
+ 	bfd_version_string="\"$(VERSION)\"" ;\
+-	bfd_soversion="$(VERSION)" ;\
++	bfd_soversion="$(VERSION)$(BFD_SOVER_EXT)" ;\
+ 	bfd_version_package="\"$(PKGVERSION)\"" ;\
+ 	report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\
+ 	. $(srcdir)/development.sh ;\
+ 	if test "$$development" = true ; then \
+ 	  bfd_version_date=`$(SED) -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\
+ 	  bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\
+-	  bfd_soversion="$(VERSION).$${bfd_version_date}" ;\
++	  bfd_soversion="$(VERSION)$(BFD_SOVER_EXT).$${bfd_version_date}" ;\
+ 	fi ;\
+ 	$(SED) -e "s,@bfd_version@,$$bfd_version," \
+ 	    -e "s,@bfd_version_string@,$$bfd_version_string," \
+--- a/bfd/Makefile.in
++++ b/bfd/Makefile.in
+@@ -2095,14 +2095,14 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/
+ 	$(AM_V_GEN)\
+ 	bfd_version=`echo "$(VERSION)" | $(SED) -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
+ 	bfd_version_string="\"$(VERSION)\"" ;\
+-	bfd_soversion="$(VERSION)" ;\
++	bfd_soversion="$(VERSION)$(BFD_SOVER_EXT)" ;\
+ 	bfd_version_package="\"$(PKGVERSION)\"" ;\
+ 	report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\
+ 	. $(srcdir)/development.sh ;\
+ 	if test "$$development" = true ; then \
+ 	  bfd_version_date=`$(SED) -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\
+ 	  bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\
+-	  bfd_soversion="$(VERSION).$${bfd_version_date}" ;\
++	  bfd_soversion="$(VERSION)$(BFD_SOVER_EXT).$${bfd_version_date}" ;\
+ 	fi ;\
+ 	$(SED) -e "s,@bfd_version@,$$bfd_version," \
+ 	    -e "s,@bfd_version_string@,$$bfd_version_string," \
diff --git a/patches/136_bfd_pic.patch b/patches/136_bfd_pic.patch
new file mode 100644
index 000000000..dcae790c9
--- /dev/null
+++ b/patches/136_bfd_pic.patch
@@ -0,0 +1,25 @@
+Author: Balint Reczey <balint@balintreczey.hu>
+Description: Build libbfd with -fPIC to allow linking with PIE binaries
+
+--- a/bfd/Makefile.am
++++ b/bfd/Makefile.am
+@@ -52,7 +52,7 @@ ZLIBINC = @zlibinc@
+ 
+ WARN_CFLAGS = @WARN_CFLAGS@
+ NO_WERROR = @NO_WERROR@
+-AM_CFLAGS = $(WARN_CFLAGS) $(ZLIBINC)
++AM_CFLAGS = $(WARN_CFLAGS) $(ZLIBINC) -fPIC
+ AM_CPPFLAGS = -DBINDIR='"$(bindir)"' -DLIBDIR='"$(libdir)"' @LARGEFILE_CPPFLAGS@
+ if PLUGINS
+ bfdinclude_HEADERS += $(INCDIR)/plugin-api.h
+--- a/bfd/Makefile.in
++++ b/bfd/Makefile.in
+@@ -480,7 +480,7 @@ libbfd_la_LDFLAGS = $(am__append_1) -rel
+ # case both are empty.
+ ZLIB = @zlibdir@ -lz
+ ZLIBINC = @zlibinc@
+-AM_CFLAGS = $(WARN_CFLAGS) $(ZLIBINC)
++AM_CFLAGS = $(WARN_CFLAGS) $(ZLIBINC) -fPIC
+ AM_CPPFLAGS = -DBINDIR='"$(bindir)"' -DLIBDIR='"$(libdir)"' \
+ 	@LARGEFILE_CPPFLAGS@ @HDEFINES@ @COREFLAG@ @TDEFINES@ \
+ 	$(CSEARCH) $(CSWITCHES) $(HAVEVECS) @INCINTL@
diff --git a/patches/157_ar_scripts_with_tilde.patch b/patches/157_ar_scripts_with_tilde.patch
new file mode 100644
index 000000000..840b66882
--- /dev/null
+++ b/patches/157_ar_scripts_with_tilde.patch
@@ -0,0 +1,11 @@
+--- a/binutils/arlex.l
++++ b/binutils/arlex.l
+@@ -78,7 +78,7 @@ int linenumber;
+ "("             { return '('; }
+ ")"             { return ')'; }
+ ","             { return ','; }
+-[A-Za-z0-9/\\$:.\-\_]+  {
++[A-Za-z0-9/\\$:.\-\_~]+  { 	
+ 		yylval.name =  xstrdup (yytext);
+ 		return FILENAME;
+ 		}
diff --git a/patches/158_ld_system_root.patch b/patches/158_ld_system_root.patch
new file mode 100644
index 000000000..27c07a636
--- /dev/null
+++ b/patches/158_ld_system_root.patch
@@ -0,0 +1,42 @@
+Index: b/ld/configure.ac
+===================================================================
+--- a/ld/configure.ac
++++ b/ld/configure.ac
+@@ -56,7 +56,9 @@
+  *) TARGET_SYSTEM_ROOT=$with_sysroot ;;
+  esac
+ 
++ if test "x$TARGET_SYSTEM_ROOT" != x/; then
+  TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"'
++ fi
+  use_sysroot=yes
+ 
+  if test "x$prefix" = xNONE; then
+Index: b/ld/configure
+===================================================================
+--- a/ld/configure
++++ b/ld/configure
+@@ -4283,7 +4283,9 @@
+  *) TARGET_SYSTEM_ROOT=$with_sysroot ;;
+  esac
+ 
++ if test "x$TARGET_SYSTEM_ROOT" != x/; then
+  TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"'
++ fi
+  use_sysroot=yes
+ 
+  if test "x$prefix" = xNONE; then
+Index: b/ld/ldmain.c
+===================================================================
+--- a/ld/ldmain.c
++++ b/ld/ldmain.c
+@@ -226,8 +226,8 @@
+     {
+       if (*TARGET_SYSTEM_ROOT == 0)
+ 	{
+-	  einfo ("%P%F: this linker was not configured to use sysroots\n");
+ 	  ld_sysroot = "";
++	  ld_canon_sysroot = "";
+ 	}
+       else
+ 	ld_canon_sysroot = lrealpath (ld_sysroot);
diff --git a/patches/161_gold_dummy_zoption.diff b/patches/161_gold_dummy_zoption.diff
new file mode 100644
index 000000000..9dfcd3d33
--- /dev/null
+++ b/patches/161_gold_dummy_zoption.diff
@@ -0,0 +1,25 @@
+# DP: let gold accept a dummy -z buildd-<random-string> option.
+
+--- a/gold/options.cc
++++ b/gold/options.cc
+@@ -994,6 +994,8 @@ parse_short_option(int argc, const char*
+     {
+       int dummy_i = 0;
+       const char* dash_z_arg = *arg;
++      if (strncmp(dash_z_arg, "buildd", strlen("buildd")) == 0)
++	  *arg = "buildd";
+       retval = parse_long_option(1, arg, true, arg, &dummy_i);
+       if (retval == NULL)
+ 	usage(_("unknown -z option"), dash_z_arg);
+--- a/gold/options.h
++++ b/gold/options.h
+@@ -1409,6 +1409,9 @@ class General_options
+ 		    options::TWO_DASHES, '\0',
+ 		    N_("Report unresolved symbols as errors"),
+ 		    NULL, true);
++  DEFINE_bool(buildd, options::DASH_Z, '\0', false,
++	      N_("Dummy z option"),
++	      NULL);
+ 
+   DEFINE_bool(wchar_size_warning, options::TWO_DASHES, '\0', true, NULL,
+ 	      N_("(ARM only) Do not warn about objects with incompatible "
diff --git a/patches/164_ld_doc_remove_xref.diff b/patches/164_ld_doc_remove_xref.diff
new file mode 100644
index 000000000..41c14e7f6
--- /dev/null
+++ b/patches/164_ld_doc_remove_xref.diff
@@ -0,0 +1,14 @@
+# DP: In ld.texi, remove cross reference to BFD internals documentation.
+
+--- a/ld/ld.texi
++++ b/ld/ld.texi
+@@ -8949,7 +8949,8 @@ may be spent optimizing algorithms for a
+ One minor artifact of the BFD solution which you should bear in
+ mind is the potential for information loss.  There are two places where
+ useful information can be lost using the BFD mechanism: during
+-conversion and during output. @xref{BFD information loss}.
++conversion and during output. See BFD information loss in the BFD
++internal documentation.
+ 
+ @menu
+ * BFD outline::                 How it works: an outline of BFD
diff --git a/patches/7c4643efe7b.diff b/patches/7c4643efe7b.diff
new file mode 100644
index 000000000..4be0cd520
--- /dev/null
+++ b/patches/7c4643efe7b.diff
@@ -0,0 +1,26 @@
+# DP: Fix objcopy --only-keep-debug, taken from the trunk (7c4643efe7b)
+
+diff --git a/binutils/objcopy.c b/binutils/objcopy.c
+index d16d8ee67e4..d53aa5c6000 100644
+--- a/binutils/objcopy.c
++++ b/binutils/objcopy.c
+@@ -4085,9 +4085,6 @@ setup_section (bfd *ibfd, sec_ptr isection, void *obfdarg)
+       goto loser;
+     }
+ 
+-  if (make_nobits)
+-    elf_section_type (osection) = SHT_NOBITS;
+-
+   size = bfd_section_size (isection);
+   size = bfd_convert_section_size (ibfd, isection, obfd, size);
+   if (copy_byte >= 0)
+@@ -4181,6 +4178,9 @@ setup_section (bfd *ibfd, sec_ptr isection, void *obfdarg)
+       goto loser;
+     }
+ 
++  if (make_nobits)
++    elf_section_type (osection) = SHT_NOBITS;
++
+   /* All went well.  */
+   return;
+ 
diff --git a/patches/aarch64-libpath.diff b/patches/aarch64-libpath.diff
new file mode 100644
index 000000000..656a14611
--- /dev/null
+++ b/patches/aarch64-libpath.diff
@@ -0,0 +1,25 @@
+--- a/ld/emulparams/aarch64linux.sh
++++ b/ld/emulparams/aarch64linux.sh
+@@ -38,12 +38,15 @@ PLT=".plt          ${RELOCATING-0} : ALI
+ 
+ # Linux modifies the default library search path to first include
+ # a 64-bit specific directory.
+-case "$target" in
+-  aarch64*-linux*)
+-    case "$EMULATION_NAME" in
+-      aarch64linux*) LIBPATH_SUFFIX=64 ;;
+-    esac
+-    ;;
+-esac
++
++# not for multiarch systems ...
++
++#case "$target" in
++#  aarch64*-linux*)
++#    case "$EMULATION_NAME" in
++#      aarch64linux*) LIBPATH_SUFFIX=64 ;;
++#    esac
++#    ;;
++#esac
+ 
+ ELF_INTERPRETER_NAME=\"/lib/ld-linux-aarch64.so.1\"
diff --git a/patches/branch-updates.diff b/patches/branch-updates.diff
new file mode 100644
index 000000000..862c4e733
--- /dev/null
+++ b/patches/branch-updates.diff
@@ -0,0 +1,14075 @@
+# DP: updates from the binutils-2.37 branch
+
+# git diff 116a737f438d03a1bd6aa706b6ea0b4022f3b7e2 86f474b5fff439ca3393a16075a232c6d08e4b9d
+
+diff --git a/bfd/ChangeLog b/bfd/ChangeLog
+index 75ca29c09b9..8782224e8b8 100644
+--- a/bfd/ChangeLog
++++ b/bfd/ChangeLog
+@@ -1,3 +1,21 @@
++2021-09-07  Luis Machado  <luis.machado@linaro.org>
++
++	Revert: [AArch64] MTE corefile support
++
++	2021-05-21  Luis Machado  <luis.machado@linaro.org>
++
++	* elf.c (elfcore_make_memtag_note_section): New function.
++	(elfcore_grok_note): Handle NT_MEMTAG note types.
++
++2021-07-21  Nick Clifton  <nickc@redhat.com>
++
++	* po/ru.po: Updated Russian translation.
++
++2021-07-18  Nick Clifton  <nickc@redhat.com>
++
++	* version.m4 (BFD_VERSION): Set to 2.37/0
++	* development.sh (development): Set to true.
++
+ 2021-07-18  Nick Clifton  <nickc@redhat.com>
+ 
+ 	* 2.37 release.
+diff --git a/bfd/development.sh b/bfd/development.sh
+index eb9762e4426..a376b02d869 100644
+--- a/bfd/development.sh
++++ b/bfd/development.sh
+@@ -16,7 +16,7 @@
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+ # Controls whether to enable development-mode features by default.
+-development=false
++development=true
+ 
+ # Indicate whether this is a release branch.
+ experimental=false
+diff --git a/bfd/elf.c b/bfd/elf.c
+index de5abafabf0..7a722841acf 100644
+--- a/bfd/elf.c
++++ b/bfd/elf.c
+@@ -7984,7 +7984,7 @@ _bfd_elf_fixup_group_sections (bfd *ibfd, asection *discarded)
+ 		    isec->flags |= SEC_EXCLUDE;
+ 		  }
+ 	      }
+-	    else
++	    else if (isec->output_section != NULL)
+ 	      {
+ 		/* Adjust the output section size when called from
+ 		   objcopy. */
+@@ -9599,23 +9599,6 @@ elfcore_make_auxv_note_section (bfd *abfd, Elf_Internal_Note *note,
+   return true;
+ }
+ 
+-static bool
+-elfcore_make_memtag_note_section (bfd *abfd, Elf_Internal_Note *note,
+-				  size_t offs)
+-{
+-  asection *sect = bfd_make_section_anyway_with_flags (abfd, ".memtag",
+-						       SEC_HAS_CONTENTS);
+-
+-  if (sect == NULL)
+-    return false;
+-
+-  sect->size = note->descsz - offs;
+-  sect->filepos = note->descpos + offs;
+-  sect->alignment_power = 1 + bfd_get_arch_size (abfd) / 32;
+-
+-  return true;
+-}
+-
+ /* prstatus_t exists on:
+      solaris 2.5+
+      linux 2.[01] + glibc
+@@ -10676,8 +10659,6 @@ elfcore_grok_note (bfd *abfd, Elf_Internal_Note *note)
+       return elfcore_make_note_pseudosection (abfd, ".note.linuxcore.siginfo",
+ 					      note);
+ 
+-    case NT_MEMTAG:
+-      return elfcore_make_memtag_note_section (abfd, note, 0);
+     }
+ }
+ 
+diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c
+index 34a6b3fd837..93fbadf61bc 100644
+--- a/bfd/elf32-ppc.c
++++ b/bfd/elf32-ppc.c
+@@ -19,8 +19,10 @@
+    Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+    Boston, MA 02110-1301, USA.  */
+ 
+-/* Don't generate unused section symbols.  */
+-#define TARGET_KEEP_UNUSED_SECTION_SYMBOLS false
++/* The assembler should generate a full set of section symbols even
++   when they appear unused.  The linux kernel build tool recordmcount
++   needs them.  */
++#define TARGET_KEEP_UNUSED_SECTION_SYMBOLS true
+ 
+ #include "sysdep.h"
+ #include <stdarg.h>
+diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
+index a4a05302a6a..55c5e500d06 100644
+--- a/bfd/elf64-ppc.c
++++ b/bfd/elf64-ppc.c
+@@ -25,8 +25,10 @@
+    http://www.linuxbase.org/spec/ELF/ppc64/PPC-elf64abi.txt, and
+    http://www.linuxbase.org/spec/ELF/ppc64/spec/book1.html  */
+ 
+-/* Don't generate unused section symbols.  */
+-#define TARGET_KEEP_UNUSED_SECTION_SYMBOLS false
++/* The assembler should generate a full set of section symbols even
++   when they appear unused.  The linux kernel build tool recordmcount
++   needs them.  */
++#define TARGET_KEEP_UNUSED_SECTION_SYMBOLS true
+ 
+ #include "sysdep.h"
+ #include <stdarg.h>
+diff --git a/bfd/format.c b/bfd/format.c
+index 5d08d1d642c..408c984690e 100644
+--- a/bfd/format.c
++++ b/bfd/format.c
+@@ -151,6 +151,7 @@ bfd_reinit (bfd *abfd, unsigned int section_id, bfd_cleanup cleanup)
+   abfd->tdata.any = NULL;
+   abfd->arch_info = &bfd_default_arch_struct;
+   abfd->flags &= BFD_FLAGS_SAVED;
++  abfd->build_id = NULL;
+   bfd_section_list_clear (abfd);
+ }
+ 
+diff --git a/bfd/plugin.c b/bfd/plugin.c
+index 6cfa2b66470..3bab8febe88 100644
+--- a/bfd/plugin.c
++++ b/bfd/plugin.c
+@@ -291,6 +291,14 @@ bfd_plugin_close_file_descriptor (bfd *abfd, int fd)
+ 	     && !bfd_is_thin_archive (abfd->my_archive))
+ 	abfd = abfd->my_archive;
+ 
++      /* Close the file descriptor if there is no archive plugin file
++	 descriptor.  */
++      if (abfd->archive_plugin_fd == -1)
++	{
++	  close (fd);
++	  return;
++	}
++
+       abfd->archive_plugin_fd_open_count--;
+       /* Dup the archive plugin file descriptor for later use, which
+ 	 will be closed by _bfd_archive_close_and_cleanup.  */
+diff --git a/bfd/po/ru.po b/bfd/po/ru.po
+index 5e3211cfe78..ede20f1ecbc 100644
+--- a/bfd/po/ru.po
++++ b/bfd/po/ru.po
+@@ -2,13 +2,13 @@
+ # Copyright (C) 2003, 2005, 2006, 2009 Free Software Foundation, Inc.
+ # This file is distributed under the same license as the binutils package.
+ #
+-# Yuri Kozlov <yuray@komyakino.ru>, 2009, 2010, 2011, 2012, 2018, 2019, 2020.
++# Yuri Kozlov <yuray@komyakino.ru>, 2009, 2010, 2011, 2012, 2018, 2019, 2020, 2021.
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: bfd 2.34.90\n"
++"Project-Id-Version: bfd 2.36.90\n"
+ "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
+-"POT-Creation-Date: 2020-07-04 10:26+0100\n"
+-"PO-Revision-Date: 2020-07-30 19:54+0300\n"
++"POT-Creation-Date: 2021-07-03 15:02+0100\n"
++"PO-Revision-Date: 2021-07-21 08:19+0300\n"
+ "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
+ "Language-Team: Russian <gnu@d07.ru>\n"
+ "Language: ru\n"
+@@ -16,7 +16,7 @@ msgstr ""
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ "X-Bugs: Report translation errors to the Language-Team address.\n"
+-"X-Generator: Lokalize 2.0\n"
++"X-Generator: Lokalize 20.12.0\n"
+ "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+ 
+ #: aout-cris.c:196
+@@ -34,21 +34,21 @@ msgstr "%pB: импортирован неподдерживаемый тип п
+ msgid "%pB: bad relocation record imported: %d"
+ msgstr "%pB: импортирована некорректная запись о перемещении: %d"
+ 
+-#: aoutx.h:1265 aoutx.h:1613 pdp11.c:1236 pdp11.c:1510
++#: aoutx.h:1265 aoutx.h:1613 pdp11.c:1238 pdp11.c:1512
+ #, c-format
+ msgid "%pB: can not represent section `%pA' in a.out object file format"
+ msgstr "%pB: нельзя представить раздел «%pA» в формате объектного файла a.out"
+ 
+-#: aoutx.h:1577 pdp11.c:1482
++#: aoutx.h:1577 pdp11.c:1484
+ #, c-format
+ msgid "%pB: can not represent section for symbol `%s' in a.out object file format"
+ msgstr "%pB: нельзя представить раздел для символа «%s» в формате объектного файла a.out"
+ 
+-#: aoutx.h:1580 vms-alpha.c:8040
++#: aoutx.h:1580 vms-alpha.c:8038
+ msgid "*unknown*"
+ msgstr "*неизвестно*"
+ 
+-#: aoutx.h:1716 pdp11.c:1578
++#: aoutx.h:1716 pdp11.c:1580
+ #, c-format
+ msgid "%pB: invalid string offset %<PRIu64> >= %<PRIu64>"
+ msgstr "%pB: недопустимое смещение строки %<PRIu64> >= %<PRIu64>"
+@@ -58,52 +58,53 @@ msgstr "%pB: недопустимое смещение строки %<PRIu64> >=
+ msgid "%pB: unsupported AOUT relocation size: %d"
+ msgstr "%pB: неподдерживаемый размер перемещения AOUT: %d"
+ 
+-#: aoutx.h:2412 aoutx.h:2430 pdp11.c:2058
++#: aoutx.h:2412 aoutx.h:2430 pdp11.c:2060
+ #, c-format
+ msgid "%pB: attempt to write out unknown reloc type"
+ msgstr "%pB: попытка записать неизвестный тип перемещения"
+ 
+-#: aoutx.h:4087 pdp11.c:3441
++#: aoutx.h:4085 pdp11.c:3441
+ #, c-format
+ msgid "%pB: unsupported relocation type"
+ msgstr "%pB: неподдерживаемый тип перемещения"
+ 
+ #. Unknown relocation.
+-#: aoutx.h:4408 coff-alpha.c:601 coff-alpha.c:1512 coff-rs6000.c:2758
++#: aoutx.h:4405 coff-alpha.c:601 coff-alpha.c:1518 coff-rs6000.c:2916
+ #: coff-sh.c:504 coff-tic4x.c:184 coff-tic54x.c:279 elf-hppa.h:798
+-#: elf-hppa.h:826 elf-m10200.c:226 elf-m10300.c:812 elf32-arc.c:532
+-#: elf32-arm.c:1985 elf32-avr.c:962 elf32-bfin.c:1062 elf32-bfin.c:4677
++#: elf-hppa.h:826 elf-m10200.c:226 elf-m10300.c:813 elf32-arc.c:532
++#: elf32-arm.c:1985 elf32-avr.c:962 elf32-bfin.c:1062 elf32-bfin.c:4687
+ #: elf32-cr16.c:654 elf32-cr16.c:684 elf32-cris.c:467 elf32-crx.c:429
+-#: elf32-csky.c:990 elf32-d10v.c:234 elf32-d30v.c:522 elf32-d30v.c:544
+-#: elf32-dlx.c:546 elf32-epiphany.c:372 elf32-fr30.c:381 elf32-frv.c:2558
+-#: elf32-frv.c:6239 elf32-ft32.c:306 elf32-h8300.c:302 elf32-i386.c:400
+-#: elf32-ip2k.c:1240 elf32-iq2000.c:442 elf32-lm32.c:495 elf32-m32c.c:305
+-#: elf32-m32r.c:1286 elf32-m32r.c:1311 elf32-m32r.c:2232 elf32-m68hc11.c:390
++#: elf32-csky.c:991 elf32-d10v.c:234 elf32-d30v.c:522 elf32-d30v.c:544
++#: elf32-dlx.c:546 elf32-epiphany.c:372 elf32-fr30.c:381 elf32-frv.c:2559
++#: elf32-frv.c:6240 elf32-ft32.c:305 elf32-h8300.c:302 elf32-i386.c:400
++#: elf32-ip2k.c:1240 elf32-iq2000.c:442 elf32-lm32.c:496 elf32-m32c.c:305
++#: elf32-m32r.c:1286 elf32-m32r.c:1311 elf32-m32r.c:2209 elf32-m68hc11.c:390
+ #: elf32-m68hc12.c:510 elf32-m68k.c:354 elf32-mcore.c:354 elf32-mcore.c:440
+-#: elf32-mep.c:389 elf32-metag.c:874 elf32-microblaze.c:692
+-#: elf32-microblaze.c:965 elf32-mips.c:2229 elf32-moxie.c:137
+-#: elf32-msp430.c:653 elf32-msp430.c:663 elf32-mt.c:241 elf32-nds32.c:3237
+-#: elf32-nds32.c:3263 elf32-nds32.c:5033 elf32-nios2.c:3022 elf32-or1k.c:1040
+-#: elf32-pj.c:326 elf32-ppc.c:901 elf32-ppc.c:914 elf32-pru.c:423
++#: elf32-mep.c:385 elf32-metag.c:871 elf32-microblaze.c:690
++#: elf32-microblaze.c:961 elf32-mips.c:2231 elf32-moxie.c:137
++#: elf32-msp430.c:737 elf32-msp430.c:747 elf32-mt.c:241 elf32-nds32.c:3237
++#: elf32-nds32.c:3263 elf32-nds32.c:5029 elf32-nios2.c:3019 elf32-or1k.c:1070
++#: elf32-pj.c:326 elf32-ppc.c:898 elf32-ppc.c:911 elf32-pru.c:423
+ #: elf32-rl78.c:291 elf32-rx.c:313 elf32-rx.c:322 elf32-s12z.c:296
+-#: elf32-s390.c:347 elf32-sh.c:438 elf32-spu.c:163 elf32-tic6x.c:1498
+-#: elf32-tic6x.c:1508 elf32-tic6x.c:1527 elf32-tic6x.c:1537 elf32-tic6x.c:2583
+-#: elf32-tilepro.c:800 elf32-v850.c:1898 elf32-v850.c:1920 elf32-v850.c:4270
+-#: elf32-vax.c:290 elf32-visium.c:481 elf32-wasm32.c:105 elf32-xc16x.c:250
+-#: elf32-xgate.c:418 elf32-xstormy16.c:395 elf32-xtensa.c:522
+-#: elf32-xtensa.c:556 elf32-z80.c:331 elf64-alpha.c:1113 elf64-alpha.c:4067
+-#: elf64-alpha.c:4215 elf64-bpf.c:322 elf64-ia64-vms.c:254
+-#: elf64-ia64-vms.c:3429 elf64-mips.c:3958 elf64-mips.c:3974 elf64-mmix.c:1264
+-#: elf64-nfp.c:238 elf64-ppc.c:1014 elf64-ppc.c:1366 elf64-ppc.c:1375
+-#: elf64-s390.c:328 elf64-s390.c:378 elf64-x86-64.c:281 elfn32-mips.c:3786
+-#: elfxx-ia64.c:324 elfxx-riscv.c:954 elfxx-sparc.c:589 elfxx-sparc.c:639
+-#: elfxx-tilegx.c:909 elfxx-tilegx.c:949 elfnn-aarch64.c:2215
+-#: elfnn-aarch64.c:2313 elfnn-ia64.c:213 elfnn-ia64.c:3824
++#: elf32-s390.c:347 elf32-score.c:2392 elf32-score7.c:2231 elf32-sh.c:437
++#: elf32-spu.c:163 elf32-tic6x.c:1498 elf32-tic6x.c:1508 elf32-tic6x.c:1527
++#: elf32-tic6x.c:1537 elf32-tic6x.c:2583 elf32-tilepro.c:792 elf32-v850.c:1902
++#: elf32-v850.c:1924 elf32-v850.c:4249 elf32-vax.c:289 elf32-visium.c:481
++#: elf32-wasm32.c:105 elf32-xc16x.c:250 elf32-xgate.c:418
++#: elf32-xstormy16.c:395 elf32-xtensa.c:522 elf32-xtensa.c:556 elf32-z80.c:331
++#: elf64-alpha.c:1114 elf64-alpha.c:4072 elf64-alpha.c:4220 elf64-bpf.c:325
++#: elf64-ia64-vms.c:255 elf64-ia64-vms.c:3431 elf64-mips.c:3958
++#: elf64-mips.c:3974 elf64-mmix.c:1264 elf64-nfp.c:238 elf64-ppc.c:1021
++#: elf64-ppc.c:1373 elf64-ppc.c:1382 elf64-s390.c:328 elf64-s390.c:378
++#: elf64-x86-64.c:279 elfn32-mips.c:3788 elfxx-ia64.c:324 elfxx-riscv.c:970
++#: elfxx-sparc.c:589 elfxx-sparc.c:639 elfxx-tilegx.c:907 elfxx-tilegx.c:947
++#: elfnn-aarch64.c:2215 elfnn-aarch64.c:2313 elfnn-ia64.c:214
++#: elfnn-ia64.c:3820
+ #, c-format
+ msgid "%pB: unsupported relocation type %#x"
+ msgstr "%pB: неподдерживаемый тип перемещения %#x"
+ 
+-#: aoutx.h:5435 pdp11.c:3864
++#: aoutx.h:5432 pdp11.c:3864
+ #, c-format
+ msgid "%pB: relocatable link from %s to %s not supported"
+ msgstr "%pB: перемещаемая ссылка из %s в %s не поддерживается"
+@@ -113,132 +114,132 @@ msgstr "%pB: перемещаемая ссылка из %s в %s не подде
+ msgid "%pB: cannot allocate memory for local GOT entries"
+ msgstr "%pB: невозможно выделить память для локальных элементов GOT"
+ 
+-#: archive.c:2249
++#: archive.c:2241
+ msgid "warning: writing archive was slow: rewriting timestamp"
+ msgstr "предупреждение: медленная запись в архив: перезаписывается метка времени"
+ 
+-#: archive.c:2316 archive.c:2376 elflink.c:4545 linker.c:1428
++#: archive.c:2308 archive.c:2368 elflink.c:4611 linker.c:1427
+ #, c-format
+ msgid "%pB: plugin needed to handle lto object"
+ msgstr "%pB: для обработки объекта lto требуется модуль"
+ 
+-#: archive.c:2602
++#: archive.c:2594
+ msgid "Reading archive file mod timestamp"
+ msgstr "Чтение метки времени изменения архивного файла"
+ 
+-#: archive.c:2626
++#: archive.c:2618
+ msgid "Writing updated armap timestamp"
+ msgstr "Запись обновлённой метки времени armap"
+ 
+-#: bfd.c:677
++#: bfd.c:681
+ msgid "no error"
+ msgstr "нет ошибки"
+ 
+-#: bfd.c:678
++#: bfd.c:682
+ msgid "system call error"
+ msgstr "ошибка системного вызова"
+ 
+-#: bfd.c:679
++#: bfd.c:683
+ msgid "invalid bfd target"
+ msgstr "неверная цель bfd"
+ 
+-#: bfd.c:680
++#: bfd.c:684
+ msgid "file in wrong format"
+ msgstr "файл в неправильном формате"
+ 
+-#: bfd.c:681
++#: bfd.c:685
+ msgid "archive object file in wrong format"
+ msgstr "архивный объектный файл в неправильном формате"
+ 
+-#: bfd.c:682
++#: bfd.c:686
+ msgid "invalid operation"
+ msgstr "неверная операция"
+ 
+-#: bfd.c:683
++#: bfd.c:687
+ msgid "memory exhausted"
+ msgstr "закончилась память"
+ 
+-#: bfd.c:684
++#: bfd.c:688
+ msgid "no symbols"
+ msgstr "нет символов"
+ 
+-#: bfd.c:685
++#: bfd.c:689
+ msgid "archive has no index; run ranlib to add one"
+ msgstr "архив без индекса; запустите ranlib для создания"
+ 
+-#: bfd.c:686
++#: bfd.c:690
+ msgid "no more archived files"
+ msgstr "архивные файлы закончились"
+ 
+-#: bfd.c:687
++#: bfd.c:691
+ msgid "malformed archive"
+ msgstr "искажённый архив"
+ 
+-#: bfd.c:688
++#: bfd.c:692
+ msgid "DSO missing from command line"
+ msgstr "в командной строке не указан DSO"
+ 
+-#: bfd.c:689
++#: bfd.c:693
+ msgid "file format not recognized"
+ msgstr "формат файла не распознан"
+ 
+-#: bfd.c:690
++#: bfd.c:694
+ msgid "file format is ambiguous"
+ msgstr "формат файла неоднозначен"
+ 
+-#: bfd.c:691
++#: bfd.c:695
+ msgid "section has no contents"
+ msgstr "раздел не имеет содержимого"
+ 
+-#: bfd.c:692
++#: bfd.c:696
+ msgid "nonrepresentable section on output"
+ msgstr "раздел, непредставимый для вывода"
+ 
+-#: bfd.c:693
++#: bfd.c:697
+ msgid "symbol needs debug section which does not exist"
+ msgstr "для символа требуется отладочный раздел, но его не существует"
+ 
+-#: bfd.c:694
++#: bfd.c:698
+ msgid "bad value"
+ msgstr "некорректное значение"
+ 
+-#: bfd.c:695
++#: bfd.c:699
+ msgid "file truncated"
+ msgstr "файл усечён"
+ 
+-#: bfd.c:696
++#: bfd.c:700
+ msgid "file too big"
+ msgstr "файл слишком большой"
+ 
+-#: bfd.c:697
++#: bfd.c:701
+ msgid "sorry, cannot handle this file"
+ msgstr "невозможно обработать этот файл"
+ 
+-#: bfd.c:698
++#: bfd.c:702
+ #, c-format
+ msgid "error reading %s: %s"
+ msgstr "ошибка чтения %s: %s"
+ 
+-#: bfd.c:699
++#: bfd.c:703
+ msgid "#<invalid error code>"
+ msgstr "#<неверный код ошибки>"
+ 
+-#: bfd.c:1658
++#: bfd.c:1640
+ #, c-format
+ msgid "BFD %s assertion fail %s:%d"
+ msgstr "Оператор контроля BFD %s обнаружил ошибку %s:%d"
+ 
+-#: bfd.c:1671
++#: bfd.c:1653
+ #, c-format
+ msgid "BFD %s internal error, aborting at %s:%d in %s\n"
+ msgstr "Внутренняя ошибка BFD %s, останов на %s:%d в %s\n"
+ 
+-#: bfd.c:1676
++#: bfd.c:1658
+ #, c-format
+ msgid "BFD %s internal error, aborting at %s:%d\n"
+ msgstr "Внутренняя ошибка BFD %s, останов на %s:%d\n"
+ 
+-#: bfd.c:1678
++#: bfd.c:1660
+ msgid "Please report this bug.\n"
+ msgstr "Пожалуйста, сообщите об этой ошибке.\n"
+ 
+@@ -267,41 +268,63 @@ msgstr "переоткрывается %pB: %s\n"
+ msgid "%pB: cannot handle compressed Alpha binaries; use compiler flags, or objZ, to generate uncompressed binaries"
+ msgstr "%pB: не удалось обработать сжатые двоичные файлы Alpha; для создания несжатых файлов используйте параметры компилятора или objZ."
+ 
+-#: coff-alpha.c:850 coff-alpha.c:887 coff-alpha.c:1954 coff-mips.c:953
++#: coff-alpha.c:856 coff-alpha.c:893 coff-alpha.c:1960 coff-mips.c:953
+ msgid "GP relative relocation used when GP not defined"
+ msgstr "Использовано относительное перемещение GP, но GP не определена"
+ 
+-#: coff-alpha.c:1441
++#: coff-alpha.c:1447
+ msgid "using multiple gp values"
+ msgstr "используется несколько значений gp"
+ 
+-#: coff-alpha.c:1499 coff-alpha.c:1505 elf.c:9431 elf32-mcore.c:100
+-#: elf32-mcore.c:455 elf32-ppc.c:7596 elf32-ppc.c:8747 elf64-ppc.c:15962
++#: coff-alpha.c:1505 coff-alpha.c:1511 elf.c:9463 elf32-mcore.c:100
++#: elf32-mcore.c:455 elf32-ppc.c:7614 elf32-ppc.c:8763 elf64-ppc.c:16242
+ #, c-format
+ msgid "%pB: %s unsupported"
+ msgstr "%pB: %s не поддерживается"
+ 
+-#: coff-go32.c:156 coffswap.h:785
++#: coff-go32.c:156 coffswap.h:792
+ #, c-format
+ msgid "%pB: warning: %s: line number overflow: 0x%lx > 0xffff"
+ msgstr "%pB: предупреждение: %s: переполнение номера строки: 0x%lx > 0xffff"
+ 
+-#: coff-mips.c:643 elf32-mips.c:1742 elf32-score.c:430 elf32-score7.c:330
+-#: elf64-mips.c:3451 elfn32-mips.c:3276
++#: coff-mips.c:643 elf32-mips.c:1744 elf32-score.c:433 elf32-score7.c:333
++#: elf64-mips.c:3451 elfn32-mips.c:3278
+ msgid "GP relative relocation when _gp not defined"
+ msgstr "Относительное перемещение GP, но _gp не определена"
+ 
+-#: coff-rs6000.c:2844
++#: coff-rs6000.c:484 coff64-rs6000.c:377
++#, c-format
++msgid "%pB: unsupported swap_aux_in for storage class %#x"
++msgstr "%pB: неподдерживаемый swap_aux_in для класса хранения %#x"
++
++#: coff-rs6000.c:570 coff64-rs6000.c:499
++#, c-format
++msgid "%pB: unsupported swap_aux_out for storage class %#x"
++msgstr "%pB: неподдерживаемый swap_aux_out для класса хранения %#x"
++
++#: coff-rs6000.c:3002
+ #, c-format
+ msgid "%pB: TOC reloc at %#<PRIx64> to symbol `%s' with no TOC entry"
+ msgstr "%pB: перемещение TOC по адресу %#<PRIx64> к символу «%s» без элемента TOC"
+ 
+-#: coff-rs6000.c:3607 coff64-rs6000.c:2153
++#: coff-rs6000.c:3209 coff-rs6000.c:3220
++msgid "%pB: TLS relocation at (0x%"
++msgstr "%pB: перемещение TLS по адресу (0x%"
++
++#: coff-rs6000.c:3234
++msgid "%pB: TLS local relocation at (0x%"
++msgstr "%pB: локальное перемещение TLS по адресу (0x%"
++
++#: coff-rs6000.c:3642 coff64-rs6000.c:1573
++msgid "%pB: relocatation (%d) at (0x%"
++msgstr "%pB: перемещение (%d) по адресу (0x%"
++
++#: coff-rs6000.c:3905 coff64-rs6000.c:2023
+ #, c-format
+ msgid "%pB: symbol `%s' has unrecognized smclas %d"
+ msgstr "%pB: символ «%s» имеет нераспознанный smclas %d"
+ 
+-#: coff-sh.c:778 elf32-sh.c:521
++#: coff-sh.c:778 elf32-sh.c:520
+ #, c-format
+ msgid "%pB: %#<PRIx64>: warning: bad R_SH_USES offset"
+ msgstr "%pB: %#<PRIx64>: предупреждение: неправильное смещение R_SH_USES"
+@@ -311,32 +334,32 @@ msgstr "%pB: %#<PRIx64>: предупреждение: неправильное
+ msgid "%pB: %#<PRIx64>: warning: R_SH_USES points to unrecognized insn %#x"
+ msgstr "%pB: %#<PRIx64>: предупреждение: R_SH_USES указывает на нераспознанную инструкцию %#x"
+ 
+-#: coff-sh.c:807 elf32-sh.c:552
++#: coff-sh.c:807 elf32-sh.c:551
+ #, c-format
+ msgid "%pB: %#<PRIx64>: warning: bad R_SH_USES load offset"
+ msgstr "%pB: %#<PRIx64>: предупреждение: неправильное загрузочное смещение R_SH_USES"
+ 
+-#: coff-sh.c:832 elf32-sh.c:568
++#: coff-sh.c:832 elf32-sh.c:567
+ #, c-format
+ msgid "%pB: %#<PRIx64>: warning: could not find expected reloc"
+ msgstr "%pB: %#<PRIx64>: предупреждение: невозможно найти ожидаемое перемещение"
+ 
+-#: coff-sh.c:849 elf32-sh.c:597
++#: coff-sh.c:849 elf32-sh.c:596
+ #, c-format
+ msgid "%pB: %#<PRIx64>: warning: symbol in unexpected section"
+ msgstr "%pB: %#<PRIx64>: предупреждение: символ в неожиданном разделе"
+ 
+-#: coff-sh.c:975 elf32-sh.c:727
++#: coff-sh.c:975 elf32-sh.c:726
+ #, c-format
+ msgid "%pB: %#<PRIx64>: warning: could not find expected COUNT reloc"
+ msgstr "%pB: %#<PRIx64>: предупреждение: невозможно найти ожидаемое перемещение COUNT"
+ 
+-#: coff-sh.c:985 elf32-sh.c:738
++#: coff-sh.c:985 elf32-sh.c:737
+ #, c-format
+ msgid "%pB: %#<PRIx64>: warning: bad count"
+ msgstr "%pB: %#<PRIx64>: предупреждение: неправильный счётчик"
+ 
+-#: coff-sh.c:1356 coff-sh.c:2644 elf32-sh.c:1138 elf32-sh.c:1505
++#: coff-sh.c:1356 coff-sh.c:2644 elf32-sh.c:1137 elf32-sh.c:1504
+ #, c-format
+ msgid "%pB: %#<PRIx64>: fatal: reloc overflow while relaxing"
+ msgstr "%pB: %#<PRIx64>: останов: переполнение перемещения при ослаблении"
+@@ -346,34 +369,44 @@ msgstr "%pB: %#<PRIx64>: останов: переполнение перемещ
+ msgid "%pB: fatal: generic symbols retrieved before relaxing"
+ msgstr "%pB: останов: перед ослаблением получены общие символы"
+ 
+-#: coff-sh.c:2781 cofflink.c:2948
++#: coff-sh.c:2781 cofflink.c:2959
+ #, c-format
+ msgid "%pB: illegal symbol index %ld in relocs"
+ msgstr "%pB: недопустимый символьный индекс %ld в перемещениях"
+ 
+-#: coff-tic4x.c:228 coff-tic54x.c:366 coffcode.h:5085
++#: coff-tic4x.c:228 coff-tic54x.c:366 coffcode.h:5124
+ #, c-format
+ msgid "%pB: warning: illegal symbol index %ld in relocs"
+ msgstr "%pB: предупреждение: недопустимый символьный индекс %ld в перемещениях"
+ 
+-#: coffcode.h:961
++#: coff64-rs6000.c:449 coff64-rs6000.c:555
++#, c-format
++msgid "%pB: C_STAT isn't supported by XCOFF64"
++msgstr "%pB: C_STAT не поддерживается в XCOFF64"
++
++#: coff64-rs6000.c:479
++#, c-format
++msgid "%pB: wrong auxtype %#x for storage class %#x"
++msgstr "%pB: некорректный auxtype %#x для класса хранения %#x"
++
++#: coffcode.h:986
+ #, c-format
+ msgid "%pB: unable to load COMDAT section name"
+ msgstr "%pB: невозможно загрузить имя раздела COMDAT"
+ 
+ #. Malformed input files can trigger this test.
+ #. cf PR 21781.
+-#: coffcode.h:996
++#: coffcode.h:1021
+ #, c-format
+ msgid "%pB: error: unexpected symbol '%s' in COMDAT section"
+ msgstr "%pB: ошибка: неожиданный символ «%s» в разделе COMDAT"
+ 
+-#: coffcode.h:1008
++#: coffcode.h:1033
+ #, c-format
+ msgid "%pB: warning: COMDAT symbol '%s' does not match section name '%s'"
+ msgstr "%pB: предупреждение: символ «%s» в COMDAT не совпадает с именем раздела «%s»"
+ 
+-#: coffcode.h:1018
++#: coffcode.h:1043
+ #, c-format
+ msgid "%pB: warning: no symbol for section '%s' found"
+ msgstr "%pB: предупреждение: не найден символ для раздела «%s»"
+@@ -381,126 +414,126 @@ msgstr "%pB: предупреждение: не найден символ для
+ #. Generate a warning message rather using the 'unhandled'
+ #. variable as this will allow some .sys files generate by
+ #. other toolchains to be processed.  See bugzilla issue 196.
+-#: coffcode.h:1249
++#: coffcode.h:1274
+ #, c-format
+ msgid "%pB: warning: ignoring section flag %s in section %s"
+ msgstr "%pB: предупреждение: игнорируется флаг раздела %s в разделе %s"
+ 
+-#: coffcode.h:1318
++#: coffcode.h:1343
+ #, c-format
+ msgid "%pB (%s): section flag %s (%#lx) ignored"
+ msgstr "%pB (%s): игнорируется флаг раздела %s (%#lx)"
+ 
+-#: coffcode.h:1934 coffcode.h:1999
++#: coffcode.h:1959 coffcode.h:2024
+ #, c-format
+ msgid "%pB: warning: claims to have 0xffff relocs, without overflow"
+ msgstr "%pB: предупреждение: утверждается, что есть 0xffff перемещений, без переполнения"
+ 
+-#: coffcode.h:2365
++#: coffcode.h:2385
+ #, c-format
+ msgid "unrecognized TI COFF target id '0x%x'"
+ msgstr "нераспознанный идентификатор цели TI COFF «0x%x»"
+ 
+-#: coffcode.h:2643
++#: coffcode.h:2663
+ #, c-format
+ msgid "%pB: reloc against a non-existent symbol index: %ld"
+ msgstr "%pB: перемещение по несуществующему символьному индексу: %ld"
+ 
+-#: coffcode.h:2951
++#: coffcode.h:2961
+ #, c-format
+ msgid "%pB: page size is too large (0x%x)"
+ msgstr "%pB: слишком большой размер страницы (0x%x)"
+ 
+-#: coffcode.h:3111
++#: coffcode.h:3121
+ #, c-format
+ msgid "%pB: too many sections (%d)"
+ msgstr "%pB: слишком много разделов (%d)"
+ 
+-#: coffcode.h:3530
++#: coffcode.h:3548
+ #, c-format
+ msgid "%pB: section %pA: string table overflow at offset %ld"
+ msgstr "%pB: раздел %pA: переполнение таблицы строк по смещению %ld"
+ 
+-#: coffcode.h:3630
++#: coffcode.h:3655
+ #, c-format
+ msgid "%pB:%s section %s: alignment 2**%u not representable"
+ msgstr "%pB:%s раздел %s: выравнивание 2**%u не представимо"
+ 
+-#: coffcode.h:4329
++#: coffcode.h:4358
+ #, c-format
+ msgid "%pB: warning: line number count (%#lx) exceeds section size (%#lx)"
+ msgstr "%pB: предупреждение: счётчик количества строк (%#lx) превышает размер раздела (%#lx)"
+ 
+-#: coffcode.h:4349
++#: coffcode.h:4378
+ #, c-format
+ msgid "%pB: warning: line number table read failed"
+ msgstr "%pB: предупреждение: не удалось прочитать таблицу номеров строк"
+ 
+-#: coffcode.h:4383 coffcode.h:4397
++#: coffcode.h:4412 coffcode.h:4426
+ #, c-format
+ msgid "%pB: warning: illegal symbol index 0x%lx in line number entry %d"
+ msgstr "%pB: предупреждение: недопустимый символьный индекс 0x%lx в элементе номера строки %d"
+ 
+-#: coffcode.h:4411
++#: coffcode.h:4440
+ #, c-format
+ msgid "%pB: warning: illegal symbol in line number entry %d"
+ msgstr "%pB: предупреждение: недопустимый символьный индекс %d в элементе номера строки"
+ 
+-#: coffcode.h:4424
++#: coffcode.h:4453
+ #, c-format
+ msgid "%pB: warning: duplicate line number information for `%s'"
+ msgstr "%pB: предупреждение: повторяющаяся информация о номере строки для «%s»"
+ 
+-#: coffcode.h:4845
++#: coffcode.h:4874
+ #, c-format
+ msgid "%pB: unrecognized storage class %d for %s symbol `%s'"
+ msgstr "%pB: нераспознанный класс хранения %d для %s, символ «%s»"
+ 
+-#: coffcode.h:4975
++#: coffcode.h:5014
+ #, c-format
+ msgid "warning: %pB: local symbol `%s' has no section"
+ msgstr "предупреждение: %pB: локальный символ «%s» не имеет раздела"
+ 
+-#: coffcode.h:5125
++#: coffcode.h:5164
+ #, c-format
+ msgid "%pB: illegal relocation type %d at address %#<PRIx64>"
+ msgstr "%pB: недопустимый тип перемещения %d по адресу %#<PRIx64>"
+ 
+-#: coffgen.c:179 elf.c:1236
++#: coffgen.c:179 elf.c:1239
+ #, c-format
+ msgid "%pB: unable to initialize compress status for section %s"
+ msgstr "%pB: невозможно инициализировать состояние сжатия раздела %s"
+ 
+-#: coffgen.c:203 elf.c:1247
++#: coffgen.c:203 elf.c:1250
+ #, c-format
+ msgid "%pB: unable to initialize decompress status for section %s"
+ msgstr "%pB: невозможно инициализировать состояние разжатия раздела %s"
+ 
+-#: coffgen.c:1704
++#: coffgen.c:1706
+ #, c-format
+ msgid "%pB: bad string table size %<PRIu64>"
+ msgstr "%pB: неправильный размер таблицы строк %#<PRIu64>"
+ 
+-#: coffgen.c:1876 coffgen.c:1936 coffgen.c:1954 cofflink.c:2024 elf.c:1921
+-#: xcofflink.c:4500
++#: coffgen.c:1878 coffgen.c:1938 coffgen.c:1956 cofflink.c:2024 elf.c:1936
++#: xcofflink.c:4540
+ msgid "<corrupt>"
+ msgstr "<повреждено>"
+ 
+-#: coffgen.c:2085
++#: coffgen.c:2087
+ #, c-format
+ msgid "<corrupt info> %s"
+ msgstr "<информация о повреждении> %s"
+ 
+-#: coffgen.c:2675 elflink.c:14624 linker.c:2956
++#: coffgen.c:2684 elflink.c:14829 linker.c:2965
+ msgid "%F%P: already_linked_table: %E\n"
+ msgstr "%F%P: already_linked_table: %E\n"
+ 
+-#: coffgen.c:3016 elflink.c:13617
++#: coffgen.c:3026 elflink.c:13816
+ #, c-format
+ msgid "removing unused section '%pA' in file '%pB'"
+ msgstr "удаляется неиспользуемый раздел «%pA» в файле «%pB»"
+ 
+-#: coffgen.c:3093 elflink.c:13835
++#: coffgen.c:3103 elflink.c:14036
+ msgid "warning: gc-sections option ignored"
+ msgstr "предупреждение: параметр gc-sections игнорируется"
+ 
+@@ -509,7 +542,7 @@ msgstr "предупреждение: параметр gc-sections игнори
+ msgid "warning: symbol `%s' is both section and non-section"
+ msgstr "предупреждение: символ «%s» для раздела и не для раздела одновременно"
+ 
+-#: cofflink.c:471 elf64-ia64-vms.c:5200 elflink.c:5131
++#: cofflink.c:471 elf64-ia64-vms.c:5202 elflink.c:5207
+ #, c-format
+ msgid "warning: type of symbol `%s' changed from %d to %d in %pB"
+ msgstr "предупреждение: тип символа «%s» изменён с %d на %d в %pB"
+@@ -519,177 +552,187 @@ msgstr "предупреждение: тип символа «%s» изменё
+ msgid "%pB: relocs in section `%pA', but it has no contents"
+ msgstr "%pB: перемещения в разделе «%pA», но он не имеет содержимого"
+ 
+-#: cofflink.c:2415 elflink.c:11082
++#: cofflink.c:2415 elflink.c:11342
+ #, c-format
+ msgid "%X`%s' referenced in section `%pA' of %pB: defined in discarded section `%pA' of %pB\n"
+ msgstr "%X«%s» указывает в раздел «%pA» из %pB: определён в отброшенном разделе «%pA» из %pB\n"
+ 
+-#: cofflink.c:2717
++#: cofflink.c:2610
++msgid "%pB: stripping non-representable symbol '%s' (value %"
++msgstr "%pB: удаляется непредставимый символ «%s» (значение %"
++
++#: cofflink.c:2728
+ #, c-format
+ msgid "%pB: %pA: reloc overflow: %#x > 0xffff"
+ msgstr "%pB: %pA: переполнение перемещения: %#x > 0xffff"
+ 
+-#: cofflink.c:2725
++#: cofflink.c:2736
+ #, c-format
+ msgid "%pB: warning: %pA: line number overflow: %#x > 0xffff"
+ msgstr "%pB: предупреждение: %pA: переполнение номера строки: %#x > 0xffff"
+ 
+-#: cofflink.c:3110
++#: cofflink.c:3127
+ #, c-format
+ msgid "%pB: bad reloc address %#<PRIx64> in section `%pA'"
+ msgstr "%pB: неправильный адрес перемещения %#<PRIx64> в разделе «%pA»"
+ 
+-#: coffswap.h:799
++#: coffswap.h:806
+ #, c-format
+ msgid "%pB: %s: reloc overflow: 0x%lx > 0xffff"
+ msgstr "%pB: %s: переполнение перемещения: 0x%lx > 0xffff"
+ 
+-#: compress.c:271
++#: compress.c:270
+ #, c-format
+ msgid "error: %pB(%pA) section size (%#<PRIx64> bytes) is larger than file size (%#<PRIx64> bytes)"
+ msgstr "ошибка: размер раздела %pB(%pA) равен %#<PRIx64>, это больше размера файла (%#<PRIx64> байт)"
+ 
+-#: compress.c:282
++#: compress.c:281
+ #, c-format
+ msgid "error: %pB(%pA) is too large (%#<PRIx64> bytes)"
+ msgstr "ошибка: %pB(%pA) слишком велико (%#<PRIx64> байт)"
+ 
+-#: cpu-arm.c:303 cpu-arm.c:315
++#: cpu-arm.c:307 cpu-arm.c:319
+ #, c-format
+ msgid "error: %pB is compiled for the EP9312, whereas %pB is compiled for XScale"
+ msgstr "ошибка: %pB скомпилирован для EP9312, в то время как %pB скомпилирован для XScale"
+ 
+-#: cpu-arm.c:451
++#: cpu-arm.c:455
+ #, c-format
+ msgid "warning: unable to update contents of %s section in %pB"
+ msgstr "предупреждение: невозможно обновить содержимое раздела %s в %pB"
+ 
+-#: dwarf2.c:543
++#: dwarf2.c:552
+ #, c-format
+ msgid "DWARF error: can't find %s section."
+ msgstr "ошибка в DWARF: раздел %s не найден"
+ 
+-#: dwarf2.c:578
++#. PR 26946
++#: dwarf2.c:563
++#, c-format
++msgid "DWARF error: section %s is larger than its filesize! (0x%lx vs 0x%lx)"
++msgstr "ошибка в DWARF: раздел %s больше размера его файла! (0x%lx и 0x%lx)"
++
++#: dwarf2.c:598
+ #, c-format
+ msgid "DWARF error: offset (%<PRIu64>) greater than or equal to %s size (%<PRIu64>)"
+ msgstr "ошибка в DWARF: смещение (%#<PRIu64>) больше или равно размеру %s (%#<PRIu64>)"
+ 
+-#: dwarf2.c:1165
++#: dwarf2.c:1201
+ msgid "DWARF error: info pointer extends beyond end of attributes"
+ msgstr "ошибка в DWARF: информационный указатель выходит за конец атрибутов"
+ 
+-#: dwarf2.c:1333
++#: dwarf2.c:1349
+ #, c-format
+ msgid "DWARF error: invalid or unhandled FORM value: %#x"
+ msgstr "ошибка в DWARF: недопустимое или необработанное значение FORM: %#x"
+ 
+-#: dwarf2.c:1646
++#: dwarf2.c:1664
+ msgid "DWARF error: mangled line number section (bad file number)"
+ msgstr "ошибка в DWARF: искажённый раздел номеров строк (неверный номер файла)"
+ 
+-#: dwarf2.c:1994
++#: dwarf2.c:2007
+ msgid "DWARF error: zero format count"
+ msgstr "ошибка в DWARF: счётчик формата равен нулю"
+ 
+-#: dwarf2.c:2004
++#: dwarf2.c:2017
+ #, c-format
+ msgid "DWARF error: data count (%<PRIx64>) larger than buffer size"
+ msgstr "ошибка в DWARF: счётчик данных (%#<PRIx64>) больше размера буфера"
+ 
+-#: dwarf2.c:2045
++#: dwarf2.c:2056
+ #, c-format
+ msgid "DWARF error: unknown format content type %<PRIu64>"
+ msgstr "ошибка в DWARF: неизвестный формат типа содержимого %#<PRIu64>"
+ 
+-#: dwarf2.c:2112
++#: dwarf2.c:2126
+ #, c-format
+ msgid "DWARF error: line info section is too small (%<PRId64>)"
+ msgstr "ошибка в DWARF: раздел информации о строках слишком мал (%<PRId64>)"
+ 
+-#: dwarf2.c:2142
++#: dwarf2.c:2153
+ #, c-format
+ msgid "DWARF error: line info data is bigger (%#<PRIx64>) than the space remaining in the section (%#lx)"
+ msgstr "ошибка в DWARF: данные информации о строках больше (%<PRIx64>) чем пространство, оставшееся в разделе (%#lx)"
+ 
+-#: dwarf2.c:2155
++#: dwarf2.c:2166
+ #, c-format
+ msgid "DWARF error: unhandled .debug_line version %d"
+ msgstr "ошибка в DWARF: необработанная версия %d в .debug_line"
+ 
+-#: dwarf2.c:2165
++#: dwarf2.c:2175
+ msgid "DWARF error: ran out of room reading prologue"
+ msgstr "ошибка в DWARF: кончилось место при чтении пролога"
+ 
+-#: dwarf2.c:2183
++#: dwarf2.c:2191
+ #, c-format
+ msgid "DWARF error: line info unsupported segment selector size %u"
+ msgstr "ошибка в DWARF: неподдерживаемый размер %u селектора сегмента в информации о строках"
+ 
+-#: dwarf2.c:2210
++#: dwarf2.c:2213
+ msgid "DWARF error: invalid maximum operations per instruction"
+ msgstr "ошибка в DWARF: неверное максимальное количество операций на инструкцию"
+ 
+-#: dwarf2.c:2229
++#: dwarf2.c:2225
+ msgid "DWARF error: ran out of room reading opcodes"
+ msgstr "ошибка в DWARF: кончилось место при чтении кодов операций"
+ 
+-#: dwarf2.c:2420
++#: dwarf2.c:2393
+ msgid "DWARF error: mangled line number section"
+ msgstr "ошибка в DWARF: раздел номеров строк искажён"
+ 
+-#: dwarf2.c:2905
++#: dwarf2.c:2881
+ msgid "DWARF error: abstract instance recursion detected"
+ msgstr "ошибка в DWARF: обнаружена рекурсия абстрактного экземпляра"
+ 
+-#: dwarf2.c:2939 dwarf2.c:3033
++#: dwarf2.c:2915 dwarf2.c:3009
+ msgid "DWARF error: invalid abstract instance DIE ref"
+ msgstr "ошибка в DWARF: некорректный абстрактный экземпляр ссылки DIE"
+ 
+-#: dwarf2.c:2955
++#: dwarf2.c:2931
+ #, c-format
+ msgid "DWARF error: unable to read alt ref %<PRIu64>"
+ msgstr "ошибка в DWARF: невозможно прочитать альтернативную ссылку %<PRIu64>"
+ 
+-#: dwarf2.c:3011
++#: dwarf2.c:2987
+ #, c-format
+ msgid "DWARF error: unable to locate abstract instance DIE ref %<PRIu64>"
+ msgstr "ошибка в DWARF: невозможно найти абстрактный экземпляр ссылки DIE %<PRIu64>"
+ 
+-#: dwarf2.c:3050 dwarf2.c:3232 dwarf2.c:3618
++#: dwarf2.c:3024 dwarf2.c:3305 dwarf2.c:3750
+ #, c-format
+ msgid "DWARF error: could not find abbrev number %u"
+ msgstr "ошибка в DWARF: невозможно найти укороченный номер %u"
+ 
+-#: dwarf2.c:3381
++#: dwarf2.c:3538
+ #, c-format
+-msgid "DWARF error: could not find variable specification at offset %lx"
+-msgstr "ошибка в DWARF: невозможно найти задание переменной по смещению %lx"
++msgid "DWARF error: could not find variable specification at offset 0x%lx"
++msgstr "ошибка в DWARF: невозможно найти задание переменной по смещению 0x%lx"
+ 
+-#: dwarf2.c:3537
++#: dwarf2.c:3677
+ #, c-format
+ msgid "DWARF error: found dwarf version '%u', this reader only handles version 2, 3, 4 and 5 information"
+ msgstr "ошибка в DWARF: найдена версия dwarf «%u», текущая функция чтения понимает только версии 2, 3, 4 и 5"
+ 
+-#: dwarf2.c:3581
++#: dwarf2.c:3714
+ #, c-format
+ msgid "DWARF error: found address size '%u', this reader can not handle sizes greater than '%u'"
+ msgstr "ошибка в DWARF: найден размер адреса «%u», текущая функция чтения не умеет работать с размерами более чем «%u»"
+ 
+-#: dwarf2.c:3685
++#: dwarf2.c:3817
+ msgid "DWARF error: DW_AT_comp_dir attribute encountered with a non-string form"
+ msgstr "ошибка в DWARF: встречен атрибут DW_AT_comp_dir в не строковом виде"
+ 
+-#: ecoff.c:982
++#: ecoff.c:940
+ #, c-format
+ msgid "%pB: warning: isymMax (%ld) is greater than ifdMax (%ld)"
+ msgstr "%pB: предупреждение: isymMax (%ld) больше, чем ifdMax (%ld)"
+ 
+-#: ecoff.c:1279
++#: ecoff.c:1236
+ #, c-format
+ msgid "unknown basic type %d"
+ msgstr "неизвестный начальный тип %d"
+ 
+-#: ecoff.c:1536
++#: ecoff.c:1492
+ #, c-format
+ msgid ""
+ "\n"
+@@ -698,7 +741,7 @@ msgstr ""
+ "\n"
+ "      Символ End+1: %ld"
+ 
+-#: ecoff.c:1543 ecoff.c:1546
++#: ecoff.c:1499 ecoff.c:1502
+ #, c-format
+ msgid ""
+ "\n"
+@@ -707,7 +750,7 @@ msgstr ""
+ "\n"
+ "      Первый символ: %ld"
+ 
+-#: ecoff.c:1559
++#: ecoff.c:1517
+ #, c-format
+ msgid ""
+ "\n"
+@@ -716,7 +759,7 @@ msgstr ""
+ "\n"
+ "      Символ End+1: %-7ld   Тип:  %s"
+ 
+-#: ecoff.c:1566
++#: ecoff.c:1525
+ #, c-format
+ msgid ""
+ "\n"
+@@ -725,7 +768,7 @@ msgstr ""
+ "\n"
+ "      Локальный символ: %ld"
+ 
+-#: ecoff.c:1574
++#: ecoff.c:1533
+ #, c-format
+ msgid ""
+ "\n"
+@@ -734,7 +777,7 @@ msgstr ""
+ "\n"
+ "      struct; символ End+1: %ld"
+ 
+-#: ecoff.c:1579
++#: ecoff.c:1538
+ #, c-format
+ msgid ""
+ "\n"
+@@ -743,7 +786,7 @@ msgstr ""
+ "\n"
+ "      union; символ End+1: %ld"
+ 
+-#: ecoff.c:1584
++#: ecoff.c:1543
+ #, c-format
+ msgid ""
+ "\n"
+@@ -752,7 +795,7 @@ msgstr ""
+ "\n"
+ "      enum; символ End+1: %ld"
+ 
+-#: ecoff.c:1590
++#: ecoff.c:1551
+ #, c-format
+ msgid ""
+ "\n"
+@@ -761,22 +804,22 @@ msgstr ""
+ "\n"
+ "      Тип: %s"
+ 
+-#: elf-attrs.c:449
++#: elf-attrs.c:477
+ #, c-format
+ msgid "%pB: error: attribute section '%pA' too big: %#llx"
+ msgstr "%pB: ошибка: слишком большой раздел атрибутов «%pA»: %#llx"
+ 
+-#: elf-attrs.c:490
++#: elf-attrs.c:514
+ #, c-format
+-msgid "%pB: error: attribute section length too small: %<PRId64>"
+-msgstr "%pB: ошибка: длина раздела атрибутов слишком мала: %<PRId64>"
++msgid "%pB: error: attribute section length too small: %ld"
++msgstr "%pB: ошибка: длина раздела атрибутов слишком мала: %ld"
+ 
+-#: elf-attrs.c:618
++#: elf-attrs.c:644
+ #, c-format
+ msgid "error: %pB: object has vendor-specific contents that must be processed by the '%s' toolchain"
+ msgstr "ошибка: %pB: объект содержит данные, задаваемые производителем, которые должно обрабатываться инструментами сборки «%s»"
+ 
+-#: elf-attrs.c:628
++#: elf-attrs.c:654
+ #, c-format
+ msgid "error: %pB: object tag '%d, %s' is incompatible with tag '%d, %s'"
+ msgstr "ошибка: %pB: объектный тег «%d, %s» несовместим с тегом «%d, %s»"
+@@ -842,85 +885,85 @@ msgstr ".eh_frame_hdr ссылается на перекрывающиеся FDE
+ msgid "%F%P: dynamic STT_GNU_IFUNC symbol `%s' with pointer equality in `%pB' can not be used when making an executable; recompile with -fPIE and relink with -pie\n"
+ msgstr "%F%P: динамический STT_GNU_IFUNC символ «%s» с одинаковым указателем в «%pB» нельзя использовать при создании исполняемого файла; перекомпилируйте с параметром -fPIE и перекомпонуйте с параметром -pie\n"
+ 
+-#: elf-m10200.c:434 elf-m10300.c:2145 elf32-avr.c:1508 elf32-bfin.c:3126
+-#: elf32-cr16.c:1464 elf32-cris.c:2033 elf32-crx.c:920 elf32-d10v.c:510
+-#: elf32-epiphany.c:562 elf32-fr30.c:594 elf32-frv.c:4048 elf32-ft32.c:494
+-#: elf32-h8300.c:523 elf32-ip2k.c:1477 elf32-iq2000.c:691 elf32-lm32.c:1069
+-#: elf32-m32c.c:624 elf32-m32r.c:2860 elf32-m68hc1x.c:1272 elf32-mep.c:526
+-#: elf32-metag.c:1986 elf32-microblaze.c:1627 elf32-moxie.c:288 elf32-mt.c:402
+-#: elf32-nds32.c:6048 elf32-or1k.c:1817 elf32-score.c:2734 elf32-score7.c:2543
+-#: elf32-spu.c:5083 elf32-tilepro.c:3380 elf32-v850.c:2290 elf32-visium.c:680
+-#: elf32-xstormy16.c:929 elf64-bpf.c:512 elf64-mmix.c:1541 elfxx-tilegx.c:3744
++#: elf-m10200.c:434 elf-m10300.c:2146 elf32-avr.c:1508 elf32-bfin.c:3131
++#: elf32-cr16.c:1432 elf32-cris.c:2034 elf32-crx.c:913 elf32-d10v.c:510
++#: elf32-epiphany.c:562 elf32-fr30.c:594 elf32-frv.c:4049 elf32-ft32.c:493
++#: elf32-h8300.c:523 elf32-ip2k.c:1477 elf32-iq2000.c:691 elf32-lm32.c:1070
++#: elf32-m32c.c:624 elf32-m32r.c:2837 elf32-m68hc1x.c:1271 elf32-mep.c:522
++#: elf32-metag.c:1984 elf32-microblaze.c:1623 elf32-moxie.c:288 elf32-mt.c:402
++#: elf32-nds32.c:6044 elf32-or1k.c:1861 elf32-score.c:2743 elf32-score7.c:2552
++#: elf32-spu.c:5084 elf32-tilepro.c:3372 elf32-v850.c:2294 elf32-visium.c:680
++#: elf32-xstormy16.c:930 elf64-bpf.c:552 elf64-mmix.c:1541 elfxx-tilegx.c:3742
+ msgid "internal error: out of range error"
+ msgstr "внутренняя ошибка: ошибка выхода из диапазона"
+ 
+-#: elf-m10200.c:438 elf-m10300.c:2149 elf32-avr.c:1512 elf32-bfin.c:3130
+-#: elf32-cr16.c:1468 elf32-cris.c:2037 elf32-crx.c:924 elf32-d10v.c:514
+-#: elf32-fr30.c:598 elf32-frv.c:4052 elf32-ft32.c:498 elf32-h8300.c:527
+-#: elf32-iq2000.c:695 elf32-lm32.c:1073 elf32-m32c.c:628 elf32-m32r.c:2864
+-#: elf32-m68hc1x.c:1276 elf32-mep.c:530 elf32-metag.c:1990
+-#: elf32-microblaze.c:1631 elf32-moxie.c:292 elf32-msp430.c:1371
+-#: elf32-nds32.c:6052 elf32-or1k.c:1821 elf32-score.c:2738 elf32-score7.c:2547
+-#: elf32-spu.c:5087 elf32-tilepro.c:3384 elf32-v850.c:2294 elf32-visium.c:684
+-#: elf32-xstormy16.c:933 elf64-mmix.c:1545 elfxx-mips.c:10576
+-#: elfxx-tilegx.c:3748
++#: elf-m10200.c:438 elf-m10300.c:2150 elf32-avr.c:1512 elf32-bfin.c:3135
++#: elf32-cr16.c:1436 elf32-cris.c:2038 elf32-crx.c:917 elf32-d10v.c:514
++#: elf32-fr30.c:598 elf32-frv.c:4053 elf32-ft32.c:497 elf32-h8300.c:527
++#: elf32-iq2000.c:695 elf32-lm32.c:1074 elf32-m32c.c:628 elf32-m32r.c:2841
++#: elf32-m68hc1x.c:1275 elf32-mep.c:526 elf32-metag.c:1988
++#: elf32-microblaze.c:1627 elf32-moxie.c:292 elf32-msp430.c:1510
++#: elf32-nds32.c:6048 elf32-or1k.c:1865 elf32-score.c:2747 elf32-score7.c:2556
++#: elf32-spu.c:5088 elf32-tilepro.c:3376 elf32-v850.c:2298 elf32-visium.c:684
++#: elf32-xstormy16.c:934 elf64-mmix.c:1545 elfxx-mips.c:10558
++#: elfxx-tilegx.c:3746
+ msgid "internal error: unsupported relocation error"
+ msgstr "внутренняя ошибка: ошибка неподдерживаемого перемещения"
+ 
+-#: elf-m10200.c:442 elf32-cr16.c:1472 elf32-crx.c:928 elf32-d10v.c:518
+-#: elf32-h8300.c:531 elf32-lm32.c:1077 elf32-m32r.c:2868 elf32-m68hc1x.c:1280
+-#: elf32-microblaze.c:1635 elf32-nds32.c:6056 elf32-score.c:2742
+-#: elf32-score7.c:2551 elf32-spu.c:5091
++#: elf-m10200.c:442 elf32-cr16.c:1440 elf32-crx.c:921 elf32-d10v.c:518
++#: elf32-h8300.c:531 elf32-lm32.c:1078 elf32-m32r.c:2845 elf32-m68hc1x.c:1279
++#: elf32-microblaze.c:1631 elf32-nds32.c:6052 elf32-score.c:2751
++#: elf32-score7.c:2560 elf32-spu.c:5092
+ msgid "internal error: dangerous error"
+ msgstr "внутренняя ошибка: опасная ошибка"
+ 
+-#: elf-m10200.c:446 elf-m10300.c:2166 elf32-avr.c:1520 elf32-bfin.c:3138
+-#: elf32-cr16.c:1476 elf32-cris.c:2045 elf32-crx.c:932 elf32-d10v.c:522
+-#: elf32-epiphany.c:577 elf32-fr30.c:606 elf32-frv.c:4060 elf32-ft32.c:506
+-#: elf32-h8300.c:535 elf32-ip2k.c:1492 elf32-iq2000.c:703 elf32-lm32.c:1081
+-#: elf32-m32c.c:636 elf32-m32r.c:2872 elf32-m68hc1x.c:1284 elf32-mep.c:538
+-#: elf32-metag.c:1998 elf32-microblaze.c:1639 elf32-moxie.c:300
+-#: elf32-msp430.c:1379 elf32-mt.c:410 elf32-nds32.c:6060 elf32-or1k.c:1829
+-#: elf32-score.c:2751 elf32-score7.c:2555 elf32-spu.c:5095
+-#: elf32-tilepro.c:3392 elf32-v850.c:2314 elf32-visium.c:692
+-#: elf32-xstormy16.c:941 elf64-bpf.c:525 elf64-mmix.c:1553 elfxx-tilegx.c:3756
++#: elf-m10200.c:446 elf-m10300.c:2167 elf32-avr.c:1520 elf32-bfin.c:3143
++#: elf32-cr16.c:1444 elf32-cris.c:2046 elf32-crx.c:925 elf32-d10v.c:522
++#: elf32-epiphany.c:577 elf32-fr30.c:606 elf32-frv.c:4061 elf32-ft32.c:505
++#: elf32-h8300.c:535 elf32-ip2k.c:1492 elf32-iq2000.c:703 elf32-lm32.c:1082
++#: elf32-m32c.c:636 elf32-m32r.c:2849 elf32-m68hc1x.c:1283 elf32-mep.c:534
++#: elf32-metag.c:1996 elf32-microblaze.c:1635 elf32-moxie.c:300
++#: elf32-msp430.c:1518 elf32-mt.c:410 elf32-nds32.c:6056 elf32-or1k.c:1873
++#: elf32-score.c:2760 elf32-score7.c:2564 elf32-spu.c:5096
++#: elf32-tilepro.c:3384 elf32-v850.c:2318 elf32-visium.c:692
++#: elf32-xstormy16.c:942 elf64-bpf.c:565 elf64-mmix.c:1553 elfxx-tilegx.c:3754
+ msgid "internal error: unknown error"
+ msgstr "внутренняя ошибка: неизвестная ошибка"
+ 
+-#: elf-m10300.c:1029
++#: elf-m10300.c:1030
+ #, c-format
+ msgid "%pB: unsupported transition from %s to %s"
+ msgstr "%pB: неподдерживаемый переход из %s в %s"
+ 
+-#: elf-m10300.c:1196
++#: elf-m10300.c:1197
+ #, c-format
+ msgid "%pB: %s' accessed both as normal and thread local symbol"
+ msgstr "%pB: «%s» доступен как обычный и как локальный символ нити"
+ 
+-#: elf-m10300.c:2092 elf32-arm.c:13400 elf32-i386.c:3403 elf32-m32r.c:2354
+-#: elf32-m68k.c:3931 elf32-s390.c:3082 elf32-sh.c:3677 elf32-tilepro.c:3283
+-#: elf32-xtensa.c:3023 elf64-s390.c:3031 elf64-x86-64.c:4062
+-#: elfxx-sparc.c:3795 elfxx-tilegx.c:3667 elfnn-aarch64.c:5505
+-#: elfnn-aarch64.c:7102
++#: elf-m10300.c:2093 elf32-arm.c:13376 elf32-i386.c:3426 elf32-m32r.c:2331
++#: elf32-m68k.c:3929 elf32-s390.c:3080 elf32-sh.c:3671 elf32-tilepro.c:3275
++#: elf32-xtensa.c:3024 elf64-s390.c:3029 elf64-x86-64.c:4082
++#: elfxx-sparc.c:2917 elfxx-sparc.c:3814 elfxx-tilegx.c:3665
++#: elfnn-aarch64.c:5501 elfnn-aarch64.c:7104
+ #, c-format
+ msgid "%pB(%pA+%#<PRIx64>): unresolvable %s relocation against symbol `%s'"
+ msgstr "%pB(%pA+%#<PRIx64>): неразрешимое перемещение %s относительно символа «%s»"
+ 
+-#: elf-m10300.c:2154
++#: elf-m10300.c:2155
+ msgid "error: inappropriate relocation type for shared library (did you forget -fpic?)"
+ msgstr "ошибка: неподходящий тип перемещения для общей библиотеки (не указан -fpic?)"
+ 
+-#: elf-m10300.c:2158
++#: elf-m10300.c:2159
+ #, c-format
+ msgid "%pB: taking the address of protected function '%s' cannot be done when making a shared library"
+ msgstr "%pB: получение адреса защищённой функции «%s» не может быть выполнено при создании общей библиотеки"
+ 
+-#: elf-m10300.c:2161
++#: elf-m10300.c:2162
+ msgid "internal error: suspicious relocation type used in shared library"
+ msgstr "внутренняя ошибка: подозрительный тип перемещения в общей библиотеке"
+ 
+-#: elf-m10300.c:2647 elf32-avr.c:2489 elf32-frv.c:5620 elf64-ia64-vms.c:364
+-#: elfxx-sparc.c:2683 reloc.c:8244 reloc16.c:155 elfnn-ia64.c:364
++#: elf-m10300.c:2650 elf32-avr.c:2486 elf32-frv.c:5621 elf64-ia64-vms.c:365
++#: elfxx-sparc.c:2684 reloc.c:8282 reloc16.c:155 elfnn-ia64.c:365
+ msgid "%P%F: --relax and -r may not be used together\n"
+ msgstr "%P%F: --relax и -r нельзя использовать вместе\n"
+ 
+@@ -949,131 +992,131 @@ msgstr "предупреждение: %pB: повреждённый размер
+ msgid "warning: %pB: corrupt no copy on protected size: 0x%x"
+ msgstr "предупреждение: %pB: повреждённый размер у выключения копирования защищённых перемещений: 0x%x"
+ 
+-#: elf-properties.c:186
++#: elf-properties.c:189
++#, c-format
++msgid "error: %pB: <corrupt property (0x%x) size: 0x%x>"
++msgstr "ошибка: %pB: <повреждение размера свойства (0x%x): 0x%x>"
++
++#: elf-properties.c:205
+ #, c-format
+ msgid "warning: %pB: unsupported GNU_PROPERTY_TYPE (%ld) type: 0x%x"
+ msgstr "предупреждение: %pB: неподдерживаемый тип GNU_PROPERTY_TYPE (%ld): 0x%x"
+ 
+-#: elf-properties.c:301
++#: elf-properties.c:391
+ msgid "Removed property %W to merge %pB (0x%v) and %pB (0x%v)\n"
+ msgstr "Удалено свойство %W при объединении %pB (0x%v) и %pB (0x%v)\n"
+ 
+-#: elf-properties.c:307
++#: elf-properties.c:397
+ msgid "Removed property %W to merge %pB (0x%v) and %pB (not found)\n"
+ msgstr "Удалено свойство %W при объединении %pB (0x%v) и %pB (не найдено)\n"
+ 
+-#: elf-properties.c:316 elf-properties.c:394
++#: elf-properties.c:406 elf-properties.c:484
+ msgid "Removed property %W to merge %pB and %pB\n"
+ msgstr "Удалено свойство %W при объединении %pB и %pB\n"
+ 
+-#: elf-properties.c:320
++#: elf-properties.c:410
+ msgid "Removed property %W to merge %pB and %pB (not found)\n"
+ msgstr "Удалено свойство %W при объединении %pB и %pB (не найдено)\n"
+ 
+-#: elf-properties.c:337
++#: elf-properties.c:427
+ msgid "Updated property %W (0x%v) to merge %pB (0x%v) and %pB (0x%v)\n"
+ msgstr "Обновлено свойство %W (0x%v) при объединении %pB (0x%v) и %pB (0x%v)\n"
+ 
+-#: elf-properties.c:346
++#: elf-properties.c:436
+ msgid "Updated property %W (%v) to merge %pB (0x%v) and %pB (not found)\n"
+ msgstr "Обновлено свойство %W (%v) при объединении %pB (0x%v) и %pB (не найдено)\n"
+ 
+-#: elf-properties.c:388
++#: elf-properties.c:478
+ msgid "Removed property %W to merge %pB (not found) and %pB (0x%v)\n"
+ msgstr "Удалено свойство %W при объединении %pB (не найдено) и %pB (0x%v)\n"
+ 
+ #. Merge .note.gnu.property sections.
+-#: elf-properties.c:550 elf-properties.c:552
++#: elf-properties.c:640 elf-properties.c:642
+ msgid "\n"
+ msgstr "\n"
+ 
+-#: elf-properties.c:551
++#: elf-properties.c:641
+ msgid "Merging program properties\n"
+ msgstr "Объединение программных свойств\n"
+ 
+ #. PR 17512: file: f057ec89.
+-#: elf.c:336
++#: elf.c:337
+ #, c-format
+ msgid "%pB: attempt to load strings from a non-string section (number %d)"
+ msgstr "%pB: попытка загрузить строки из не строкового раздела (номер %d)"
+ 
+-#: elf.c:361
++#: elf.c:362
+ #, c-format
+ msgid "%pB: invalid string offset %u >= %<PRIu64> for section `%s'"
+ msgstr "%pB: недопустимое смещение строки %u >= %<PRIu64> для раздела «%s»"
+ 
+-#: elf.c:513 elfnn-aarch64.c:8096
++#: elf.c:514 elfnn-aarch64.c:8104
+ #, c-format
+ msgid "%pB symbol number %lu references nonexistent SHT_SYMTAB_SHNDX section"
+ msgstr "%pB: символьный номер %lu ссылается на несуществующий раздел SHT_SYMTAB_SHNDX"
+ 
+-#: elf.c:675
++#: elf.c:676
+ #, c-format
+ msgid "%pB: invalid size field in group section header: %#<PRIx64>"
+ msgstr "%pB: некорректное поле размера в заголовке раздела групп: %#<PRIx64>"
+ 
+-#: elf.c:720
++#: elf.c:721
+ #, c-format
+ msgid "%pB: invalid entry in SHT_GROUP section [%u]"
+ msgstr "%pB: некорректный элемент в разделе SHT_GROUP [%u]"
+ 
+-#: elf.c:739
++#: elf.c:740
+ #, c-format
+ msgid "%pB: no valid group sections found"
+ msgstr "%pB: не найдено корректных разделов групп"
+ 
+ #. See PR 21957 for a reproducer.
+-#: elf.c:768
++#: elf.c:769
+ #, c-format
+ msgid "%pB: group section '%pA' has no contents"
+ msgstr "%pB: раздел групп «%pA» не имеет содержимого"
+ 
+-#: elf.c:829
++#: elf.c:830
+ #, c-format
+ msgid "%pB: no group info for section '%pA'"
+ msgstr "%pB: нет информации о группе для раздела «%pA»"
+ 
+-#: elf.c:859 elf.c:3955
+-#, c-format
+-msgid "%pB: warning: sh_link not set for section `%pA'"
+-msgstr "%pB: предупреждение: не задан sh_link для раздела «%pA»"
+-
+-#: elf.c:879
++#: elf.c:878
+ #, c-format
+ msgid "%pB: sh_link [%d] in section `%pA' is incorrect"
+ msgstr "%pB: некорректный sh_link [%d] в разделе «%pA»"
+ 
+-#: elf.c:892
++#: elf.c:891
+ #, c-format
+ msgid "%pB: SHT_GROUP section [index %d] has no SHF_GROUP sections"
+ msgstr "%pB: раздел SHT_GROUP [индекс %d] не содержит разделов SHF_GROUP"
+ 
+-#: elf.c:913
++#: elf.c:912
+ #, c-format
+ msgid "%pB: section group entry number %u is corrupt"
+ msgstr "%pB: номер элемента группы разделов %u повреждён"
+ 
+-#: elf.c:936
++#: elf.c:935
+ #, c-format
+ msgid "%pB: unknown type [%#x] section `%s' in group [%pA]"
+ msgstr "%pB: неизвестный тип [%#x] раздела «%s» в группе [%pA]"
+ 
+-#: elf.c:1438
++#: elf.c:1453
+ #, c-format
+ msgid "%pB: invalid sh_link field (%d) in section number %d"
+ msgstr "%pB: некорректное поле sh_link (%d) в номере раздела %d"
+ 
+-#: elf.c:1454
++#: elf.c:1469
+ #, c-format
+ msgid "%pB: failed to find link section for section %d"
+ msgstr "%pB: не удалось найти раздел ссылок для раздела %d"
+ 
+-#: elf.c:1481
++#: elf.c:1496
+ #, c-format
+ msgid "%pB: failed to find info section for section %d"
+ msgstr "%pB: не удалось найти информационный раздел для раздела %d"
+ 
+-#: elf.c:1653
++#: elf.c:1668
+ #, c-format
+ msgid ""
+ "\n"
+@@ -1082,7 +1125,7 @@ msgstr ""
+ "\n"
+ "Заголовок программы:\n"
+ 
+-#: elf.c:1695
++#: elf.c:1710
+ #, c-format
+ msgid ""
+ "\n"
+@@ -1091,7 +1134,7 @@ msgstr ""
+ "\n"
+ "Динамический раздел:\n"
+ 
+-#: elf.c:1836
++#: elf.c:1851
+ #, c-format
+ msgid ""
+ "\n"
+@@ -1100,7 +1143,7 @@ msgstr ""
+ "\n"
+ "Объявления версий:\n"
+ 
+-#: elf.c:1861
++#: elf.c:1876
+ #, c-format
+ msgid ""
+ "\n"
+@@ -1109,97 +1152,97 @@ msgstr ""
+ "\n"
+ "Версии ссылок:\n"
+ 
+-#: elf.c:1866
++#: elf.c:1881
+ #, c-format
+ msgid "  required from %s:\n"
+ msgstr "  требуется из %s:\n"
+ 
+-#: elf.c:2082
++#: elf.c:2071
+ #, c-format
+ msgid "%pB: warning: loop in section dependencies detected"
+ msgstr "%pB: предупреждение: обнаружено зацикливание в зависимостях разделов"
+ 
+-#: elf.c:2190
++#: elf.c:2178
+ #, c-format
+ msgid "%pB: warning: multiple symbol tables detected - ignoring the table in section %u"
+ msgstr "%pB: предупреждение: обнаружена пустая таблица символов — игнорируется таблица в разделе %u"
+ 
+-#: elf.c:2274
++#: elf.c:2262
+ #, c-format
+ msgid "%pB: warning: multiple dynamic symbol tables detected - ignoring the table in section %u"
+ msgstr "%pB: предупреждение: обнаружена пустая таблица динамических символов — игнорируется таблица в разделе %u"
+ 
+-#: elf.c:2387
++#: elf.c:2375
+ #, c-format
+ msgid "%pB: invalid link %u for reloc section %s (index %u)"
+ msgstr "%pB: некорректная ссылка %u для раздела перемещений %s (индекс %u)"
+ 
+-#: elf.c:2478
++#: elf.c:2466
+ #, c-format
+ msgid "%pB: warning: secondary relocation section '%s' for section %pA found - ignoring"
+ msgstr "%pB: предупреждение: обнаружен вторичный раздел перемещений «%s» для раздела %pA — игнорируется"
+ 
+-#: elf.c:2562 elf.c:2577 elf.c:2588 elf.c:2601
++#: elf.c:2552 elf.c:2567 elf.c:2578 elf.c:2591
+ #, c-format
+ msgid "%pB: unknown type [%#x] section `%s'"
+ msgstr "%pB: неизвестный тип [%#x] раздела «%s»"
+ 
+-#: elf.c:3308
++#: elf.c:3288
+ #, c-format
+ msgid "%pB: error: alignment power %d of section `%pA' is too big"
+ msgstr "%pB: ошибка: кратность выравнивания %d раздела «%pA» слишком велика"
+ 
+-#: elf.c:3341
++#: elf.c:3321
+ #, c-format
+ msgid "warning: section `%pA' type changed to PROGBITS"
+ msgstr "предупреждение: тип раздела «%pA» изменён на PROGBITS"
+ 
+-#: elf.c:3824
++#: elf.c:3805
+ #, c-format
+ msgid "%pB: too many sections: %u"
+ msgstr "%pB: слишком много разделов: %u"
+ 
+-#: elf.c:3909
++#: elf.c:3891
+ #, c-format
+ msgid "%pB: sh_link of section `%pA' points to discarded section `%pA' of `%pB'"
+ msgstr "%pB: sh_link раздела «%pA» указывает на отброшенный раздел «%pA» из «%pB»"
+ 
+-#: elf.c:3934
++#: elf.c:3909
+ #, c-format
+ msgid "%pB: sh_link of section `%pA' points to removed section `%pA' of `%pB'"
+ msgstr "%pB: sh_link раздела «%pA» указывает на удалённый раздел «%pA» из «%pB»"
+ 
+-#: elf.c:4495
++#: elf.c:4471
+ #, c-format
+ msgid "%pB: GNU_MBIND section `%pA' has invalid sh_info field: %d"
+ msgstr "%pB: GNU_MBIND раздела «%pA» содержит некорректное поле sh_info: %d"
+ 
+-#: elf.c:5086
++#: elf.c:5065
+ #, c-format
+ msgid "%pB: TLS sections are not adjacent:"
+ msgstr "%pB: разделы TLS находятся не рядом:"
+ 
+-#: elf.c:5093
++#: elf.c:5072
+ #, c-format
+ msgid "\t    TLS: %pA"
+ msgstr "\t    TLS: %pA"
+ 
+-#: elf.c:5097
++#: elf.c:5076
+ #, c-format
+ msgid "\tnon-TLS: %pA"
+ msgstr "\t не-TLS: %pA"
+ 
+-#: elf.c:5687
++#: elf.c:5672
+ #, c-format
+ msgid "%pB: The first section in the PT_DYNAMIC segment is not the .dynamic section"
+ msgstr "%pB: первый раздел в сегменте PT_DYNAMIC не является разделом .dynamic"
+ 
+-#: elf.c:5713
++#: elf.c:5698
+ #, c-format
+ msgid "%pB: not enough room for program headers, try linking with -N"
+ msgstr "%pB: недостаточно места для заголовков программы, попытайтесь скомпоновать с параметром -N"
+ 
+-#: elf.c:5830
++#: elf.c:5815
+ #, c-format
+ msgid "%pB: section %pA lma %#<PRIx64> adjusted to %#<PRIx64>"
+ msgstr "%pB: у раздела %pA lma %#<PRIx64> подогнано к %#<PRIx64>"
+@@ -1207,146 +1250,172 @@ msgstr "%pB: у раздела %pA lma %#<PRIx64> подогнано к %#<PRIx6
+ #. The fix for this error is usually to edit the linker script being
+ #. used and set up the program headers manually.  Either that or
+ #. leave room for the headers at the start of the SECTIONS.
+-#: elf.c:5967
++#: elf.c:5952
+ #, c-format
+ msgid "%pB: error: PHDR segment not covered by LOAD segment"
+ msgstr "%pB: ошибка: сегмент PHDR не покрывается сегментом LOAD"
+ 
+-#: elf.c:6007
++#: elf.c:5992
+ #, c-format
+ msgid "%pB: section `%pA' can't be allocated in segment %d"
+ msgstr "%pB: раздел «%pA» не может быть выделен в сегменте %d"
+ 
+-#: elf.c:6139
++#: elf.c:6129
+ #, c-format
+ msgid "%pB: warning: allocated section `%s' not in segment"
+ msgstr "%pB: предупреждение: раздел «%s» выделен не в сегменте"
+ 
+-#: elf.c:6300
++#: elf.c:6290
+ #, c-format
+ msgid "%pB: error: non-load segment %d includes file header and/or program header"
+ msgstr "%pB: ошибка: незагружаемый сегмент %d включает файловый заголовок и/или программный заголовок"
+ 
+-#: elf.c:6804
++#: elf.c:6799
+ #, c-format
+ msgid "%pB: symbol `%s' required but not present"
+ msgstr "%pB: требуется символ «%s», но он отсутствует"
+ 
+-#: elf.c:7147
++#: elf.c:7151
+ #, c-format
+ msgid "%pB: warning: empty loadable segment detected at vaddr=%#<PRIx64>, is this intentional?"
+ msgstr "%pB: предупреждение: обнаружен пустой загружаемый сегмент по vaddr=%#<PRIx64>, это так задумывалось?"
+ 
+-#: elf.c:7773
++#: elf.c:7779
+ #, c-format
+ msgid "%pB: warning: segment alignment of %#<PRIx64> is too large"
+ msgstr "%pB: предупреждение: слишком большое выравнивание сегмента %#<PRIx64>"
+ 
+-#: elf.c:8286
++#: elf.c:8292
+ #, c-format
+ msgid "%pB: Unable to handle section index %x in ELF symbol.  Using ABS instead."
+ msgstr "%pB: невозможно обработать индекс раздела %x в символе ELF. Вместо него используем ABS."
+ 
+-#: elf.c:8316
++#: elf.c:8322
+ #, c-format
+ msgid "unable to find equivalent output section for symbol '%s' from section '%s'"
+ msgstr "невозможно найти подходящее место вывода для символа «%s» из раздела «%s»"
+ 
+-#: elf.c:8703
++#: elf.c:8735
+ #, c-format
+ msgid "%pB: .gnu.version_r invalid entry"
+ msgstr "%pB: некорректный элемент .gnu.version_r"
+ 
+-#: elf.c:8836
++#: elf.c:8868
+ #, c-format
+ msgid "%pB: .gnu.version_d invalid entry"
+ msgstr "%pB: некорректный элемент .gnu.version_d"
+ 
+-#: elf.c:9293
++#: elf.c:9325
+ #, c-format
+ msgid "%pB:%pA: error: attempting to write into an unallocated compressed section"
+ msgstr "%pB:%pA: ошибка: попытка записи в невыделенный сжатый раздел"
+ 
+-#: elf.c:9302
++#: elf.c:9334
+ #, c-format
+ msgid "%pB:%pA: error: attempting to write over the end of the section"
+ msgstr "%pB:%pA: ошибка: попытка записи за конец раздела"
+ 
+-#: elf.c:9313
++#: elf.c:9345
+ #, c-format
+ msgid "%pB:%pA: error: attempting to write section into an empty buffer"
+ msgstr "%pB:%pA: ошибка: попытка записи раздела в пустой буфер"
+ 
+-#: elf.c:12430
+-msgid "GNU_MBIND section is unsupported"
+-msgstr "раздел GNU_MBIND не поддерживается"
++#: elf.c:10246
++#, c-format
++msgid "%pB: warning: win32pstatus %s of size %lu bytes is too small"
++msgstr "%pB: предупреждение: размер win32pstatus %s в %lu байт слишком мал"
++
++#: elf.c:10324
++#, c-format
++msgid "%pB: win32pstatus NOTE_INFO_MODULE of size %lu is too small to contain a name of size %u"
++msgstr "%pB: размер win32pstatus NOTE_INFO_MODULE в %lu слишком мал, чтобы хранить имя размером %u"
++
++#: elf.c:12633
++msgid "GNU_MBIND section is supported only by GNU and FreeBSD targets"
++msgstr "раздел GNU_MBIND поддерживается только целями GNU и FreeBSD"
+ 
+-#: elf.c:12432
+-msgid "symbol type STT_GNU_IFUNC is unsupported"
+-msgstr "символьный тип STT_GNU_IFUNC не поддерживается"
++#: elf.c:12636
++msgid "symbol type STT_GNU_IFUNC is supported only by GNU and FreeBSD targets"
++msgstr "символьный тип STT_GNU_IFUNC поддерживается только целями GNU и FreeBSD"
+ 
+-#: elf.c:12434
+-msgid "symbol binding STB_GNU_UNIQUE is unsupported"
+-msgstr "символьная привязка STB_GNU_UNIQUE не поддерживается"
++#: elf.c:12639
++msgid "symbol binding STB_GNU_UNIQUE is supported only by GNU and FreeBSD targets"
++msgstr "символьная привязка STB_GNU_UNIQUE поддерживается только целями GNU и FreeBSD"
+ 
+-#: elf.c:12618 elf64-sparc.c:123 elfcode.h:1482
++#: elf.c:12642
++msgid "GNU_RETAIN section is supported only by GNU and FreeBSD targets"
++msgstr "раздел GNU_RETAIN поддерживается только целями GNU и FreeBSD"
++
++#: elf.c:12850 elf64-sparc.c:123 elfcode.h:1504
+ #, c-format
+ msgid "%pB(%pA): relocation %d has invalid symbol index %ld"
+ msgstr "%pB(%pA): перемещение %d имеет некорректный индекс символа %ld"
+ 
+-#: elf.c:12692
++#: elf.c:12925
+ #, c-format
+ msgid "%pB(%pA): link section cannot be set because the output file does not have a symbol table"
+ msgstr "%pB(%pA): нельзя задать раздел ссылок, так как выходной файл не содержит таблицу символов"
+ 
+-#: elf.c:12704
++#: elf.c:12937
+ #, c-format
+ msgid "%pB(%pA): info section index is invalid"
+ msgstr "%pB(%pA): некорректный индекс раздела информации"
+ 
+-#: elf.c:12718
++#: elf.c:12951
+ #, c-format
+ msgid "%pB(%pA): info section index cannot be set because the section is not in the output"
+ msgstr "%pB(%pA): нельзя задать индекс раздела информации, так как раздел отсутствует в результате"
+ 
+-#: elf.c:12784
++#: elf.c:13026
+ #, c-format
+ msgid "%pB(%pA): error: secondary reloc section processed twice"
+ msgstr "%pB(%pA): ошибка: вторичный раздел перемещений обработан дважды"
+ 
+-#: elf.c:12796
++#: elf.c:13038
++#, c-format
++msgid "%pB(%pA): error: secondary reloc section has zero sized entries"
++msgstr "%pB(%pA): ошибка: вторичный раздел перемещений содержит элементы нулевого размера"
++
++#: elf.c:13049
++#, c-format
++msgid "%pB(%pA): error: secondary reloc section has non-standard sized entries"
++msgstr "%pB(%pA): ошибка: вторичный раздел перемещений содержит элементы нестандартного размера"
++
++#: elf.c:13061
+ #, c-format
+ msgid "%pB(%pA): error: secondary reloc section is empty!"
+ msgstr "%pB(%pA): ошибка: вторичный раздел перемещений пуст!"
+ 
+-#: elf.c:12819
++#: elf.c:13084
+ #, c-format
+ msgid "%pB(%pA): error: internal relocs missing for secondary reloc section"
+ msgstr "%pB(%pA): ошибка: внутренние перемещения отсутствуют для вторичного раздела перемещений"
+ 
+-#: elf.c:12838
++#: elf.c:13103
+ #, c-format
+ msgid "%pB(%pA): error: reloc table entry %u is empty"
+ msgstr "%pB:%pA: ошибка: элемент таблицы перемещений %u пуст"
+ 
+-#: elf.c:12863
++#: elf.c:13128
+ #, c-format
+ msgid "%pB(%pA): error: secondary reloc %u references a missing symbol"
+ msgstr "%pB(%pA): ошибка: вторичный раздел %u ссылается на отсутствующий символ"
+ 
+-#: elf.c:12880
++#: elf.c:13145
+ #, c-format
+ msgid "%pB(%pA): error: secondary reloc %u references a deleted symbol"
+ msgstr "%pB(%pA): ошибка: вторичный раздел %u ссылается на удалённый символ"
+ 
+-#: elf.c:12893
++#: elf.c:13158
+ #, c-format
+ msgid "%pB(%pA): error: secondary reloc %u is of an unknown type"
+ msgstr "%pB(%pA): ошибка: вторичный раздел %u неизвестного типа"
+ 
+-#: elf32-arc.c:455 elf32-frv.c:6611 elf32-iq2000.c:868 elf32-m32c.c:914
+-#: elf32-mt.c:562 elf32-rl78.c:1260 elf32-rx.c:3205 elf32-visium.c:844
+-#: elf64-ppc.c:5291
++#. Ignore init flag - it may not be set, despite the flags field
++#. containing valid data.
++#: elf32-arc.c:455 elf32-arm.c:15047 elf32-frv.c:6612 elf32-iq2000.c:868
++#: elf32-m32c.c:914 elf32-mt.c:560 elf32-rl78.c:1260 elf32-rx.c:3206
++#: elf32-visium.c:844 elf64-ppc.c:5347 elfnn-aarch64.c:7334
+ #, c-format
+ msgid "private flags = 0x%lx:"
+ msgstr "собственные флаги = 0x%lx:"
+@@ -1391,8 +1460,8 @@ msgstr "ошибка: %pB: несогласующиеся атрибуты %s"
+ msgid "error: attempting to link %pB with a binary %pB of different architecture"
+ msgstr "ошибка: попытка компоновки %pB с двоичным файлом %pB другой архитектуры"
+ 
+-#: elf32-arc.c:938 elf32-iq2000.c:844 elf32-m32c.c:889 elf32-m68hc1x.c:1391
+-#: elf32-ppc.c:3867 elf64-sparc.c:722 elfxx-mips.c:15513
++#: elf32-arc.c:938 elf32-iq2000.c:844 elf32-m32c.c:889 elf32-m68hc1x.c:1390
++#: elf32-ppc.c:3866 elf64-sparc.c:722 elfxx-mips.c:15568
+ #, c-format
+ msgid "%pB: uses different e_flags (%#x) fields than previous modules (%#x)"
+ msgstr "%pB: использующиеся поля e_flags (%#x) отличаются от использованных в предыдущих модулях (%#x)"
+@@ -1444,604 +1513,618 @@ msgstr "%pB(%pA): внутренняя ошибка: опасное переме
+ msgid "%pB(%pA): internal error: unknown error"
+ msgstr "%pB(%pA): внутренняя ошибка: неизвестная ошибка"
+ 
+-#: elf32-arc.c:2022 elf32-arc.c:2090 elf32-arm.c:15513 elf32-metag.c:2253
+-#: elf32-nds32.c:5498 elfnn-aarch64.c:7739 elfnn-riscv.c:483
++#: elf32-arc.c:2023 elf32-arc.c:2091 elf32-arm.c:15502 elf32-metag.c:2251
++#: elf32-nds32.c:5494 elfnn-aarch64.c:7741 elfnn-riscv.c:617
+ #, c-format
+ msgid "%pB: relocation %s against `%s' can not be used when making a shared object; recompile with -fPIC"
+ msgstr "%pB: перемещение %s для «%s» не может использоваться при создании общего объекта; перекомпилируйте с -fPIC"
+ 
+-#: elf32-arc.c:2909
++#: elf32-arc.c:2910
+ #, c-format
+ msgid "%pB: unknown mandatory ARC object attribute %d"
+ msgstr "%pB: неизвестный обязательный атрибут объекта ARC %d"
+ 
+-#: elf32-arc.c:2917
++#: elf32-arc.c:2918
+ #, c-format
+ msgid "warning: %pB: unknown ARC object attribute %d"
+ msgstr "предупреждение: %pB: неизвестный атрибут объекта ARC %d"
+ 
+-#: elf32-arm.c:4307 elf32-arm.c:4341 elf32-arm.c:4360 elf32-arm.c:4412
++#: elf32-arm.c:4333 elf32-arm.c:4367 elf32-arm.c:4386 elf32-arm.c:4438
+ #, c-format
+ msgid "%pB(%pA): warning: long branch veneers used in section with SHF_ARM_PURECODE section attribute is only supported for M-profile targets that implement the movw instruction"
+ msgstr "%pB(%pA): предупреждение: склейки длинных ветвей, использованных в разделе с атрибутом раздела SHF_ARM_PURECODE, поддерживаются только для целей M-профиля, который реализован инструкцией movw"
+ 
+-#: elf32-arm.c:4372 elf32-arm.c:4426 elf32-arm.c:9116 elf32-arm.c:9206
++#: elf32-arm.c:4398 elf32-arm.c:4452 elf32-arm.c:9141 elf32-arm.c:9231
+ #, c-format
+ msgid "%pB(%s): warning: interworking not enabled; first occurrence: %pB: %s call to %s"
+ msgstr "%pB(%s): предупреждение: совместная работа не включена; первое упоминание: %pB: вызов %s в %s"
+ 
+-#: elf32-arm.c:4552
++#: elf32-arm.c:4578
+ #, c-format
+ msgid "ERROR: CMSE stub (%s section) too far (%#<PRIx64>) from destination (%#<PRIx64>)"
+ msgstr "ОШИБКА: заглушка CMSE (раздел %s) слишком далеко (%#<PRIx64>) от назначения (%#<PRIx64>)"
+ 
+-#: elf32-arm.c:4721
++#: elf32-arm.c:4747
+ #, c-format
+ msgid "no address assigned to the veneers output section %s"
+ msgstr "не назначен адрес склейкам в выходном разделе %s"
+ 
+-#: elf32-arm.c:4796 elf32-arm.c:6943 elf32-csky.c:3172 elf32-hppa.c:584
+-#: elf32-m68hc1x.c:165 elf32-metag.c:1182 elf32-nios2.c:2204 elf64-ppc.c:3775
+-#: elfnn-aarch64.c:3190
++#: elf32-arm.c:4822 elf32-arm.c:6968 elf32-csky.c:3400 elf32-hppa.c:582
++#: elf32-m68hc1x.c:164 elf32-metag.c:1180 elf32-nios2.c:2201 elf64-ppc.c:3827
++#: elf64-ppc.c:13638 elfnn-aarch64.c:3187
+ #, c-format
+ msgid "%pB: cannot create stub entry %s"
+ msgstr "%pB: невозможно создать элемент заглушки %s"
+ 
+-#: elf32-arm.c:5017 elf32-csky.c:3514 elf32-hppa.c:734 elf32-m68hc11.c:422
+-#: elf32-m68hc12.c:542 elf32-metag.c:3347 elf32-nios2.c:2497 elf64-ppc.c:11315
+-#: elfnn-aarch64.c:3259
++#: elf32-arm.c:5043 elf32-csky.c:3742 elf32-hppa.c:732 elf32-m68hc11.c:422
++#: elf32-m68hc12.c:542 elf32-metag.c:3345 elf32-nios2.c:2494 elf64-ppc.c:11473
++#: elfnn-aarch64.c:3256
+ msgid "%F%P: Could not assign '%pA' to an output section. Retry without --enable-non-contiguous-regions.\n"
+ msgstr "%F%P: Невозможно назначить «%pA» выходному разделу. Повторите без --enable-non-contiguous-regions.\n"
+ 
+-#: elf32-arm.c:5987
++#: elf32-arm.c:6011
+ #, c-format
+ msgid "%pB: special symbol `%s' only allowed for ARMv8-M architecture or later"
+ msgstr "%pB: специальный символ «%s» разрешён только для архитектуры ARMv8-M и новее"
+ 
+-#: elf32-arm.c:5996
++#: elf32-arm.c:6020
+ #, c-format
+ msgid "%pB: invalid special symbol `%s'; it must be a global or weak function symbol"
+ msgstr "%pB: некорректный специальный символ «%s»; это должен быть глобальный или слабый символ функции"
+ 
+-#: elf32-arm.c:6035
++#: elf32-arm.c:6059
+ #, c-format
+ msgid "%pB: invalid standard symbol `%s'; it must be a global or weak function symbol"
+ msgstr "%pB: некорректный стандартный символ «%s»; это должен быть глобальный или слабый символ функции"
+ 
+-#: elf32-arm.c:6041
++#: elf32-arm.c:6065
+ #, c-format
+ msgid "%pB: absent standard symbol `%s'"
+ msgstr "%pB: отсутствует стандартный символ «%s»"
+ 
+-#: elf32-arm.c:6053
++#: elf32-arm.c:6077
+ #, c-format
+ msgid "%pB: `%s' and its special symbol are in different sections"
+ msgstr "%pB: «%s» и его специальный символ находятся в разных разделах"
+ 
+-#: elf32-arm.c:6065
++#: elf32-arm.c:6089
+ #, c-format
+ msgid "%pB: entry function `%s' not output"
+ msgstr "%pB: входная функция «%s» отсутствует в выводе"
+ 
+-#: elf32-arm.c:6072
++#: elf32-arm.c:6096
+ #, c-format
+ msgid "%pB: entry function `%s' is empty"
+ msgstr "%pB: входная функция «%s» пуста"
+ 
+-#: elf32-arm.c:6201
++#: elf32-arm.c:6225
+ #, c-format
+ msgid "%pB: --in-implib only supported for Secure Gateway import libraries"
+ msgstr "%pB: --in-implib поддерживается только для библиотек импорта Secure Gateway"
+ 
+-#: elf32-arm.c:6250
++#: elf32-arm.c:6274
+ #, c-format
+ msgid "%pB: invalid import library entry: `%s'; symbol should be absolute, global and refer to Thumb functions"
+ msgstr "%pB: некорректный элемент импортируемой библиотеки: «%s»; символ должен быть абсолютным, глобальным или ссылаться на функции Thumb"
+ 
+-#: elf32-arm.c:6272
++#: elf32-arm.c:6296
+ #, c-format
+ msgid "entry function `%s' disappeared from secure code"
+ msgstr "входная функция «%s» исчезла из безопасного кода"
+ 
+-#: elf32-arm.c:6296
++#: elf32-arm.c:6320
+ #, c-format
+ msgid "`%s' refers to a non entry function"
+ msgstr "«%s» ссылается на не пустую входную функцию"
+ 
+-#: elf32-arm.c:6311
++#: elf32-arm.c:6335
+ #, c-format
+ msgid "%pB: visibility of symbol `%s' has changed"
+ msgstr "%pB: изменилась видимость символа «%s»"
+ 
+-#: elf32-arm.c:6320
++#: elf32-arm.c:6344
+ #, c-format
+ msgid "%pB: incorrect size for symbol `%s'"
+ msgstr "%pB: некорректный размер символа «%s»"
+ 
+-#: elf32-arm.c:6339
++#: elf32-arm.c:6363
+ #, c-format
+ msgid "offset of veneer for entry function `%s' not a multiple of its size"
+ msgstr "смещение склейки входной функции «%s» не кратно её размеру"
+ 
+-#: elf32-arm.c:6359
++#: elf32-arm.c:6383
+ msgid "new entry function(s) introduced but no output import library specified:"
+ msgstr "появилась новая входная функция(и), но не указан вывод импортируемой библиотеки:"
+ 
+-#: elf32-arm.c:6367
++#: elf32-arm.c:6391
+ #, c-format
+ msgid "start address of `%s' is different from previous link"
+ msgstr "начальный адрес «%s» отличается от предыдущей ссылки"
+ 
+-#: elf32-arm.c:7076 elf32-arm.c:7111
++#: elf32-arm.c:7101 elf32-arm.c:7136
+ #, c-format
+ msgid "unable to find %s glue '%s' for '%s'"
+ msgstr "не удалось найти склейку %s «%s» для «%s»"
+ 
+-#: elf32-arm.c:7822
++#: elf32-arm.c:7847
+ #, c-format
+ msgid "%pB: BE8 images only valid in big-endian mode"
+ msgstr "%pB: образы BE8 разрешены только в режиме big-endian"
+ 
+ #. Give a warning, but do as the user requests anyway.
+-#: elf32-arm.c:8049
++#: elf32-arm.c:8074
+ #, c-format
+ msgid "%pB: warning: selected VFP11 erratum workaround is not necessary for target architecture"
+ msgstr "%pB: предупреждение: выбранный обход ошибки VFP11 не требуется для целевой архитектуры"
+ 
+-#: elf32-arm.c:8076
++#: elf32-arm.c:8101
+ #, c-format
+ msgid "%pB: warning: selected STM32L4XX erratum workaround is not necessary for target architecture"
+ msgstr "%pB: предупреждение: выбранный обход ошибки STM32L4XX не требуется для целевой архитектуры"
+ 
+-#: elf32-arm.c:8612 elf32-arm.c:8632 elf32-arm.c:8699 elf32-arm.c:8718
++#: elf32-arm.c:8637 elf32-arm.c:8657 elf32-arm.c:8724 elf32-arm.c:8743
+ #, c-format
+ msgid "%pB: unable to find %s veneer `%s'"
+ msgstr "%pB: невозможно найти склейку %s «%s»"
+ 
+-#: elf32-arm.c:8925
++#: elf32-arm.c:8950
+ #, c-format
+ msgid "%pB(%pA+%#x): error: multiple load detected in non-last IT block instruction: STM32L4XX veneer cannot be generated; use gcc option -mrestrict-it to generate only one instruction per IT block"
+ msgstr "%pB(%pA+%#x): ошибка: обнаружено несколько инструкций загрузок в не последнем блоке IT: невозможно сгенерировать склейку STM32L4XX; используйте параметр gcc -mrestrict-it для генерации только одной инструкции в блоке IT"
+ 
+-#: elf32-arm.c:9023
++#: elf32-arm.c:9048
+ #, c-format
+ msgid "invalid TARGET2 relocation type '%s'"
+ msgstr "недопустимый TARGET2 тип перемещения «%s»"
+ 
+ #. FIXME: We ought to be able to generate thumb-1 PLT
+ #. instructions...
+-#: elf32-arm.c:9825
++#: elf32-arm.c:9818
+ #, c-format
+ msgid "%pB: warning: thumb-1 mode PLT generation not currently supported"
+ msgstr "%pB: предупреждение: генерация PLT в режиме thumb-1 пока не поддерживается"
+ 
+-#: elf32-arm.c:10135 elf32-arm.c:10177
++#: elf32-arm.c:10127 elf32-arm.c:10169
+ #, c-format
+ msgid "%pB(%pA+%#<PRIx64>): unexpected %s instruction '%#lx' in TLS trampoline"
+ msgstr "%pB(%pA+%#<PRIx64>): неожидаемая инструкция %s «%#lx» в трамплине TLS"
+ 
+-#: elf32-arm.c:10521
++#: elf32-arm.c:10519
+ msgid "shared object"
+ msgstr "общий объект"
+ 
+-#: elf32-arm.c:10524
++#: elf32-arm.c:10522
+ msgid "PIE executable"
+ msgstr "исполняемый PIE"
+ 
+-#: elf32-arm.c:10527
++#: elf32-arm.c:10525
+ #, c-format
+ msgid "%pB: relocation %s against external or undefined symbol `%s' can not be used when making a %s; recompile with -fPIC"
+ msgstr "%pB: перемещение %s для внешнего или неопределённого символа «%s» не может использоваться при создании %s; перекомпилируйте с -fPIC"
+ 
+-#: elf32-arm.c:10664 elf32-arm.c:11091
++#: elf32-arm.c:10627 elf32-arm.c:11044
+ #, c-format
+ msgid "%pB: warning: %s BLX instruction targets %s function '%s'"
+ msgstr "%pB: предупреждение: инструкция BLX %s указывает на функцию %s «%s»"
+ 
+-#: elf32-arm.c:12003 elf32-arm.c:12029
++#: elf32-arm.c:11678
++#, c-format
++msgid "%pB: expected symbol index in range 0..%lu but found local symbol with index %lu"
++msgstr "%pB: ожидается индекс символа в диапазоне 0..%lu, но найден локальный символ с индексом %lu"
++
++#: elf32-arm.c:11953 elf32-arm.c:11979
+ #, c-format
+ msgid "%pB(%pA+%#<PRIx64>): unexpected %s instruction '%#lx' referenced by TLS_GOTDESC"
+ msgstr "%pB(%pA+%#<PRIx64>): неожидаемая инструкция %s «%#lx», на которую ссылается TLS_GOTDESC"
+ 
+-#: elf32-arm.c:12075 elf32-csky.c:4746 elf32-m68k.c:3735 elf32-metag.c:1915
+-#: elf32-nios2.c:4385
++#: elf32-arm.c:12025 elf32-csky.c:4970 elf32-m68k.c:3733 elf32-metag.c:1913
++#: elf32-nios2.c:4382
+ #, c-format
+ msgid "%pB(%pA+%#<PRIx64>): %s relocation not permitted in shared object"
+ msgstr "%pB(%pA+%#<PRIx64>): перемещение %s не разрешено в общем объекте"
+ 
+-#: elf32-arm.c:12289
++#: elf32-arm.c:12239
+ #, c-format
+ msgid "%pB(%pA+%#<PRIx64>): only ADD or SUB instructions are allowed for ALU group relocations"
+ msgstr "%pB(%pA+%#<PRIx64>): в группе перемещений ALU разрешены только инструкции ADD или SUB"
+ 
+-#: elf32-arm.c:12330 elf32-arm.c:12422 elf32-arm.c:12510 elf32-arm.c:12600
++#: elf32-arm.c:12280 elf32-arm.c:12372 elf32-arm.c:12460 elf32-arm.c:12550
+ #, c-format
+ msgid "%pB(%pA+%#<PRIx64>): overflow whilst splitting %#<PRIx64> for group relocation %s"
+ msgstr "%pB(%pA+%#<PRIx64>): переполнение во время разделения %#<PRIx64> для группы перемещений %s"
+ 
+-#: elf32-arm.c:13232 elf32-sh.c:3571
++#: elf32-arm.c:12608 elf32-arm.c:12767
++msgid "local symbol index too big"
++msgstr "индекс локального символа слишком большой"
++
++#: elf32-arm.c:12618 elf32-arm.c:12652
++msgid "no dynamic index information available"
++msgstr "нет информации о динамическом индексе"
++
++#: elf32-arm.c:12660
++msgid "invalid dynamic index"
++msgstr "неверный динамический индекс"
++
++#: elf32-arm.c:12777
++msgid "dynamic index information not available"
++msgstr "нет информации о динамическом индексе"
++
++#: elf32-arm.c:13208 elf32-sh.c:3565
+ #, c-format
+ msgid "%pB(%pA+%#<PRIx64>): %s relocation against SEC_MERGE section"
+ msgstr "%pB(%pA+%#<PRIx64>): перемещение %s в разделе SEC_MERGE"
+ 
+-#: elf32-arm.c:13345 elf32-m68k.c:3968 elf32-xtensa.c:2761
+-#: elfnn-aarch64.c:6829
++#: elf32-arm.c:13321 elf32-m68k.c:3966 elf32-xtensa.c:2762
++#: elfnn-aarch64.c:6831
+ #, c-format
+ msgid "%pB(%pA+%#<PRIx64>): %s used with TLS symbol %s"
+ msgstr "%pB(%pA+%#<PRIx64>): %s используется с TLS-символом %s"
+ 
+-#: elf32-arm.c:13347 elf32-m68k.c:3970 elf32-xtensa.c:2763
+-#: elfnn-aarch64.c:6831
++#: elf32-arm.c:13323 elf32-m68k.c:3968 elf32-xtensa.c:2764
++#: elfnn-aarch64.c:6833
+ #, c-format
+ msgid "%pB(%pA+%#<PRIx64>): %s used with non-TLS symbol %s"
+ msgstr "%pB(%pA+%#<PRIx64>): %s используется с не TLS-символом %s"
+ 
+-#: elf32-arm.c:13430 elf32-tic6x.c:2649 elfnn-aarch64.c:7166
++#: elf32-arm.c:13406 elf32-tic6x.c:2649 elfnn-aarch64.c:7168
+ msgid "out of range"
+ msgstr "вне диапазона"
+ 
+-#: elf32-arm.c:13434 elf32-nios2.c:4519 elf32-pru.c:936 elf32-tic6x.c:2653
+-#: elfnn-aarch64.c:7170
++#: elf32-arm.c:13410 elf32-nios2.c:4516 elf32-pru.c:936 elf32-tic6x.c:2653
++#: elfnn-aarch64.c:7172
+ msgid "unsupported relocation"
+ msgstr "неподдерживаемое перемещение"
+ 
+-#: elf32-arm.c:13442 elf32-nios2.c:4529 elf32-pru.c:946 elf32-tic6x.c:2661
+-#: elfnn-aarch64.c:7178
++#: elf32-arm.c:13418 elf32-nios2.c:4526 elf32-pru.c:946 elf32-tic6x.c:2661
++#: elfnn-aarch64.c:7180
+ msgid "unknown error"
+ msgstr "неизвестная ошибка"
+ 
+-#: elf32-arm.c:13920
++#: elf32-arm.c:13898
+ #, c-format
+ msgid "warning: not setting interworking flag of %pB since it has already been specified as non-interworking"
+ msgstr "предупреждение: флаг совместной работы для %pB не устанавливается, так как он уже указывает на несовместную работу"
+ 
+-#: elf32-arm.c:13924
++#: elf32-arm.c:13902
+ #, c-format
+ msgid "warning: clearing the interworking flag of %pB due to outside request"
+ msgstr "предупреждение: очищается флаг совместной работы для %pB из-за внешнего запроса"
+ 
+-#: elf32-arm.c:13969
++#: elf32-arm.c:13947
+ #, c-format
+ msgid "warning: clearing the interworking flag of %pB because non-interworking code in %pB has been linked with it"
+ msgstr "предупреждение: сброс флага совместной работы %pB, так как с ним был скомпонован код без совместной работы из %pB"
+ 
+-#: elf32-arm.c:14056
++#: elf32-arm.c:14034
+ #, c-format
+ msgid "%pB: unknown mandatory EABI object attribute %d"
+ msgstr "%pB: неизвестный обязательный атрибут EABI-объекта %d"
+ 
+-#: elf32-arm.c:14064
++#: elf32-arm.c:14042
+ #, c-format
+ msgid "warning: %pB: unknown EABI object attribute %d"
+ msgstr "предупреждение: %pB: неизвестный атрибут EABI-объекта %d"
+ 
+-#: elf32-arm.c:14364
++#: elf32-arm.c:14342
+ #, c-format
+ msgid "error: %pB: unknown CPU architecture"
+ msgstr "ошибка: %pB: неизвестная процессорная архитектура"
+ 
+-#: elf32-arm.c:14402 elf32-nios2.c:2953
++#: elf32-arm.c:14380 elf32-nios2.c:2950
+ #, c-format
+ msgid "error: %pB: conflicting CPU architectures %d/%d"
+ msgstr "ошибка: %pB: противоречащие архитектурные профили %d/%d"
+ 
+-#: elf32-arm.c:14499
++#: elf32-arm.c:14477
+ #, c-format
+ msgid "Error: %pB has both the current and legacy Tag_MPextension_use attributes"
+ msgstr "ошибка: %pB содержит одновременно и текущий и устаревший атрибут Tag_MPextension_use"
+ 
+-#: elf32-arm.c:14528
++#: elf32-arm.c:14506
+ #, c-format
+ msgid "error: %pB uses VFP register arguments, %pB does not"
+ msgstr "ошибка: %pB использует регистровые аргументы VFP, а %pB нет"
+ 
+-#: elf32-arm.c:14687
++#: elf32-arm.c:14665
+ #, c-format
+ msgid "error: %pB: unable to merge virtualization attributes with %pB"
+ msgstr "ошибка: %pB: не удалось объединить атрибуты виртуализации с %pB"
+ 
+-#: elf32-arm.c:14713
++#: elf32-arm.c:14691
+ #, c-format
+ msgid "error: %pB: conflicting architecture profiles %c/%c"
+ msgstr "ошибка: %pB: противоречащие архитектурные профили %c/%c"
+ 
+-#: elf32-arm.c:14852
++#: elf32-arm.c:14830
+ #, c-format
+ msgid "warning: %pB: conflicting platform configuration"
+ msgstr "предупреждение: %pB: противоречивые настройки платформы"
+ 
+-#: elf32-arm.c:14861
++#: elf32-arm.c:14839
+ #, c-format
+ msgid "error: %pB: conflicting use of R9"
+ msgstr "ошибка: %pB: противоречащее использование R9"
+ 
+-#: elf32-arm.c:14873
++#: elf32-arm.c:14851
+ #, c-format
+ msgid "error: %pB: SB relative addressing conflicts with use of R9"
+ msgstr "ошибка: %pB: противоречащее использование относительной адресации SB и R9"
+ 
+-#: elf32-arm.c:14886
++#: elf32-arm.c:14864
+ #, c-format
+ msgid "warning: %pB uses %u-byte wchar_t yet the output is to use %u-byte wchar_t; use of wchar_t values across objects may fail"
+ msgstr "предупреждение: %pB использует %u-байтовый wchar_t, хотя уже использовался %u-байтовый wchar_t; использование значений wchar_t в разных объектах может привести к ошибке"
+ 
+-#: elf32-arm.c:14917
++#: elf32-arm.c:14895
+ #, c-format
+ msgid "warning: %pB uses %s enums yet the output is to use %s enums; use of enum values across objects may fail"
+ msgstr "предупреждение: %pB использует %s enum, хотя уже использовался %s enum; использование значений enum в разных объектах может привести к ошибке"
+ 
+-#: elf32-arm.c:14929
++#: elf32-arm.c:14907
+ #, c-format
+ msgid "error: %pB uses iWMMXt register arguments, %pB does not"
+ msgstr "ошибка: %pB использует регистровые аргументы iWMMXt, а %pB нет"
+ 
+-#: elf32-arm.c:14946
++#: elf32-arm.c:14924
+ #, c-format
+ msgid "error: fp16 format mismatch between %pB and %pB"
+ msgstr "ошибка: формат fp16 расходится в %pB и %pB"
+ 
+-#: elf32-arm.c:14982
++#: elf32-arm.c:14960
+ #, c-format
+ msgid "%pB has both the current and legacy Tag_MPextension_use attributes"
+ msgstr "%pB содержит одновременно и текущий и устаревший атрибут Tag_MPextension_use"
+ 
+-#. Ignore init flag - it may not be set, despite the flags field
+-#. containing valid data.
+-#. Ignore init flag - it may not be set, despite the flags field containing valid data.
+-#. Ignore init flag - it may not be set, despite the flags field
+-#. containing valid data.
+-#: elf32-arm.c:15069 elf32-bfin.c:4719 elf32-cris.c:3861 elf32-m68hc1x.c:1416
+-#: elf32-m68k.c:1267 elf32-score.c:4000 elf32-score7.c:3805 elf32-vax.c:537
+-#: elf32-xgate.c:494 elfxx-mips.c:16199 elfnn-aarch64.c:7332
+-#, c-format
+-msgid "private flags = %lx:"
+-msgstr "собственные флаги = %lx:"
+-
+-#: elf32-arm.c:15078
++#: elf32-arm.c:15056
+ #, c-format
+ msgid " [interworking enabled]"
+ msgstr " [совместная работа включена]"
+ 
+-#: elf32-arm.c:15086
++#: elf32-arm.c:15064
+ #, c-format
+ msgid " [VFP float format]"
+ msgstr " [VFP формат плавающей точки]"
+ 
+-#: elf32-arm.c:15088
++#: elf32-arm.c:15066
+ #, c-format
+ msgid " [Maverick float format]"
+ msgstr " [Maverick формат плавающей точки]"
+ 
+-#: elf32-arm.c:15090
++#: elf32-arm.c:15068
+ #, c-format
+ msgid " [FPA float format]"
+ msgstr " [FPA формат плавающей точки]"
+ 
+-#: elf32-arm.c:15093
++#: elf32-arm.c:15071
+ #, c-format
+ msgid " [floats passed in float registers]"
+ msgstr " [числа с плавающей точкой передаются в регистрах с плавающей точкой]"
+ 
+-#: elf32-arm.c:15096 elf32-arm.c:15182
++#: elf32-arm.c:15074 elf32-arm.c:15160
+ #, c-format
+ msgid " [position independent]"
+ msgstr " [позиционно-независимый]"
+ 
+-#: elf32-arm.c:15099
++#: elf32-arm.c:15077
+ #, c-format
+ msgid " [new ABI]"
+ msgstr " [новый ABI]"
+ 
+-#: elf32-arm.c:15102
++#: elf32-arm.c:15080
+ #, c-format
+ msgid " [old ABI]"
+ msgstr " [старый ABI]"
+ 
+-#: elf32-arm.c:15105
++#: elf32-arm.c:15083
+ #, c-format
+ msgid " [software FP]"
+ msgstr " [программная FP]"
+ 
+-#: elf32-arm.c:15114
++#: elf32-arm.c:15092
+ #, c-format
+ msgid " [Version1 EABI]"
+ msgstr " [Версия1 EABI]"
+ 
+-#: elf32-arm.c:15117 elf32-arm.c:15128
++#: elf32-arm.c:15095 elf32-arm.c:15106
+ #, c-format
+ msgid " [sorted symbol table]"
+ msgstr " [отсортированная таблица символов]"
+ 
+-#: elf32-arm.c:15119 elf32-arm.c:15130
++#: elf32-arm.c:15097 elf32-arm.c:15108
+ #, c-format
+ msgid " [unsorted symbol table]"
+ msgstr " [несортированная таблица символов]"
+ 
+-#: elf32-arm.c:15125
++#: elf32-arm.c:15103
+ #, c-format
+ msgid " [Version2 EABI]"
+ msgstr " [Версия2 EABI]"
+ 
+-#: elf32-arm.c:15133
++#: elf32-arm.c:15111
+ #, c-format
+ msgid " [dynamic symbols use segment index]"
+ msgstr " [динамические символы используют сегментный индекс]"
+ 
+-#: elf32-arm.c:15136
++#: elf32-arm.c:15114
+ #, c-format
+ msgid " [mapping symbols precede others]"
+ msgstr " [проецируемые символы указываются раньше]"
+ 
+-#: elf32-arm.c:15143
++#: elf32-arm.c:15121
+ #, c-format
+ msgid " [Version3 EABI]"
+ msgstr " [Версия3 EABI]"
+ 
+-#: elf32-arm.c:15147
++#: elf32-arm.c:15125
+ #, c-format
+ msgid " [Version4 EABI]"
+ msgstr " [Версия4 EABI]"
+ 
+-#: elf32-arm.c:15151
++#: elf32-arm.c:15129
+ #, c-format
+ msgid " [Version5 EABI]"
+ msgstr " [Версия5 EABI]"
+ 
+-#: elf32-arm.c:15154
++#: elf32-arm.c:15132
+ #, c-format
+ msgid " [soft-float ABI]"
+ msgstr " [soft-float ABI]"
+ 
+-#: elf32-arm.c:15157
++#: elf32-arm.c:15135
+ #, c-format
+ msgid " [hard-float ABI]"
+ msgstr " [hard-float ABI]"
+ 
+-#: elf32-arm.c:15163
++#: elf32-arm.c:15141
+ #, c-format
+ msgid " [BE8]"
+ msgstr " [BE8]"
+ 
+-#: elf32-arm.c:15166
++#: elf32-arm.c:15144
+ #, c-format
+ msgid " [LE8]"
+ msgstr " [LE8]"
+ 
+-#: elf32-arm.c:15172
++#: elf32-arm.c:15150
+ #, c-format
+ msgid " <EABI version unrecognised>"
+ msgstr " <нераспознанная версия EABI>"
+ 
+-#: elf32-arm.c:15179
++#: elf32-arm.c:15157
+ #, c-format
+ msgid " [relocatable executable]"
+ msgstr " [перемещаемый исполняемый]"
+ 
+-#: elf32-arm.c:15185
++#: elf32-arm.c:15163
+ #, c-format
+ msgid " [FDPIC ABI supplement]"
+ msgstr " [дополнительный FDPIC ABI]"
+ 
+-#: elf32-arm.c:15190 elfnn-aarch64.c:7335
++#: elf32-arm.c:15168 elfnn-aarch64.c:7337
+ #, c-format
+-msgid "<Unrecognised flag bits set>"
+-msgstr "<Нераспознанный набор битов флага>"
++msgid " <Unrecognised flag bits set>"
++msgstr " <Нераспознанный набор битов флага>"
+ 
+-#: elf32-arm.c:15307 elf32-i386.c:1524 elf32-s390.c:925 elf32-tic6x.c:2724
+-#: elf32-tilepro.c:1443 elf32-xtensa.c:1093 elf64-s390.c:847
+-#: elf64-x86-64.c:1902 elfxx-sparc.c:1386 elfxx-tilegx.c:1664
+-#: elfnn-aarch64.c:7606 elfnn-riscv.c:525
++#: elf32-arm.c:15285 elf32-arm.c:15419 elf32-i386.c:1524 elf32-s390.c:923
++#: elf32-tic6x.c:2724 elf32-tilepro.c:1435 elf32-xtensa.c:1094
++#: elf64-s390.c:845 elf64-x86-64.c:1900 elfxx-sparc.c:1386 elfxx-tilegx.c:1662
++#: elfnn-aarch64.c:7608 elfnn-riscv.c:660
+ #, c-format
+ msgid "%pB: bad symbol index: %d"
+ msgstr "%pB: неправильный символьный индекс: %d"
+ 
+-#: elf32-arm.c:15696
++#: elf32-arm.c:15675
+ #, c-format
+ msgid "FDPIC does not yet support %s relocation to become dynamic for executable"
+ msgstr "FDPIC пока не поддерживает создание динамических перемещений %s для исполняемых файлов"
+ 
+-#: elf32-arm.c:16939
++#: elf32-arm.c:16936
+ #, c-format
+ msgid "errors encountered processing file %pB"
+ msgstr "при обработке файла %pB обнаружены ошибки"
+ 
+-#: elf32-arm.c:17326 elflink.c:12818 elflink.c:12865
++#: elf32-arm.c:17309 elflink.c:12991 elflink.c:13038
+ #, c-format
+ msgid "could not find section %s"
+ msgstr "невозможно найти раздел %s"
+ 
+-#: elf32-arm.c:18550
++#: elf32-arm.c:18230
++#, c-format
++msgid "%pB: Number of symbols in input file has increased from %lu to %u\n"
++msgstr "%pB: Количество символов во входном файле увеличилось с %lu до %u\n"
++
++#: elf32-arm.c:18494
+ #, c-format
+ msgid "%pB: error: Cortex-A8 erratum stub is allocated in unsafe location"
+ msgstr "%pB: ошибка: заглушка для ошибки Cortex-A8 расположена в небезопасном месте"
+ 
+ #. There's not much we can do apart from complain if this
+ #. happens.
+-#: elf32-arm.c:18577
++#: elf32-arm.c:18521
+ #, c-format
+ msgid "%pB: error: Cortex-A8 erratum stub out of range (input file too large)"
+ msgstr "%pB: ошибка: заглушка для ошибки Cortex-A8 находится вне диапазона (слишком большой входной файл)"
+ 
+-#: elf32-arm.c:19404 elf32-arm.c:19426
++#: elf32-arm.c:19348 elf32-arm.c:19370
+ #, c-format
+ msgid "%pB: error: VFP11 veneer out of range"
+ msgstr "%pB: ошибка: склейка VFP11 вне диапазона"
+ 
+-#: elf32-arm.c:19477
++#: elf32-arm.c:19421
+ #, c-format
+ msgid "%pB(%#<PRIx64>): error: cannot create STM32L4XX veneer; jump out of range by %<PRId64> bytes; cannot encode branch instruction"
+ msgstr "%pB(%#<PRIx64>): ошибка: невозможно создать склейку STM32L4XX; прыжок выходит за диапазон %<PRId64> байт; невозможно закодировать инструкцию ветвления"
+ 
+-#: elf32-arm.c:19516
++#: elf32-arm.c:19460
+ #, c-format
+ msgid "%pB: error: cannot create STM32L4XX veneer"
+ msgstr "%pB: ошибка: невозможно создать склейку STM32L4XX"
+ 
+-#: elf32-arm.c:20600
++#: elf32-arm.c:20544
+ #, c-format
+ msgid "error: %pB is already in final BE8 format"
+ msgstr "ошибка: %pB уже в конечном формате BE8"
+ 
+-#: elf32-arm.c:20676
++#: elf32-arm.c:20620
+ #, c-format
+ msgid "error: source object %pB has EABI version %d, but target %pB has EABI version %d"
+ msgstr "ошибка: объект-источник %pB имеет версию EABI %d, а цель %pB имеет версию EABI %d"
+ 
+-#: elf32-arm.c:20691
++#: elf32-arm.c:20635
+ #, c-format
+ msgid "error: %pB is compiled for APCS-%d, whereas target %pB uses APCS-%d"
+ msgstr "ошибка: %pB скомпилирован для APCS-%d, в то время как цель %pB использует APCS-%d"
+ 
+-#: elf32-arm.c:20701
++#: elf32-arm.c:20645
+ #, c-format
+ msgid "error: %pB passes floats in float registers, whereas %pB passes them in integer registers"
+ msgstr "ошибка: %pB передаёт числа с плавающей точкой в регистрах с плавающей точкой, в то время как %pB передаёт их в целочисленных регистрах"
+ 
+-#: elf32-arm.c:20705
++#: elf32-arm.c:20649
+ #, c-format
+ msgid "error: %pB passes floats in integer registers, whereas %pB passes them in float registers"
+ msgstr "ошибка: %pB передаёт числа в целочисленных регистрах, в то время как %pB передаёт их в регистрах с плавающей точкой"
+ 
+-#: elf32-arm.c:20715 elf32-arm.c:20719 elf32-arm.c:20729
++#: elf32-arm.c:20659 elf32-arm.c:20663 elf32-arm.c:20673
+ #, c-format
+ msgid "error: %pB uses %s instructions, whereas %pB does not"
+ msgstr "ошибка: %pB использует инструкции %s, в то время как %pB нет"
+ 
+-#: elf32-arm.c:20733
++#: elf32-arm.c:20677
+ #, c-format
+ msgid "error: %pB does not use %s instructions, whereas %pB does"
+ msgstr "ошибка: %pB не использует инструкции %s, в то время как %pB использует"
+ 
+-#: elf32-arm.c:20752
++#: elf32-arm.c:20696
+ #, c-format
+ msgid "error: %pB uses software FP, whereas %pB uses hardware FP"
+ msgstr "ошибка: %pB использует программную FP, в то время как %pB использует аппаратную FP"
+ 
+-#: elf32-arm.c:20756
++#: elf32-arm.c:20700
+ #, c-format
+ msgid "error: %pB uses hardware FP, whereas %pB uses software FP"
+ msgstr "ошибка: %pB использует аппаратную FP, в то время как %pB использует программную FP"
+ 
+-#: elf32-arm.c:20770
++#: elf32-arm.c:20714
+ #, c-format
+ msgid "warning: %pB supports interworking, whereas %pB does not"
+ msgstr "предупреждение: %pB поддерживает совместную работу, в то время как %pB нет"
+ 
+-#: elf32-arm.c:20776
++#: elf32-arm.c:20720
+ #, c-format
+ msgid "warning: %pB does not support interworking, whereas %pB does"
+ msgstr "предупреждение: %pB не поддерживает совместную работу, в то время как %pB поддерживает"
+ 
+-#: elf32-avr.c:1516 elf32-bfin.c:3134 elf32-cris.c:2041 elf32-epiphany.c:573
+-#: elf32-fr30.c:602 elf32-frv.c:4056 elf32-ft32.c:502 elf32-ip2k.c:1488
+-#: elf32-iq2000.c:699 elf32-m32c.c:632 elf32-mep.c:534 elf32-metag.c:1994
+-#: elf32-moxie.c:296 elf32-msp430.c:1375 elf32-mt.c:406 elf32-or1k.c:1825
+-#: elf32-tilepro.c:3388 elf32-v850.c:2298 elf32-visium.c:688
+-#: elf32-xstormy16.c:937 elf64-bpf.c:521 elf64-mmix.c:1549 elfxx-tilegx.c:3752
++#: elf32-avr.c:1516 elf32-bfin.c:3139 elf32-cris.c:2042 elf32-epiphany.c:573
++#: elf32-fr30.c:602 elf32-frv.c:4057 elf32-ft32.c:501 elf32-ip2k.c:1488
++#: elf32-iq2000.c:699 elf32-m32c.c:632 elf32-mep.c:530 elf32-metag.c:1992
++#: elf32-moxie.c:296 elf32-msp430.c:1514 elf32-mt.c:406 elf32-or1k.c:1869
++#: elf32-tilepro.c:3380 elf32-v850.c:2302 elf32-visium.c:688
++#: elf32-xstormy16.c:938 elf64-bpf.c:561 elf64-mmix.c:1549 elfxx-tilegx.c:3750
+ msgid "internal error: dangerous relocation"
+ msgstr "внутренняя ошибка: опасное перемещение"
+ 
+-#: elf32-avr.c:3327 elfnn-aarch64.c:3221
++#: elf32-avr.c:3324 elfnn-aarch64.c:3218
+ #, c-format
+ msgid "cannot create stub entry %s"
+ msgstr "невозможно создать элемент заглушки %s"
+@@ -2050,219 +2133,252 @@ msgstr "невозможно создать элемент заглушки %s"
+ msgid "relocation should be even number"
+ msgstr "значение перемещения должно быть чётным числом"
+ 
+-#: elf32-bfin.c:1584
++#: elf32-bfin.c:1587
+ #, c-format
+ msgid "%pB(%pA+%#<PRIx64>): unresolvable relocation against symbol `%s'"
+ msgstr "%pB(%pA+%#<PRIx64>): неразрешимое перемещение с символом «%s»"
+ 
+-#: elf32-bfin.c:1616 elf32-i386.c:3443 elf32-m68k.c:4008 elf32-s390.c:3140
+-#: elf64-s390.c:3089 elf64-x86-64.c:4112
++#: elf32-bfin.c:1619 elf32-i386.c:3466 elf32-m68k.c:4006 elf32-s390.c:3138
++#: elf64-s390.c:3087 elf64-x86-64.c:4137
+ #, c-format
+ msgid "%pB(%pA+%#<PRIx64>): reloc against `%s': error %d"
+ msgstr "%pB(%pA+%#<PRIx64>): перемещение с «%s»: ошибка %d"
+ 
+-#: elf32-bfin.c:2641
++#: elf32-bfin.c:2645
+ #, c-format
+ msgid "%pB: relocation at `%pA+%#<PRIx64>' references symbol `%s' with nonzero addend"
+ msgstr "%pB: перемещение по адресу «%pA+%#<PRIx64>» ссылается на символ «%s» с ненулевым добавлением"
+ 
+-#: elf32-bfin.c:2658
++#: elf32-bfin.c:2662
+ msgid "relocation references symbol not defined in the module"
+ msgstr "перемещение указывает на неопределённый символ в модуле"
+ 
+-#: elf32-bfin.c:2755
++#: elf32-bfin.c:2760
+ msgid "R_BFIN_FUNCDESC references dynamic symbol with nonzero addend"
+ msgstr "R_BFIN_FUNCDESC указывает на динамический символ с ненулевым добавлением"
+ 
+-#: elf32-bfin.c:2795 elf32-bfin.c:2916
++#: elf32-bfin.c:2800 elf32-bfin.c:2921
+ msgid "cannot emit fixups in read-only section"
+ msgstr "невозможно сгенерировать местоположения в разделе только для чтения"
+ 
+-#: elf32-bfin.c:2825 elf32-bfin.c:2953 elf32-lm32.c:1006 elf32-sh.c:4389
++#: elf32-bfin.c:2830 elf32-bfin.c:2958 elf32-lm32.c:1007 elf32-sh.c:4383
+ msgid "cannot emit dynamic relocations in read-only section"
+ msgstr "невозможно сгенерировать динамические перемещения в разделе только для чтения"
+ 
+-#: elf32-bfin.c:2875
++#: elf32-bfin.c:2880
+ msgid "R_BFIN_FUNCDESC_VALUE references dynamic symbol with nonzero addend"
+ msgstr "R_BFIN_FUNCDESC_VALUE указывает на динамический символ с ненулевым добавлением"
+ 
+-#: elf32-bfin.c:3038
++#: elf32-bfin.c:3043
+ msgid "relocations between different segments are not supported"
+ msgstr "перемещения между различными сегментами не поддерживаются"
+ 
+-#: elf32-bfin.c:3039
++#: elf32-bfin.c:3044
+ msgid "warning: relocation references a different segment"
+ msgstr "предупреждение: перемещение ссылается на другой сегмент"
+ 
+-#: elf32-bfin.c:4770 elf32-frv.c:6584
++#. Ignore init flag - it may not be set, despite the flags field containing valid data.
++#: elf32-bfin.c:4729 elf32-cris.c:3862 elf32-m68hc1x.c:1415 elf32-m68k.c:1265
++#: elf32-score.c:3996 elf32-score7.c:3801 elf32-vax.c:536 elf32-xgate.c:494
++#: elfxx-mips.c:16254
++#, c-format
++msgid "private flags = %lx:"
++msgstr "собственные флаги = %lx:"
++
++#: elf32-bfin.c:4780 elf32-frv.c:6585
+ #, c-format
+ msgid "%pB: cannot link non-fdpic object file into fdpic executable"
+ msgstr "%pB: невозможно скомпоновать объектный файл, не являющийся fdpic, в исполняемый fdpic"
+ 
+-#: elf32-bfin.c:4774 elf32-frv.c:6588
++#: elf32-bfin.c:4784 elf32-frv.c:6589
+ #, c-format
+ msgid "%pB: cannot link fdpic object file into non-fdpic executable"
+ msgstr "%pB: невозможно скомпоновать объектный файл, являющийся fdpic, в исполняемый не fdpic"
+ 
+-#: elf32-bfin.c:4924
++#: elf32-bfin.c:4921
+ #, c-format
+ msgid "*** check this relocation %s"
+ msgstr "*** проверьте это перемещение %s"
+ 
+-#: elf32-bfin.c:5040
++#: elf32-bfin.c:5037
+ msgid "the bfin target does not currently support the generation of copy relocations"
+ msgstr "для цели bfin пока не поддерживается генерация копирования перемещений"
+ 
+-#: elf32-bfin.c:5334 elf32-cr16.c:2731 elf32-m68k.c:4422
++#: elf32-bfin.c:5331 elf32-cr16.c:2713 elf32-m68k.c:4420
+ msgid "unsupported relocation type"
+ msgstr "неподдерживаемый тип перемещения"
+ 
+-#: elf32-cris.c:1119
++#: elf32-cris.c:1120
+ #, c-format
+ msgid "%pB, section %pA: unresolvable relocation %s against symbol `%s'"
+ msgstr "%pB, раздел %pA: неразрешимое перемещение %s у символа «%s»"
+ 
+-#: elf32-cris.c:1184
++#: elf32-cris.c:1185
+ #, c-format
+ msgid "%pB, section %pA: no PLT nor GOT for relocation %s against symbol `%s'"
+ msgstr "%pB, раздел %pA: нет ни PLT ни GOT для перемещения %s у символа «%s»"
+ 
+-#: elf32-cris.c:1187
++#: elf32-cris.c:1188
+ #, c-format
+ msgid "%pB, section %pA: no PLT for relocation %s against symbol `%s'"
+ msgstr "%pB, раздел %pA: нет PLT для перемещения %s у символа «%s»"
+ 
+-#: elf32-cris.c:1193 elf32-cris.c:1326 elf32-cris.c:1591 elf32-cris.c:1674
+-#: elf32-cris.c:1827 elf32-tic6x.c:2560
++#: elf32-cris.c:1194 elf32-cris.c:1327 elf32-cris.c:1592 elf32-cris.c:1675
++#: elf32-cris.c:1828 elf32-tic6x.c:2560
+ msgid "[whose name is lost]"
+ msgstr "[чьё имя потеряно]"
+ 
+-#: elf32-cris.c:1311 elf32-tic6x.c:2544
++#: elf32-cris.c:1312 elf32-tic6x.c:2544
+ #, c-format
+ msgid "%pB, section %pA: relocation %s with non-zero addend %<PRId64> against local symbol"
+ msgstr "%pB, раздел %pA: перемещение %s с ненулевым добавлением %<PRId64> у локального символа"
+ 
+-#: elf32-cris.c:1320 elf32-cris.c:1668 elf32-cris.c:1821 elf32-tic6x.c:2553
++#: elf32-cris.c:1321 elf32-cris.c:1669 elf32-cris.c:1822 elf32-tic6x.c:2553
+ #, c-format
+ msgid "%pB, section %pA: relocation %s with non-zero addend %<PRId64> against symbol `%s'"
+ msgstr "%pB, раздел %pA: перемещение %s с ненулевым добавлением %<PRId64> у символа «%s»"
+ 
+-#: elf32-cris.c:1347
++#: elf32-cris.c:1348
+ #, c-format
+ msgid "%pB, section %pA: relocation %s is not allowed for global symbol: `%s'"
+ msgstr "%pB, раздел %pA: перемещение %s не разрешено для глобального символа: «%s»"
+ 
+-#: elf32-cris.c:1364
++#: elf32-cris.c:1365
+ #, c-format
+ msgid "%pB, section %pA: relocation %s with no GOT created"
+ msgstr "%pB, раздел %pA: перемещение %s без созданного GOT"
+ 
+ #. We shouldn't get here for GCC-emitted code.
+-#: elf32-cris.c:1581
++#: elf32-cris.c:1582
+ #, c-format
+ msgid "%pB, section %pA: relocation %s has an undefined reference to `%s', perhaps a declaration mixup?"
+ msgstr "%pB, раздел %pA: перемещение %s имеет неопределённую ссылку на «%s»; возможно, смешение объявлений?"
+ 
+-#: elf32-cris.c:1584
++#: elf32-cris.c:1585
+ #, c-format
+ msgid "%pB, section %pA: relocation %s is not allowed for `%s', a global symbol with default visibility, perhaps a declaration mixup?"
+ msgstr "%pB, раздел %pA: перемещение %s не разрешено для «%s», глобального символа с видимостью по умолчанию; возможно, смешение объявлений?"
+ 
+-#: elf32-cris.c:1955
++#: elf32-cris.c:1956
+ #, c-format
+ msgid "%pB, section %pA: relocation %s is not allowed for symbol: `%s' which is defined outside the program, perhaps a declaration mixup?"
+ msgstr "%pB, раздел %pA: перемещение %s не разрешено для символа: «%s», который определён вне программы; возможно, смешение объявлений?"
+ 
+-#: elf32-cris.c:2008
++#: elf32-cris.c:2009
+ msgid "(too many global variables for -fpic: recompile with -fPIC)"
+ msgstr "(слишком много глобальных переменных для -fpic: перекомпилируйте с параметром -fPIC)"
+ 
+-#: elf32-cris.c:2015
++#: elf32-cris.c:2016
+ msgid "(thread-local data too big for -fpic or -msmall-tls: recompile with -fPIC or -mno-small-tls)"
+ msgstr "(локальный данные нити слишком велики для -fpic или -msmall-tls: перекомпилируйте с параметром -fPIC или -mno-small-tls)"
+ 
+-#: elf32-cris.c:3050
++#: elf32-cris.c:3051
+ #, c-format
+ msgid "%pB, section %pA: v10/v32 compatible object must not contain a PIC relocation"
+ msgstr "%pB, раздел %pA: v10/v32 совместимый объект не должен содержать перемещение PIC"
+ 
+-#: elf32-cris.c:3104
++#: elf32-cris.c:3105
+ #, c-format
+ msgid ""
+ "%pB, section %pA:\n"
+ "  relocation %s not valid in a shared object; typically an option mixup, recompile with -fPIC"
+ msgstr "%pB, раздел %pA: перемещение %s не должно использоваться в общем объекте; возможно, смешение параметров, перекомпилируйте с -fPIC"
+ 
+-#: elf32-cris.c:3322
++#: elf32-cris.c:3323
+ #, c-format
+ msgid "%pB, section %pA: relocation %s should not be used in a shared object; recompile with -fPIC"
+ msgstr "%pB, раздел %pA: перемещение %s не должно использоваться в общем объекте; перекомпилируйте с -fPIC"
+ 
+-#: elf32-cris.c:3700
++#: elf32-cris.c:3701
+ #, c-format
+ msgid "%pB, section `%pA', to symbol `%s': relocation %s should not be used in a shared object; recompile with -fPIC"
+ msgstr "%pB, раздел «%pA», к символу «%s»: перемещение %s не должно использоваться в общем объекте; перекомпилируйте с -fPIC"
+ 
+-#: elf32-cris.c:3812
++#: elf32-cris.c:3813
+ msgid "unexpected machine number"
+ msgstr "неожидаемое машинное число"
+ 
+-#: elf32-cris.c:3864
++#: elf32-cris.c:3865
+ #, c-format
+ msgid " [symbols have a _ prefix]"
+ msgstr " [символы содержат префикс _]"
+ 
+-#: elf32-cris.c:3867
++#: elf32-cris.c:3868
+ #, c-format
+ msgid " [v10 and v32]"
+ msgstr " [v10 и v32]"
+ 
+-#: elf32-cris.c:3870
++#: elf32-cris.c:3871
+ #, c-format
+ msgid " [v32]"
+ msgstr " [v32]"
+ 
+-#: elf32-cris.c:3914
++#: elf32-cris.c:3915
+ #, c-format
+ msgid "%pB: uses _-prefixed symbols, but writing file with non-prefixed symbols"
+ msgstr "%pB: используются символы с префиксом _, но в файл записываются символы без префиксов"
+ 
+-#: elf32-cris.c:3915
++#: elf32-cris.c:3916
+ #, c-format
+ msgid "%pB: uses non-prefixed symbols, but writing file with _-prefixed symbols"
+ msgstr "%pB: используются символы без префикса _, но в файл записываются символы с префиксом _"
+ 
+-#: elf32-cris.c:3934
++#: elf32-cris.c:3935
+ #, c-format
+ msgid "%pB contains CRIS v32 code, incompatible with previous objects"
+ msgstr "%pB содержит код CRIS v32, который не совместим с предыдущими объектами"
+ 
+-#: elf32-cris.c:3936
++#: elf32-cris.c:3937
+ #, c-format
+ msgid "%pB contains non-CRIS-v32 code, incompatible with previous objects"
+ msgstr "%pB содержит код не CRIS v32, который не совместим с предыдущими объектами"
+ 
+-#: elf32-csky.c:2022
++#: elf32-csky.c:2019
+ msgid "GOT table size out of range"
+ msgstr "размер таблицы GOT выходит за границы"
+ 
+-#: elf32-csky.c:2802
++#: elf32-csky.c:2831
+ #, c-format
+ msgid "warning: unrecognized arch eflag '%#lx'"
+-msgstr "предупреждение: нераспознанный архитектурный eflag «%#lx»"
++msgstr "предупреждение: нераспознанный eflag архитектуры «%#lx»"
++
++#: elf32-csky.c:2854
++#, c-format
++msgid "warning: unrecognised arch name '%#x'"
++msgstr "предупреждение: нераспознанное имя архитектуры «%#x»"
+ 
+-#: elf32-csky.c:2862
++#: elf32-csky.c:2928 elf32-csky.c:3086
+ #, c-format
+ msgid "%pB: machine flag conflict with target"
+ msgstr "%pB: машинный флаг конфликтует с целью"
+ 
+-#: elf32-csky.c:2875
++#: elf32-csky.c:2941
++#, c-format
++msgid "warning: file %pB's arch flag %s conflict with target %s,set target arch flag to %s"
++msgstr "предупреждение: файловый флаг %pB архитектуры %s конфликтует с целевым %s, используем флаг целевой архитектуры %s"
++
++#: elf32-csky.c:2970
++#, c-format
++msgid "Error: %pB and %pB has different VDSP version"
++msgstr "Ошибка: у %pB и %pB разные версии VDSP"
++
++#: elf32-csky.c:2987
++#, c-format
++msgid "Error: %pB and %pB has different DSP version"
++msgstr "Ошибка: у %pB и %pB разные версии DSP"
++
++#: elf32-csky.c:3005
++#, c-format
++msgid "Error: %pB and %pB has different FPU ABI"
++msgstr "Ошибка: у %pB и %pB разные FPU ABI"
++
++#: elf32-csky.c:3100
+ #, c-format
+-msgid "warning: file %pB's arch flag ck%s conflicts with target ck%s, using ck%s"
+-msgstr "предупреждение: файловый флаг %pB архитектуры ck%s конфликтует с ck%s цели, используем ck%s"
++msgid "warning: file %pB's arch flag %s conflicts with target ck%s, using %s"
++msgstr "предупреждение: файловый флаг %pB архитектуры %s конфликтует с целевым %s, используем %s"
+ 
+ #. The r_type is error, not support it.
+-#: elf32-csky.c:4118 elf32-i386.c:350
++#: elf32-csky.c:4342 elf32-i386.c:350
+ #, c-format
+ msgid "%pB: unsupported relocation type: %#x"
+ msgstr "%pB: неподдерживаемый тип перемещения : %#x"
+@@ -2282,100 +2398,100 @@ msgstr "прыжок (PC rel26) в раздел (%s) не поддерживае
+ msgid "unsupported relocation between data/insn address spaces"
+ msgstr "неподдерживаемое перемещение между адресным пространством данных/инструкций"
+ 
+-#: elf32-frv.c:1452 elf32-frv.c:1603
++#: elf32-frv.c:1453 elf32-frv.c:1604
+ msgid "relocation requires zero addend"
+ msgstr "для перемещения требуется нулевое добавление"
+ 
+-#: elf32-frv.c:2832
++#: elf32-frv.c:2833
+ #, c-format
+ msgid "%H: relocation to `%s+%v' may have caused the error above\n"
+ msgstr "%H: перемещение в «%s+%v» может быть вызвано предыдущей ошибкой\n"
+ 
+-#: elf32-frv.c:2849
++#: elf32-frv.c:2850
+ msgid "%H: relocation references symbol not defined in the module\n"
+ msgstr "%H: перемещение указывает на неопределённый символ в модуле\n"
+ 
+-#: elf32-frv.c:2925
++#: elf32-frv.c:2926
+ msgid "%H: R_FRV_GETTLSOFF not applied to a call instruction\n"
+ msgstr "%H: R_FRV_GETTLSOFF не применимо для инструкции call\n"
+ 
+-#: elf32-frv.c:2966
++#: elf32-frv.c:2967
+ msgid "%H: R_FRV_GOTTLSDESC12 not applied to an lddi instruction\n"
+ msgstr "%H R_FRV_GOTTLSDESC12 не применимо для инструкции lddi\n"
+ 
+-#: elf32-frv.c:3037
++#: elf32-frv.c:3038
+ msgid "%H: R_FRV_GOTTLSDESCHI not applied to a sethi instruction\n"
+ msgstr "%H: R_FRV_GOTTLSDESCHI не применимо для инструкции sethi\n"
+ 
+-#: elf32-frv.c:3074
++#: elf32-frv.c:3075
+ msgid "%H: R_FRV_GOTTLSDESCLO not applied to a setlo or setlos instruction\n"
+ msgstr "%H: R_FRV_GOTTLSDESCLO не применимо для инструкции setlo или setlos\n"
+ 
+-#: elf32-frv.c:3121
++#: elf32-frv.c:3122
+ msgid "%H: R_FRV_TLSDESC_RELAX not applied to an ldd instruction\n"
+ msgstr "%H: R_FRV_TLSDESC_RELAX не применимо для инструкции ldd\n"
+ 
+-#: elf32-frv.c:3205
++#: elf32-frv.c:3206
+ msgid "%H: R_FRV_GETTLSOFF_RELAX not applied to a calll instruction\n"
+ msgstr "%H: R_FRV_GETTLSOFF_RELAX не применимо для инструкции calll\n"
+ 
+-#: elf32-frv.c:3259
++#: elf32-frv.c:3260
+ msgid "%H: R_FRV_GOTTLSOFF12 not applied to an ldi instruction\n"
+ msgstr "%H: R_FRV_GOTTLSOFF12 не применимо для инструкции ldi\n"
+ 
+-#: elf32-frv.c:3289
++#: elf32-frv.c:3290
+ msgid "%H: R_FRV_GOTTLSOFFHI not applied to a sethi instruction\n"
+ msgstr "%H: R_FRV_GOTTLSOFFHI не применимо для инструкции sethi\n"
+ 
+-#: elf32-frv.c:3318
++#: elf32-frv.c:3319
+ msgid "%H: R_FRV_GOTTLSOFFLO not applied to a setlo or setlos instruction\n"
+ msgstr "%H: R_FRV_GOTTLSOFFLO не применимо для инструкции setlo или setlos\n"
+ 
+-#: elf32-frv.c:3348
++#: elf32-frv.c:3349
+ msgid "%H: R_FRV_TLSOFF_RELAX not applied to an ld instruction\n"
+ msgstr "%H: R_FRV_TLSOFF_RELAX не применимо для инструкции ld\n"
+ 
+-#: elf32-frv.c:3393
++#: elf32-frv.c:3394
+ msgid "%H: R_FRV_TLSMOFFHI not applied to a sethi instruction\n"
+ msgstr "%H: R_FRV_TLSMOFFHI не применимо для инструкции sethi\n"
+ 
+-#: elf32-frv.c:3420
++#: elf32-frv.c:3421
+ msgid "R_FRV_TLSMOFFLO not applied to a setlo or setlos instruction\n"
+ msgstr "R_FRV_TLSMOFFLO не применимо для инструкции setlo или setlos\n"
+ 
+-#: elf32-frv.c:3541 elf32-frv.c:3661
++#: elf32-frv.c:3542 elf32-frv.c:3662
+ msgid "%H: %s references dynamic symbol with nonzero addend\n"
+ msgstr "%H: %s указывает на динамический символ с ненулевым добавлением\n"
+ 
+-#: elf32-frv.c:3582 elf32-frv.c:3703
++#: elf32-frv.c:3583 elf32-frv.c:3704
+ msgid "%H: cannot emit fixups in read-only section\n"
+ msgstr "%H: невозможно сгенерировать местоположения в разделе только для чтения\n"
+ 
+-#: elf32-frv.c:3612 elf32-frv.c:3745
++#: elf32-frv.c:3613 elf32-frv.c:3746
+ msgid "%H: cannot emit dynamic relocations in read-only section\n"
+ msgstr "%H: невозможно сгенерировать динамические перемещения в разделе только для чтения\n"
+ 
+-#: elf32-frv.c:3917
++#: elf32-frv.c:3918
+ #, c-format
+ msgid "%H: reloc against `%s' references a different segment\n"
+ msgstr "%H: перемещение указывает на ссылки «%s» другого сегмента\n"
+ 
+-#: elf32-frv.c:4068
++#: elf32-frv.c:4069
+ #, c-format
+ msgid "%H: reloc against `%s': %s\n"
+ msgstr "%H: перемещение указывает на «%s»: %s\n"
+ 
+-#: elf32-frv.c:6495
++#: elf32-frv.c:6496
+ #, c-format
+ msgid "%pB: compiled with %s and linked with modules that use non-pic relocations"
+ msgstr "%pB: скомпилирован с %s и скомпонован с модулями, в которых используются не-pic перемещения"
+ 
+-#: elf32-frv.c:6549 elf32-iq2000.c:830 elf32-m32c.c:876
++#: elf32-frv.c:6550 elf32-iq2000.c:830 elf32-m32c.c:876
+ #, c-format
+ msgid "%pB: compiled with %s and linked with modules compiled with %s"
+ msgstr "%pB: скомпилирован с %s и скомпонован с модулями, скомпилированными с %s"
+ 
+-#: elf32-frv.c:6562
++#: elf32-frv.c:6563
+ #, c-format
+ msgid "%pB: uses different unknown e_flags (%#x) fields than previous modules (%#x)"
+ msgstr "%pB: используются неизвестные поля e_flags (%#x), отличающиеся от использованных в предыдущих модулях (%#x)"
+@@ -2385,50 +2501,50 @@ msgstr "%pB: используются неизвестные поля e_flags (%
+ msgid "%pB: relocations in generic ELF (EM: %d)"
+ msgstr "%pB: перемещения в универсальном ELF (EM: %d)"
+ 
+-#: elf32-hppa.c:763 elf32-hppa.c:844 elf64-ppc.c:11859
++#: elf32-hppa.c:761 elf32-hppa.c:842 elf64-ppc.c:12022
+ msgid "%F%P: Could not assign %pA to an output section. Retry without --enable-non-contiguous-regions.\n"
+ msgstr "%F%P: Невозможно назначить %pA выходному разделу. Повторите без --enable-non-contiguous-regions.\n"
+ 
+-#: elf32-hppa.c:865 elf32-hppa.c:3407
++#: elf32-hppa.c:863 elf32-hppa.c:3403
+ #, c-format
+ msgid "%pB(%pA+%#<PRIx64>): cannot reach %s, recompile with -ffunction-sections"
+ msgstr "%pB(%pA+%#<PRIx64>): невозможно достичь %s, перекомпилируйте с -ffunction-sections"
+ 
+-#: elf32-hppa.c:1243
++#: elf32-hppa.c:1241
+ #, c-format
+ msgid "%pB: relocation %s can not be used when making a shared object; recompile with -fPIC"
+ msgstr "%pB: перемещение %s не может использоваться при создании общего объекта; перекомпилируйте с -fPIC"
+ 
+-#: elf32-hppa.c:2584
++#: elf32-hppa.c:2580
+ #, c-format
+ msgid "%pB: duplicate export stub %s"
+ msgstr "%pB: повторный экспорт заглушки %s"
+ 
+-#: elf32-hppa.c:3240
++#: elf32-hppa.c:3236
+ #, c-format
+ msgid "%pB(%pA+%#<PRIx64>): %s fixup for insn %#x is not supported in a non-shared link"
+ msgstr "%pB(%pA+%#<PRIx64>): местоположение %s для инструкции %#x не поддерживается в не общей ссылке"
+ 
+-#: elf32-hppa.c:4036
++#: elf32-hppa.c:4032
+ #, c-format
+ msgid "%s has both normal and TLS relocs"
+ msgstr "%s содержит обычные перемещения и перемещения TLS"
+ 
+-#: elf32-hppa.c:4054
++#: elf32-hppa.c:4050
+ #, c-format
+ msgid "%pB:%s has both normal and TLS relocs"
+ msgstr "%pB:%s содержит обычные перемещения и перемещения TLS"
+ 
+-#: elf32-hppa.c:4113
++#: elf32-hppa.c:4109
+ #, c-format
+ msgid "%pB(%pA+%#<PRIx64>): cannot handle %s for %s"
+ msgstr "%pB(%pA+%#<PRIx64>): невозможно обработать %s для %s"
+ 
+-#: elf32-hppa.c:4417
++#: elf32-hppa.c:4413
+ msgid ".got section not immediately after .plt section"
+ msgstr "раздел .got не может стоять сразу после раздела .plt"
+ 
+-#: elf32-i386.c:1169 elf64-x86-64.c:1382
++#: elf32-i386.c:1169 elf64-x86-64.c:1380
+ #, c-format
+ msgid "%pB: TLS transition from %s to %s against `%s' at %#<PRIx64> in section `%pA' failed"
+ msgstr "%pB: TLS-переход из %s в %s для «%s» по адресу %#<PRIx64> в разделе «%pA» завершился ошибкой"
+@@ -2438,9 +2554,9 @@ msgstr "%pB: TLS-переход из %s в %s для «%s» по адресу %#
+ msgid "%pB: direct GOT relocation R_386_GOT32X against `%s' without base register can not be used when making a shared object"
+ msgstr "%pB: прямое GOT перемещение R_386_GOT32X c «%s» без базового регистра не может использоваться при создании общего объекта"
+ 
+-#: elf32-i386.c:1721 elf32-s390.c:1153 elf32-sh.c:5494 elf32-tilepro.c:1556
+-#: elf32-xtensa.c:1265 elf64-s390.c:1085 elfxx-sparc.c:1555
+-#: elfxx-tilegx.c:1769 elfnn-riscv.c:437
++#: elf32-i386.c:1721 elf32-s390.c:1151 elf32-sh.c:5488 elf32-tilepro.c:1548
++#: elf32-xtensa.c:1266 elf64-s390.c:1083 elfxx-sparc.c:1556
++#: elfxx-tilegx.c:1767 elfnn-riscv.c:568
+ #, c-format
+ msgid "%pB: `%s' accessed both as normal and thread local symbol"
+ msgstr "%pB: «%s» доступен как обычный и как локальный для нити символ"
+@@ -2450,44 +2566,45 @@ msgstr "%pB: «%s» доступен как обычный и как локал
+ msgid "%pB: unsupported non-PIC call to IFUNC `%s'"
+ msgstr "%pB: неподдерживаемый не PIC вызов IFUNC «%s»"
+ 
+-#: elf32-i386.c:2373 elf64-x86-64.c:2721
++#: elf32-i386.c:2373 elf64-x86-64.c:2721 elfnn-riscv.c:2284
+ #, c-format
+ msgid "%pB: relocation %s against STT_GNU_IFUNC symbol `%s' isn't supported"
+ msgstr "%pB: перемещение %s с STT_GNU_IFUNC символом «%s» не поддерживается"
+ 
+-#: elf32-i386.c:2406 elf32-i386.c:3654 elf32-i386.c:3795 elf64-x86-64.c:2778
+-#: elf64-x86-64.c:4285 elf64-x86-64.c:4441
++#: elf32-i386.c:2406 elf32-i386.c:3677 elf32-i386.c:3824 elf64-x86-64.c:2778
++#: elf64-x86-64.c:4310 elf64-x86-64.c:4472 elfnn-riscv.c:2157
++#: elfnn-riscv.c:2956 elfnn-riscv.c:3030
+ #, c-format
+ msgid "Local IFUNC function `%s' in %pB\n"
+ msgstr "Локальная функция IFUNC «%s» в %pB\n"
+ 
+-#: elf32-i386.c:2563
++#: elf32-i386.c:2575
+ #, c-format
+ msgid "%pB: direct GOT relocation %s against `%s' without base register can not be used when making a shared object"
+ msgstr "%pB: прямое GOT перемещение %s c «%s» без базового регистра не может использоваться при создании общего объекта"
+ 
+-#: elf32-i386.c:2598 elf64-x86-64.c:2977
++#: elf32-i386.c:2610 elf64-x86-64.c:2988
+ msgid "hidden symbol"
+ msgstr "скрытый символ"
+ 
+-#: elf32-i386.c:2601 elf64-x86-64.c:2980
++#: elf32-i386.c:2613 elf64-x86-64.c:2991
+ msgid "internal symbol"
+ msgstr "внутренний символ"
+ 
+-#: elf32-i386.c:2604 elf64-x86-64.c:2983
++#: elf32-i386.c:2616 elf64-x86-64.c:2994
+ msgid "protected symbol"
+ msgstr "защищённый символ"
+ 
+-#: elf32-i386.c:2607 elf64-x86-64.c:2986
++#: elf32-i386.c:2619 elf64-x86-64.c:2997
+ msgid "symbol"
+ msgstr "символ"
+ 
+-#: elf32-i386.c:2613
++#: elf32-i386.c:2625
+ #, c-format
+ msgid "%pB: relocation R_386_GOTOFF against undefined %s `%s' can not be used when making a shared object"
+ msgstr "%pB: перемещение R_386_GOTOFF для неопределённого %s «%s» не может использоваться при создании общего объекта"
+ 
+-#: elf32-i386.c:2626
++#: elf32-i386.c:2638
+ #, c-format
+ msgid "%pB: relocation R_386_GOTOFF against protected %s `%s' can not be used when making a shared object"
+ msgstr "%pB: перемещение R_386_GOTOFF для защищённой %s «%s» не может использоваться при создании общего объекта"
+@@ -2510,158 +2627,158 @@ msgstr "компоновщик ip2k: отсутствует страница и
+ msgid "ip2k linker: redundant page instruction at %#<PRIx64> (dest = %#<PRIx64>)"
+ msgstr "компоновщик ip2k: повторяющаяся страница инструкций по адресу %#<PRIx64> (назнач = %#<PRIx64>)"
+ 
+-#: elf32-lm32.c:608 elf32-nios2.c:3148
++#: elf32-lm32.c:609 elf32-nios2.c:3145
+ msgid "global pointer relative relocation when _gp not defined"
+ msgstr "глобальный указатель относительно перемещения, но _gp не определена"
+ 
+-#: elf32-lm32.c:663 elf32-nios2.c:3585
++#: elf32-lm32.c:664 elf32-nios2.c:3582
+ msgid "global pointer relative address out of range"
+ msgstr "глобальный указатель относительно адреса вне диапазона"
+ 
+-#: elf32-lm32.c:959
++#: elf32-lm32.c:960
+ #, c-format
+ msgid "internal error: addend should be zero for %s"
+ msgstr "внутренняя ошибка: добавление должно быть нулём для %s"
+ 
+-#: elf32-m32r.c:1471
++#: elf32-m32r.c:1461
+ msgid "SDA relocation when _SDA_BASE_ not defined"
+ msgstr "перемещение SDA, но _SDA_BASE_ не определена"
+ 
+-#: elf32-m32r.c:2799 elf32-microblaze.c:1097 elf32-microblaze.c:1145
++#: elf32-m32r.c:2776 elf32-microblaze.c:1093 elf32-microblaze.c:1141
+ #, c-format
+ msgid "%pB: the target (%s) of an %s relocation is in the wrong section (%pA)"
+ msgstr "%pB: цель (%s) перемещения %s в ошибочном разделе (%pA)"
+ 
+-#: elf32-m32r.c:3302
++#: elf32-m32r.c:3279
+ #, c-format
+ msgid "%pB: instruction set mismatch with previous modules"
+ msgstr "%pB: набор инструкций не совпадает с набором у предыдущих модулей"
+ 
+-#: elf32-m32r.c:3323 elf32-nds32.c:6855
++#: elf32-m32r.c:3300 elf32-nds32.c:6851
+ #, c-format
+ msgid "private flags = %lx"
+ msgstr "собственные флаги = %lx"
+ 
+-#: elf32-m32r.c:3328
++#: elf32-m32r.c:3305
+ #, c-format
+ msgid ": m32r instructions"
+ msgstr ": инструкции m32r"
+ 
+-#: elf32-m32r.c:3329
++#: elf32-m32r.c:3306
+ #, c-format
+ msgid ": m32rx instructions"
+ msgstr ": инструкции m32rx"
+ 
+-#: elf32-m32r.c:3330
++#: elf32-m32r.c:3307
+ #, c-format
+ msgid ": m32r2 instructions"
+ msgstr ": инструкции m32r2"
+ 
+-#: elf32-m68hc1x.c:1136
++#: elf32-m68hc1x.c:1135
+ #, c-format
+ msgid "reference to the far symbol `%s' using a wrong relocation may result in incorrect execution"
+ msgstr "ссылка на дальний символ «%s» с помощью ошибочного перемещения может привести к неправильному выполнению"
+ 
+-#: elf32-m68hc1x.c:1167
++#: elf32-m68hc1x.c:1166
+ #, c-format
+ msgid "XGATE address (%lx) is not within shared RAM(0xE000-0xFFFF), therefore you must manually offset the address, and possibly manage the page, in your code."
+ msgstr "Адрес XGATE (%lx) находится вне общей оперативной памяти (0xE000-0xFFFF), поэтому вы должны вручную указывать адрес смещения и, возможно, управлять страницей в коде."
+ 
+-#: elf32-m68hc1x.c:1183
++#: elf32-m68hc1x.c:1182
+ #, c-format
+ msgid "banked address [%lx:%04lx] (%lx) is not in the same bank as current banked address [%lx:%04lx] (%lx)"
+ msgstr "банкируемый адрес [%lx:%04lx] (%lx) не совпадает с банком текущего банкируемого адреса [%lx:%04lx] (%lx)"
+ 
+-#: elf32-m68hc1x.c:1198
++#: elf32-m68hc1x.c:1197
+ #, c-format
+ msgid "reference to a banked address [%lx:%04lx] in the normal address space at %04lx"
+ msgstr "ссылка на банкируемый адрес [%lx:%04lx] в обычном адресном пространстве по адресу %04lx"
+ 
+-#: elf32-m68hc1x.c:1234
++#: elf32-m68hc1x.c:1233
+ #, c-format
+ msgid "S12 address (%lx) is not within shared RAM(0x2000-0x4000), therefore you must manually offset the address in your code"
+ msgstr "Адрес S12 (%lx) находится вне общей оперативной памяти (0x2000-0x4000), поэтому вы должны вручную указывать адрес смещения в коде"
+ 
+-#: elf32-m68hc1x.c:1358
++#: elf32-m68hc1x.c:1357
+ #, c-format
+ msgid "%pB: linking files compiled for 16-bit integers (-mshort) and others for 32-bit integers"
+ msgstr "%pB: компоновка файлов, скомпилированных для 16-битных целых (-mshort), с файлами, скомпилированными для 32-битных целых"
+ 
+-#: elf32-m68hc1x.c:1365
++#: elf32-m68hc1x.c:1364
+ #, c-format
+ msgid "%pB: linking files compiled for 32-bit double (-fshort-double) and others for 64-bit double"
+ msgstr "%pB: компоновка файлов, скомпилированных для 32-битных double (-fshort-double), с файлами, скомпилированными для 64-битных double"
+ 
+-#: elf32-m68hc1x.c:1374
++#: elf32-m68hc1x.c:1373
+ #, c-format
+ msgid "%pB: linking files compiled for HCS12 with others compiled for HC12"
+ msgstr "%pB: компоновка файлов, скомпилированных для HCS12, с файлами, скомпилированными для HC12"
+ 
+-#: elf32-m68hc1x.c:1419 elf32-xgate.c:497
++#: elf32-m68hc1x.c:1418 elf32-xgate.c:497
+ #, c-format
+ msgid "[abi=32-bit int, "
+ msgstr "[abi=32-битное int, "
+ 
+-#: elf32-m68hc1x.c:1421 elf32-xgate.c:499
++#: elf32-m68hc1x.c:1420 elf32-xgate.c:499
+ #, c-format
+ msgid "[abi=16-bit int, "
+ msgstr "[abi=16-битное int, "
+ 
+-#: elf32-m68hc1x.c:1424 elf32-xgate.c:502
++#: elf32-m68hc1x.c:1423 elf32-xgate.c:502
+ #, c-format
+ msgid "64-bit double, "
+ msgstr "64-битное double, "
+ 
+-#: elf32-m68hc1x.c:1426 elf32-xgate.c:504
++#: elf32-m68hc1x.c:1425 elf32-xgate.c:504
+ #, c-format
+ msgid "32-bit double, "
+ msgstr "32-битное double, "
+ 
+-#: elf32-m68hc1x.c:1429
++#: elf32-m68hc1x.c:1428
+ #, c-format
+ msgid "cpu=HC11]"
+ msgstr "ЦП=HC11]"
+ 
+-#: elf32-m68hc1x.c:1431
++#: elf32-m68hc1x.c:1430
+ #, c-format
+ msgid "cpu=HCS12]"
+ msgstr "ЦП=HCS12]"
+ 
+-#: elf32-m68hc1x.c:1433
++#: elf32-m68hc1x.c:1432
+ #, c-format
+ msgid "cpu=HC12]"
+ msgstr "ЦП=HC12]"
+ 
+-#: elf32-m68hc1x.c:1436
++#: elf32-m68hc1x.c:1435
+ #, c-format
+ msgid " [memory=bank-model]"
+ msgstr " [память=модель с банками]"
+ 
+-#: elf32-m68hc1x.c:1438
++#: elf32-m68hc1x.c:1437
+ #, c-format
+ msgid " [memory=flat]"
+ msgstr " [память=плоская]"
+ 
+-#: elf32-m68hc1x.c:1441
++#: elf32-m68hc1x.c:1440
+ #, c-format
+ msgid " [XGATE RAM offsetting]"
+ msgstr " [смещение XGATE памяти]"
+ 
+-#: elf32-m68k.c:1159 elf32-m68k.c:1167 elf32-ppc.c:3583 elf32-ppc.c:3591
++#: elf32-m68k.c:1157 elf32-m68k.c:1165 elf32-ppc.c:3582 elf32-ppc.c:3590
+ #, c-format
+ msgid "%pB uses hard float, %pB uses soft float"
+ msgstr "%pB использует аппаратную плавающую точку, %pB использует программную плавающую точку"
+ 
+-#: elf32-m68k.c:1282 elf32-m68k.c:1283 vms-alpha.c:7664 vms-alpha.c:7680
++#: elf32-m68k.c:1280 elf32-m68k.c:1281 vms-alpha.c:7662 vms-alpha.c:7678
+ msgid "unknown"
+ msgstr "неизвестно"
+ 
+-#: elf32-m68k.c:1733
++#: elf32-m68k.c:1731
+ #, c-format
+ msgid "%pB: GOT overflow: number of relocations with 8-bit offset > %d"
+ msgstr "%pB: переполнение GOT: количество перемещений с 8-битным смещением > %d"
+ 
+-#: elf32-m68k.c:1740
++#: elf32-m68k.c:1738
+ #, c-format
+ msgid "%pB: GOT overflow: number of relocations with 8- or 16-bit offset > %d"
+ msgstr "%pB: переполнение GOT: количество перемещений с 8-ми или 16-битным смещением > %d"
+@@ -2677,90 +2794,95 @@ msgstr "mep: нет перемещения для кода %d"
+ msgid "MeP: howto %d has type %d"
+ msgstr "MeP: howto %d имеет тип %d"
+ 
+-#: elf32-mep.c:622
++#: elf32-mep.c:618
+ #, c-format
+ msgid "%pB and %pB are for different cores"
+ msgstr "%pB и %pB для разных ядер"
+ 
+-#: elf32-mep.c:641
++#: elf32-mep.c:637
+ #, c-format
+ msgid "%pB and %pB are for different configurations"
+ msgstr "%pB и %pB для разных конфигураций"
+ 
+-#: elf32-mep.c:679
++#: elf32-mep.c:675
+ #, c-format
+ msgid "private flags = 0x%lx"
+ msgstr "собственные флаги = 0x%lx"
+ 
+-#: elf32-metag.c:1859
++#: elf32-metag.c:1857
+ #, c-format
+ msgid "%pB(%pA): multiple TLS models are not supported"
+ msgstr "%pB(%pA): несколько моделей TLS не поддерживается"
+ 
+-#: elf32-metag.c:1862
++#: elf32-metag.c:1860
+ #, c-format
+ msgid "%pB(%pA): shared library symbol %s encountered whilst performing a static link"
+ msgstr "%pB(%pA): при выполнении статической компоновки обнаружен символ %s общей библиотеки"
+ 
+-#: elf32-microblaze.c:1540 elf32-tilepro.c:3029 elfxx-sparc.c:3427
+-#: elfxx-tilegx.c:3417
++#: elf32-microblaze.c:1536 elf32-tilepro.c:3021 elfxx-sparc.c:3446
++#: elfxx-tilegx.c:3415
+ #, c-format
+ msgid "%pB: probably compiled without -fPIC?"
+ msgstr "%pB: вероятно, компиляция без -fPIC?"
+ 
+-#: elf32-mips.c:1775 elf64-mips.c:3516 elfn32-mips.c:3332
++#: elf32-mips.c:1777 elf64-mips.c:3516 elfn32-mips.c:3334
+ msgid "literal relocation occurs for an external symbol"
+ msgstr "для внешнего символа обнаружено константное перемещение"
+ 
+-#: elf32-mips.c:1822 elf32-score.c:569 elf32-score7.c:469 elf64-mips.c:3559
+-#: elfn32-mips.c:3373
++#: elf32-mips.c:1824 elf32-score.c:572 elf32-score7.c:472 elf64-mips.c:3559
++#: elfn32-mips.c:3375
+ msgid "32bits gp relative relocation occurs for an external symbol"
+ msgstr "для внешнего символа обнаружено 32—битное относительное перемещение"
+ 
+-#: elf32-msp430.c:846 elf32-msp430.c:1160
++#: elf32-msp430.c:914
++#, c-format
++msgid "error: final size of uleb128 value at offset 0x%lx in %pA from %pB exceeds available space"
++msgstr "ошибка: конечный размер значения uleb128 по смещению 0x%lx в %pA из %pB превышает доступное место"
++
++#: elf32-msp430.c:983 elf32-msp430.c:1297
+ msgid "try enabling relaxation to avoid relocation truncations"
+ msgstr "попробуйте включить ослабление, чтобы избежать обрезания перемещений"
+ 
+-#: elf32-msp430.c:1367
++#: elf32-msp430.c:1506
+ msgid "internal error: branch/jump to an odd address detected"
+ msgstr "внутренняя ошибка: обнаружено ветвление/прыжок по странному адресу"
+ 
+-#: elf32-msp430.c:2532
++#: elf32-msp430.c:2671
+ #, c-format
+ msgid "warning: %pB: unknown MSPABI object attribute %d"
+ msgstr "предупреждение: %pB: неизвестный атрибут MSPABI-объекта %d"
+ 
+-#: elf32-msp430.c:2633
++#: elf32-msp430.c:2772
+ #, c-format
+ msgid "error: %pB uses %s instructions but %pB uses %s"
+ msgstr "ошибка: %pB использует инструкции %s, в то время как %pB использует %s"
+ 
+-#: elf32-msp430.c:2645
++#: elf32-msp430.c:2784
+ #, c-format
+ msgid "error: %pB uses the %s code model whereas %pB uses the %s code model"
+ msgstr "ошибка: %pB использует модель кода %s, в то время как %pB использует модель кода %s"
+ 
+-#: elf32-msp430.c:2658
++#: elf32-msp430.c:2797
+ #, c-format
+ msgid "error: %pB uses the large code model but %pB uses MSP430 instructions"
+ msgstr "ошибка: %pB использует огромную модель кода, в то время как %pB использует инструкции MSP430"
+ 
+-#: elf32-msp430.c:2669
++#: elf32-msp430.c:2808
+ #, c-format
+ msgid "error: %pB uses the %s data model whereas %pB uses the %s data model"
+ msgstr "ошибка: %pB использует модель данных %s, в то время как %pB использует модель данных %s"
+ 
+-#: elf32-msp430.c:2682
++#: elf32-msp430.c:2821
+ #, c-format
+ msgid "error: %pB uses the small code model but %pB uses the %s data model"
+ msgstr "ошибка: %pB использует малую модель данных, в то время как %pB использует модель данных %s"
+ 
+-#: elf32-msp430.c:2694
++#: elf32-msp430.c:2833
+ #, c-format
+ msgid "error: %pB uses the %s data model but %pB only uses MSP430 instructions"
+ msgstr "ошибка: %pB использует модель данных %s, в то время как %pB использует только инструкции MSP430"
+ 
+-#: elf32-msp430.c:2719
++#: elf32-msp430.c:2858
+ #, c-format
+ msgid "error: %pB can use the upper region for data, but %pB assumes data is exclusively in lower memory"
+ msgstr "ошибка: %pB может использовать верхнюю область для данных, но %pB предполагает, что данные находятся только в нижней области памяти"
+@@ -2770,303 +2892,303 @@ msgstr "ошибка: %pB может использовать верхнюю о
+ msgid "error: can't find symbol: %s"
+ msgstr "ошибка: невозможно найти символ: %s"
+ 
+-#: elf32-nds32.c:5528
++#: elf32-nds32.c:5524
+ #, c-format
+ msgid "%pB: warning: %s unsupported in shared mode"
+ msgstr "%pB: предупреждение: %s не поддерживается в общем режиме"
+ 
+-#: elf32-nds32.c:5654
++#: elf32-nds32.c:5650
+ #, c-format
+ msgid "%pB: warning: unaligned access to GOT entry"
+ msgstr "%pB: предупреждение: невыровненный доступ к элементу GOT"
+ 
+-#: elf32-nds32.c:5695
++#: elf32-nds32.c:5691
+ #, c-format
+ msgid "%pB: warning: relocate SDA_BASE failed"
+ msgstr "%pB: предупреждение: не удалось выполнить перемещение SDA_BASE"
+ 
+-#: elf32-nds32.c:5717
++#: elf32-nds32.c:5713
+ #, c-format
+ msgid "%pB(%pA): warning: unaligned small data access of type %d"
+ msgstr "%pB(%pA): предупреждение: невыровненный доступ к малым данным с типом %d"
+ 
+-#: elf32-nds32.c:6643
++#: elf32-nds32.c:6639
+ #, c-format
+ msgid "%pB: ISR vector size mismatch with previous modules, previous %u-byte, current %u-byte"
+ msgstr "%pB: размер вектора ISR не совпадает с предыдущими модулями, был %u-байтовый, стал %u-байтовый"
+ 
+-#: elf32-nds32.c:6691
++#: elf32-nds32.c:6687
+ #, c-format
+ msgid "%pB: warning: endian mismatch with previous modules"
+ msgstr "%pB: предупреждение: порядок байт не совпадает с предыдущими модулями"
+ 
+-#: elf32-nds32.c:6705
++#: elf32-nds32.c:6701
+ #, c-format
+ msgid "%pB: warning: older version of object file encountered, please recompile with current tool chain"
+ msgstr "%pB: предупреждение: обнаружена старая версия объектного файла, перекомпилируйте текущим набором инструментов"
+ 
+-#: elf32-nds32.c:6793
++#: elf32-nds32.c:6789
+ #, c-format
+ msgid "%pB: error: ABI mismatch with previous modules"
+ msgstr "%pB: ошибка: ABI не совпадает с использованным в предыдущих модулях"
+ 
+-#: elf32-nds32.c:6803
++#: elf32-nds32.c:6799
+ #, c-format
+ msgid "%pB: error: instruction set mismatch with previous modules"
+ msgstr "%pB: ошибка: набор инструкций не совпадает с использованным в предыдущих модулях"
+ 
+-#: elf32-nds32.c:6830
++#: elf32-nds32.c:6826
+ #, c-format
+ msgid "%pB: warning: incompatible elf-versions %s and %s"
+ msgstr "%pB: предупреждение: несовместимые версии elf %s и %s"
+ 
+-#: elf32-nds32.c:6861
++#: elf32-nds32.c:6857
+ #, c-format
+ msgid ": n1 instructions"
+ msgstr ": инструкции n1"
+ 
+-#: elf32-nds32.c:6864
++#: elf32-nds32.c:6860
+ #, c-format
+ msgid ": n1h instructions"
+ msgstr ": инструкции n1h"
+ 
+-#: elf32-nds32.c:9316
++#: elf32-nds32.c:9313
+ #, c-format
+ msgid "%pB: error: search_nds32_elf_blank reports wrong node"
+ msgstr "%pB: ошибка: search_nds32_elf_blank сообщает о неверном узле"
+ 
+-#: elf32-nds32.c:9576
++#: elf32-nds32.c:9577
+ #, c-format
+ msgid "%pB: warning: %s points to unrecognized reloc at %#<PRIx64>"
+ msgstr "%pB: предупреждение: %s указывает на нераспознанное перемещение по адресу %#<PRIx64>"
+ 
+-#: elf32-nds32.c:12839
++#: elf32-nds32.c:12842
+ #, c-format
+ msgid "%pB: nested OMIT_FP in %pA"
+ msgstr "%pB: вложенные OMIT_FP в %pA"
+ 
+-#: elf32-nds32.c:12858
++#: elf32-nds32.c:12861
+ #, c-format
+ msgid "%pB: unmatched OMIT_FP in %pA"
+ msgstr "%pB: несовпадение OMIT_FP в %pA"
+ 
+-#: elf32-nds32.c:13140 reloc.c:8470
++#: elf32-nds32.c:13143 elfxx-mips.c:13407 reloc.c:8508
+ #, c-format
+ msgid "%X%P: %pB(%pA): relocation \"%pR\" goes out of range\n"
+ msgstr "%X%P: %pB(%pA): перемещение «%R» выходит за диапазон\n"
+ 
+-#: elf32-nios2.c:2937
++#: elf32-nios2.c:2934
+ #, c-format
+ msgid "error: %pB: big-endian R2 is not supported"
+ msgstr "ошибка: %pB: порядок от старшего к младшему R2 не поддерживается"
+ 
+-#: elf32-nios2.c:3829
++#: elf32-nios2.c:3826
+ #, c-format
+ msgid "global pointer relative relocation at address %#<PRIx64> when _gp not defined\n"
+ msgstr "глобальный указатель относительного перемещения по адресу %#<PRIx64>, но _gp не определена\n"
+ 
+-#: elf32-nios2.c:3859
++#: elf32-nios2.c:3856
+ #, c-format
+ msgid "unable to reach %s (at %#<PRIx64>) from the global pointer (at %#<PRIx64>) because the offset (%<PRId64>) is out of the allowed range, -32678 to 32767\n"
+ msgstr "невозможно достичь %s (по адресу %#<PRIx64>) из глобального указателя (%#<PRIx64>), так как смещение (%<PRId64>) выходит из разрешённого диапазона -32678—32767\n"
+ 
+-#: elf32-nios2.c:4514 elf32-pru.c:931
++#: elf32-nios2.c:4511 elf32-pru.c:931
+ msgid "relocation out of range"
+ msgstr "перемещение выходит за диапазон"
+ 
+-#: elf32-nios2.c:4524 elf32-pru.c:941 elf32-tic6x.c:2657
++#: elf32-nios2.c:4521 elf32-pru.c:941 elf32-tic6x.c:2657
+ msgid "dangerous relocation"
+ msgstr "опасное перемещение"
+ 
+-#: elf32-nios2.c:5367
++#: elf32-nios2.c:5364
+ #, c-format
+ msgid "dynamic variable `%s' is zero size"
+ msgstr "динамическая переменная «%s» имеет нулевой размер"
+ 
+-#: elf32-or1k.c:1210
++#: elf32-or1k.c:1241
+ #, c-format
+ msgid "%pB: Cannot handle relocation value size of %d"
+ msgstr "%pB: невозможно обработать размер значения перемещения %d"
+ 
+-#: elf32-or1k.c:1317
++#: elf32-or1k.c:1349
+ #, c-format
+ msgid "%pB: unknown relocation type %d"
+ msgstr "%pB: неизвестный тип перемещения %d"
+ 
+-#: elf32-or1k.c:1371
++#: elf32-or1k.c:1403
+ #, c-format
+ msgid "%pB: addend should be zero for plt relocations"
+ msgstr "%pB: добавление должно быть нулём для перемещений plt"
+ 
+-#: elf32-or1k.c:1476
++#: elf32-or1k.c:1520
+ #, c-format
+ msgid "%pB: addend should be zero for got relocations"
+ msgstr "%pB: добавление должно быть нулём для перемещений got"
+ 
+-#: elf32-or1k.c:1493
++#: elf32-or1k.c:1537
+ #, c-format
+ msgid "%pB: gotoff relocation against dynamic symbol %s"
+ msgstr "%pB: перемещение gotoff для динамического символа %s"
+ 
+-#: elf32-or1k.c:1510 elf64-alpha.c:4421 elf64-alpha.c:4565
++#: elf32-or1k.c:1554 elf64-alpha.c:4426 elf64-alpha.c:4570
+ #, c-format
+ msgid "%pB: pc-relative relocation against dynamic symbol %s"
+ msgstr "%pB: pc-относительное перемещение для динамического символа %s"
+ 
+-#: elf32-or1k.c:1524
++#: elf32-or1k.c:1568
+ #, c-format
+ msgid "%pB: non-pic relocation against symbol %s"
+ msgstr "%pB: не-pic перемещение для символа %s"
+ 
+-#: elf32-or1k.c:1608
++#: elf32-or1k.c:1652
+ #, c-format
+ msgid "%pB: support for local dynamic not implemented"
+ msgstr "%pB: поддержка локальных динамических элементов не реализована"
+ 
+-#: elf32-or1k.c:1787
++#: elf32-or1k.c:1831
+ #, c-format
+ msgid "%pB: will not resolve runtime TLS relocation"
+ msgstr "%pB: перемещение TLS времени выполнения не будет решено"
+ 
+-#: elf32-or1k.c:2120
++#: elf32-or1k.c:2165
+ #, c-format
+ msgid "%pB: bad relocation section name `%s'"
+ msgstr "%pB: неправильное имя перемещаемого раздела «%s»"
+ 
+-#: elf32-or1k.c:3181
++#: elf32-or1k.c:3279
+ #, c-format
+ msgid "%pB: %s flag mismatch with previous modules"
+ msgstr "%pB: флаг %s не совпадает с предыдущими модулями"
+ 
+-#: elf32-ppc.c:989
++#: elf32-ppc.c:987 elf64-ppc.c:1723
+ #, c-format
+ msgid "generic linker can't handle %s"
+ msgstr "универсальный компоновщик не смог обработать %s"
+ 
+-#: elf32-ppc.c:1628
++#: elf32-ppc.c:1627
+ #, c-format
+ msgid "corrupt %s section in %pB"
+ msgstr "повреждённый раздел %s в %pB"
+ 
+-#: elf32-ppc.c:1647
++#: elf32-ppc.c:1646
+ #, c-format
+ msgid "unable to read in %s section from %pB"
+ msgstr "не удалось прочитать раздел %s из %pB"
+ 
+-#: elf32-ppc.c:1689
++#: elf32-ppc.c:1688
+ #, c-format
+ msgid "warning: unable to set size of %s section in %pB"
+ msgstr "предупреждение: не удалось задать размер раздела %s в %pB"
+ 
+-#: elf32-ppc.c:1738
++#: elf32-ppc.c:1737
+ msgid "failed to allocate space for new APUinfo section"
+ msgstr "не удалось выделить место для нового раздела APUinfo"
+ 
+-#: elf32-ppc.c:1757
++#: elf32-ppc.c:1756
+ msgid "failed to compute new APUinfo section"
+ msgstr "не удалось вычислить новый раздел APUinfo"
+ 
+-#: elf32-ppc.c:1760
++#: elf32-ppc.c:1759
+ msgid "failed to install new APUinfo section"
+ msgstr "не удалось установить новый раздел APUinfo"
+ 
+-#: elf32-ppc.c:2861
++#: elf32-ppc.c:2858
+ #, c-format
+ msgid "%pB: relocation %s cannot be used when making a shared object"
+ msgstr "%pB: перемещение %s не может использоваться при создании общего объекта"
+ 
+-#: elf32-ppc.c:3599 elf32-ppc.c:3607
++#: elf32-ppc.c:3598 elf32-ppc.c:3606
+ #, c-format
+ msgid "%pB uses double-precision hard float, %pB uses single-precision hard float"
+ msgstr "%pB использует аппаратную плавающую точку двойной точности, %pB использует аппаратную плавающую точку одинарной точности"
+ 
+-#: elf32-ppc.c:3629 elf32-ppc.c:3637
++#: elf32-ppc.c:3628 elf32-ppc.c:3636
+ #, c-format
+ msgid "%pB uses 64-bit long double, %pB uses 128-bit long double"
+ msgstr "%pB использует 64-битный long double, %pB использует 128-битный long double"
+ 
+-#: elf32-ppc.c:3645 elf32-ppc.c:3653
++#: elf32-ppc.c:3644 elf32-ppc.c:3652
+ #, c-format
+ msgid "%pB uses IBM long double, %pB uses IEEE long double"
+ msgstr "%pB использует long double в формате IBM, %pB использует long double в формате IEEE"
+ 
+-#: elf32-ppc.c:3720 elf32-ppc.c:3729
++#: elf32-ppc.c:3719 elf32-ppc.c:3728
+ #, c-format
+ msgid "%pB uses AltiVec vector ABI, %pB uses SPE vector ABI"
+ msgstr "%pB использует ABI векторов AltiVec, %pB использует ABI векторов SPE"
+ 
+-#: elf32-ppc.c:3758 elf32-ppc.c:3767
++#: elf32-ppc.c:3757 elf32-ppc.c:3766
+ #, c-format
+ msgid "%pB uses r3/r4 for small structure returns, %pB uses memory"
+ msgstr "%pB использует r3/r4 для возврата маленькой структуры, %pB использует память"
+ 
+-#: elf32-ppc.c:3831
++#: elf32-ppc.c:3830
+ #, c-format
+ msgid "%pB: compiled with -mrelocatable and linked with modules compiled normally"
+ msgstr "%pB: скомпилирована с параметром -mrelocatable и нормально скомпонована со скомпилированными модулями"
+ 
+-#: elf32-ppc.c:3839
++#: elf32-ppc.c:3838
+ #, c-format
+ msgid "%pB: compiled normally and linked with modules compiled with -mrelocatable"
+ msgstr "%pB: нормально скомпилирована и скомпонована с модулями, скомпилированными с параметром -mrelocatable"
+ 
+-#: elf32-ppc.c:3908
++#: elf32-ppc.c:3907
+ #, c-format
+ msgid "%pB(%pA+0x%lx): expected 16A style relocation on 0x%08x insn"
+ msgstr "%pB(%pA+0x%lx): ожидается перемещение в формате 16A по адресу 0x%08x insn"
+ 
+-#: elf32-ppc.c:3927
++#: elf32-ppc.c:3926
+ #, c-format
+ msgid "%pB(%pA+0x%lx): expected 16D style relocation on 0x%08x insn"
+ msgstr "%pB(%pA+0x%lx): ожидается перемещение в формате 16D по адресу 0x%08x insn"
+ 
+-#: elf32-ppc.c:4030
++#: elf32-ppc.c:4029
+ #, c-format
+ msgid "bss-plt forced due to %pB"
+ msgstr "принудительно используется bss-plt из-за %pB"
+ 
+-#: elf32-ppc.c:4032
++#: elf32-ppc.c:4031
+ msgid "bss-plt forced by profiling"
+ msgstr "принудительно используется bss-plt из-за профилирования"
+ 
++#: elf32-ppc.c:4608 elf64-ppc.c:8317
++msgid "%H: warning: %s unexpected insn %#x.\n"
++msgstr "%H: предупреждение: в %s не ожидалось insn %#x.\n"
++
+ #. Uh oh, we didn't find the expected call.  We
+ #. could just mark this symbol to exclude it
+ #. from tls optimization but it's safer to skip
+ #. the entire optimization.
+-#: elf32-ppc.c:4606 elf64-ppc.c:8252
++#: elf32-ppc.c:4638 elf64-ppc.c:8382
+ #, c-format
+ msgid "%H arg lost __tls_get_addr, TLS optimization disabled\n"
+ msgstr "%H аргумент lost __tls_get_addr, оптимизация TLS выключена\n"
+ 
+-#: elf32-ppc.c:5513 elf32-sh.c:3023 elf32-tilepro.c:2256 elfxx-sparc.c:2453
+-#: elfxx-tilegx.c:2496
++#: elf32-ppc.c:5564 elf32-sh.c:3017 elf32-tilepro.c:2248 elfxx-sparc.c:2454
++#: elfxx-tilegx.c:2494
+ #, c-format
+ msgid "%pB: dynamic relocation in read-only section `%pA'\n"
+ msgstr "%pB: динамическое перемещение в разделе только для чтения «%pA»\n"
+ 
+-#: elf32-ppc.c:7356
++#: elf32-ppc.c:7407
+ msgid "%P: %H: error: %s with unexpected instruction %x\n"
+ msgstr "%P: %H: ошибка: %s с неожиданной инструкцией %x\n"
+ 
+-#: elf32-ppc.c:7393
++#: elf32-ppc.c:7444
+ msgid "%H: fixup branch overflow\n"
+ msgstr "%H: переполнение ветви местоположений\n"
+ 
+-#: elf32-ppc.c:7433 elf32-ppc.c:7469
++#: elf32-ppc.c:7484 elf32-ppc.c:7520
+ #, c-format
+ msgid "%pB(%pA+%#<PRIx64>): error: %s with unexpected instruction %#x"
+ msgstr "%pB(%pA+%#<PRIx64>): ошибка: %s с неожиданной инструкцией %#x"
+ 
+-#: elf32-ppc.c:7533
++#: elf32-ppc.c:7584
+ #, c-format
+ msgid "%X%H: unsupported bss-plt -fPIC ifunc %s\n"
+ msgstr "%X%H: неподдерживаемая bss-plt -fPIC ifunc %s\n"
+ 
+-#: elf32-ppc.c:7572 elf64-ppc.c:16848
+-msgid "%H: warning: %s unexpected insn %#x.\n"
+-msgstr "%H: предупреждение: в %s не ожидалось insn %#x.\n"
+-
+-#: elf32-ppc.c:7881
++#: elf32-ppc.c:7899
+ #, c-format
+ msgid "%H: non-zero addend on %s reloc against `%s'\n"
+ msgstr "%H: ненулевое добавление в перемещении %s для «%s»\n"
+@@ -3079,49 +3201,49 @@ msgstr "%H: ненулевое добавление в перемещении %s
+ #. local won't have the +32k reloc addend trick marking
+ #. -fPIC code, so the linker won't know whether r30 is
+ #. _GLOBAL_OFFSET_TABLE_ or pointing into a .got2 section.
+-#: elf32-ppc.c:7913
++#: elf32-ppc.c:7931
+ #, c-format
+ msgid "%X%H: @local call to ifunc %s\n"
+ msgstr "%X%H: @local вызов ifunc %s\n"
+ 
+-#: elf32-ppc.c:8091
++#: elf32-ppc.c:8109
+ #, c-format
+ msgid "%H: relocation %s for indirect function %s unsupported\n"
+ msgstr "%H: перемещение %s для неявного вызова функции %s не поддерживается\n"
+ 
+-#: elf32-ppc.c:8425 elf32-ppc.c:8456 elf32-ppc.c:8547 elf32-ppc.c:8643
++#: elf32-ppc.c:8441 elf32-ppc.c:8472 elf32-ppc.c:8563 elf32-ppc.c:8659
+ #, c-format
+ msgid "%pB: the target (%s) of a %s relocation is in the wrong output section (%s)"
+ msgstr "%pB: назначение (%s) перемещения %s в ошибочный выходной раздел (%s)"
+ 
+-#: elf32-ppc.c:8773 elf32-ppc.c:8791
++#: elf32-ppc.c:8814 elf32-ppc.c:8832
+ msgid "%X%P: %H: %s relocation unsupported for bss-plt\n"
+ msgstr "%X%P: %H: перемещение %s не поддерживается для bss-plt\n"
+ 
+-#: elf32-ppc.c:8872
++#: elf32-ppc.c:8913
+ #, c-format
+ msgid "%H: error: %s against `%s' not a multiple of %u\n"
+ msgstr "%H: ошибка: %s в «%s» не кратно %u\n"
+ 
+-#: elf32-ppc.c:8901
++#: elf32-ppc.c:8942
+ #, c-format
+ msgid "%H: unresolvable %s relocation against symbol `%s'\n"
+ msgstr "%H: неразрешимое перемещение %s для символа «%s»\n"
+ 
+-#: elf32-ppc.c:8982
++#: elf32-ppc.c:9023
+ #, c-format
+ msgid "%H: %s reloc against `%s': error %d\n"
+ msgstr "%H: перемещение %s для «%s»: ошибка %d\n"
+ 
+-#: elf32-ppc.c:9872
++#: elf32-ppc.c:9904
+ msgid "%X%P: text relocations and GNU indirect functions will result in a segfault at runtime\n"
+ msgstr "%X%P:  текстовые перемещения и неявные функции GNU приведут к ошибке сегментирования во время выполнения\n"
+ 
+-#: elf32-ppc.c:9876 elf64-ppc.c:17398
++#: elf32-ppc.c:9908 elf64-ppc.c:17667
+ msgid "%P: warning: text relocations and GNU indirect functions may result in a segfault at runtime\n"
+ msgstr "%P: предупреждение: текстовые перемещения и неявные функции GNU могут привести к ошибке сегментирования во время выполнения\n"
+ 
+-#: elf32-ppc.c:9921
++#: elf32-ppc.c:9953
+ #, c-format
+ msgid "%s not defined in linker created %pA"
+ msgstr "%s не определено в компоновщике, созданном %pA"
+@@ -3215,201 +3337,201 @@ msgstr "  флаги входного файла: %s"
+ msgid "  the output file's flags: %s"
+ msgstr "  флаги выходного файла: %s"
+ 
+-#: elf32-rx.c:3784
++#: elf32-rx.c:3785
+ #, c-format
+ msgid "%pB:%pA: table %s missing corresponding %s"
+ msgstr "%pB:%pA: отсутствует таблица %s, соответствующая %s"
+ 
+-#: elf32-rx.c:3792
++#: elf32-rx.c:3793
+ #, c-format
+ msgid "%pB:%pA: %s and %s must be in the same input section"
+ msgstr "%pB:%pA: %s и %s должны быть в одном входном разделе"
+ 
+-#: elf32-s390.c:2011 elf64-s390.c:1965
++#: elf32-s390.c:2009 elf64-s390.c:1963
+ #, c-format
+ msgid "%pB(%pA+%#<PRIx64>): invalid instruction for TLS relocation %s"
+ msgstr "%pB(%pA+%#<PRIx64>): недопустимая инструкция для TLS-перемещения %s"
+ 
+-#: elf32-score.c:1521 elf32-score7.c:1382 elfxx-mips.c:3800
++#: elf32-score.c:1524 elf32-score7.c:1385 elfxx-mips.c:3798
+ msgid "not enough GOT space for local GOT entries"
+ msgstr "недостаточно пространства GOT для локальных элементов GOT"
+ 
+-#: elf32-score.c:2747
++#: elf32-score.c:2756
+ msgid "address not word aligned"
+ msgstr "адрес не выровнен по границе слова"
+ 
+-#: elf32-score.c:2828 elf32-score7.c:2633
++#: elf32-score.c:2837 elf32-score7.c:2642
+ #, c-format
+ msgid "%pB: malformed reloc detected for section %pA"
+ msgstr "%pB: обнаружено искажённое перемещение в разделе %pA"
+ 
+-#: elf32-score.c:2882 elf32-score7.c:2687
++#: elf32-score.c:2891 elf32-score7.c:2696
+ #, c-format
+ msgid "%pB: CALL15 reloc at %#<PRIx64> not against global symbol"
+ msgstr "%pB: перемещение CALL15 по адресу %#<PRIx64> не для глобального символа"
+ 
+-#: elf32-score.c:4003 elf32-score7.c:3808
++#: elf32-score.c:3999 elf32-score7.c:3804
+ #, c-format
+ msgid " [pic]"
+ msgstr " [pic]"
+ 
+-#: elf32-score.c:4007 elf32-score7.c:3812
++#: elf32-score.c:4003 elf32-score7.c:3808
+ #, c-format
+ msgid " [fix dep]"
+ msgstr " [fix dep]"
+ 
+-#: elf32-score.c:4054 elf32-score7.c:3859
++#: elf32-score.c:4050 elf32-score7.c:3855
+ #, c-format
+ msgid "%pB: warning: linking PIC files with non-PIC files"
+ msgstr "%pB: предупреждение: выполняется компоновка PIC-файлов с не-PIC файлами"
+ 
+-#: elf32-sh.c:533
++#: elf32-sh.c:532
+ #, c-format
+ msgid "%pB: %#<PRIx64>: warning: R_SH_USES points to unrecognized insn 0x%x"
+ msgstr "%pB: %#<PRIx64>: предупреждение: R_SH_USES указывает на нераспознанную инструкцию 0x%x"
+ 
+-#: elf32-sh.c:3758
++#: elf32-sh.c:3752
+ #, c-format
+ msgid "%pB: %#<PRIx64>: fatal: unaligned branch target for relax-support relocation"
+ msgstr "%pB: %#<PRIx64>: останов: невыровненное назначение ветвления для перемещения с поддержкой ослабления"
+ 
+-#: elf32-sh.c:3788 elf32-sh.c:3804
++#: elf32-sh.c:3782 elf32-sh.c:3798
+ #, c-format
+ msgid "%pB: %#<PRIx64>: fatal: unaligned %s relocation %#<PRIx64>"
+ msgstr "%pB: %#<PRIx64>: останов: невыровненное перемещение %s (%#<PRIx64>)"
+ 
+-#: elf32-sh.c:3820
++#: elf32-sh.c:3814
+ #, c-format
+ msgid "%pB: %#<PRIx64>: fatal: R_SH_PSHA relocation %<PRId64> not in range -32..32"
+ msgstr "%pB: %#<PRIx64>: останов: перемещение R_SH_PSHA %#<PRId64> вне диапазона -32..32"
+ 
+-#: elf32-sh.c:3836
++#: elf32-sh.c:3830
+ #, c-format
+ msgid "%pB: %#<PRIx64>: fatal: R_SH_PSHL relocation %<PRId64> not in range -32..32"
+ msgstr "%pB: %#<PRIx64>: останов: перемещение R_SH_PSHL %#<PRId64> вне диапазона -32..32"
+ 
+-#: elf32-sh.c:3966 elf32-sh.c:4361
++#: elf32-sh.c:3960 elf32-sh.c:4355
+ #, c-format
+ msgid "%pB(%pA+%#<PRIx64>): cannot emit fixup to `%s' in read-only section"
+ msgstr "%pB(%pA+%#<PRIx64>): невозможно сгенерировать местоположение к «%s» в разделе только для чтения"
+ 
+-#: elf32-sh.c:4464
++#: elf32-sh.c:4458
+ #, c-format
+ msgid "%pB(%pA+%#<PRIx64>): %s relocation against external symbol \"%s\""
+ msgstr "%pB(%pA+%#<PRIx64>): перемещение %s для внешнего символа «%s»"
+ 
+-#: elf32-sh.c:4583
++#: elf32-sh.c:4577
+ #, c-format
+ msgid "%pB(%pA): offset in relocation for GD->LE translation is too small: %#<PRIx64>"
+ msgstr "%pB(%pA): смещение в перемещении для трансляции GD->LE слишком мало: %#<PRIx64>"
+ 
+ #. The backslash is to prevent bogus trigraph detection.
+-#: elf32-sh.c:4601
++#: elf32-sh.c:4595
+ #, c-format
+ msgid "%pB(%pA+%#<PRIx64>): unexpected instruction %#04X (expected 0xd4??)"
+ msgstr "%pB(%pA+%#<PRIx64>): неожиданная инструкция %#04X (ожидалась 0xd4??)"
+ 
+-#: elf32-sh.c:4609
++#: elf32-sh.c:4603
+ #, c-format
+ msgid "%pB(%pA+%#<PRIx64>): unexpected instruction %#04X (expected 0xc7??)"
+ msgstr "%pB(%pA+%#<PRIx64>): неожиданная инструкция %#04X (ожидалась 0xc7??)"
+ 
+-#: elf32-sh.c:4616
++#: elf32-sh.c:4610
+ #, c-format
+ msgid "%pB(%pA+%#<PRIx64>): unexpected instruction %#04X (expected 0xd1??)"
+ msgstr "%pB(%pA+%#<PRIx64>): неожиданная инструкция %#04X (ожидалась 0xd1??)"
+ 
+-#: elf32-sh.c:4623
++#: elf32-sh.c:4617
+ #, c-format
+ msgid "%pB(%pA+%#<PRIx64>): unexpected instruction %#04X (expected 0x310c)"
+ msgstr "%pB(%pA+%#<PRIx64>): неожиданная инструкция %#04X (ожидалась 0x310c)"
+ 
+-#: elf32-sh.c:4630
++#: elf32-sh.c:4624
+ #, c-format
+ msgid "%pB(%pA+%#<PRIx64>): unexpected instruction %#04X (expected 0x410b)"
+ msgstr "%pB(%pA+%#<PRIx64>): неожиданная инструкция %#04X (ожидалась 0x410b)"
+ 
+-#: elf32-sh.c:4637
++#: elf32-sh.c:4631
+ #, c-format
+ msgid "%pB(%pA+%#<PRIx64>): unexpected instruction %#04X (expected 0x34cc)"
+ msgstr "%pB(%pA+%#<PRIx64>): неожиданная инструкция %#04X (ожидалась 0x34cc)"
+ 
+-#: elf32-sh.c:4672
++#: elf32-sh.c:4666
+ #, c-format
+ msgid "%pB(%pA): offset in relocation for IE->LE translation is too small: %#<PRIx64>"
+ msgstr "%pB(%pA): смещение в перемещении для трансляции IE->LE слишком мало: %#<PRIx64>"
+ 
+-#: elf32-sh.c:4690
++#: elf32-sh.c:4684
+ #, c-format
+ msgid "%pB(%pA+%#<PRIx64>): unexpected instruction %#04X (expected 0xd0??: mov.l)"
+ msgstr "%pB(%pA+%#<PRIx64>): неожиданная инструкция %#04X (ожидалась 0xd0??: mov.l)"
+ 
+-#: elf32-sh.c:4699
++#: elf32-sh.c:4693
+ #, c-format
+ msgid "%pB(%pA+%#<PRIx64>): unexpected instruction %#04X (expected 0x0?12: stc)"
+ msgstr "%pB(%pA+%#<PRIx64>): неожиданная инструкция %#04X (ожидалась 0x0?12: stc)"
+ 
+-#: elf32-sh.c:4706
++#: elf32-sh.c:4700
+ #, c-format
+ msgid "%pB(%pA+%#<PRIx64>): unexpected instruction %#04X (expected 0x0?ce: mov.l)"
+ msgstr "%pB(%pA+%#<PRIx64>): неожиданная инструкция %#04X (ожидалась 0x0?ce: mov.l)"
+ 
+-#: elf32-sh.c:4821
++#: elf32-sh.c:4815
+ #, c-format
+ msgid "%pB(%pA): offset in relocation for GD->IE translation is too small: %#<PRIx64>"
+ msgstr "%pB(%pA): смещение в перемещении для трансляции GD->IE слишком мало: %#<PRIx64>"
+ 
+-#: elf32-sh.c:4889
++#: elf32-sh.c:4883
+ #, c-format
+ msgid "%pB(%pA): offset in relocation for LD->LE translation is too small: %#<PRIx64>"
+ msgstr "%pB(%pA): смещение в перемещении для трансляции LD->LE слишком мало: %#<PRIx64>"
+ 
+-#: elf32-sh.c:5017
++#: elf32-sh.c:5011
+ #, c-format
+ msgid "%X%C: relocation to \"%s\" references a different segment\n"
+ msgstr "%X%C: перемещение указывает на ссылки «%s» другого сегмента\n"
+ 
+-#: elf32-sh.c:5024
++#: elf32-sh.c:5018
+ #, c-format
+ msgid "%C: warning: relocation to \"%s\" references a different segment\n"
+ msgstr "%C: предупреждение: перемещение указывает на ссылки «%s» другого сегмента\n"
+ 
+-#: elf32-sh.c:5483 elf32-sh.c:5565
++#: elf32-sh.c:5477 elf32-sh.c:5559
+ #, c-format
+ msgid "%pB: `%s' accessed both as normal and FDPIC symbol"
+ msgstr "%pB: «%s» доступен как обычный и как FDPIC символ"
+ 
+-#: elf32-sh.c:5489 elf32-sh.c:5570
++#: elf32-sh.c:5483 elf32-sh.c:5564
+ #, c-format
+ msgid "%pB: `%s' accessed both as FDPIC and thread local symbol"
+ msgstr "%pB: «%s» доступен как FDPIC и как локальный символ нити"
+ 
+-#: elf32-sh.c:5520
++#: elf32-sh.c:5514
+ #, c-format
+ msgid "%pB: Function descriptor relocation with non-zero addend"
+ msgstr "%pB: перемещение дескриптора функции с ненулевым добавлением"
+ 
+-#: elf32-sh.c:5727 elf64-alpha.c:4657
++#: elf32-sh.c:5721 elf64-alpha.c:4662
+ #, c-format
+ msgid "%pB: TLS local exec code cannot be linked into shared objects"
+ msgstr "%pB: локальный исполняемый код TLS не может быть скомпонован с общими объектами"
+ 
+-#: elf32-sh.c:5842
++#: elf32-sh.c:5836
+ #, c-format
+ msgid "%pB: uses %s instructions while previous modules use %s instructions"
+ msgstr "%pB: используются инструкции %s, хотя в предыдущих модулях использовались инструкции %s"
+ 
+-#: elf32-sh.c:5854
++#: elf32-sh.c:5848
+ #, c-format
+ msgid "internal error: merge of architecture '%s' with architecture '%s' produced unknown architecture"
+ msgstr "внутренняя ошибка: объединение архитектуры «%s» с архитектурой «%s» создаёт неизвестную архитектуру"
+ 
+-#: elf32-sh.c:5895
++#: elf32-sh.c:5889
+ #, c-format
+ msgid "%pB: uses instructions which are incompatible with instructions used in previous modules"
+ msgstr "%pB: используются инструкции, не совместимые с инструкциями, использовавшимися в предыдущих модулях"
+ 
+-#: elf32-sh.c:5908
++#: elf32-sh.c:5902
+ #, c-format
+ msgid "%pB: attempt to mix FDPIC and non-FDPIC objects"
+ msgstr "%pB: попытка смешать объекты FDPIC и не FDPIC"
+@@ -3429,118 +3551,118 @@ msgstr "%pB: производится компоновка файлов с об
+ msgid "%pB: unhandled sparc machine value '%lu' detected during write processing"
+ msgstr "%pB: во время выполнения записи обнаружено необработанное машинное значение sparc «%lu»"
+ 
+-#: elf32-spu.c:735
++#: elf32-spu.c:736
+ msgid "%X%P: overlay section %pA does not start on a cache line\n"
+ msgstr "%X%P: раздел оверлея %pA не начинается со строки кэша\n"
+ 
+-#: elf32-spu.c:743
++#: elf32-spu.c:744
+ msgid "%X%P: overlay section %pA is larger than a cache line\n"
+ msgstr "%X%P: раздел оверлея %pA больше строки кэша\n"
+ 
+-#: elf32-spu.c:763
++#: elf32-spu.c:764
+ msgid "%X%P: overlay section %pA is not in cache area\n"
+ msgstr "%X%P: раздел оверлея %pA не в области кэша\n"
+ 
+-#: elf32-spu.c:804
++#: elf32-spu.c:805
+ #, c-format
+ msgid "%X%P: overlay sections %pA and %pA do not start at the same address\n"
+ msgstr "%X%P: разделы оверлеев %pA и %pA не начинаются с одинакового адреса\n"
+ 
+-#: elf32-spu.c:1030
++#: elf32-spu.c:1031
+ #, c-format
+ msgid "warning: call to non-function symbol %s defined in %pB"
+ msgstr "предупреждение: вызов символа не-функции %s, определённой в %pB"
+ 
+-#: elf32-spu.c:1380
++#: elf32-spu.c:1381
+ #, c-format
+ msgid "%pA:0x%v lrlive .brinfo (%u) differs from analysis (%u)\n"
+ msgstr "%pA:0x%v lrlive .brinfo (%u) отличается от анализируемого (%u)\n"
+ 
+-#: elf32-spu.c:1910
++#: elf32-spu.c:1911
+ #, c-format
+ msgid "%pB is not allowed to define %s"
+ msgstr "%pB не разрешено определять %s"
+ 
+-#: elf32-spu.c:1918
++#: elf32-spu.c:1919
+ #, c-format
+ msgid "you are not allowed to define %s in a script"
+ msgstr "вам не разрешено определять %s в сценарии"
+ 
+-#: elf32-spu.c:1952
++#: elf32-spu.c:1953
+ #, c-format
+ msgid "%s in overlay section"
+ msgstr "%s в разделе оверлеев"
+ 
+-#: elf32-spu.c:1981
++#: elf32-spu.c:1982
+ msgid "overlay stub relocation overflow"
+ msgstr "переполнение оверлейной заглушки перемещения"
+ 
+-#: elf32-spu.c:1990 elf64-ppc.c:14496
++#: elf32-spu.c:1991 elf64-ppc.c:14761
+ msgid "stubs don't match calculated size"
+ msgstr "заглушка не соответствует вычисленному размеру"
+ 
+-#: elf32-spu.c:2573
++#: elf32-spu.c:2574
+ #, c-format
+ msgid "warning: %s overlaps %s\n"
+ msgstr "предупреждение: %s перекрывается с %s\n"
+ 
+-#: elf32-spu.c:2589
++#: elf32-spu.c:2590
+ #, c-format
+ msgid "warning: %s exceeds section size\n"
+ msgstr "предупреждение: %s превышает размер раздела\n"
+ 
+-#: elf32-spu.c:2621
++#: elf32-spu.c:2622
+ #, c-format
+ msgid "%pA:0x%v not found in function table\n"
+ msgstr "%pA:0x%v не найдена в таблице функций\n"
+ 
+-#: elf32-spu.c:2762
++#: elf32-spu.c:2763
+ #, c-format
+ msgid "%pB(%pA+0x%v): call to non-code section %pB(%pA), analysis incomplete\n"
+ msgstr "%pB(%pA+0x%v): вызов не кодового раздела %pB(%pA), анализ не полон\n"
+ 
+-#: elf32-spu.c:3328
++#: elf32-spu.c:3329
+ #, c-format
+ msgid "stack analysis will ignore the call from %s to %s\n"
+ msgstr "в анализе стека будет игнорироваться вызов из %s в %s\n"
+ 
+-#: elf32-spu.c:4025
++#: elf32-spu.c:4026
+ msgid "  calls:\n"
+ msgstr "  вызовы:\n"
+ 
+-#: elf32-spu.c:4340
++#: elf32-spu.c:4341
+ #, c-format
+ msgid "%s duplicated in %s\n"
+ msgstr "%s повторяется в %s\n"
+ 
+-#: elf32-spu.c:4344
++#: elf32-spu.c:4345
+ #, c-format
+ msgid "%s duplicated\n"
+ msgstr "%s повторяется\n"
+ 
+-#: elf32-spu.c:4351
++#: elf32-spu.c:4352
+ msgid "sorry, no support for duplicate object files in auto-overlay script\n"
+ msgstr "поддержка повторяющихся объектных файлов в сценарии auto-overlay пока не сделана\n"
+ 
+-#: elf32-spu.c:4393
++#: elf32-spu.c:4394
+ #, c-format
+ msgid "non-overlay size of 0x%v plus maximum overlay size of 0x%v exceeds local store\n"
+ msgstr "не оверлейный размер 0x%v плюс максимальный размер оверлея 0x%v превышает локальное хранилище\n"
+ 
+-#: elf32-spu.c:4549
++#: elf32-spu.c:4550
+ #, c-format
+ msgid "%pB:%pA%s exceeds overlay size\n"
+ msgstr "%pB:%pA%s превышает размер оверлея\n"
+ 
+-#: elf32-spu.c:4690
++#: elf32-spu.c:4691
+ msgid "%F%P: auto overlay error: %E\n"
+ msgstr "%F%P: ошибка автоматического оверлея: %E\n"
+ 
+-#: elf32-spu.c:4711
++#: elf32-spu.c:4712
+ msgid "Stack size for call graph root nodes.\n"
+ msgstr "Размер стека для вызова графа корневых узлов.\n"
+ 
+-#: elf32-spu.c:4712
++#: elf32-spu.c:4713
+ msgid ""
+ "\n"
+ "Stack size for functions.  Annotations: '*' max stack, 't' tail call\n"
+@@ -3548,23 +3670,23 @@ msgstr ""
+ "\n"
+ "Размер стека для функций. Примечания: '*' макс стек, 't' хвостовой вызов\n"
+ 
+-#: elf32-spu.c:4722
++#: elf32-spu.c:4723
+ msgid "Maximum stack required is 0x%v\n"
+ msgstr "Для максимального стека требуется 0x%v\n"
+ 
+-#: elf32-spu.c:4741
++#: elf32-spu.c:4742
+ msgid "%X%P: stack/lrlive analysis error: %E\n"
+ msgstr "%X%P: ошибка при анализе стека/lrlive: %E\n"
+ 
+-#: elf32-spu.c:4744
++#: elf32-spu.c:4745
+ msgid "%F%P: can not build overlay stubs: %E\n"
+ msgstr "%F%P: невозможно собрать заглушки оверлея: %E\n"
+ 
+-#: elf32-spu.c:4813
++#: elf32-spu.c:4814
+ msgid "fatal error while creating .fixup"
+ msgstr "неисправимая ошибка при создании .fixup"
+ 
+-#: elf32-spu.c:5049
++#: elf32-spu.c:5050
+ #, c-format
+ msgid "%pB(%s+%#<PRIx64>): unresolvable %s relocation against symbol `%s'"
+ msgstr "%pB(%s+%#<PRIx64>): неразрешимое перемещение %s для символа «%s»"
+@@ -3582,48 +3704,48 @@ msgstr "предупреждение: генерация общей библио
+ msgid "%pB: SB-relative relocation but __c6xabi_DSBT_BASE not defined"
+ msgstr "%pB: относительное перемещение SB, но __c6xabi_DSBT_BASE не определён"
+ 
+-#: elf32-tic6x.c:3511
++#: elf32-tic6x.c:3498
+ #, c-format
+ msgid "%pB: error: unknown mandatory EABI object attribute %d"
+ msgstr "%pB: ошибка: неизвестный обязательный атрибут EABI-объекта %d"
+ 
+-#: elf32-tic6x.c:3520
++#: elf32-tic6x.c:3507
+ #, c-format
+ msgid "%pB: warning: unknown EABI object attribute %d"
+ msgstr "%pB: предупреждение: неизвестный атрибут EABI-объекта %d"
+ 
+-#: elf32-tic6x.c:3638 elf32-tic6x.c:3647
++#: elf32-tic6x.c:3625 elf32-tic6x.c:3634
+ #, c-format
+ msgid "error: %pB requires more stack alignment than %pB preserves"
+ msgstr "ошибка: для %pB требуется большее выравнивание стека, чем сохранено в %pB"
+ 
+-#: elf32-tic6x.c:3657 elf32-tic6x.c:3666
++#: elf32-tic6x.c:3644 elf32-tic6x.c:3653
+ #, c-format
+ msgid "error: unknown Tag_ABI_array_object_alignment value in %pB"
+ msgstr "ошибка: неизвестное значение Tag_ABI_array_object_alignment в %pB"
+ 
+-#: elf32-tic6x.c:3675 elf32-tic6x.c:3684
++#: elf32-tic6x.c:3662 elf32-tic6x.c:3671
+ #, c-format
+ msgid "error: unknown Tag_ABI_array_object_align_expected value in %pB"
+ msgstr "ошибка: неизвестное значение Tag_ABI_array_object_align_expected в %pB"
+ 
+-#: elf32-tic6x.c:3693 elf32-tic6x.c:3701
++#: elf32-tic6x.c:3680 elf32-tic6x.c:3688
+ #, c-format
+ msgid "error: %pB requires more array alignment than %pB preserves"
+ msgstr "ошибка: для %pB требуется большее выравнивание массива, чем сохранено в %pB"
+ 
+-#: elf32-tic6x.c:3724
++#: elf32-tic6x.c:3711
+ #, c-format
+ msgid "warning: %pB and %pB differ in wchar_t size"
+ msgstr "предупреждение: в %pB и %pB различается размер wchar_t"
+ 
+-#: elf32-tic6x.c:3743
++#: elf32-tic6x.c:3730
+ #, c-format
+ msgid "warning: %pB and %pB differ in whether code is compiled for DSBT"
+ msgstr "предупреждение: в %pB и %pB по-разному скомпилирован код для DSBT"
+ 
+-#: elf32-tilepro.c:3635 elfxx-tilegx.c:4019 elfxx-x86.c:1393
+-#: elfnn-aarch64.c:9704 elfnn-riscv.c:2522
++#: elf32-tilepro.c:3627 elfxx-tilegx.c:4017 elfxx-x86.c:1397
++#: elfnn-aarch64.c:9711 elfnn-riscv.c:3253
+ #, c-format
+ msgid "discarded output section: `%pA'"
+ msgstr "отброшенный выходной раздел: «%pA»"
+@@ -3653,225 +3775,225 @@ msgstr "переменная «%s» не может быть в маленьки
+ msgid "variable `%s' cannot be in both zero and tiny data regions simultaneously"
+ msgstr "переменная «%s» не может быть в нулевых и крошечных областях данных одновременно"
+ 
+-#: elf32-v850.c:462
++#: elf32-v850.c:466
+ msgid "failed to find previous HI16 reloc"
+ msgstr "не удалось найти предыдущее перемещение HI16"
+ 
+-#: elf32-v850.c:2302
++#: elf32-v850.c:2306
+ msgid "could not locate special linker symbol __gp"
+ msgstr "невозможно отыскать специальный символ компоновки __gp"
+ 
+-#: elf32-v850.c:2306
++#: elf32-v850.c:2310
+ msgid "could not locate special linker symbol __ep"
+ msgstr "невозможно отыскать специальный символ компоновки __ep"
+ 
+-#: elf32-v850.c:2310
++#: elf32-v850.c:2314
+ msgid "could not locate special linker symbol __ctbp"
+ msgstr "невозможно отыскать специальный символ компоновки __ctbp"
+ 
+-#: elf32-v850.c:2531
++#: elf32-v850.c:2535
+ #, c-format
+ msgid "error: %pB needs 8-byte alignment but %pB is set for 4-byte alignment"
+ msgstr "ошибка: для %pB требуется 8-байтовое выравнивание, но для %pB задано 4-байтовое выравнивание"
+ 
+-#: elf32-v850.c:2547
++#: elf32-v850.c:2551
+ #, c-format
+ msgid "error: %pB uses 64-bit doubles but %pB uses 32-bit doubles"
+ msgstr "ошибка: в %pB используются 64-битные double, но в %pB используют 32-битные double"
+ 
+-#: elf32-v850.c:2562
++#: elf32-v850.c:2566
+ #, c-format
+ msgid "error: %pB uses FPU-3.0 but %pB only supports FPU-2.0"
+ msgstr "ошибка: в %pB используется FPU-3.0, в то время как %pB поддерживает только FPU-2.0"
+ 
+-#: elf32-v850.c:2594
++#: elf32-v850.c:2598
+ #, c-format
+ msgid " alignment of 8-byte entities: "
+ msgstr " выравнивание 8-байтовых элементов: "
+ 
+-#: elf32-v850.c:2597
++#: elf32-v850.c:2601
+ #, c-format
+ msgid "4-byte"
+ msgstr "4-байтовое"
+ 
+-#: elf32-v850.c:2598
++#: elf32-v850.c:2602
+ #, c-format
+ msgid "8-byte"
+ msgstr "8-байтовое"
+ 
+-#: elf32-v850.c:2599 elf32-v850.c:2611
++#: elf32-v850.c:2603 elf32-v850.c:2615
+ #, c-format
+ msgid "not set"
+ msgstr " [не задано]"
+ 
+-#: elf32-v850.c:2600 elf32-v850.c:2612 elf32-v850.c:2624 elf32-v850.c:2635
+-#: elf32-v850.c:2646 elf32-v850.c:2657
++#: elf32-v850.c:2604 elf32-v850.c:2616 elf32-v850.c:2628 elf32-v850.c:2639
++#: elf32-v850.c:2650 elf32-v850.c:2661
+ #, c-format
+ msgid "unknown: %x"
+ msgstr "неизвестно: %x"
+ 
+-#: elf32-v850.c:2606
++#: elf32-v850.c:2610
+ #, c-format
+ msgid " size of doubles: "
+ msgstr " размер double: "
+ 
+-#: elf32-v850.c:2609
++#: elf32-v850.c:2613
+ #, c-format
+ msgid "4-bytes"
+ msgstr "4-байтовые"
+ 
+-#: elf32-v850.c:2610
++#: elf32-v850.c:2614
+ #, c-format
+ msgid "8-bytes"
+ msgstr "8-байтовые"
+ 
+-#: elf32-v850.c:2618
++#: elf32-v850.c:2622
+ #, c-format
+ msgid " FPU support required: "
+ msgstr " требуемая поддержка FPU: "
+ 
+-#: elf32-v850.c:2621
++#: elf32-v850.c:2625
+ #, c-format
+ msgid "FPU-2.0"
+ msgstr "FPU-2.0"
+ 
+-#: elf32-v850.c:2622
++#: elf32-v850.c:2626
+ #, c-format
+ msgid "FPU-3.0"
+ msgstr "FPU-3.0"
+ 
+-#: elf32-v850.c:2623
++#: elf32-v850.c:2627
+ #, c-format
+ msgid "none"
+ msgstr "не требуется"
+ 
+-#: elf32-v850.c:2630
++#: elf32-v850.c:2634
+ #, c-format
+ msgid "SIMD use: "
+ msgstr "Использование SIMD: "
+ 
+-#: elf32-v850.c:2633 elf32-v850.c:2644 elf32-v850.c:2655
++#: elf32-v850.c:2637 elf32-v850.c:2648 elf32-v850.c:2659
+ #, c-format
+ msgid "yes"
+ msgstr "да"
+ 
+-#: elf32-v850.c:2634 elf32-v850.c:2645 elf32-v850.c:2656
++#: elf32-v850.c:2638 elf32-v850.c:2649 elf32-v850.c:2660
+ #, c-format
+ msgid "no"
+ msgstr "нет"
+ 
+-#: elf32-v850.c:2641
++#: elf32-v850.c:2645
+ #, c-format
+ msgid "CACHE use: "
+ msgstr "Использование CACHE: "
+ 
+-#: elf32-v850.c:2652
++#: elf32-v850.c:2656
+ #, c-format
+ msgid "MMU use: "
+ msgstr "Использование MMU: "
+ 
+-#: elf32-v850.c:2819 elf32-v850.c:2875
++#: elf32-v850.c:2823 elf32-v850.c:2879
+ #, c-format
+ msgid "%pB: architecture mismatch with previous modules"
+ msgstr "%pB: архитектура не совпадает с использованной в предыдущих модулях"
+ 
+ #. xgettext:c-format.
+-#: elf32-v850.c:2893
++#: elf32-v850.c:2897
+ #, c-format
+ msgid "private flags = %lx: "
+ msgstr "собственные флаги = %lx: "
+ 
+-#: elf32-v850.c:2898
++#: elf32-v850.c:2902
+ #, c-format
+ msgid "unknown v850 architecture"
+ msgstr "неизвестная архитектура v850"
+ 
+-#: elf32-v850.c:2900
++#: elf32-v850.c:2904
+ #, c-format
+ msgid "v850 E3 architecture"
+ msgstr "архитектура v850 E3"
+ 
+-#: elf32-v850.c:2902 elf32-v850.c:2909
++#: elf32-v850.c:2906 elf32-v850.c:2913
+ #, c-format
+ msgid "v850 architecture"
+ msgstr "архитектура v850"
+ 
+-#: elf32-v850.c:2910
++#: elf32-v850.c:2914
+ #, c-format
+ msgid "v850e architecture"
+ msgstr "архитектура v850e"
+ 
+-#: elf32-v850.c:2911
++#: elf32-v850.c:2915
+ #, c-format
+ msgid "v850e1 architecture"
+ msgstr "архитектура v850e1"
+ 
+-#: elf32-v850.c:2912
++#: elf32-v850.c:2916
+ #, c-format
+ msgid "v850e2 architecture"
+ msgstr "архитектура v850e2"
+ 
+-#: elf32-v850.c:2913
++#: elf32-v850.c:2917
+ #, c-format
+ msgid "v850e2v3 architecture"
+ msgstr "архитектура v850e2v3"
+ 
+-#: elf32-v850.c:2914
++#: elf32-v850.c:2918
+ #, c-format
+ msgid "v850e3v5 architecture"
+ msgstr "архитектура v850e3v5"
+ 
+-#: elf32-v850.c:3612 elf32-v850.c:3851
++#: elf32-v850.c:3591 elf32-v850.c:3830
+ #, c-format
+ msgid "%pB: %#<PRIx64>: warning: %s points to unrecognized insns"
+ msgstr "%pB: %#<PRIx64>: предупреждение: %s указывает на нераспознанные инструкции"
+ 
+-#: elf32-v850.c:3622 elf32-v850.c:3861
++#: elf32-v850.c:3601 elf32-v850.c:3840
+ #, c-format
+ msgid "%pB: %#<PRIx64>: warning: %s points to unrecognized insn %#x"
+ msgstr "%pB: %#<PRIx64>: предупреждение: %s указывает на нераспознанную инструкцию %#x"
+ 
+-#: elf32-v850.c:3668 elf32-v850.c:3896
++#: elf32-v850.c:3647 elf32-v850.c:3875
+ #, c-format
+ msgid "%pB: %#<PRIx64>: warning: %s points to unrecognized reloc"
+ msgstr "%pB: %#<PRIx64>: предупреждение: %s указывает на нераспознанное перемещение"
+ 
+-#: elf32-v850.c:3708
++#: elf32-v850.c:3687
+ #, c-format
+ msgid "%pB: %#<PRIx64>: warning: %s points to unrecognized reloc %#<PRIx64>"
+ msgstr "%pB: %#<PRIx64>: предупреждение: %s указывает на нераспознанное перемещение по адресу %#<PRIx64>"
+ 
+-#: elf32-vax.c:540
++#: elf32-vax.c:539
+ #, c-format
+ msgid " [nonpic]"
+ msgstr " [не-pic]"
+ 
+-#: elf32-vax.c:543
++#: elf32-vax.c:542
+ #, c-format
+ msgid " [d-float]"
+ msgstr " [d-float]"
+ 
+-#: elf32-vax.c:546
++#: elf32-vax.c:545
+ #, c-format
+ msgid " [g-float]"
+ msgstr " [g-float]"
+ 
+-#: elf32-vax.c:632
++#: elf32-vax.c:631
+ #, c-format
+ msgid "%pB: warning: GOT addend of %<PRId64> to `%s' does not match previous GOT addend of %<PRId64>"
+ msgstr "%pB: предупреждение: добавление GOT из %<PRId64> к «%s» не совпадает с предыдущим добавлением GOT из %<PRId64>"
+ 
+-#: elf32-vax.c:1389
++#: elf32-vax.c:1388
+ #, c-format
+ msgid "%pB: warning: PLT addend of %<PRId64> to `%s' from %pA section ignored"
+ msgstr "%pB: предупреждение: добавление PLT из %<PRId64> к «%s» из раздела %pA игнорируется"
+ 
+-#: elf32-vax.c:1515
++#: elf32-vax.c:1514
+ #, c-format
+ msgid "%pB: warning: %s relocation against symbol `%s' from %pA section"
+ msgstr "%pB: предупреждение: перемещение %s для символа «%s» из раздела %pA"
+ 
+-#: elf32-vax.c:1522
++#: elf32-vax.c:1521
+ #, c-format
+ msgid "%pB: warning: %s relocation to %#<PRIx64> from %pA section"
+ msgstr "%pB: предупреждение: перемещение %s к %<PRIx64> из раздела %pA"
+@@ -3891,60 +4013,60 @@ msgstr "процессор=XGATE]"
+ msgid "error reading cpu type from elf private data"
+ msgstr "ошибка чтения типа процессора из закрытых данных elf"
+ 
+-#: elf32-xstormy16.c:457 elf64-ia64-vms.c:2074 elfnn-ia64.c:2343
++#: elf32-xstormy16.c:457 elf64-ia64-vms.c:2076 elfnn-ia64.c:2345
+ msgid "non-zero addend in @fptr reloc"
+ msgstr "ненулевое добавление в перемещение @fptr"
+ 
+-#: elf32-xtensa.c:1001
++#: elf32-xtensa.c:1002
+ #, c-format
+ msgid "%pB(%pA): invalid property table"
+ msgstr "%pB(%pA): некорректная таблица свойств"
+ 
+-#: elf32-xtensa.c:2733
++#: elf32-xtensa.c:2734
+ #, c-format
+ msgid "%pB(%pA+%#<PRIx64>): relocation offset out of range (size=%#<PRIx64>)"
+ msgstr "%pB(%pA+%<PRIx64>): смещение перемещения вне диапазона (размер=%<PRIx64>)"
+ 
+-#: elf32-xtensa.c:2816 elf32-xtensa.c:2939
++#: elf32-xtensa.c:2817 elf32-xtensa.c:2940
+ msgid "dynamic relocation in read-only section"
+ msgstr "динамическое перемещение в разделе только для чтения"
+ 
+-#: elf32-xtensa.c:2916
++#: elf32-xtensa.c:2917
+ msgid "TLS relocation invalid without dynamic sections"
+ msgstr "TLS-перемещение недопустимо без динамических разделов"
+ 
+-#: elf32-xtensa.c:3126
++#: elf32-xtensa.c:3130
+ msgid "internal inconsistency in size of .got.loc section"
+ msgstr "внутренняя несогласованность размера раздела .got.loc"
+ 
+-#: elf32-xtensa.c:3432
++#: elf32-xtensa.c:3436
+ #, c-format
+ msgid "%pB: incompatible machine type; output is 0x%x; input is 0x%x"
+ msgstr "%pB: несовместимый машинный тип; выходной 0x%x; входной 0x%x"
+ 
+-#: elf32-xtensa.c:4726 elf32-xtensa.c:4734
++#: elf32-xtensa.c:4735 elf32-xtensa.c:4743
+ msgid "attempt to convert L32R/CALLX to CALL failed"
+ msgstr "попытка преобразования L32R/CALLX в CALL завершилась неудачно"
+ 
+-#: elf32-xtensa.c:6559 elf32-xtensa.c:6638 elf32-xtensa.c:8064
++#: elf32-xtensa.c:6571 elf32-xtensa.c:6650 elf32-xtensa.c:8076
+ #, c-format
+ msgid "%pB(%pA+%#<PRIx64>): could not decode instruction; possible configuration mismatch"
+ msgstr "%pB(%pA+%#<PRIx64>): невозможно декодировать инструкцию; возможно несовпадение конфигурации"
+ 
+-#: elf32-xtensa.c:7805
++#: elf32-xtensa.c:7817
+ #, c-format
+ msgid "%pB(%pA+%#<PRIx64>): could not decode instruction for XTENSA_ASM_SIMPLIFY relocation; possible configuration mismatch"
+ msgstr "%pB(%pA+%#<PRIx64>): невозможно декодировать инструкцию для перемещения XTENSA_ASM_SIMPLIFY; возможно несовпадение конфигурации"
+ 
+-#: elf32-xtensa.c:9663
++#: elf32-xtensa.c:9675
+ msgid "invalid relocation address"
+ msgstr "недопустимый адрес перемещения"
+ 
+-#: elf32-xtensa.c:9754
++#: elf32-xtensa.c:9766
+ msgid "overflow after relaxation"
+ msgstr "переполнение после ослабления"
+ 
+-#: elf32-xtensa.c:10900
++#: elf32-xtensa.c:10912
+ #, c-format
+ msgid "%pB(%pA+%#<PRIx64>): unexpected fix for %s relocation"
+ msgstr "%pB(%pA+%#<PRIx64>): неожиданное назначение для перемещения %s"
+@@ -3964,66 +4086,66 @@ msgstr "%pB: неподдерживаемая машина %#x"
+ msgid "%pB: unsupported arch %#x"
+ msgstr "%pB: неподдерживаемая архитектура %#x"
+ 
+-#: elf64-alpha.c:473
++#: elf64-alpha.c:474
+ msgid "GPDISP relocation did not find ldah and lda instructions"
+ msgstr "Не найдены инструкции ldah и lda для перемещения GPDISP"
+ 
+-#: elf64-alpha.c:1999 elf64-alpha.c:2694 elflink.c:14885
++#: elf64-alpha.c:2002 elf64-alpha.c:2697 elflink.c:15091
+ #, c-format
+ msgid "%pB: dynamic relocation against `%pT' in read-only section `%pA'\n"
+ msgstr "%pB: динамическое перемещение с «%pT» в разделе только для чтения «%pA»\n"
+ 
+-#: elf64-alpha.c:2451
++#: elf64-alpha.c:2454
+ #, c-format
+ msgid "%pB: .got subsegment exceeds 64K (size %d)"
+ msgstr "%pB: подраздел .got превышает 64K (размер %d)"
+ 
+-#: elf64-alpha.c:2989 elf64-alpha.c:3183
++#: elf64-alpha.c:2992 elf64-alpha.c:3187
+ #, c-format
+ msgid "%pB: %pA+%#<PRIx64>: warning: %s relocation against unexpected insn"
+ msgstr "%pB: %pA+%#<PRIx64>: предупреждение: перемещение %s с неожиданной инструкцией"
+ 
+-#: elf64-alpha.c:4381 elf64-alpha.c:4394
++#: elf64-alpha.c:4386 elf64-alpha.c:4399
+ #, c-format
+ msgid "%pB: gp-relative relocation against dynamic symbol %s"
+ msgstr "%pB: gp-относительное перемещение для динамического символа %s"
+ 
+-#: elf64-alpha.c:4450
++#: elf64-alpha.c:4455
+ #, c-format
+ msgid "%pB: change in gp: BRSGP %s"
+ msgstr "%pB: изменение в gp: BRSGP %s"
+ 
+-#: elf64-alpha.c:4475 mach-o.c:616 elfnn-riscv.c:485
++#: elf64-alpha.c:4480 mach-o.c:616 elfnn-riscv.c:619
+ msgid "<unknown>"
+ msgstr "<неизвестно>"
+ 
+-#: elf64-alpha.c:4481
++#: elf64-alpha.c:4486
+ #, c-format
+ msgid "%pB: !samegp reloc against symbol without .prologue: %s"
+ msgstr "%pB: перемещение !samegp для символа без .prologue: %s"
+ 
+-#: elf64-alpha.c:4539
++#: elf64-alpha.c:4544
+ #, c-format
+ msgid "%pB: unhandled dynamic relocation against %s"
+ msgstr "%pB: необработанное динамическое перемещение для %s"
+ 
+-#: elf64-alpha.c:4574
++#: elf64-alpha.c:4579
+ #, c-format
+ msgid "%pB: pc-relative relocation against undefined weak symbol %s"
+ msgstr "%pB: pc-относительное перемещение для неопределённого слабого символа %s"
+ 
+-#: elf64-alpha.c:4640
++#: elf64-alpha.c:4645
+ #, c-format
+ msgid "%pB: dtp-relative relocation against dynamic symbol %s"
+ msgstr "%pB: dtp-относительное перемещение для динамического символа %s"
+ 
+-#: elf64-alpha.c:4665
++#: elf64-alpha.c:4670
+ #, c-format
+ msgid "%pB: tp-relative relocation against dynamic symbol %s"
+ msgstr "%pB: tp-относительное перемещение для динамического символа %s"
+ 
+ #. Only if it's not an unresolved symbol.
+-#: elf64-bpf.c:517
++#: elf64-bpf.c:557
+ msgid "internal error: relocation not supported"
+ msgstr "внутренняя ошибка: перемещение не поддерживается"
+ 
+@@ -4042,105 +4164,105 @@ msgstr "элемент заглушки для %s не может загрузи
+ msgid "%pB(%pA+%#<PRIx64>): cannot reach %s"
+ msgstr "%pB(%pA+%#<PRIx64>): невозможно добраться до %s"
+ 
+-#: elf64-ia64-vms.c:598 elfnn-ia64.c:639
++#: elf64-ia64-vms.c:599 elfnn-ia64.c:640
+ #, c-format
+ msgid "%pB: can't relax br at %#<PRIx64> in section `%pA'; please use brl or indirect branch"
+ msgstr "%pB: невозможно ослабить br по адресу %#<PRIx64> в разделе «%pA»; используйте brl или косвенное ветвление"
+ 
+-#: elf64-ia64-vms.c:2029 elfnn-ia64.c:2291
++#: elf64-ia64-vms.c:2031 elfnn-ia64.c:2293
+ msgid "@pltoff reloc against local symbol"
+ msgstr "перемещение @pltoff для локального символа"
+ 
+-#: elf64-ia64-vms.c:3281 elfnn-ia64.c:3674
++#: elf64-ia64-vms.c:3283 elfnn-ia64.c:3670
+ #, c-format
+ msgid "%pB: short data segment overflowed (%#<PRIx64> >= 0x400000)"
+ msgstr "%pB: переполнение короткого сегмента данных (%#<PRIx64> >= 0x400000)"
+ 
+-#: elf64-ia64-vms.c:3291 elfnn-ia64.c:3684
++#: elf64-ia64-vms.c:3293 elfnn-ia64.c:3680
+ #, c-format
+ msgid "%pB: __gp does not cover short data segment"
+ msgstr "%pB: __gp не покрывает короткий сегмент данных"
+ 
+-#: elf64-ia64-vms.c:3561 elfnn-ia64.c:3958
++#: elf64-ia64-vms.c:3563 elfnn-ia64.c:3953
+ #, c-format
+ msgid "%pB: non-pic code with imm relocation against dynamic symbol `%s'"
+ msgstr "%pB: не-pic код с перемещением imm для динамического символа «%s»"
+ 
+-#: elf64-ia64-vms.c:3625 elfnn-ia64.c:4026
++#: elf64-ia64-vms.c:3627 elfnn-ia64.c:4021
+ #, c-format
+ msgid "%pB: @gprel relocation against dynamic symbol %s"
+ msgstr "%pB: перемещение @gprel для динамического символа %s"
+ 
+-#: elf64-ia64-vms.c:3684 elfnn-ia64.c:4089
++#: elf64-ia64-vms.c:3686 elfnn-ia64.c:4084
+ #, c-format
+ msgid "%pB: linking non-pic code in a position independent executable"
+ msgstr "%pB: компоновка не-pic кода в позиционно-независимый исполняемый"
+ 
+-#: elf64-ia64-vms.c:3786 elfnn-ia64.c:4227
++#: elf64-ia64-vms.c:3788 elfnn-ia64.c:4222
+ #, c-format
+ msgid "%pB: @internal branch to dynamic symbol %s"
+ msgstr "%pB: ветвление @internal к динамическому символу %s"
+ 
+-#: elf64-ia64-vms.c:3789 elfnn-ia64.c:4230
++#: elf64-ia64-vms.c:3791 elfnn-ia64.c:4225
+ #, c-format
+ msgid "%pB: speculation fixup to dynamic symbol %s"
+ msgstr "%pB: догадка местоположения динамического символа %s"
+ 
+-#: elf64-ia64-vms.c:3792 elfnn-ia64.c:4233
++#: elf64-ia64-vms.c:3794 elfnn-ia64.c:4228
+ #, c-format
+ msgid "%pB: @pcrel relocation against dynamic symbol %s"
+ msgstr "%pB: перемещение @pcrel для динамического символа %s"
+ 
+-#: elf64-ia64-vms.c:3916 elfnn-ia64.c:4430
++#: elf64-ia64-vms.c:3918 elfnn-ia64.c:4425
+ msgid "unsupported reloc"
+ msgstr "неподдерживаемое перемещение"
+ 
+-#: elf64-ia64-vms.c:3953 elfnn-ia64.c:4468
++#: elf64-ia64-vms.c:3955 elfnn-ia64.c:4463
+ #, c-format
+ msgid "%pB: missing TLS section for relocation %s against `%s' at %#<PRIx64> in section `%pA'."
+ msgstr "%pB: отсутствует TLS-раздел для перемещения %s для «%s» по адресу %#<PRIx64> в разделе «%pA»."
+ 
+-#: elf64-ia64-vms.c:3970 elfnn-ia64.c:4485
++#: elf64-ia64-vms.c:3972 elfnn-ia64.c:4480
+ #, c-format
+ msgid "%pB: Can't relax br (%s) to `%s' at %#<PRIx64> in section `%pA' with size %#<PRIx64> (> 0x1000000)."
+ msgstr "%pB: Невозможно ослабить br (%s) до «%s» по адресу %#<PRIx64> в разделе «%pA» с размером %#<PRIx64> (> 0x1000000)."
+ 
+-#: elf64-ia64-vms.c:4266 elfnn-ia64.c:4746
++#: elf64-ia64-vms.c:4268 elfnn-ia64.c:4741
+ #, c-format
+ msgid "%pB: linking trap-on-NULL-dereference with non-trapping files"
+ msgstr "%pB: компоновка trap-on-NULL-dereference с не-trapping файлами"
+ 
+-#: elf64-ia64-vms.c:4275 elfnn-ia64.c:4755
++#: elf64-ia64-vms.c:4277 elfnn-ia64.c:4750
+ #, c-format
+ msgid "%pB: linking big-endian files with little-endian files"
+ msgstr "%pB: компоновка файлов с прямым порядком байт с файлами с обратным порядком байт"
+ 
+-#: elf64-ia64-vms.c:4284 elfnn-ia64.c:4764
++#: elf64-ia64-vms.c:4286 elfnn-ia64.c:4759
+ #, c-format
+ msgid "%pB: linking 64-bit files with 32-bit files"
+ msgstr "%pB: компоновка 64-битных файлов с 32-битными файлами"
+ 
+-#: elf64-ia64-vms.c:4293 elfnn-ia64.c:4773
++#: elf64-ia64-vms.c:4295 elfnn-ia64.c:4768
+ #, c-format
+ msgid "%pB: linking constant-gp files with non-constant-gp files"
+ msgstr "%pB: компоновка constant-gp файлов с не-constant-gp файлами"
+ 
+-#: elf64-ia64-vms.c:4303 elfnn-ia64.c:4783
++#: elf64-ia64-vms.c:4305 elfnn-ia64.c:4778
+ #, c-format
+ msgid "%pB: linking auto-pic files with non-auto-pic files"
+ msgstr "%pB: компоновка auto-pic файлов с не-auto-pic файлами"
+ 
+-#: elf64-ia64-vms.c:5150 elflink.c:5072
++#: elf64-ia64-vms.c:5152 elflink.c:5148
+ #, c-format
+ msgid "warning: alignment %u of common symbol `%s' in %pB is greater than the alignment (%u) of its section %pA"
+ msgstr "предупреждение: выравнивание %u общего символа «%s» в %pB больше, чем выравнивание (%u) его раздела %pA"
+ 
+-#: elf64-ia64-vms.c:5157 elflink.c:5079
++#: elf64-ia64-vms.c:5159 elflink.c:5155
+ #, c-format
+ msgid "warning: alignment %u of symbol `%s' in %pB is smaller than %u in %pB"
+ msgstr "предупреждение: выравнивание %u символа «%s» в %pB меньше, чем %u в %pB"
+ 
+-#: elf64-ia64-vms.c:5173 elflink.c:5096
++#: elf64-ia64-vms.c:5175 elflink.c:5172
+ #, c-format
+ msgid "warning: size of symbol `%s' changed from %<PRIu64> in %pB to %<PRIu64> in %pB"
+ msgstr "предупреждение: размер символа «%s» изменился с %<PRIu64> в %pB на %<PRIu64> в %pB"
+@@ -4197,155 +4319,166 @@ msgstr "%pB: директива LOCAL разрешена только с рег
+ msgid "%pB: LOCAL directive: register $%<PRId64> is not a local register; first global register is $%<PRId64>"
+ msgstr "%pB: директива LOCAL: регистр $%<PRId64> не является локальным регистром; первый глобальный регистр: $%<PRId64>"
+ 
+-#: elf64-mmix.c:2167
++#: elf64-mmix.c:2157
+ #, c-format
+ msgid "%pB: error: multiple definition of `%s'; start of %s is set in a earlier linked file"
+ msgstr "%pB: ошибка: множественные объявления «%s»; начало %s установлено в ранее скомпонованном файле"
+ 
+-#: elf64-mmix.c:2222
++#: elf64-mmix.c:2212
+ msgid "register section has contents\n"
+ msgstr "в регистровом разделе имеется содержимое\n"
+ 
+-#: elf64-mmix.c:2412
++#: elf64-mmix.c:2402
+ #, c-format
+ msgid "internal inconsistency: remaining %lu != max %lu; please report this bug"
+ msgstr "внутреннее противоречие: остаётся %lu != макс %lu; сообщите об этом дефекте"
+ 
+-#: elf64-ppc.c:1342
++#: elf64-ppc.c:1349
+ #, c-format
+ msgid "warning: %s should be used rather than %s"
+ msgstr "предупреждение: нужно использовать %s, а не %s"
+ 
+-#: elf64-ppc.c:4101
++#: elf64-ppc.c:4153
+ #, c-format
+ msgid "symbol '%s' has invalid st_other for ABI version 1"
+ msgstr "символ «%s» содержит некорректное st_other для ABI версии 1"
+ 
+-#: elf64-ppc.c:4281
++#: elf64-ppc.c:4334
+ #, c-format
+ msgid "%pB .opd not allowed in ABI version %d"
+ msgstr "%pB .opd запрещено в ABI версии %d"
+ 
+-#: elf64-ppc.c:4852
++#: elf64-ppc.c:4906
+ #, c-format
+ msgid "%H: %s reloc unsupported in shared libraries and PIEs\n"
+ msgstr "%H: перемещение %s не поддерживается в общих библиотеках и PIE\n"
+ 
+-#: elf64-ppc.c:5260
++#: elf64-ppc.c:5316
+ #, c-format
+ msgid "%pB uses unknown e_flags 0x%lx"
+ msgstr "%pB использует неизвестное значение e_flags 0x%lx"
+ 
+-#: elf64-ppc.c:5268
++#: elf64-ppc.c:5324
+ #, c-format
+ msgid "%pB: ABI version %ld is not compatible with ABI version %ld output"
+ msgstr "%pB: ABI версии %ld не совместимо с выводом с ABI версии %ld"
+ 
+-#: elf64-ppc.c:5295
++#: elf64-ppc.c:5351
+ #, c-format
+ msgid " [abiv%ld]"
+ msgstr " [abiv%ld]"
+ 
+-#: elf64-ppc.c:6574
++#: elf64-ppc.c:6649
+ msgid "%P: copy reloc against `%pT' requires lazy plt linking; avoid setting LD_BIND_NOW=1 or upgrade gcc\n"
+ msgstr "%P: копирование перемещения для «%pT» требует ленивой plt-компоновки; не задавайте LD_BIND_NOW=1 или обновите gcc\n"
+ 
+-#: elf64-ppc.c:6841
++#: elf64-ppc.c:6916
+ #, c-format
+ msgid "%pB: undefined symbol on R_PPC64_TOCSAVE relocation"
+ msgstr "%pB: неопределённый символ по перемещению R_PPC64_TOCSAVE"
+ 
+-#: elf64-ppc.c:7089
++#: elf64-ppc.c:7164
+ #, c-format
+ msgid "dynreloc miscount for %pB, section %pA"
+ msgstr "ошибка в вычислении dynreloc %pB, раздел %pA"
+ 
+-#: elf64-ppc.c:7178
++#: elf64-ppc.c:7253
+ #, c-format
+ msgid "%pB: .opd is not a regular array of opd entries"
+ msgstr "%pB: .opd не является обычным массивом элементов opd"
+ 
+-#: elf64-ppc.c:7188
++#: elf64-ppc.c:7263
+ #, c-format
+ msgid "%pB: unexpected reloc type %u in .opd section"
+ msgstr "%pB: неожиданный тип перемещения %u в разделе .opd"
+ 
+-#: elf64-ppc.c:7210
++#: elf64-ppc.c:7285
+ #, c-format
+ msgid "%pB: undefined sym `%s' in .opd section"
+ msgstr "%pB: неопределённый символ «%s» в разделе .opd"
+ 
+-#: elf64-ppc.c:7697
++#. The issue is that __glink_PLTresolve saves r2, which is done
++#. because glibc ld.so _dl_runtime_resolve restores r2 to support
++#. a glibc plt call optimisation where global entry code is
++#. skipped on calls that resolve to the same binary.  The
++#. __glink_PLTresolve save of r2 is incompatible with code
++#. making tail calls, because the tail call might go via the
++#. resolver and thus overwrite the proper saved r2.
++#: elf64-ppc.c:7779
++msgid "warning: --plt-localentry is incompatible with power10 pc-relative code"
++msgstr "предупреждение: --plt-localentry несовместим с pc-относительным кодом power10"
++
++#: elf64-ppc.c:7787
+ msgid "warning: --plt-localentry is especially dangerous without ld.so support to detect ABI violations"
+ msgstr "предупреждение: --plt-localentry особенно опасно без поддержки в ld.so определения нарушений ABI"
+ 
+-#: elf64-ppc.c:8017
++#: elf64-ppc.c:8111
+ msgid "%H __tls_get_addr lost arg, TLS optimization disabled\n"
+ msgstr "%H __tls_get_addr без аргумента, оптимизация TLS выключена\n"
+ 
+-#: elf64-ppc.c:8417 elf64-ppc.c:9130
++#: elf64-ppc.c:8546 elf64-ppc.c:9259
+ #, c-format
+ msgid "%s defined on removed toc entry"
+ msgstr "%s определён на удалённом элементе toc"
+ 
+-#: elf64-ppc.c:9087
++#: elf64-ppc.c:9216
+ #, c-format
+ msgid "%H: %s references optimized away TOC entry\n"
+ msgstr "%H: %s ссылается на удалённый оптимизатором элемент TOC\n"
+ 
+-#: elf64-ppc.c:9308
++#: elf64-ppc.c:9437
+ #, c-format
+ msgid "%H: got/toc optimization is not supported for %s instruction\n"
+ msgstr "%H: оптимизация got/toc не поддерживается для инструкции %s\n"
+ 
+-#: elf64-ppc.c:10135
++#: elf64-ppc.c:10282
+ #, c-format
+ msgid "warning: discarding dynamic section %s"
+ msgstr "предупреждение: отбрасывается динамический раздел %s"
+ 
+-#: elf64-ppc.c:11277
++#: elf64-ppc.c:11433
+ msgid "%P: cannot find opd entry toc for `%pT'\n"
+ msgstr "%P: не удалось найти opd у элемента toc для «%pT»\n"
+ 
+-#: elf64-ppc.c:11323 elf64-ppc.c:11867
++#: elf64-ppc.c:11481 elf64-ppc.c:12030
+ msgid "%F%P: Could not assign group %pA target %pA to an output section. Retry without --enable-non-contiguous-regions.\n"
+ msgstr "%F%P: Невозможно назначить группу %pA цели %pA выходному разделу. Повторите без --enable-non-contiguous-regions.\n"
+ 
+-#: elf64-ppc.c:11385
++#: elf64-ppc.c:11542
+ #, c-format
+ msgid "long branch stub `%s' offset overflow"
+ msgstr "переполнение смещения заглушки длинного ветвления «%s»"
+ 
+-#: elf64-ppc.c:11412
++#: elf64-ppc.c:11569
+ #, c-format
+ msgid "can't find branch stub `%s'"
+ msgstr "не найдена заглушка ветвления «%s»"
+ 
+-#: elf64-ppc.c:11476 elf64-ppc.c:11743 elf64-ppc.c:13972
++#: elf64-ppc.c:11633 elf64-ppc.c:11898 elf64-ppc.c:14202
+ #, c-format
+ msgid "%P: linkage table error against `%pT'\n"
+ msgstr "%P: ошибка в таблице компоновки для «%pT»\n"
+ 
+-#: elf64-ppc.c:11939
++#: elf64-ppc.c:12102
+ #, c-format
+ msgid "can't build branch stub `%s'"
+ msgstr "невозможно собрать заглушку ветвления «%s»"
+ 
+-#: elf64-ppc.c:12920
++#: elf64-ppc.c:13114
+ #, c-format
+ msgid "%pB section %pA exceeds stub group size"
+ msgstr "%pB раздела %pA превышает групповой размер заглушки"
+ 
+-#: elf64-ppc.c:14153
++#: elf64-ppc.c:14381
+ msgid "__tls_get_addr call offset overflow"
+ msgstr "__tls_get_addr вызвала перемещение смещения"
+ 
+-#: elf64-ppc.c:14455 elf64-ppc.c:14474
++#: elf64-ppc.c:14720 elf64-ppc.c:14739
+ #, c-format
+ msgid "%s offset too large for .eh_frame sdata4 encoding"
+ msgstr "смещение %s слишком больше для кодирования sdata4 в .eh_frame"
+ 
+-#: elf64-ppc.c:14506
++#: elf64-ppc.c:14771
+ #, c-format
+ msgid "linker stubs in %u group\n"
+ msgid_plural "linker stubs in %u groups\n"
+@@ -4353,7 +4486,7 @@ msgstr[0] "заглушки компоновщика в %u группе\n"
+ msgstr[1] "заглушки компоновщика в %u группах\n"
+ msgstr[2] "заглушки компоновщика в %u группах\n"
+ 
+-#: elf64-ppc.c:14513
++#: elf64-ppc.c:14778
+ #, c-format
+ msgid ""
+ "%s  branch         %lu\n"
+@@ -4384,57 +4517,57 @@ msgstr ""
+ "  оба plt-вызова                       %lu\n"
+ "  глобальный элемент                   %lu"
+ 
+-#: elf64-ppc.c:14913
++#: elf64-ppc.c:15178
+ #, c-format
+ msgid "%H: %s used with TLS symbol `%pT'\n"
+ msgstr "%H: %s используется с TLS-символом «%pT»\n"
+ 
+-#: elf64-ppc.c:14915
++#: elf64-ppc.c:15180
+ #, c-format
+ msgid "%H: %s used with non-TLS symbol `%pT'\n"
+ msgstr "%H: %s используется с не TLS-символом «%pT»\n"
+ 
+-#: elf64-ppc.c:15670
++#: elf64-ppc.c:15936
+ #, c-format
+ msgid "%H: call to `%pT' lacks nop, can't restore toc; (plt call stub)\n"
+ msgstr "%H: вызов «%pT» указывает на не nop, невозможно восстановить toc; (вызов заглушки plt)\n"
+ 
+-#: elf64-ppc.c:15676
++#: elf64-ppc.c:15942
+ #, c-format
+ msgid "%H: call to `%pT' lacks nop, can't restore toc; (toc save/adjust stub)\n"
+ msgstr "%H: вызов «%pT» указывает на не nop, невозможно восстановить toc; (заглушка сохранения/исправления toc)\n"
+ 
+-#: elf64-ppc.c:16564
++#: elf64-ppc.c:16845
+ #, c-format
+ msgid "%H: %s for indirect function `%pT' unsupported\n"
+ msgstr "%H: %s для неявного вызова функции «%pT» не поддерживается\n"
+ 
+-#: elf64-ppc.c:16649
++#: elf64-ppc.c:16930
+ #, c-format
+ msgid "%X%P: %pB: %s against %pT is not supported by glibc as a dynamic relocation\n"
+ msgstr "%X%P: %pB: %s с %pT не поддерживается в glibc как динамическое перемещение\n"
+ 
+-#: elf64-ppc.c:16704
++#: elf64-ppc.c:16985
+ #, c-format
+ msgid "%P: %pB: %s is not supported for `%pT'\n"
+ msgstr "%P: %pB: %s не поддерживается для «%pT»\n"
+ 
+-#: elf64-ppc.c:16963
++#: elf64-ppc.c:17233
+ #, c-format
+ msgid "%H: error: %s not a multiple of %u\n"
+ msgstr "%H: ошибка: %s не кратно %u\n"
+ 
+-#: elf64-ppc.c:16986
++#: elf64-ppc.c:17256
+ #, c-format
+ msgid "%H: unresolvable %s against `%pT'\n"
+ msgstr "%H: неразрешимое %s для символа «%pT»\n"
+ 
+-#: elf64-ppc.c:17131
++#: elf64-ppc.c:17400
+ #, c-format
+ msgid "%H: %s against `%pT': error %d\n"
+ msgstr "%H: %s для «%pT»: ошибка %d\n"
+ 
+-#: elf64-s390.c:2446
++#: elf64-s390.c:2444
+ #, c-format
+ msgid "%pB: `%s' non-PLT reloc for symbol defined in shared library and accessed from executable (rebuild file with -fPIC ?)"
+ msgstr "%pB: не PLT перемещение «%s» для символа, определённого в общей библиотеке, к которому обращаются из исполняемого файла (пересоберите файл с -fPIC ?)"
+@@ -4464,114 +4597,121 @@ msgstr "символ «%s» имеет различные типы: %s в %pB, 
+ msgid "%pB: linking UltraSPARC specific with HAL specific code"
+ msgstr "%pB: UltraSPARC-специфичная компоновка с HAL-специфичным кодом"
+ 
+-#: elf64-x86-64.c:1417
++#: elf64-x86-64.c:1415
+ msgid "hidden symbol "
+ msgstr "скрытый символ "
+ 
+-#: elf64-x86-64.c:1420
++#: elf64-x86-64.c:1418
+ msgid "internal symbol "
+ msgstr "внутренний символ "
+ 
+-#: elf64-x86-64.c:1423 elf64-x86-64.c:1427
++#: elf64-x86-64.c:1421 elf64-x86-64.c:1425
+ msgid "protected symbol "
+ msgstr "защищённый символ "
+ 
+-#: elf64-x86-64.c:1429
++#: elf64-x86-64.c:1427
+ msgid "symbol "
+ msgstr "символ "
+ 
+-#: elf64-x86-64.c:1435
++#: elf64-x86-64.c:1433
+ msgid "undefined "
+ msgstr "не определено "
+ 
+-#: elf64-x86-64.c:1445
++#: elf64-x86-64.c:1443
+ msgid "a shared object"
+ msgstr "общий объект"
+ 
+-#: elf64-x86-64.c:1447
++#: elf64-x86-64.c:1445
+ msgid "; recompile with -fPIC"
+ msgstr "; перекомпилируйте с параметром -fPIC"
+ 
+-#: elf64-x86-64.c:1452
++#: elf64-x86-64.c:1450
+ msgid "a PIE object"
+ msgstr "объект PIE"
+ 
+-#: elf64-x86-64.c:1454
++#: elf64-x86-64.c:1452
+ msgid "a PDE object"
+ msgstr "объект PDE"
+ 
+-#: elf64-x86-64.c:1456
++#: elf64-x86-64.c:1454
+ msgid "; recompile with -fPIE"
+ msgstr "; перекомпилируйте с параметром -fPIE"
+ 
+-#: elf64-x86-64.c:1460
++#: elf64-x86-64.c:1458
+ #, c-format
+ msgid "%pB: relocation %s against %s%s`%s' can not be used when making %s%s"
+ msgstr "%pB: перемещение %s для %s%s«%s» не может использоваться при создании %s%s"
+ 
+-#: elf64-x86-64.c:1968
++#: elf64-x86-64.c:1966
+ #, c-format
+ msgid "%pB: relocation %s against symbol `%s' isn't supported in x32 mode"
+ msgstr "%pB: перемещение %s для символа «%s» не поддерживается в режиме x32"
+ 
+-#: elf64-x86-64.c:2124
++#: elf64-x86-64.c:2122
+ #, c-format
+ msgid "%pB: '%s' accessed both as normal and thread local symbol"
+ msgstr "%pB: «%s» доступен как обычный и как локальный для нити символ"
+ 
+-#: elf64-x86-64.c:2747 elfnn-aarch64.c:5546
++#: elf64-x86-64.c:2747 elfnn-aarch64.c:5542 elfnn-riscv.c:2124
+ #, c-format
+ msgid "%pB: relocation %s against STT_GNU_IFUNC symbol `%s' has non-zero addend: %<PRId64>"
+ msgstr "%pB: перемещение %s вместе с STT_GNU_IFUNC символом «%s» имеет ненулевое добавление: %<PRId64>"
+ 
+-#: elf64-x86-64.c:2992
++#: elf64-x86-64.c:3003
+ #, c-format
+ msgid "%pB: relocation R_X86_64_GOTOFF64 against undefined %s `%s' can not be used when making a shared object"
+ msgstr "%pB: перемещение R_X86_64_GOTOFF64 для неопределённого %s «%s» не может использоваться при создании общего объекта"
+ 
+-#: elf64-x86-64.c:3006
++#: elf64-x86-64.c:3017
+ #, c-format
+ msgid "%pB: relocation R_X86_64_GOTOFF64 against protected %s `%s' can not be used when making a shared object"
+ msgstr "%pB: перемещение R_X86_64_GOTOFF64 для защищённого %s «%s» не может использоваться при создании общего объекта"
+ 
+-#: elf64-x86-64.c:3283
++#: elf64-x86-64.c:3297
+ #, c-format
+ msgid "%pB: addend %s%#x in relocation %s against symbol `%s' at %#<PRIx64> in section `%pA' is out of range"
+ msgstr "%pB: добавление %s%#x в перемещении %s для символа «%s» по адресу %#<PRIx64> разделе «%pA»."
+ 
+-#: elf64-x86-64.c:3417 elflink.c:13267
++#: elf64-x86-64.c:3437 elflink.c:13453
+ msgid "%F%P: corrupt input: %pB\n"
+ msgstr "%F%P: повреждённый ввод: %pB\n"
+ 
+-#: elf64-x86-64.c:4101
+-msgid "%F%P: failed to convert GOTPCREL relocation; relink with --no-relax\n"
+-msgstr "%F%P: не удалось преобразовать перемещение GOTPCREL; перекомпонуйте с --no-relax\n"
++#: elf64-x86-64.c:4123
++#, c-format
++msgid " failed to convert GOTPCREL relocation against '%s'; relink with --no-relax\n"
++msgstr "не удалось преобразовать перемещение GOTPCREL в «%s»; перекомпонуйте с --no-relax\n"
+ 
+-#: elf64-x86-64.c:4259
++#: elf64-x86-64.c:4284
+ #, c-format
+ msgid "%F%pB: PC-relative offset overflow in PLT entry for `%s'\n"
+ msgstr "%F%pB: переполнение относительного PC перемещения в элементе PLT для «%s»\n"
+ 
+-#: elf64-x86-64.c:4322
++#: elf64-x86-64.c:4352
+ #, c-format
+ msgid "%F%pB: branch displacement overflow in PLT entry for `%s'\n"
+ msgstr "%F%pB: переполнение ветви перестановки в элементе PLT для «%s»\n"
+ 
+-#: elf64-x86-64.c:4375
++#: elf64-x86-64.c:4405
+ #, c-format
+ msgid "%F%pB: PC-relative offset overflow in GOT PLT entry for `%s'\n"
+ msgstr "%F%pB: переполнение относительного PC перемещения в элементе GOT PLT для «%s»\n"
+ 
+-#: elfcode.h:326
+-msgid "warning: %pB has a corrupt section with a size (%"
+-msgstr "предупреждение: у %pB повреждён раздел размером (%"
++#: elfcode.h:329
++#, c-format
++msgid "warning: %pB has a section extending past end of file"
++msgstr "предупреждение: раздел %pB расширяется за конец файла"
+ 
+-#: elfcode.h:768
++#: elfcode.h:775
+ #, c-format
+ msgid "warning: %pB has a corrupt string table index - ignoring"
+ msgstr "предупреждение: у %pB повреждена таблица индексов строк — игнорируется"
+ 
+-#: elfcode.h:1228
++#: elfcode.h:819
++#, c-format
++msgid "warning: %pB has a program header with invalid alignment"
++msgstr "предупреждение: заголовок программы %pB некорректно выровнен"
++
++#: elfcode.h:1244
+ #, c-format
+ msgid "%pB: version count (%<PRId64>) does not match symbol count (%ld)"
+ msgstr "%pB: счётчик версии (%<PRId64>) не совпадает со счётчиком символа (%ld)"
+@@ -4581,288 +4721,286 @@ msgstr "%pB: счётчик версии (%<PRId64>) не совпадает с
+ msgid "warning: %pB is truncated: expected core file size >= %<PRIu64>, found: %<PRIu64>"
+ msgstr "предупреждение: %pB усечён: ожидался размер файла core >= %<PRIu64>, найдено: %<PRIu64>"
+ 
+-#: elflink.c:1362
++#: elflink.c:1384
+ #, c-format
+ msgid "%s: TLS definition in %pB section %pA mismatches non-TLS definition in %pB section %pA"
+ msgstr "%s: TLS-определение в %pB раздела %pA не совпадает с не-TLS определением в %pB раздела %pA"
+ 
+-#: elflink.c:1368
++#: elflink.c:1390
+ #, c-format
+ msgid "%s: TLS reference in %pB mismatches non-TLS reference in %pB"
+ msgstr "%s: TLS-ссылка в %pB не совпадает с не-TLS ссылкой в %pB"
+ 
+-#: elflink.c:1374
++#: elflink.c:1396
+ #, c-format
+ msgid "%s: TLS definition in %pB section %pA mismatches non-TLS reference in %pB"
+ msgstr "%s: TLS-определение в %pB раздела %pA не совпадает с не-TLS ссылкой в %pB"
+ 
+-#: elflink.c:1380
++#: elflink.c:1402
+ #, c-format
+ msgid "%s: TLS reference in %pB mismatches non-TLS definition in %pB section %pA"
+ msgstr "%s: TLS-ссылка в %pB не совпадает с не-TLS определением в %pB раздела %pA"
+ 
+-#: elflink.c:2071
++#: elflink.c:2114
+ #, c-format
+ msgid "%pB: unexpected redefinition of indirect versioned symbol `%s'"
+ msgstr "%pB: неожиданное переопределение косвенного версионного символа «%s»"
+ 
+-#: elflink.c:2448
++#: elflink.c:2496
+ #, c-format
+ msgid "%pB: version node not found for symbol %s"
+ msgstr "%pB: версия узла не найдена для символа %s"
+ 
+-#: elflink.c:2539
++#: elflink.c:2587
+ #, c-format
+ msgid "%pB: bad reloc symbol index (%#<PRIx64> >= %#lx) for offset %#<PRIx64> in section `%pA'"
+ msgstr "%pB: неправильный индекс перемещаемого символа (%#<PRIx64> >= %#lx) для смещения %#<PRIx64> в разделе «%pA»"
+ 
+-#: elflink.c:2551
++#: elflink.c:2599
+ #, c-format
+ msgid "%pB: non-zero symbol index (%#<PRIx64>) for offset %#<PRIx64> in section `%pA' when the object file has no symbol table"
+ msgstr "%pB: ненулевой индекс символа (%#<PRIx64>) для смещения %#<PRIx64> в разделе «%pA», в то время как в объектном файле нет таблицы символов"
+ 
+-#: elflink.c:2740
++#: elflink.c:2788
+ #, c-format
+ msgid "%pB: relocation size mismatch in %pB section %pA"
+ msgstr "%pB: размер перемещения не совпадает в %pB раздела %pA"
+ 
+-#: elflink.c:3069
++#: elflink.c:3117
+ #, c-format
+ msgid "warning: type and size of dynamic symbol `%s' are not defined"
+ msgstr "предупреждение: тип и размер динамического символа «%s» не определён"
+ 
+-#: elflink.c:3129
++#: elflink.c:3177
+ msgid "%P: copy reloc against protected `%pT' is dangerous\n"
+ msgstr "%P: копирование перемещения с защищённым «%pT» опасно\n"
+ 
+-#: elflink.c:4064
++#: elflink.c:4117
+ #, c-format
+ msgid "alternate ELF machine code found (%d) in %pB, expecting %d"
+ msgstr "обнаружен альтернативный машинный код ELF (%d) в %pB, ожидается %d"
+ 
+-#: elflink.c:4534
++#: elflink.c:4600
+ #, c-format
+ msgid "%pB: invalid version offset %lx (max %lx)"
+ msgstr "%pB: недопустимое смещение версии %lx (макс %lx)"
+ 
+-#: elflink.c:4602
++#: elflink.c:4668
+ #, c-format
+ msgid "%pB: %s local symbol at index %lu (>= sh_info of %lu)"
+ msgstr "%pB: локальный символ %s с индексом %lu (>= sh_info с %lu)"
+ 
+-#: elflink.c:4750
++#: elflink.c:4816
+ #, c-format
+ msgid "%pB: not enough version information"
+ msgstr "%pB: недостаточно информации о версии"
+ 
+-#: elflink.c:4788
++#: elflink.c:4854
+ #, c-format
+ msgid "%pB: %s: invalid version %u (max %d)"
+ msgstr "%pB: %s: недопустимая версия %u (макс %d)"
+ 
+-#: elflink.c:4825
++#: elflink.c:4891
+ #, c-format
+ msgid "%pB: %s: invalid needed version %d"
+ msgstr "%pB: %s: недопустимая необходимая версия %d"
+ 
+-#: elflink.c:5231
++#: elflink.c:5309
+ #, c-format
+ msgid "%pB: undefined reference to symbol '%s'"
+ msgstr "%pB: неопределённая ссылка на символ «%s»"
+ 
+-#: elflink.c:6315
++#: elflink.c:6375
+ #, c-format
+ msgid "%pB: stack size specified and %s set"
+ msgstr "%pB: указан и задан размер стека %s"
+ 
+-#: elflink.c:6319
++#: elflink.c:6379
+ #, c-format
+ msgid "%pB: %s not absolute"
+ msgstr "%pB: %s не является абсолютным"
+ 
+-#: elflink.c:6516
++#: elflink.c:6576
+ #, c-format
+ msgid "%s: undefined version: %s"
+ msgstr "%s: неопределённая версия: %s"
+ 
+-#: elflink.c:7088
++#: elflink.c:7148
+ #, c-format
+ msgid "%pB: .preinit_array section is not allowed in DSO"
+ msgstr "%pB: раздел .preinit_array не разрешается в DSO"
+ 
+-#: elflink.c:8602
++#: elflink.c:8740
+ #, c-format
+ msgid "undefined %s reference in complex symbol: %s"
+ msgstr "неопределённая ссылка %s в сложном символе: %s"
+ 
+-#: elflink.c:8757
++#: elflink.c:8903 elflink.c:8911
++msgid "division by zero"
++msgstr "деление на ноль"
++
++#: elflink.c:8925
+ #, c-format
+ msgid "unknown operator '%c' in complex symbol"
+ msgstr "неизвестный оператор '%c' в сложном символе"
+ 
+ #. PR 21524: Let the user know if a symbol was removed by garbage collection.
+-#: elflink.c:9095
++#: elflink.c:9263
+ #, c-format
+ msgid "%pB:%pA: error: relocation references symbol %s which was removed by garbage collection"
+ msgstr "%pB:%pA: ошибка: перемещение ссылается на символ %s, который был удалён сборщиком мусора"
+ 
+-#: elflink.c:9098
++#: elflink.c:9266
+ #, c-format
+ msgid "%pB:%pA: error: try relinking with --gc-keep-exported enabled"
+ msgstr "%pB:%pA: ошибка: попробуйте перекомпоновать с включённым --gc-keep-exported"
+ 
+-#: elflink.c:9343 elflink.c:9361 elflink.c:9400 elflink.c:9418
++#: elflink.c:9511 elflink.c:9529 elflink.c:9568 elflink.c:9586
+ #, c-format
+ msgid "%pB: unable to sort relocs - they are in more than one size"
+ msgstr "%pB: невозможно отсортировать перемещения — они разных размеров"
+ 
+ #. The section size is not divisible by either -
+ #. something is wrong.
+-#: elflink.c:9377 elflink.c:9434
++#: elflink.c:9545 elflink.c:9602
+ #, c-format
+ msgid "%pB: unable to sort relocs - they are of an unknown size"
+ msgstr "%pB: невозможно отсортировать перемещения — они неизвестного размера"
+ 
+-#: elflink.c:9486
++#: elflink.c:9654
+ msgid "not enough memory to sort relocations"
+ msgstr "недостаточно памяти для сортировки перемещений"
+ 
+-#: elflink.c:9767
++#: elflink.c:9998
+ #, c-format
+ msgid "%pB: too many sections: %d (>= %d)"
+ msgstr "%pB: слишком много разделов: %d (>= %d)"
+ 
+-#: elflink.c:10043
++#: elflink.c:10274
+ #, c-format
+ msgid "%pB: internal symbol `%s' in %pB is referenced by DSO"
+ msgstr "%pB: на внутренний символ «%s» из %pB ссылаются из DSO"
+ 
+-#: elflink.c:10046
++#: elflink.c:10277
+ #, c-format
+ msgid "%pB: hidden symbol `%s' in %pB is referenced by DSO"
+ msgstr "%pB: на скрытый символ «%s» из %pB ссылаются из DSO"
+ 
+-#: elflink.c:10049
++#: elflink.c:10280
+ #, c-format
+ msgid "%pB: local symbol `%s' in %pB is referenced by DSO"
+ msgstr "%pB: на локальный символ «%s» из %pB ссылаются из DSO"
+ 
+-#: elflink.c:10135
++#: elflink.c:10366
+ #, c-format
+ msgid "%pB: could not find output section %pA for input section %pA"
+ msgstr "%pB: невозможно найти выходной раздел %pA для входного раздела %pA"
+ 
+-#: elflink.c:10289
++#: elflink.c:10520
+ #, c-format
+ msgid "%pB: protected symbol `%s' isn't defined"
+ msgstr "%pB: защищённый символ «%s» не определён"
+ 
+-#: elflink.c:10292
++#: elflink.c:10523
+ #, c-format
+ msgid "%pB: internal symbol `%s' isn't defined"
+ msgstr "%pB: внутренний символ «%s» не определён"
+ 
+-#: elflink.c:10295
++#: elflink.c:10526
+ #, c-format
+ msgid "%pB: hidden symbol `%s' isn't defined"
+ msgstr "%pB: скрытый символ «%s» не определён"
+ 
+-#: elflink.c:10327
++#: elflink.c:10558
+ #, c-format
+ msgid "%pB: no symbol version section for versioned symbol `%s'"
+ msgstr "%pB: отсутствует раздел версий символов для версионного символа «%s»"
+ 
+-#: elflink.c:10699
++#: elflink.c:10957
+ #, c-format
+ msgid "warning: --enable-non-contiguous-regions discards section `%s' from '%s'\n"
+ msgstr "предупреждение: --enable-non-contiguous-regions отбрасывает раздел «%s» из «%s»\n"
+ 
+-#: elflink.c:10951
++#: elflink.c:11211
+ #, c-format
+ msgid "error: %pB: size of section %pA is not multiple of address size"
+ msgstr "ошибка: %pB: размер раздела %pA не кратен размеру адреса"
+ 
+-#: elflink.c:10996
++#: elflink.c:11256
+ #, c-format
+ msgid "error: %pB contains a reloc (%#<PRIx64>) for section %pA that references a non-existent global symbol"
+ msgstr "ошибка: %pB содержит перемещение (%#<PRIx64>) для раздела %pA, который ссылается на несуществующий глобальный символ"
+ 
+-#: elflink.c:11739
+-#, c-format
+-msgid "%pA has both ordered [`%pA' in %pB] and unordered [`%pA' in %pB] sections"
+-msgstr "%pA содержит упорядоченные [«%pA» в %pB] и неупорядоченные [«%pA» в %pB] разделы"
+-
+-#: elflink.c:11745
+-#, c-format
+-msgid "%pA has both ordered and unordered sections"
+-msgstr "%pA содержит упорядоченные и неупорядоченные разделы"
+-
+-#: elflink.c:11851
++#: elflink.c:11977
+ #, c-format
+ msgid "%pB: no symbol found for import library"
+ msgstr "%pB: не найден символ импортируемой библиотеки"
+ 
+-#: elflink.c:12488
++#: elflink.c:12620
+ #, c-format
+ msgid "%pB: file class %s incompatible with %s"
+ msgstr "%pB: файловый класс %s несовместим с %s"
+ 
+-#: elflink.c:12704
++#: elflink.c:12870
+ #, c-format
+ msgid "%pB: failed to generate import library"
+ msgstr "%pB: не удалось сгенерировать импортируемую библиотеку"
+ 
+-#: elflink.c:12823
++#: elflink.c:12996
+ #, c-format
+ msgid "warning: %s section has zero size"
+ msgstr "предупреждение: раздел %s имеет нулевой размер"
+ 
+-#: elflink.c:12871
++#: elflink.c:13044
+ #, c-format
+ msgid "warning: section '%s' is being made into a note"
+ msgstr "предупреждение: раздел «%s» преобразуется в примечание"
+ 
+-#: elflink.c:12964
++#: elflink.c:13137
+ msgid "%P%X: read-only segment has dynamic relocations\n"
+ msgstr "%P%X: в сегменте, доступном только для чтения, содержатся динамические перемещения\n"
+ 
+-#: elflink.c:12967
++#: elflink.c:13140
+ msgid "%P: warning: creating DT_TEXTREL in a shared object\n"
+ msgstr "%P: предупреждение: создаётся DT_TEXTREL в общем объекте\n"
+ 
+-#: elflink.c:12970
++#: elflink.c:13143
++msgid "%P: warning: creating DT_TEXTREL in a PDE\n"
++msgstr "%P: предупреждение: создаётся DT_TEXTREL в PDE\n"
++
++#: elflink.c:13146
+ msgid "%P: warning: creating DT_TEXTREL in a PIE\n"
+ msgstr "%P: предупреждение: создаётся DT_TEXTREL в PIE\n"
+ 
+-#: elflink.c:13095
++#: elflink.c:13279
+ msgid "%P%X: can not read symbols: %E\n"
+ msgstr "%P%X: невозможно прочитать символы: %E\n"
+ 
+-#: elflink.c:13500
++#: elflink.c:13699
+ msgid "%F%P: %pB(%pA): error: need linked-to section for --gc-sections\n"
+ msgstr "%F%P: %pB(%pA): ошибка: для --gc-sections необходим раздел linked-to\n"
+ 
+-#: elflink.c:13961
++#: elflink.c:14165
+ #, c-format
+ msgid "%pB: %pA+%#<PRIx64>: no symbol found for INHERIT"
+ msgstr "%pB: %pA+%#<PRIx64>: не найден символ для INHERIT"
+ 
+-#: elflink.c:14002
++#: elflink.c:14206
+ #, c-format
+ msgid "%pB: section '%pA': corrupt VTENTRY entry"
+ msgstr "%pB: раздел «%pA:» повреждённый элемент VTENTRY"
+ 
+-#: elflink.c:14145
++#: elflink.c:14349
+ #, c-format
+ msgid "unrecognized INPUT_SECTION_FLAG %s\n"
+ msgstr "нераспознанный INPUT_SECTION_FLAG %s\n"
+ 
+-#: elflink.c:14891
++#: elflink.c:15097
+ #, c-format
+ msgid "%P: %pB: warning: relocation against `%s' in read-only section `%pA'\n"
+ msgstr "%P: %pB: предупреждение: перемещение указывает на «%s» из раздела только для чтения «%pA»\n"
+ 
+-#: elflink.c:14980
++#: elflink.c:15186
+ msgid "%P: warning: GNU indirect functions with DT_TEXTREL may result in a segfault at runtime; recompile with %s\n"
+ msgstr "%P: предупреждение: неявные функции GNU с DT_TEXTREL могут привести к ошибке сегментирования во время выполнения; перекомпилируйте с %s\n"
+ 
+@@ -4871,16 +5009,16 @@ msgstr "%P: предупреждение: неявные функции GNU с D
+ msgid "%pB: warning: Weak TLS is implementation defined and may not work as expected"
+ msgstr "%pB: предупреждение: слабый TLS определяется реализацией и может не работать как ожидается"
+ 
+-#: elfxx-aarch64.c:738 elfnn-aarch64.c:9902 elfnn-aarch64.c:9909
++#: elfxx-aarch64.c:738 elfnn-aarch64.c:9909 elfnn-aarch64.c:9916
+ #, c-format
+ msgid "%pB: warning: BTI turned on by -z force-bti when all inputs do not have BTI in NOTE section."
+ msgstr "%pB: предупреждение: BTI включён параметром -z force-bti, но все входные данные не имеют BTI в разделе NOTE."
+ 
+-#: elfxx-aarch64.c:758 elfxx-x86.c:2554
++#: elfxx-aarch64.c:758 elfxx-x86.c:2695
+ msgid "%F%P: failed to create GNU property section\n"
+ msgstr "%F%P: не удалось создать раздел свойств GNU\n"
+ 
+-#: elfxx-aarch64.c:762 elfxx-x86.c:2559
++#: elfxx-aarch64.c:762 elfxx-x86.c:2700
+ #, c-format
+ msgid "%F%pA: failed to align section\n"
+ msgstr "%F%pA: не удалось выровнять раздел\n"
+@@ -4890,491 +5028,529 @@ msgstr "%F%pA: не удалось выровнять раздел\n"
+ msgid "error: %pB: <corrupt AArch64 used size: 0x%x>"
+ msgstr "ошибка: %pB: <повреждение используемого размера AArch64: 0x%x>"
+ 
+-#: elfxx-mips.c:1507
++#: elfxx-mips.c:1505
+ msgid "static procedure (no name)"
+ msgstr "статическая процедура (без имени)"
+ 
+-#: elfxx-mips.c:5782
++#: elfxx-mips.c:5780
+ msgid "MIPS16 and microMIPS functions cannot call each other"
+ msgstr "Функции MIPS16 и microMIPS не могут вызывать друг друга"
+ 
+-#: elfxx-mips.c:6547
++#: elfxx-mips.c:6545
+ msgid "%X%H: unsupported JALX to the same ISA mode\n"
+ msgstr "%X%H: неподдерживаемый JALX для того же режима ISA\n"
+ 
+-#: elfxx-mips.c:6580
++#: elfxx-mips.c:6578
+ msgid "%X%H: unsupported jump between ISA modes; consider recompiling with interlinking enabled\n"
+ msgstr "%X%H: неподдерживаемый прыжок между режимами ISA; попробуйте перекомпилировать с включённой увязкой\n"
+ 
+-#: elfxx-mips.c:6625
++#: elfxx-mips.c:6623
+ msgid "%X%H: cannot convert branch between ISA modes to JALX: relocation out of range\n"
+ msgstr "%X%H: невозможно преобразовать ветвление между режимами ISA в JALX: перемещение выходит за диапазон\n"
+ 
+-#: elfxx-mips.c:6637
++#: elfxx-mips.c:6635
+ msgid "%X%H: unsupported branch between ISA modes\n"
+ msgstr "%X%H: неподдерживаемое ветвление между режимами ISA\n"
+ 
+-#: elfxx-mips.c:7286
++#: elfxx-mips.c:7264
+ #, c-format
+ msgid "%pB: incorrect `.reginfo' section size; expected %<PRIu64>, got %<PRIu64>"
+ msgstr "%pB: некорректный размер раздела «.reginfo»; ожидался %<PRIu64>, получен %<PRIu64>"
+ 
+-#: elfxx-mips.c:7330 elfxx-mips.c:7567
++#: elfxx-mips.c:7308 elfxx-mips.c:7547
+ #, c-format
+ msgid "%pB: warning: bad `%s' option size %u smaller than its header"
+ msgstr "%pB: предупреждение: размер параметра «%s» (%u) меньше, чем его заголовок"
+ 
+-#: elfxx-mips.c:8374 elfxx-mips.c:8500
++#: elfxx-mips.c:8356 elfxx-mips.c:8482
+ #, c-format
+ msgid "%pB: warning: cannot determine the target function for stub section `%s'"
+ msgstr "%pB: предупреждение: невозможно определить функцию назначения для раздела заглушки «%s»"
+ 
+-#: elfxx-mips.c:8632
++#: elfxx-mips.c:8614
+ #, c-format
+ msgid "%pB: malformed reloc detected for section %s"
+ msgstr "%pB: обнаружено искажённое перемещение в разделе %s"
+ 
+-#: elfxx-mips.c:8731
++#: elfxx-mips.c:8713
+ #, c-format
+ msgid "%pB: GOT reloc at %#<PRIx64> not expected in executables"
+ msgstr "%pB: перемещение GOT по адресу %#<PRIx64> не ожидается в исполняемых файлах"
+ 
+-#: elfxx-mips.c:8871
++#: elfxx-mips.c:8853
+ #, c-format
+ msgid "%pB: CALL16 reloc at %#<PRIx64> not against global symbol"
+ msgstr "%pB: перемещение CALL16 по адресу %#<PRIx64> не для глобального символа"
+ 
+-#: elfxx-mips.c:9174
++#: elfxx-mips.c:9156
+ #, c-format
+ msgid "%X%H: relocation %s against `%s' cannot be used when making a shared object; recompile with -fPIC\n"
+ msgstr "%X%H: перемещение %s для «%s» нельзя использовать при создании общего объекта; перекомпилируйте с -fPIC\n"
+ 
+-#: elfxx-mips.c:9300
++#: elfxx-mips.c:9282
+ #, c-format
+ msgid "IFUNC symbol %s in dynamic symbol table - IFUNCS are not supported"
+ msgstr "Символ IFUNC %s в таблице динамических символов — IFUNCS не поддерживается"
+ 
+-#: elfxx-mips.c:9303
++#: elfxx-mips.c:9285
+ #, c-format
+ msgid "non-dynamic symbol %s in dynamic symbol table"
+ msgstr "не динамический символ %s в таблице динамических символов"
+ 
+-#: elfxx-mips.c:9523
++#: elfxx-mips.c:9505
+ #, c-format
+ msgid "non-dynamic relocations refer to dynamic symbol %s"
+ msgstr "не-динамические перемещения указывают на динамический символ %s"
+ 
+-#: elfxx-mips.c:10457
++#: elfxx-mips.c:10439
+ #, c-format
+ msgid "%pB: can't find matching LO16 reloc against `%s' for %s at %#<PRIx64> in section `%pA'"
+ msgstr "%pB: невозможно найти подходящее LO16 перемещение у «%s» для %s по адресу %#<PRIx64> в разделе «%pA»"
+ 
+-#: elfxx-mips.c:10597
++#: elfxx-mips.c:10579
+ msgid "small-data section exceeds 64KB; lower small-data size limit (see option -G)"
+ msgstr "раздел small-data превышает 64КБ — нижний предел small-data (см. параметр -G)"
+ 
+-#: elfxx-mips.c:10616
++#: elfxx-mips.c:10598
+ msgid "cannot convert a jump to JALX for a non-word-aligned address"
+ msgstr "невозможно преобразовать прыжок к JALX для не выровненного по границе слова адреса"
+ 
+-#: elfxx-mips.c:10619
++#: elfxx-mips.c:10601
+ msgid "jump to a non-word-aligned address"
+ msgstr "прыжок по не выровненному по границе слова адресу"
+ 
+-#: elfxx-mips.c:10620
++#: elfxx-mips.c:10602
+ msgid "jump to a non-instruction-aligned address"
+ msgstr "прыжок по не выровненному по границе инструкции адресу"
+ 
+-#: elfxx-mips.c:10623
++#: elfxx-mips.c:10605
+ msgid "cannot convert a branch to JALX for a non-word-aligned address"
+ msgstr "невозможно преобразовать ветвление к JALX для не выровненного по границе слова адреса"
+ 
+-#: elfxx-mips.c:10625
++#: elfxx-mips.c:10607
+ msgid "branch to a non-instruction-aligned address"
+ msgstr "ветвление по не выровненному по границе инструкции адресу"
+ 
+-#: elfxx-mips.c:10627
++#: elfxx-mips.c:10609
+ msgid "PC-relative load from unaligned address"
+ msgstr "загрузка относительно PC из не выровненного адреса"
+ 
+-#: elfxx-mips.c:10927
++#: elfxx-mips.c:10909
+ #, c-format
+ msgid "%pB: `%pA' entry VMA of %#<PRIx64> outside the 32-bit range supported; consider using `-Ttext-segment=...'"
+ msgstr "%pB: VMA элемент «%pA» по адресу %#<PRIx64> выходит за поддерживаемые границы 32-битного диапазона; попробуйте использовать «-Ttext-segment=…»"
+ 
+-#: elfxx-mips.c:11042 elfxx-mips.c:11629
++#: elfxx-mips.c:11024 elfxx-mips.c:11611
+ #, c-format
+ msgid "%pB: `%pA' offset of %<PRId64> from `%pA' beyond the range of ADDIUPC"
+ msgstr "%pB: смещение «%pA» для %<PRId64> из «%pA» вне диапазона ADDIUPC"
+ 
+-#: elfxx-mips.c:11601
++#: elfxx-mips.c:11583
+ #, c-format
+ msgid "%pB: `%pA' start VMA of %#<PRIx64> outside the 32-bit range supported; consider using `-Ttext-segment=...'"
+ msgstr "%pB: стартовый VMA элемент «%pA» по адресу %#<PRIx64> выходит за поддерживаемые границы 32-битного диапазона; попробуйте использовать «-Ttext-segment=…»"
+ 
+-#: elfxx-mips.c:14556
++#: elfxx-mips.c:13316 reloc.c:8430
++#, c-format
++msgid "%X%P: %pB(%pA): error: relocation for offset %V has no value\n"
++msgstr "%X%P: %pB(%pA): ошибка: отсутствует значение перемещения для смещения %V\n"
++
++#: elfxx-mips.c:13417 reloc.c:8518
++#, c-format
++msgid "%X%P: %pB(%pA): relocation \"%pR\" is not supported\n"
++msgstr "%X%P: %pB(%pA): перемещение «%pR» не поддерживается\n"
++
++#: elfxx-mips.c:13426 reloc.c:8527
++#, c-format
++msgid "%X%P: %pB(%pA): relocation \"%pR\" returns an unrecognized value %x\n"
++msgstr "%X%P: %pB(%pA): перемещение «%pR» возвратило нераспознанное значение %x\n"
++
++#: elfxx-mips.c:14611
+ #, c-format
+ msgid "%pB: unknown architecture %s"
+ msgstr "%pB: неизвестная архитектура %s"
+ 
+-#: elfxx-mips.c:15090
++#: elfxx-mips.c:15145
+ #, c-format
+ msgid "%pB: illegal section name `%pA'"
+ msgstr "%pB: недопустимое имя раздела «%pA»"
+ 
+-#: elfxx-mips.c:15367
++#: elfxx-mips.c:15422
+ #, c-format
+ msgid "%pB: warning: linking abicalls files with non-abicalls files"
+ msgstr "%pB: предупреждение: компоновка файлов abicalls с файлами не-abicalls"
+ 
+-#: elfxx-mips.c:15384
++#: elfxx-mips.c:15439
+ #, c-format
+ msgid "%pB: linking 32-bit code with 64-bit code"
+ msgstr "%pB: компоновка 32-битного кода с 64-битным кодом"
+ 
+-#: elfxx-mips.c:15416 elfxx-mips.c:15482 elfxx-mips.c:15497
++#: elfxx-mips.c:15471 elfxx-mips.c:15537 elfxx-mips.c:15552
+ #, c-format
+ msgid "%pB: linking %s module with previous %s modules"
+ msgstr "%pB: компоновка модуля %s с предыдущими модулями %s"
+ 
+-#: elfxx-mips.c:15440
++#: elfxx-mips.c:15495
+ #, c-format
+ msgid "%pB: ABI mismatch: linking %s module with previous %s modules"
+ msgstr "%pB: несовпадение ABI: компоновка модуля %s с предыдущими модулями %s"
+ 
+-#: elfxx-mips.c:15465
++#: elfxx-mips.c:15520
+ #, c-format
+ msgid "%pB: ASE mismatch: linking %s module with previous %s modules"
+ msgstr "%pB: несовпадение ASE: компоновка модуля %s с предыдущими модулями %s"
+ 
+-#: elfxx-mips.c:15599
++#: elfxx-mips.c:15654
+ #, c-format
+ msgid "warning: %pB uses unknown floating point ABI %d (set by %pB), %pB uses unknown floating point ABI %d"
+ msgstr "предупреждение: %pB использует неизвестный ABI плавающей точки %d (заданный %pB), %pB использует неизвестный ABI плавающей точки %d"
+ 
+-#: elfxx-mips.c:15605
++#: elfxx-mips.c:15660
+ #, c-format
+ msgid "warning: %pB uses unknown floating point ABI %d (set by %pB), %pB uses %s"
+ msgstr "предупреждение: %pB использует неизвестный ABI плавающей точки %d (заданный %pB), %pB использует %s"
+ 
+-#: elfxx-mips.c:15611
++#: elfxx-mips.c:15666
+ #, c-format
+ msgid "warning: %pB uses %s (set by %pB), %pB uses unknown floating point ABI %d"
+ msgstr "предупреждение: %pB использует %s (заданный %pB), %pB использует неизвестный ABI плавающей точки %d"
+ 
+-#: elfxx-mips.c:15625
++#: elfxx-mips.c:15680
+ #, c-format
+ msgid "warning: %pB uses %s (set by %pB), %pB uses %s"
+ msgstr "предупреждение: %pB использует %s (заданный %pB), %pB использует %s"
+ 
+-#: elfxx-mips.c:15644
++#: elfxx-mips.c:15699
+ #, c-format
+ msgid "warning: %pB uses %s (set by %pB), %pB uses unknown MSA ABI %d"
+ msgstr "предупреждение: %pB использует %s (заданный %pB), %pB использует неизвестный ABI MSA %d"
+ 
+-#: elfxx-mips.c:15656
++#: elfxx-mips.c:15711
+ #, c-format
+ msgid "warning: %pB uses unknown MSA ABI %d (set by %pB), %pB uses %s"
+ msgstr "предупреждение: %pB использует неизвестный ABI MSA %d (заданный %pB), %pB использует %s"
+ 
+-#: elfxx-mips.c:15665
++#: elfxx-mips.c:15720
+ #, c-format
+ msgid "warning: %pB uses unknown MSA ABI %d (set by %pB), %pB uses unknown MSA ABI %d"
+ msgstr "предупреждение: %pB использует неизвестный ABI MSA %d (заданный %pB), %pB использует неизвестный ABI MSA %d"
+ 
+-#: elfxx-mips.c:15727
++#: elfxx-mips.c:15782
+ #, c-format
+ msgid "%pB: endianness incompatible with that of the selected emulation"
+ msgstr "%pB: порядок байт не совместим с выбранной эмуляцией"
+ 
+-#: elfxx-mips.c:15741
++#: elfxx-mips.c:15796
+ #, c-format
+ msgid "%pB: ABI is incompatible with that of the selected emulation"
+ msgstr "%pB: ABI не совместим с выбранной эмуляцией"
+ 
+-#: elfxx-mips.c:15794
++#: elfxx-mips.c:15849
+ #, c-format
+ msgid "%pB: warning: inconsistent ISA between e_flags and .MIPS.abiflags"
+ msgstr "%pB: предупреждение: несогласованность ISA между e_flags и .MIPS.abiflags"
+ 
+-#: elfxx-mips.c:15799
++#: elfxx-mips.c:15854
+ #, c-format
+ msgid "%pB: warning: inconsistent FP ABI between .gnu.attributes and .MIPS.abiflags"
+ msgstr "%pB: предупреждение: несогласованность FP ABI между .gnu.attributes и .MIPS.abiflags"
+ 
+-#: elfxx-mips.c:15803
++#: elfxx-mips.c:15858
+ #, c-format
+ msgid "%pB: warning: inconsistent ASEs between e_flags and .MIPS.abiflags"
+ msgstr "%pB: предупреждение: несогласованность ASE между e_flags и .MIPS.abiflags"
+ 
+-#: elfxx-mips.c:15810
++#: elfxx-mips.c:15865
+ #, c-format
+ msgid "%pB: warning: inconsistent ISA extensions between e_flags and .MIPS.abiflags"
+ msgstr "%pB: предупреждение: несогласованность расширений ISA между e_flags и .MIPS.abiflags"
+ 
+-#: elfxx-mips.c:15814
++#: elfxx-mips.c:15869
+ #, c-format
+ msgid "%pB: warning: unexpected flag in the flags2 field of .MIPS.abiflags (0x%lx)"
+ msgstr "%pB: предупреждение: неожидаемый флаг в поле flags2 у .MIPS.abiflags (0x%lx)"
+ 
+-#: elfxx-mips.c:16005
++#: elfxx-mips.c:16060
+ msgid "-mips32r2 -mfp64 (12 callee-saved)"
+ msgstr "-mips32r2 -mfp64 (12 сохраняются вызываемым)"
+ 
+-#: elfxx-mips.c:16067 elfxx-mips.c:16078
++#: elfxx-mips.c:16122 elfxx-mips.c:16133
+ msgid "None"
+ msgstr "Отсутствует"
+ 
+-#: elfxx-mips.c:16069 elfxx-mips.c:16138
++#: elfxx-mips.c:16124 elfxx-mips.c:16193
+ msgid "Unknown"
+ msgstr "Неизвестно"
+ 
+-#: elfxx-mips.c:16149
++#: elfxx-mips.c:16204
+ #, c-format
+ msgid "Hard or soft float\n"
+ msgstr "Аппаратная или программная плавающая запятая\n"
+ 
+-#: elfxx-mips.c:16152
++#: elfxx-mips.c:16207
+ #, c-format
+ msgid "Hard float (double precision)\n"
+ msgstr "Аппаратная плавающая запятая (двойная точность)\n"
+ 
+-#: elfxx-mips.c:16155
++#: elfxx-mips.c:16210
+ #, c-format
+ msgid "Hard float (single precision)\n"
+ msgstr "Аппаратная плавающая запятая (одинарная точность)\n"
+ 
+-#: elfxx-mips.c:16158
++#: elfxx-mips.c:16213
+ #, c-format
+ msgid "Soft float\n"
+ msgstr "Программная плавающая запятая\n"
+ 
+-#: elfxx-mips.c:16161
++#: elfxx-mips.c:16216
+ #, c-format
+ msgid "Hard float (MIPS32r2 64-bit FPU 12 callee-saved)\n"
+ msgstr "Аппаратная плавающая запятая (MIPS32r2 64-bit FPU 12 сохраняются вызываемым)\n"
+ 
+-#: elfxx-mips.c:16164
++#: elfxx-mips.c:16219
+ #, c-format
+ msgid "Hard float (32-bit CPU, Any FPU)\n"
+ msgstr "Аппаратная плавающая запятая (32-битный ЦП, любой FPU)\n"
+ 
+-#: elfxx-mips.c:16167
++#: elfxx-mips.c:16222
+ #, c-format
+ msgid "Hard float (32-bit CPU, 64-bit FPU)\n"
+ msgstr "Аппаратная плавающая запятая (32-битный ЦП, 64-битный FPU)\n"
+ 
+-#: elfxx-mips.c:16170
++#: elfxx-mips.c:16225
+ #, c-format
+ msgid "Hard float compat (32-bit CPU, 64-bit FPU)\n"
+ msgstr "Совместимая аппаратная плавающая запятая (32-битный ЦП, 64-битный FPU)\n"
+ 
+-#: elfxx-mips.c:16202
++#: elfxx-mips.c:16257
+ #, c-format
+ msgid " [abi=O32]"
+ msgstr " [abi=O32]"
+ 
+-#: elfxx-mips.c:16204
++#: elfxx-mips.c:16259
+ #, c-format
+ msgid " [abi=O64]"
+ msgstr " [abi=O64]"
+ 
+-#: elfxx-mips.c:16206
++#: elfxx-mips.c:16261
+ #, c-format
+ msgid " [abi=EABI32]"
+ msgstr " [abi=EABI32]"
+ 
+-#: elfxx-mips.c:16208
++#: elfxx-mips.c:16263
+ #, c-format
+ msgid " [abi=EABI64]"
+ msgstr " [abi=EABI64]"
+ 
+-#: elfxx-mips.c:16210
++#: elfxx-mips.c:16265
+ #, c-format
+ msgid " [abi unknown]"
+ msgstr " [abi неизвестен]"
+ 
+-#: elfxx-mips.c:16212
++#: elfxx-mips.c:16267
+ #, c-format
+ msgid " [abi=N32]"
+ msgstr " [abi=N32]"
+ 
+-#: elfxx-mips.c:16214
++#: elfxx-mips.c:16269
+ #, c-format
+ msgid " [abi=64]"
+ msgstr " [abi=64]"
+ 
+-#: elfxx-mips.c:16216
++#: elfxx-mips.c:16271
+ #, c-format
+ msgid " [no abi set]"
+ msgstr " [abi не задан]"
+ 
+-#: elfxx-mips.c:16241
++#: elfxx-mips.c:16296
+ #, c-format
+ msgid " [unknown ISA]"
+ msgstr " [неизвестный ISA]"
+ 
+-#: elfxx-mips.c:16261
++#: elfxx-mips.c:16316
+ #, c-format
+ msgid " [not 32bitmode]"
+ msgstr " [не 32-битный режим]"
+ 
+-#: elfxx-riscv.c:1063
++#: elfxx-riscv.c:1383
+ #, c-format
+-msgid "-march=%s: Expect number after `%dp'."
+-msgstr "-march=%s: ожидается число после «%dp»."
++msgid "x ISA extension `%s' must be set with the versions"
++msgstr "расширение x ISA «%s» должно указываться с версиями"
+ 
+-#: elfxx-riscv.c:1174
++#: elfxx-riscv.c:1387
+ #, c-format
+-msgid "-march=%s: rv%de is not a valid base ISA"
+-msgstr "-march=%s: rv%de неправильная база ISA"
++msgid "cannot find default versions of the ISA extension `%s'"
++msgstr "невозможно найти версии по умолчанию для расширения ISA «%s»"
+ 
+-#: elfxx-riscv.c:1214
++#: elfxx-riscv.c:1461
+ #, c-format
+-msgid "-march=%s: first ISA subset must be `e', `i' or `g'"
+-msgstr "-march=%s: первый поднабор ISA должен быть «e», «i» или «g»"
++msgid "-march=%s: expect number after `%dp'"
++msgstr "-march=%s: ожидается число после «%dp»"
+ 
+-#: elfxx-riscv.c:1242
++#: elfxx-riscv.c:1544
+ #, c-format
+-msgid "-march=%s: unsupported ISA subset `%c'"
+-msgstr "-march=%s: неподдерживаемый поднабор ISA «%c»"
++msgid "-march=%s: rv%de is not a valid base ISA"
++msgstr "-march=%s: rv%de неправильная база ISA"
+ 
+-#: elfxx-riscv.c:1245
++#: elfxx-riscv.c:1573
+ #, c-format
+-msgid "-march=%s: ISA string is not in canonical order. `%c'"
+-msgstr "-march=%s: строка ISA не в каноничном порядке. «%c»"
++msgid "-march=%s: first ISA extension must be `e', `i' or `g'"
++msgstr "-march=%s: первое расширение ISA должно быть «e», «i» или «g»"
+ 
+-#: elfxx-riscv.c:1364
++#: elfxx-riscv.c:1600
+ #, c-format
+-msgid "-march=%s: Invalid or unknown %s ISA extension: '%s'"
+-msgstr "-march=%s: некорректное или неизвестно расширение ISA %s: «%s»"
++msgid "-march=%s: unknown standard and prefixed ISA extension `%s'"
++msgstr "-march=%s: неизвестное стандартное  и расширение ISA с префиксом «%s»"
+ 
+-#: elfxx-riscv.c:1375
++#: elfxx-riscv.c:1604
+ #, c-format
+-msgid "-march=%s: Duplicate %s ISA extension: '%s'"
+-msgstr "-march=%s: повтор расширения %s ISA: «%s»"
++msgid "-march=%s: standard ISA extension `%c' is not in canonical order"
++msgstr "-march=%s: стандартное расширение ISA «%c» не в каноничном порядке"
+ 
+-#: elfxx-riscv.c:1386
++#: elfxx-riscv.c:1654
+ #, c-format
+-msgid "-march=%s: %s ISA extension not in alphabetical order: '%s' must come before '%s'."
+-msgstr "-march=%s: %s расширение ISA не в алфавитном порядке: «%s» должно идти перед «%s»."
++msgid "-march=%s: unknown prefix class for the ISA extension `%s'"
++msgstr "-march=%s: неизвестный класс префиксов для расширения ISA «%s»"
+ 
+-#: elfxx-riscv.c:1407
++#: elfxx-riscv.c:1688
+ #, c-format
+-msgid "-march=%s: %s must separate with _"
+-msgstr "-march=%s: %s должно отделяться _"
++msgid "-march=%s: unknown prefixed ISA extension `%s'"
++msgstr "-march=%s: неизвестное расширение ISA с префиксом «%s»"
+ 
+-#: elfxx-riscv.c:1523
++#: elfxx-riscv.c:1699
+ #, c-format
+-msgid "-march=%s: ISA string must begin with rv32 or rv64"
+-msgstr "-march=%s: строка ISA должна начинаться с rv32 или rv64"
++msgid "-march=%s: duplicate prefixed ISA extension `%s'"
++msgstr "-march=%s: повтор расширения с префиксом ISA «%s»"
+ 
+-#: elfxx-riscv.c:1544
++#: elfxx-riscv.c:1709
+ #, c-format
+-msgid "-march=%s: unexpected ISA string at end: %s"
+-msgstr "-march=%s: неожиданная строка ISA в конце: %s"
++msgid "-march=%s: prefixed ISA extension `%s' is not in expected order.  It must come before `%s'"
++msgstr "-march=%s: расширение с префиксом ISA «%s» не в ожидаемом порядке. Должно идти перед «%s»"
+ 
+-#: elfxx-riscv.c:1553
++#: elfxx-riscv.c:1725
+ #, c-format
+-msgid "-march=%s: rv32e does not support the `f' extension"
+-msgstr "-march=%s: rv32e не поддерживает расширение «f»"
++msgid "-march=%s: prefixed ISA extension must separate with _"
++msgstr "-march=s: расширение ISA с префиксом «%s» должно отделяться символом _"
+ 
+-#: elfxx-riscv.c:1562
++#: elfxx-riscv.c:1773
+ #, c-format
+-msgid "-march=%s: `d' extension requires `f' extension"
+-msgstr "-march=%s: расширению «d» необходимо расширение «f»"
++msgid "-march=%s: ISA string cannot contain uppercase letters"
++msgstr "-march=%s: строка ISA не может содержать буквы в верхнем регистры"
+ 
+-#: elfxx-riscv.c:1571
++#: elfxx-riscv.c:1799
+ #, c-format
+-msgid "-march=%s: `q' extension requires `d' extension"
+-msgstr "-march=%s: расширению «q» необходимо расширение «d»"
++msgid "-march=%s: ISA string must begin with rv32 or rv64"
++msgstr "-march=%s: строка ISA должна начинаться с rv32 или rv64"
+ 
+-#: elfxx-riscv.c:1579
++#: elfxx-riscv.c:1832
++#, c-format
++msgid "-march=%s: rv32e does not support the `f' extension"
++msgstr "-march=%s: rv32e не поддерживает расширение «f»"
++
++#: elfxx-riscv.c:1840
+ #, c-format
+ msgid "-march=%s: rv32 does not support the `q' extension"
+ msgstr "-march=%s: rv32 не поддерживает расширение «q»"
+ 
+-#: elfxx-sparc.c:3002 elfnn-aarch64.c:5530
++#: elfxx-sparc.c:3021 elfnn-aarch64.c:5526
+ #, c-format
+ msgid "%pB: relocation %s against STT_GNU_IFUNC symbol `%s' isn't handled by %s"
+ msgstr "%pB: перемещение %s вместе с STT_GNU_IFUNC символом «%s» не обрабатывается %s"
+ 
+-#: elfxx-tilegx.c:4128
++#: elfxx-tilegx.c:4126
+ #, c-format
+ msgid "%pB: cannot link together %s and %s objects"
+ msgstr "%pB: невозможно скомпоновать объекты %s и %s вместе"
+ 
+-#: elfxx-x86.c:976
++#: elfxx-x86.c:980
+ #, c-format
+ msgid "%F%P: %pB: relocation %s against absolute symbol `%s' in section `%pA' is disallowed\n"
+ msgstr "%F%P: %pB: перемещение %s абсолютного символа «%s» в разделе «%pA» запрещено\n"
+ 
+-#: elfxx-x86.c:1058
++#: elfxx-x86.c:1062
+ msgid "%P: %pB: warning: relocation in read-only section `%pA'\n"
+ msgstr "%P: %pB: предупреждение: перемещение в разделе только для чтения «%pA»\n"
+ 
+-#: elfxx-x86.c:2314
++#: elfxx-x86.c:1782
++#, c-format
++msgid "%pB: %s (offset: 0x%s, info: 0x%s, addend: 0x%s) against '%s' for section '%pA' in %pB\n"
++msgstr "%pB: %s (смещение: 0x%s, инфо: 0x%s, добавление: 0x%s) в «%s» для раздела «%pA» в %pB\n"
++
++#: elfxx-x86.c:1789
++#, c-format
++msgid "%pB: %s (offset: 0x%s, info: 0x%s) against '%s' for section '%pA' in %pB\n"
++msgstr "%pB: %s (смещение: x%s, инфо: 0x%s) в «%s» для раздела «%pA» в %pB\n"
++
++#: elfxx-x86.c:2367
+ #, c-format
+ msgid "error: %pB: <corrupt x86 property (0x%x) size: 0x%x>"
+ msgstr "ошибка: %pB: <повреждение размера свойства x86 (0x%x): 0x%x>"
+ 
+-#: elfxx-x86.c:2580
++#: elfxx-x86.c:2714
+ msgid "%P: %pB: warning: missing %s\n"
+ msgstr "%P: %pB: предупреждение: отсутствует %s\n"
+ 
+-#: elfxx-x86.c:2582
++#: elfxx-x86.c:2715
+ msgid "%X%P: %pB: error: missing %s\n"
+ msgstr "%X%P: %pB: ошибка: отсутствует %s\n"
+ 
+-#: elfxx-x86.c:2605
++#: elfxx-x86.c:2778
+ msgid "IBT and SHSTK properties"
+ msgstr "Свойства IBT и SHSTK"
+ 
+-#: elfxx-x86.c:2607
++#: elfxx-x86.c:2780
+ msgid "IBT property"
+ msgstr "Свойство IBT"
+ 
+-#: elfxx-x86.c:2609
++#: elfxx-x86.c:2782
+ msgid "SHSTK property"
+ msgstr "Свойство SHSTK"
+ 
+-#: elfxx-x86.c:2753
++#: elfxx-x86.c:2787
++msgid "LAM_U48 property"
++msgstr "Свойство LAM_U48"
++
++#: elfxx-x86.c:2792
++msgid "LAM_U57 property"
++msgstr "Свойство LAM_U57"
++
++#: elfxx-x86.c:2936
+ msgid "%F%P: failed to create VxWorks dynamic sections\n"
+ msgstr "%F%P: не удалось создать динамические разделы VxWorks\n"
+ 
+-#: elfxx-x86.c:2762
++#: elfxx-x86.c:2945
+ msgid "%F%P: failed to create GOT sections\n"
+ msgstr "%F%P: не удалось создать разделы GOT\n"
+ 
+-#: elfxx-x86.c:2780
++#: elfxx-x86.c:2963
+ msgid "%F%P: failed to create ifunc sections\n"
+ msgstr "%F%P: не удалось создать разделы ifunc\n"
+ 
+-#: elfxx-x86.c:2817
++#: elfxx-x86.c:3000
+ msgid "%F%P: failed to create GOT PLT section\n"
+ msgstr "%F%P: не удалось создать раздел GOT PLT\n"
+ 
+-#: elfxx-x86.c:2836
++#: elfxx-x86.c:3019
+ msgid "%F%P: failed to create IBT-enabled PLT section\n"
+ msgstr "%F%P: не удалось создать раздел PLT с включённым IBT\n"
+ 
+-#: elfxx-x86.c:2850
++#: elfxx-x86.c:3033
+ msgid "%F%P: failed to create BND PLT section\n"
+ msgstr "%F%P: не удалось создать раздел BND PLT\n"
+ 
+-#: elfxx-x86.c:2870
++#: elfxx-x86.c:3053
+ msgid "%F%P: failed to create PLT .eh_frame section\n"
+ msgstr "%F%P: не удалось создать раздел PLT .eh_frame\n"
+ 
+-#: elfxx-x86.c:2883
++#: elfxx-x86.c:3066
+ msgid "%F%P: failed to create GOT PLT .eh_frame section\n"
+ msgstr "%F%P: не удалось создать раздел GOT PLT .eh_frame\n"
+ 
+-#: elfxx-x86.c:2897
++#: elfxx-x86.c:3080
+ msgid "%F%P: failed to create the second PLT .eh_frame section\n"
+ msgstr "%F%P: не удалось создать второй раздел PLT .eh_frame\n"
+ 
+-#: elfxx-x86.c:2939
++#: elfxx-x86.c:3122
+ msgid "%X%P: attempted static link of dynamic object `%pB'\n"
+ msgstr "%X%P: попытка статической компоновки динамического объекта «%pB»\n"
+ 
+@@ -5433,57 +5609,57 @@ msgstr "%pB: 64-битный адрес %#<PRIx64> вне диапазона Int
+ msgid "%pB: address %#<PRIx64> out of range for Intel Hex file"
+ msgstr "%pB: адрес %#<PRIx64> вне диапазона Intel Hex файла"
+ 
+-#: libbfd.c:884
++#: libbfd.c:969
+ #, c-format
+ msgid "%pB: unable to get decompressed section %pA"
+ msgstr "%pB: не удалось получить расжатый раздел %pA"
+ 
+-#: libbfd.c:1048
++#: libbfd.c:1133
+ #, c-format
+ msgid "Deprecated %s called at %s line %d in %s\n"
+ msgstr "Вызван нерекомендуемый %s рядом с %s в строке %d в %s\n"
+ 
+-#: libbfd.c:1051
++#: libbfd.c:1136
+ #, c-format
+ msgid "Deprecated %s called\n"
+ msgstr "Вызван нерекомендуемый %s\n"
+ 
+-#: linker.c:1696
++#: linker.c:1706
+ #, c-format
+ msgid "%pB: indirect symbol `%s' to `%s' is a loop"
+ msgstr "%pB: косвенный символ «%s» к «%s» создаёт зацикливание"
+ 
+-#: linker.c:2567
++#: linker.c:2577
+ #, c-format
+ msgid "attempt to do relocatable link with %s input and %s output"
+ msgstr "попытка сделать перемещаемую ссылку с входом %s и выходом %s"
+ 
+-#: linker.c:2852
++#: linker.c:2861
+ #, c-format
+ msgid "%pB: ignoring duplicate section `%pA'\n"
+ msgstr "%pB: игнорируется повторяющийся раздел «%pA»\n"
+ 
+-#: linker.c:2862 linker.c:2872
++#: linker.c:2871 linker.c:2881
+ #, c-format
+ msgid "%pB: duplicate section `%pA' has different size\n"
+ msgstr "%pB: повторяющийся раздел «%pA» имеет другой размер\n"
+ 
+-#: linker.c:2881 linker.c:2887
++#: linker.c:2890 linker.c:2896
+ #, c-format
+ msgid "%pB: could not read contents of section `%pA'\n"
+ msgstr "%pB: предупреждение: невозможно прочитать содержимое раздела «%pA»\n"
+ 
+-#: linker.c:2892
++#: linker.c:2901
+ #, c-format
+ msgid "%pB: duplicate section `%pA' has different contents\n"
+ msgstr "%pB: предупреждение: повторяющийся раздел «%pA» имеет другое содержимое\n"
+ 
+-#: linker.c:3404
++#: linker.c:3419
+ #, c-format
+ msgid "%pB: compiled for a big endian system and target is little endian"
+ msgstr "%pB: скомпилировано для системы с прямым порядком байт, а цель с обратным порядком байт"
+ 
+-#: linker.c:3407
++#: linker.c:3422
+ #, c-format
+ msgid "%pB: compiled for a little endian system and target is big endian"
+ msgstr "%pB: скомпилировано для системы с обратным порядком байт, а цель с прямым порядком байт"
+@@ -5522,144 +5698,144 @@ msgstr "искажённое перемещение vanilla mach-o ARM: неко
+ msgid "malformed mach-o ARM reloc: unknown reloc type: %d"
+ msgstr "искажённое перемещение mach-o ARM: неизвестный тип перемещения: %d"
+ 
+-#: mach-o.c:633
++#: mach-o.c:631
+ #, c-format
+ msgid "<unknown mask flags>"
+ msgstr "<неизвестный флаги маски>"
+ 
+-#: mach-o.c:688
++#: mach-o.c:686
+ msgid " (<unknown>)"
+ msgstr " (неизвестно)"
+ 
+-#: mach-o.c:699
++#: mach-o.c:698
+ #, c-format
+ msgid " MACH-O header:\n"
+ msgstr " заголовок Mach-O:\n"
+ 
+-#: mach-o.c:700
++#: mach-o.c:699
+ #, c-format
+ msgid "   magic:      %#lx\n"
+ msgstr "   отл.призн:    %#lx\n"
+ 
+-#: mach-o.c:701
++#: mach-o.c:700
+ #, c-format
+ msgid "   cputype:    %#lx (%s)\n"
+ msgstr "   тип ЦП:       %#lx (%s)\n"
+ 
+-#: mach-o.c:703
++#: mach-o.c:702
+ #, c-format
+ msgid "   cpusubtype: %#lx%s\n"
+ msgstr "   подтип ЦП:    %#lx%s\n"
+ 
+-#: mach-o.c:705
++#: mach-o.c:704
+ #, c-format
+ msgid "   filetype:   %#lx\n"
+ msgstr "   тип файла:    %#lx\n"
+ 
+-#: mach-o.c:706
++#: mach-o.c:705
+ #, c-format
+ msgid "   ncmds:      %#lx\n"
+ msgstr "   ч_кмнд:       %#lx\n"
+ 
+-#: mach-o.c:707
++#: mach-o.c:706
+ #, c-format
+ msgid "   sizeocmds:  %#lx\n"
+ msgstr "   разм_кмнд:    %#lx\n"
+ 
+-#: mach-o.c:708
++#: mach-o.c:707
+ #, c-format
+ msgid "   flags:      %#lx\n"
+ msgstr "   флаги:        %#lx\n"
+ 
+-#: mach-o.c:709
++#: mach-o.c:708
+ #, c-format
+ msgid "   version:    %x\n"
+ msgstr "   маска версии: %x\n"
+ 
+ #. Urg - what has happened ?
+-#: mach-o.c:744
++#: mach-o.c:743
+ #, c-format
+ msgid "incompatible cputypes in mach-o files: %ld vs %ld"
+ msgstr "несовместимые типы ЦП в файлах mach-o: %ld и %ld"
+ 
+-#: mach-o.c:913
++#: mach-o.c:912
+ msgid "bfd_mach_o_canonicalize_symtab: unable to load symbols"
+ msgstr "bfd_mach_o_canonicalize_symtab: невозможно загрузить символы"
+ 
+-#: mach-o.c:1505
++#: mach-o.c:1504
+ msgid "malformed mach-o reloc: section index is greater than the number of sections"
+ msgstr "искажённое перемещение mach-o: индекс раздела больше количества разделов"
+ 
+-#: mach-o.c:2139
++#: mach-o.c:2138
+ msgid "sorry: modtab, toc and extrefsyms are not yet implemented for dysymtab commands."
+ msgstr "Извините: modtab, toc и extrefsyms пока не реализованы для команд dysymtab."
+ 
+-#: mach-o.c:2587
++#: mach-o.c:2586
+ #, c-format
+ msgid "mach-o: there are too many sections (%u) maximum is 255,\n"
+ msgstr "mach-o: слишком много разделов (%u), должно быть не более 255,\n"
+ 
+-#: mach-o.c:2694
++#: mach-o.c:2693
+ #, c-format
+ msgid "unable to allocate data for load command %#x"
+ msgstr "не удалось выделить данные для команды загрузки %#x"
+ 
+-#: mach-o.c:2799
++#: mach-o.c:2798
+ #, c-format
+ msgid "unable to write unknown load command %#x"
+ msgstr "невозможно записать неизвестную команду загрузки %#x"
+ 
+-#: mach-o.c:2983
++#: mach-o.c:2982
+ #, c-format
+ msgid "section address (%#<PRIx64>) below start of segment (%#<PRIx64>)"
+ msgstr "адрес раздела (%#<PRIx64>) меньше начала сегмента (%#<PRIx64>)"
+ 
+-#: mach-o.c:3125
++#: mach-o.c:3124
+ #, c-format
+ msgid "unable to layout unknown load command %#x"
+ msgstr "невозможно запланировать неизвестную команду загрузки %#x"
+ 
+-#: mach-o.c:3660
++#: mach-o.c:3659
+ #, c-format
+ msgid "bfd_mach_o_read_section_32: overlarge alignment value: %#lx, using 32 instead"
+ msgstr "bfd_mach_o_read_section_32: слишком большое значение выравнивания: %#lx, используется 32"
+ 
+-#: mach-o.c:3703
++#: mach-o.c:3702
+ #, c-format
+ msgid "bfd_mach_o_read_section_64: overlarge alignment value: %#lx, using 32 instead"
+ msgstr "bfd_mach_o_read_section_64: слишком большое значение выравнивания: %#lx, используется 32"
+ 
+-#: mach-o.c:3754
++#: mach-o.c:3753
+ #, c-format
+ msgid "bfd_mach_o_read_symtab_symbol: unable to read %d bytes at %u"
+ msgstr "bfd_mach_o_read_symtab_symbol: невозможно прочитать %d байт по адресу %u"
+ 
+-#: mach-o.c:3773
++#: mach-o.c:3772
+ #, c-format
+ msgid "bfd_mach_o_read_symtab_symbol: name out of range (%lu >= %u)"
+ msgstr "bfd_mach_o_read_symtab_symbol: имя вне диапазона (%lu >= %u)"
+ 
+-#: mach-o.c:3856
++#: mach-o.c:3855
+ #, c-format
+ msgid "bfd_mach_o_read_symtab_symbol: symbol \"%s\" specified invalid section %d (max %lu): setting to undefined"
+ msgstr "bfd_mach_o_read_symtab_symbol: символ «%s» указывает на неверный раздел %d (максимальное значение %lu): настройка не определена"
+ 
+-#: mach-o.c:3875
++#: mach-o.c:3874
+ #, c-format
+ msgid "bfd_mach_o_read_symtab_symbol: symbol \"%s\" specified invalid type field 0x%x: setting to undefined"
+ msgstr "bfd_mach_o_read_symtab_symbol: символ «%s» указывает на неверный тип поля 0x%x: настройка не определена"
+ 
+-#: mach-o.c:5064
++#: mach-o.c:5063
+ #, c-format
+ msgid "%pB: unknown load command %#x"
+ msgstr "%pB: неизвестная команды загрузки %#x"
+ 
+-#: mach-o.c:5263
++#: mach-o.c:5262
+ #, c-format
+ msgid "bfd_mach_o_scan: unknown architecture 0x%lx/0x%lx"
+ msgstr "bfd_mach_o_scan: неизвестная архитектура 0x%lx/0x%lx"
+ 
+-#: mach-o.c:5385
++#: mach-o.c:5384
+ #, c-format
+ msgid "unknown header byte-order value %#x"
+ msgstr "неизвестное значение порядка байт в заголовке %#x"
+@@ -5669,97 +5845,97 @@ msgstr "неизвестное значение порядка байт в за
+ msgid "%pB: access beyond end of merged section (%<PRId64>)"
+ msgstr "%pB: доступ за конец объединённого раздела (%<PRId64>)"
+ 
+-#: mmo.c:476
++#: mmo.c:475
+ #, c-format
+ msgid "%pB: no core to allocate section name %s"
+ msgstr "%pB: нет core для выделения имени раздела %s"
+ 
+-#: mmo.c:541
++#: mmo.c:540
+ #, c-format
+ msgid "%pB: no core to allocate a symbol %d bytes long"
+ msgstr "%pB: нет core для выделения %d байт символа"
+ 
+-#: mmo.c:952
++#: mmo.c:951
+ #, c-format
+ msgid "%pB: attempt to emit contents at non-multiple-of-4 address %#<PRIx64>"
+ msgstr "%pB: попытка выпустить содержимое по адресу не кратному 4 (%#<PRIx64>)"
+ 
+-#: mmo.c:1248
++#: mmo.c:1247
+ #, c-format
+ msgid "%pB: invalid mmo file: initialization value for $255 is not `Main'\n"
+ msgstr "%pB: некорректный mmo-файл: инициализационное значение для $255 не равно «Main»\n"
+ 
+-#: mmo.c:1395
++#: mmo.c:1394
+ #, c-format
+ msgid "%pB: unsupported wide character sequence 0x%02X 0x%02X after symbol name starting with `%s'\n"
+ msgstr "%pB: неподдерживаемая последовательность широких символов 0x%02X 0x%02X после имени символа, начиная с «%s»\n"
+ 
+-#: mmo.c:1628
++#: mmo.c:1627
+ #, c-format
+ msgid "%pB: invalid mmo file: unsupported lopcode `%d'\n"
+ msgstr "%pB: некорректный mmo-файл: неподдерживаемый lopcode «%d»\n"
+ 
+-#: mmo.c:1639
++#: mmo.c:1638
+ #, c-format
+ msgid "%pB: invalid mmo file: expected YZ = 1 got YZ = %d for lop_quote\n"
+ msgstr "%pB: некорректный mmo-файл: для lop_quote ожидалось YZ = 1, получено YZ = %d\n"
+ 
+-#: mmo.c:1679
++#: mmo.c:1678
+ #, c-format
+ msgid "%pB: invalid mmo file: expected z = 1 or z = 2, got z = %d for lop_loc\n"
+ msgstr "%pB: некорректный mmo-файл: для lop_loc ожидалось z = 1 или z = 2, получено z = %d\n"
+ 
+-#: mmo.c:1730
++#: mmo.c:1729
+ #, c-format
+ msgid "%pB: invalid mmo file: expected z = 1 or z = 2, got z = %d for lop_fixo\n"
+ msgstr "%pB: некорректный mmo-файл: для lop_fixo ожидалось z = 1 или z = 2, получено z = %d\n"
+ 
+-#: mmo.c:1771
++#: mmo.c:1770
+ #, c-format
+ msgid "%pB: invalid mmo file: expected y = 0, got y = %d for lop_fixrx\n"
+ msgstr "%pB: некорректный mmo-файл: для lop_fixrx ожидалось y = 0, получено y = %d\n"
+ 
+-#: mmo.c:1782
++#: mmo.c:1781
+ #, c-format
+ msgid "%pB: invalid mmo file: expected z = 16 or z = 24, got z = %d for lop_fixrx\n"
+ msgstr "%pB: некорректный mmo-файл: для lop_fixrx ожидалось z = 16 или z = 24, получено z = %d\n"
+ 
+-#: mmo.c:1807
++#: mmo.c:1806
+ #, c-format
+ msgid "%pB: invalid mmo file: leading byte of operand word must be 0 or 1, got %d for lop_fixrx\n"
+ msgstr "%pB: некорректный mmo-файл: для lop_fixrx начальный байт слова операнда должен быть равен 0 или 1, получено %d\n"
+ 
+-#: mmo.c:1832
++#: mmo.c:1831
+ #, c-format
+ msgid "%pB: cannot allocate file name for file number %d, %d bytes\n"
+ msgstr "%pB: невозможно выделить место для имени файла файлу с номером %d, %d байт\n"
+ 
+-#: mmo.c:1854
++#: mmo.c:1853
+ #, c-format
+ msgid "%pB: invalid mmo file: file number %d `%s', was already entered as `%s'\n"
+ msgstr "%pB: некорректный mmo-файл: номер файла %d «%s» был уже введён как «%s»\n"
+ 
+-#: mmo.c:1868
++#: mmo.c:1867
+ #, c-format
+ msgid "%pB: invalid mmo file: file name for number %d was not specified before use\n"
+ msgstr "%pB: некорректный mmo-файл: имя файла для номера %d не указано перед использованием\n"
+ 
+-#: mmo.c:1975
++#: mmo.c:1974
+ #, c-format
+ msgid "%pB: invalid mmo file: fields y and z of lop_stab non-zero, y: %d, z: %d\n"
+ msgstr "%pB: некорректный mmo-файл: поля y и z в lop_stab не равны нулю, y: %d, z: %d\n"
+ 
+-#: mmo.c:2012
++#: mmo.c:2011
+ #, c-format
+ msgid "%pB: invalid mmo file: lop_end not last item in file\n"
+ msgstr "%pB: некорректный mmo-файл: lop_end не последний элемент в файле\n"
+ 
+-#: mmo.c:2026
++#: mmo.c:2025
+ #, c-format
+ msgid "%pB: invalid mmo file: YZ of lop_end (%ld) not equal to the number of tetras to the preceding lop_stab (%ld)\n"
+ msgstr "%pB: некорректный mmo-файл: YZ в lop_end (%ld) не равно числу тетрад в указанной ранее lop_stab (%ld)\n"
+ 
+-#: mmo.c:2735
++#: mmo.c:2734
+ #, c-format
+ msgid "%pB: invalid symbol table: duplicate symbol `%s'\n"
+ msgstr "%pB: некорректная таблица символов: повторяющийся символ «%s»\n"
+@@ -5804,7 +5980,7 @@ msgstr "%pB: недопустимый начальный адрес для ин
+ msgid "unhandled OSF/1 core file section type %d"
+ msgstr "необработанный файл ядра OSF/1 раздела с типом %d"
+ 
+-#: pdp11.c:1588
++#: pdp11.c:1590
+ #, c-format
+ msgid "%pB: symbol indicates overlay (not supported)"
+ msgstr "%pB: символ указывает на оверлей (не поддерживается)"
+@@ -5916,6 +6092,10 @@ msgstr "%pB: строка не заканчивается нулём в объе
+ msgid "%pB: error: debug data ends beyond end of debug directory"
+ msgstr "%pB: ошибка: конец отладочных данных за окончанием отладочного каталога"
+ 
++#: plugin.c:236
++msgid "plugin framework: out of file descriptors. Try using fewer objects/archives\n"
++msgstr "модульная инфраструктура: кончились файловые дескрипторы. Попробуйте использовать меньше объектов/архивов\n"
++
+ #: ppcboot.c:392
+ #, c-format
+ msgid ""
+@@ -5969,42 +6149,33 @@ msgstr "Сектор раздела[%d]  = 0x%.8lx (%ld)\n"
+ msgid "Partition[%d] length = 0x%.8lx (%ld)\n"
+ msgstr "Длина раздела[%d]   = 0x%.8lx (%ld)\n"
+ 
+-#: reloc.c:8291
++#: reloc.c:8329
+ msgid "INPUT_SECTION_FLAGS are not supported"
+ msgstr "INPUT_SECTION_FLAGS не поддерживается"
+ 
+-#: reloc.c:8392
+-#, c-format
+-msgid "%X%P: %pB(%pA): error: relocation for offset %V has no value\n"
+-msgstr "%X%P: %pB(%pA): ошибка: отсутствует значение перемещения для смещения %V\n"
+-
+-#: reloc.c:8480
+-#, c-format
+-msgid "%X%P: %pB(%pA): relocation \"%pR\" is not supported\n"
+-msgstr "%X%P: %pB(%pA): перемещение «%pR» не поддерживается\n"
+-
+-#: reloc.c:8489
+-#, c-format
+-msgid "%X%P: %pB(%pA): relocation \"%pR\" returns an unrecognized value %x\n"
+-msgstr "%X%P: %pB(%pA): перемещение «%pR» возвратило нераспознанное значение %x\n"
+-
+-#: reloc.c:8551
++#: reloc.c:8589
+ #, c-format
+ msgid "%pB: unrecognized relocation type %#x in section `%pA'"
+ msgstr "%pB: нераспознанное перемещение %#x в разделе «%pA»"
+ 
+ #. PR 21803: Suggest the most likely cause of this error.
+-#: reloc.c:8555
++#: reloc.c:8593
+ #, c-format
+ msgid "is this version of the linker - %s - out of date ?"
+ msgstr "данная версия компоновщика — %s — устарела?"
+ 
+-#: rs6000-core.c:471
++#: rs6000-core.c:470
+ #, c-format
+ msgid "%pB: warning core file truncated"
+ msgstr "%pB: предупреждение: файл core усечён"
+ 
+-#: som.c:5497
++#. User has specified a subspace without its containing space.
++#: som.c:5476
++#, c-format
++msgid "%pB[%pA]: no output section for space %pA"
++msgstr "%pB[%pA]: нет выходного раздела для пространства %pA"
++
++#: som.c:5522
+ #, c-format
+ msgid ""
+ "\n"
+@@ -6013,7 +6184,7 @@ msgstr ""
+ "\n"
+ "Вспомогательный заголовок Exec\n"
+ 
+-#: som.c:5806
++#: som.c:5831
+ msgid "som_sizeof_headers unimplemented"
+ msgstr "som_sizeof_headers не реализован"
+ 
+@@ -6037,82 +6208,82 @@ msgstr "%pB:%d: неверная контрольная сумма в файле
+ msgid "%pB(%pA+%#lx): stabs entry has invalid string index"
+ msgstr "%pB(%pA+%#lx): элемент stabs имеет недопустимый индекс строки"
+ 
+-#: syms.c:1085
++#: syms.c:1092
+ msgid "unsupported .stab relocation"
+ msgstr "неподдерживаемое перемещение .stab"
+ 
+-#: vms-alpha.c:480
++#: vms-alpha.c:478
+ msgid "corrupt EIHD record - size is too small"
+ msgstr "запись EIHD повреждена — размер слишком мал"
+ 
+-#: vms-alpha.c:666
++#: vms-alpha.c:664
+ #, c-format
+ msgid "unable to read EIHS record at offset %#x"
+ msgstr "невозможно прочитать запись EIHS по смещению %#x"
+ 
+-#: vms-alpha.c:1158
++#: vms-alpha.c:1156
+ msgid "record is too small for symbol name length"
+ msgstr "запись слишком мала для длины имени символа"
+ 
+-#: vms-alpha.c:1191
++#: vms-alpha.c:1189
+ #, c-format
+ msgid "corrupt EGSD record: its size (%#x) is too small"
+ msgstr "запись EGSD повреждена: её размер (%#x) слишком мал"
+ 
+-#: vms-alpha.c:1215
++#: vms-alpha.c:1213
+ #, c-format
+ msgid "corrupt EGSD record type %d: size (%#x) is larger than remaining space (%#x)"
+ msgstr "запись EGSD с типом %d повреждена: размер (%#x) больше оставшегося пространства (%#x)"
+ 
+-#: vms-alpha.c:1225
++#: vms-alpha.c:1223
+ #, c-format
+ msgid "corrupt EGSD record type %d: size (%#x) is too small"
+ msgstr "запись EGSD с типом %d повреждена: размер (%#x) слишком мал"
+ 
+-#: vms-alpha.c:1367
++#: vms-alpha.c:1365
+ #, c-format
+ msgid "corrupt EGSD record: its psindx field is too big (%#lx)"
+ msgstr "запись EGSD повреждена: её поле psindx слишком велико (%#lx)"
+ 
+-#: vms-alpha.c:1443
++#: vms-alpha.c:1440
+ #, c-format
+ msgid "unknown EGSD subtype %d"
+ msgstr "неизвестный подтип EGSD %d"
+ 
+-#: vms-alpha.c:1476
++#: vms-alpha.c:1473
+ #, c-format
+ msgid "stack overflow (%d) in _bfd_vms_push"
+ msgstr "переполнение стека (%d) в _bfd_vms_push"
+ 
+-#: vms-alpha.c:1490
++#: vms-alpha.c:1487
+ msgid "stack underflow in _bfd_vms_pop"
+ msgstr "выход за нижнюю границу стека в _bfd_vms_pop"
+ 
+-#: vms-alpha.c:1564
++#: vms-alpha.c:1561
+ #, c-format
+ msgid "dst_define_location %u too large"
+ msgstr "dst_define_location %u слишком большое"
+ 
+ #. These names have not yet been added to this switch statement.
+-#: vms-alpha.c:1765
++#: vms-alpha.c:1762
+ #, c-format
+ msgid "unknown ETIR command %d"
+ msgstr "неизвестная ETIR команда %d"
+ 
+-#: vms-alpha.c:1796
++#: vms-alpha.c:1793
+ msgid "corrupt vms value"
+ msgstr "значение vms повреждено"
+ 
+-#: vms-alpha.c:1927
++#: vms-alpha.c:1924
+ msgid "corrupt ETIR record encountered"
+ msgstr "обнаружена повреждённая запись ETIR"
+ 
+-#: vms-alpha.c:1989
++#: vms-alpha.c:1986
+ #, c-format
+ msgid "bad section index in %s"
+ msgstr "неверный индекс раздела в %s"
+ 
+-#: vms-alpha.c:2003
++#: vms-alpha.c:2000
+ #, c-format
+ msgid "unsupported STA cmd %s"
+ msgstr "неподдерживаемый STA cmd %s"
+@@ -6122,1480 +6293,1480 @@ msgstr "неподдерживаемый STA cmd %s"
+ #. Rotate.
+ #. Redefine symbol to current location.
+ #. Define a literal.
+-#: vms-alpha.c:2211 vms-alpha.c:2242 vms-alpha.c:2337 vms-alpha.c:2557
++#: vms-alpha.c:2208 vms-alpha.c:2239 vms-alpha.c:2334 vms-alpha.c:2554
+ #, c-format
+ msgid "%s: not supported"
+ msgstr "%s: не поддерживается"
+ 
+-#: vms-alpha.c:2217
++#: vms-alpha.c:2214
+ #, c-format
+ msgid "%s: not implemented"
+ msgstr "%s: не реализовано"
+ 
+-#: vms-alpha.c:2382 vms-alpha.c:2397
++#: vms-alpha.c:2379 vms-alpha.c:2394
+ #, c-format
+ msgid "invalid %s"
+ msgstr "неверный %s"
+ 
+ #. Divide by zero is supposed to give a result of zero,
+ #. and a non-fatal warning message.
+-#: vms-alpha.c:2457
++#: vms-alpha.c:2454
+ #, c-format
+ msgid "%s divide by zero"
+ msgstr "%s делится на ноль"
+ 
+-#: vms-alpha.c:2523
++#: vms-alpha.c:2520
+ #, c-format
+ msgid "invalid use of %s with contexts"
+ msgstr "неправильное использование %s с контекстами"
+ 
+-#: vms-alpha.c:2581
++#: vms-alpha.c:2578
+ #, c-format
+ msgid "reserved cmd %d"
+ msgstr "зарезервированный cmd %d"
+ 
+-#: vms-alpha.c:2665
++#: vms-alpha.c:2662
+ msgid "corrupt EEOM record - size is too small"
+ msgstr "запись EEOM повреждена — размер слишком мал"
+ 
+-#: vms-alpha.c:2674
++#: vms-alpha.c:2671
+ msgid "object module not error-free !"
+ msgstr "объектный модуль НЕ error-free !"
+ 
+-#: vms-alpha.c:4001
++#: vms-alpha.c:3999
+ #, c-format
+ msgid "SEC_RELOC with no relocs in section %pA"
+ msgstr "SEC_RELOC без перемещений в разделе %pA"
+ 
+-#: vms-alpha.c:4053 vms-alpha.c:4268
++#: vms-alpha.c:4051 vms-alpha.c:4266
+ #, c-format
+ msgid "size error in section %pA"
+ msgstr "ошибка размера в разделе %pA"
+ 
+-#: vms-alpha.c:4213
++#: vms-alpha.c:4211
+ msgid "spurious ALPHA_R_BSR reloc"
+ msgstr "нетипичное перемещение ALPHA_R_BSR"
+ 
+-#: vms-alpha.c:4254
++#: vms-alpha.c:4252
+ #, c-format
+ msgid "unhandled relocation %s"
+ msgstr "необработанное перемещение %s"
+ 
+-#: vms-alpha.c:4551
++#: vms-alpha.c:4549
+ #, c-format
+ msgid "unknown source command %d"
+ msgstr "неизвестная исходная команда %d"
+ 
+-#: vms-alpha.c:4612 vms-alpha.c:4618 vms-alpha.c:4624 vms-alpha.c:4630
+-#: vms-alpha.c:4636 vms-alpha.c:4663 vms-alpha.c:4669 vms-alpha.c:4675
+-#: vms-alpha.c:4681
++#: vms-alpha.c:4610 vms-alpha.c:4616 vms-alpha.c:4622 vms-alpha.c:4628
++#: vms-alpha.c:4634 vms-alpha.c:4661 vms-alpha.c:4667 vms-alpha.c:4673
++#: vms-alpha.c:4679
+ #, c-format
+ msgid "%s not implemented"
+ msgstr "%s не реализовано"
+ 
+-#: vms-alpha.c:4724
++#: vms-alpha.c:4722
+ #, c-format
+ msgid "unknown line command %d"
+ msgstr "неизвестная строка команды %d"
+ 
+-#: vms-alpha.c:5188 vms-alpha.c:5206 vms-alpha.c:5221 vms-alpha.c:5237
+-#: vms-alpha.c:5250 vms-alpha.c:5262 vms-alpha.c:5275
++#: vms-alpha.c:5186 vms-alpha.c:5204 vms-alpha.c:5219 vms-alpha.c:5235
++#: vms-alpha.c:5248 vms-alpha.c:5260 vms-alpha.c:5273
+ #, c-format
+ msgid "unknown reloc %s + %s"
+ msgstr "неизвестное перемещение %s + %s"
+ 
+-#: vms-alpha.c:5330
++#: vms-alpha.c:5328
+ #, c-format
+ msgid "unknown reloc %s"
+ msgstr "неизвестное перемещение %s"
+ 
+-#: vms-alpha.c:5344
++#: vms-alpha.c:5342
+ msgid "invalid section index in ETIR"
+ msgstr "неверный индекс раздела в ETIR"
+ 
+-#: vms-alpha.c:5353
++#: vms-alpha.c:5351
+ msgid "relocation for non-REL psect"
+ msgstr "перемещение для не-REL psect"
+ 
+-#: vms-alpha.c:5402
++#: vms-alpha.c:5400
+ #, c-format
+ msgid "unknown symbol in command %s"
+ msgstr "неизвестный символ в команде %s"
+ 
+-#: vms-alpha.c:5816
++#: vms-alpha.c:5814
+ #, c-format
+ msgid "reloc (%d) is *UNKNOWN*"
+ msgstr "перемещение (%d) *НЕИЗВЕСТНО*"
+ 
+-#: vms-alpha.c:5932
++#: vms-alpha.c:5930
+ #, c-format
+ msgid "  EMH %u (len=%u): "
+ msgstr "  EMH %u (len=%u): "
+ 
+-#: vms-alpha.c:5937
++#: vms-alpha.c:5935
+ #, c-format
+ msgid "   Error: The length is less than the length of an EMH record\n"
+ msgstr "   Ошибка: длина меньше длины записи EMH\n"
+ 
+-#: vms-alpha.c:5954
++#: vms-alpha.c:5952
+ #, c-format
+ msgid "   Error: The record length is less than the size of an EMH_MHD record\n"
+ msgstr "   Ошибка: длина записи меньше размера записи EMH_MHD\n"
+ 
+-#: vms-alpha.c:5957
++#: vms-alpha.c:5955
+ #, c-format
+ msgid "Module header\n"
+ msgstr "Заголовок модуля\n"
+ 
+-#: vms-alpha.c:5958
++#: vms-alpha.c:5956
+ #, c-format
+ msgid "   structure level: %u\n"
+ msgstr "   уровень структуры  : %u\n"
+ 
+-#: vms-alpha.c:5959
++#: vms-alpha.c:5957
+ #, c-format
+ msgid "   max record size: %u\n"
+ msgstr "   макс. размер записи: %u\n"
+ 
+-#: vms-alpha.c:5965
++#: vms-alpha.c:5963
+ #, c-format
+ msgid "   Error: The module name is missing\n"
+ msgstr "   Ошибка: отсутствует имя модуля\n"
+ 
+-#: vms-alpha.c:5971
++#: vms-alpha.c:5969
+ #, c-format
+ msgid "   Error: The module name is too long\n"
+ msgstr "   Ошибка: слишком длинное имя модуля\n"
+ 
+-#: vms-alpha.c:5974
++#: vms-alpha.c:5972
+ #, c-format
+ msgid "   module name    : %.*s\n"
+ msgstr "   имя модуля         : %.*s\n"
+ 
+-#: vms-alpha.c:5978
++#: vms-alpha.c:5976
+ #, c-format
+ msgid "   Error: The module version is missing\n"
+ msgstr "   Ошибка: отсутствует версия модуля\n"
+ 
+-#: vms-alpha.c:5984
++#: vms-alpha.c:5982
+ #, c-format
+ msgid "   Error: The module version is too long\n"
+ msgstr "   Ошибка: слишком длинная версия модуля\n"
+ 
+-#: vms-alpha.c:5987
++#: vms-alpha.c:5985
+ #, c-format
+ msgid "   module version : %.*s\n"
+ msgstr "   версия модуля      : %.*s\n"
+ 
+-#: vms-alpha.c:5990
++#: vms-alpha.c:5988
+ #, c-format
+ msgid "   Error: The compile date is truncated\n"
+ msgstr "   Ошибка: обрезана дата компиляции\n"
+ 
+-#: vms-alpha.c:5992
++#: vms-alpha.c:5990
+ #, c-format
+ msgid "   compile date   : %.17s\n"
+ msgstr "   дата компиляции    : %.17s\n"
+ 
+-#: vms-alpha.c:5997
++#: vms-alpha.c:5995
+ #, c-format
+ msgid "Language Processor Name\n"
+ msgstr "Название процессорного языка\n"
+ 
+-#: vms-alpha.c:5998
++#: vms-alpha.c:5996
+ #, c-format
+ msgid "   language name: %.*s\n"
+ msgstr "   название языка     : %.*s\n"
+ 
+-#: vms-alpha.c:6002
++#: vms-alpha.c:6000
+ #, c-format
+ msgid "Source Files Header\n"
+ msgstr "Заголовок исходных файлов\n"
+ 
+-#: vms-alpha.c:6003
++#: vms-alpha.c:6001
+ #, c-format
+ msgid "   file: %.*s\n"
+ msgstr "   файл: %.*s\n"
+ 
+-#: vms-alpha.c:6007
++#: vms-alpha.c:6005
+ #, c-format
+ msgid "Title Text Header\n"
+ msgstr "Заголовок названия текста\n"
+ 
+-#: vms-alpha.c:6008
++#: vms-alpha.c:6006
+ #, c-format
+ msgid "   title: %.*s\n"
+ msgstr "   название : %.*s\n"
+ 
+-#: vms-alpha.c:6012
++#: vms-alpha.c:6010
+ #, c-format
+ msgid "Copyright Header\n"
+ msgstr "Заголовок авторского права\n"
+ 
+-#: vms-alpha.c:6013
++#: vms-alpha.c:6011
+ #, c-format
+ msgid "   copyright: %.*s\n"
+ msgstr "   авторское право: %.*s\n"
+ 
+-#: vms-alpha.c:6017
++#: vms-alpha.c:6015
+ #, c-format
+ msgid "unhandled emh subtype %u\n"
+ msgstr "необработанный подтип emh %u\n"
+ 
+-#: vms-alpha.c:6027
++#: vms-alpha.c:6025
+ #, c-format
+ msgid "  EEOM (len=%u):\n"
+ msgstr "  EEOM (len=%u):\n"
+ 
+-#: vms-alpha.c:6032
++#: vms-alpha.c:6030
+ #, c-format
+ msgid "   Error: The length is less than the length of an EEOM record\n"
+ msgstr "   Ошибка: длина меньше длины записи EEOM\n"
+ 
+-#: vms-alpha.c:6036
++#: vms-alpha.c:6034
+ #, c-format
+ msgid "   number of cond linkage pairs: %u\n"
+ msgstr "   кол-во условно компонуемых пар: %u\n"
+ 
+-#: vms-alpha.c:6038
++#: vms-alpha.c:6036
+ #, c-format
+ msgid "   completion code: %u\n"
+ msgstr "   завершённый код: %u\n"
+ 
+-#: vms-alpha.c:6042
++#: vms-alpha.c:6040
+ #, c-format
+ msgid "   transfer addr flags: 0x%02x\n"
+ msgstr "   адреса передачи flags: 0x%02x\n"
+ 
+-#: vms-alpha.c:6043
++#: vms-alpha.c:6041
+ #, c-format
+ msgid "   transfer addr psect: %u\n"
+ msgstr "   адрес передачи psect: %u\n"
+ 
+-#: vms-alpha.c:6045
++#: vms-alpha.c:6043
+ #, c-format
+ msgid "   transfer address   : 0x%08x\n"
+ msgstr "   адрес передачи   : 0x%08x\n"
+ 
+-#: vms-alpha.c:6054
++#: vms-alpha.c:6052
+ msgid " WEAK"
+ msgstr " WEAK"
+ 
+-#: vms-alpha.c:6056
++#: vms-alpha.c:6054
+ msgid " DEF"
+ msgstr " DEF"
+ 
+-#: vms-alpha.c:6058
++#: vms-alpha.c:6056
+ msgid " UNI"
+ msgstr " UNI"
+ 
+-#: vms-alpha.c:6060 vms-alpha.c:6081
++#: vms-alpha.c:6058 vms-alpha.c:6079
+ msgid " REL"
+ msgstr " REL"
+ 
+-#: vms-alpha.c:6062
++#: vms-alpha.c:6060
+ msgid " COMM"
+ msgstr " COMM"
+ 
+-#: vms-alpha.c:6064
++#: vms-alpha.c:6062
+ msgid " VECEP"
+ msgstr " VECEP"
+ 
+-#: vms-alpha.c:6066
++#: vms-alpha.c:6064
+ msgid " NORM"
+ msgstr " NORM"
+ 
+-#: vms-alpha.c:6068
++#: vms-alpha.c:6066
+ msgid " QVAL"
+ msgstr " QVAL"
+ 
+-#: vms-alpha.c:6075
++#: vms-alpha.c:6073
+ msgid " PIC"
+ msgstr " PIC"
+ 
+-#: vms-alpha.c:6077
++#: vms-alpha.c:6075
+ msgid " LIB"
+ msgstr " LIB"
+ 
+-#: vms-alpha.c:6079
++#: vms-alpha.c:6077
+ msgid " OVR"
+ msgstr " OVR"
+ 
+-#: vms-alpha.c:6083
++#: vms-alpha.c:6081
+ msgid " GBL"
+ msgstr " GBL"
+ 
+-#: vms-alpha.c:6085
++#: vms-alpha.c:6083
+ msgid " SHR"
+ msgstr " SHR"
+ 
+-#: vms-alpha.c:6087
++#: vms-alpha.c:6085
+ msgid " EXE"
+ msgstr " EXE"
+ 
+-#: vms-alpha.c:6089
++#: vms-alpha.c:6087
+ msgid " RD"
+ msgstr " RD"
+ 
+-#: vms-alpha.c:6091
++#: vms-alpha.c:6089
+ msgid " WRT"
+ msgstr " WRT"
+ 
+-#: vms-alpha.c:6093
++#: vms-alpha.c:6091
+ msgid " VEC"
+ msgstr " VEC"
+ 
+-#: vms-alpha.c:6095
++#: vms-alpha.c:6093
+ msgid " NOMOD"
+ msgstr " NOMOD"
+ 
+-#: vms-alpha.c:6097
++#: vms-alpha.c:6095
+ msgid " COM"
+ msgstr " COM"
+ 
+-#: vms-alpha.c:6099
++#: vms-alpha.c:6097
+ msgid " 64B"
+ msgstr " 64B"
+ 
+-#: vms-alpha.c:6108
++#: vms-alpha.c:6106
+ #, c-format
+ msgid "  EGSD (len=%u):\n"
+ msgstr "  EGSD (len=%u):\n"
+ 
+-#: vms-alpha.c:6121
++#: vms-alpha.c:6119
+ #, c-format
+ msgid "  EGSD entry %2u (type: %u, len: %u): "
+ msgstr "  запись EGSD %2u (тип: %u, длина: %u): "
+ 
+-#: vms-alpha.c:6127 vms-alpha.c:6378
++#: vms-alpha.c:6125 vms-alpha.c:6376
+ #, c-format
+ msgid "   Error: length larger than remaining space in record\n"
+ msgstr "   Ошибка: длина больше оставшегося пространства в записи\n"
+ 
+-#: vms-alpha.c:6139
++#: vms-alpha.c:6137
+ #, c-format
+ msgid "PSC - Program section definition\n"
+ msgstr "PSC - определение программного раздела\n"
+ 
+-#: vms-alpha.c:6140 vms-alpha.c:6157
++#: vms-alpha.c:6138 vms-alpha.c:6155
+ #, c-format
+ msgid "   alignment  : 2**%u\n"
+ msgstr "   выравнивание  : 2**%u\n"
+ 
+-#: vms-alpha.c:6141 vms-alpha.c:6158
++#: vms-alpha.c:6139 vms-alpha.c:6156
+ #, c-format
+ msgid "   flags      : 0x%04x"
+ msgstr "   флаги      : 0x%04x"
+ 
+-#: vms-alpha.c:6145
++#: vms-alpha.c:6143
+ #, c-format
+ msgid "   alloc (len): %u (0x%08x)\n"
+ msgstr "   alloc (len): %u (0x%08x)\n"
+ 
+-#: vms-alpha.c:6146 vms-alpha.c:6203 vms-alpha.c:6252
++#: vms-alpha.c:6144 vms-alpha.c:6201 vms-alpha.c:6250
+ #, c-format
+ msgid "   name       : %.*s\n"
+ msgstr "   имя       : %.*s\n"
+ 
+-#: vms-alpha.c:6156
++#: vms-alpha.c:6154
+ #, c-format
+ msgid "SPSC - Shared Image Program section def\n"
+ msgstr "SPSC — определение программного раздела общего образа\n"
+ 
+-#: vms-alpha.c:6162
++#: vms-alpha.c:6160
+ #, c-format
+ msgid "   alloc (len)   : %u (0x%08x)\n"
+ msgstr "   alloc (len)   : %u (0x%08x)\n"
+ 
+-#: vms-alpha.c:6163
++#: vms-alpha.c:6161
+ #, c-format
+ msgid "   image offset  : 0x%08x\n"
+ msgstr "   смещение образа : 0x%08x\n"
+ 
+-#: vms-alpha.c:6165
++#: vms-alpha.c:6163
+ #, c-format
+ msgid "   symvec offset : 0x%08x\n"
+ msgstr "   смещение symvec: 0x%08x\n"
+ 
+-#: vms-alpha.c:6167
++#: vms-alpha.c:6165
+ #, c-format
+ msgid "   name          : %.*s\n"
+ msgstr "   имя          : %.*s\n"
+ 
+-#: vms-alpha.c:6180
++#: vms-alpha.c:6178
+ #, c-format
+ msgid "SYM - Global symbol definition\n"
+ msgstr "SYM - определение глобальных символов\n"
+ 
+-#: vms-alpha.c:6181 vms-alpha.c:6241 vms-alpha.c:6262 vms-alpha.c:6281
++#: vms-alpha.c:6179 vms-alpha.c:6239 vms-alpha.c:6260 vms-alpha.c:6279
+ #, c-format
+ msgid "   flags: 0x%04x"
+ msgstr "   флаги: 0x%04x"
+ 
+-#: vms-alpha.c:6184
++#: vms-alpha.c:6182
+ #, c-format
+ msgid "   psect offset: 0x%08x\n"
+ msgstr "   смещение psect: 0x%08x\n"
+ 
+-#: vms-alpha.c:6188
++#: vms-alpha.c:6186
+ #, c-format
+ msgid "   code address: 0x%08x\n"
+ msgstr "   адрес кода: 0x%08x\n"
+ 
+-#: vms-alpha.c:6190
++#: vms-alpha.c:6188
+ #, c-format
+ msgid "   psect index for entry point : %u\n"
+ msgstr "   индекс psect для точки входа: %u\n"
+ 
+-#: vms-alpha.c:6193 vms-alpha.c:6269 vms-alpha.c:6288
++#: vms-alpha.c:6191 vms-alpha.c:6267 vms-alpha.c:6286
+ #, c-format
+ msgid "   psect index : %u\n"
+ msgstr "   индекс psect: %u\n"
+ 
+-#: vms-alpha.c:6195 vms-alpha.c:6271 vms-alpha.c:6290
++#: vms-alpha.c:6193 vms-alpha.c:6269 vms-alpha.c:6288
+ #, c-format
+ msgid "   name        : %.*s\n"
+ msgstr "   имя        : %.*s\n"
+ 
+-#: vms-alpha.c:6202
++#: vms-alpha.c:6200
+ #, c-format
+ msgid "SYM - Global symbol reference\n"
+ msgstr "SYM - ссылки глобальных символов\n"
+ 
+-#: vms-alpha.c:6214
++#: vms-alpha.c:6212
+ #, c-format
+ msgid "IDC - Ident Consistency check\n"
+ msgstr "IDC - проверка идентификатора целостности\n"
+ 
+-#: vms-alpha.c:6215
++#: vms-alpha.c:6213
+ #, c-format
+ msgid "   flags         : 0x%08x"
+ msgstr "   флаги         : 0x%08x"
+ 
+-#: vms-alpha.c:6219
++#: vms-alpha.c:6217
+ #, c-format
+ msgid "   id match      : %x\n"
+ msgstr "   id соответствия : %x\n"
+ 
+-#: vms-alpha.c:6221
++#: vms-alpha.c:6219
+ #, c-format
+ msgid "   error severity: %x\n"
+ msgstr "   серьёзность ошибки: %x\n"
+ 
+-#: vms-alpha.c:6224
++#: vms-alpha.c:6222
+ #, c-format
+ msgid "   entity name   : %.*s\n"
+ msgstr "   название категории: %.*s\n"
+ 
+-#: vms-alpha.c:6226
++#: vms-alpha.c:6224
+ #, c-format
+ msgid "   object name   : %.*s\n"
+ msgstr "   имя объекта: %.*s\n"
+ 
+-#: vms-alpha.c:6229
++#: vms-alpha.c:6227
+ #, c-format
+ msgid "   binary ident  : 0x%08x\n"
+ msgstr "   двоичный идентификатор: 0x%08x\n"
+ 
+-#: vms-alpha.c:6232
++#: vms-alpha.c:6230
+ #, c-format
+ msgid "   ascii ident   : %.*s\n"
+ msgstr "   ascii-идентификатор: %.*s\n"
+ 
+-#: vms-alpha.c:6240
++#: vms-alpha.c:6238
+ #, c-format
+ msgid "SYMG - Universal symbol definition\n"
+ msgstr "SYMG - определение универсальных символов\n"
+ 
+-#: vms-alpha.c:6244
++#: vms-alpha.c:6242
+ #, c-format
+ msgid "   symbol vector offset: 0x%08x\n"
+ msgstr "   смещение символьного вектора: 0x%08x\n"
+ 
+-#: vms-alpha.c:6246
++#: vms-alpha.c:6244
+ #, c-format
+ msgid "   entry point: 0x%08x\n"
+ msgstr "   точка входа: 0x%08x\n"
+ 
+-#: vms-alpha.c:6248
++#: vms-alpha.c:6246
+ #, c-format
+ msgid "   proc descr : 0x%08x\n"
+ msgstr "   proc descr : 0x%08x\n"
+ 
+-#: vms-alpha.c:6250
++#: vms-alpha.c:6248
+ #, c-format
+ msgid "   psect index: %u\n"
+ msgstr "   индекс psect: %u\n"
+ 
+-#: vms-alpha.c:6261
++#: vms-alpha.c:6259
+ #, c-format
+ msgid "SYMV - Vectored symbol definition\n"
+ msgstr "SYMV - определение векторных символов\n"
+ 
+-#: vms-alpha.c:6265
++#: vms-alpha.c:6263
+ #, c-format
+ msgid "   vector      : 0x%08x\n"
+ msgstr "   вектор      : 0x%08x\n"
+ 
+-#: vms-alpha.c:6267 vms-alpha.c:6286
++#: vms-alpha.c:6265 vms-alpha.c:6284
+ #, c-format
+ msgid "   psect offset: %u\n"
+ msgstr "   смещение psect: %u\n"
+ 
+-#: vms-alpha.c:6280
++#: vms-alpha.c:6278
+ #, c-format
+ msgid "SYMM - Global symbol definition with version\n"
+ msgstr "SYMM - определение глобальных символов с версией\n"
+ 
+-#: vms-alpha.c:6284
++#: vms-alpha.c:6282
+ #, c-format
+ msgid "   version mask: 0x%08x\n"
+ msgstr "   маска версии: 0x%08x\n"
+ 
+-#: vms-alpha.c:6295
++#: vms-alpha.c:6293
+ #, c-format
+ msgid "unhandled egsd entry type %u\n"
+ msgstr "необработанный egsd-элемент типа %u\n"
+ 
+-#: vms-alpha.c:6330
++#: vms-alpha.c:6328
+ #, c-format
+ msgid "    linkage index: %u, replacement insn: 0x%08x\n"
+ msgstr "    индекс компоновки: %u, заменитель insn: 0x%08x\n"
+ 
+-#: vms-alpha.c:6334
++#: vms-alpha.c:6332
+ #, c-format
+ msgid "    psect idx 1: %u, offset 1: 0x%08x %08x\n"
+ msgstr "    1-й индекс psect: %u, 1-е смещение: 0x%08x %08x\n"
+ 
+-#: vms-alpha.c:6339
++#: vms-alpha.c:6337
+ #, c-format
+ msgid "    psect idx 2: %u, offset 2: 0x%08x %08x\n"
+ msgstr "    2-й индекс psect: %u, 2-е смещение: 0x%08x %08x\n"
+ 
+-#: vms-alpha.c:6345
++#: vms-alpha.c:6343
+ #, c-format
+ msgid "    psect idx 3: %u, offset 3: 0x%08x %08x\n"
+ msgstr "    3-й индекс psect: %u, 3-е смещение: 0x%08x %08x\n"
+ 
+-#: vms-alpha.c:6350
++#: vms-alpha.c:6348
+ #, c-format
+ msgid "    global name: %.*s\n"
+ msgstr "    глобальное имя: %.*s\n"
+ 
+-#: vms-alpha.c:6361
++#: vms-alpha.c:6359
+ #, c-format
+ msgid "  %s (len=%u+%u):\n"
+ msgstr "  %s (len=%u+%u):\n"
+ 
+-#: vms-alpha.c:6383
++#: vms-alpha.c:6381
+ #, c-format
+ msgid "   (type: %3u, size: 4+%3u): "
+ msgstr "   (тип: %3u, размер: 4+%3u): "
+ 
+-#: vms-alpha.c:6387
++#: vms-alpha.c:6385
+ #, c-format
+ msgid "STA_GBL (stack global) %.*s\n"
+ msgstr "STA_GBL (глобальный стек) %.*s\n"
+ 
+-#: vms-alpha.c:6391
++#: vms-alpha.c:6389
+ #, c-format
+ msgid "STA_LW (stack longword) 0x%08x\n"
+ msgstr "STA_LW (стек длинных слов) 0x%08x\n"
+ 
+-#: vms-alpha.c:6395
++#: vms-alpha.c:6393
+ #, c-format
+ msgid "STA_QW (stack quadword) 0x%08x %08x\n"
+ msgstr "STA_QW (стек четверных слов) 0x%08x %08x\n"
+ 
+-#: vms-alpha.c:6400
++#: vms-alpha.c:6398
+ #, c-format
+ msgid "STA_PQ (stack psect base + offset)\n"
+ msgstr "STA_PQ (стек psect база + смещение)\n"
+ 
+-#: vms-alpha.c:6402
++#: vms-alpha.c:6400
+ #, c-format
+ msgid "    psect: %u, offset: 0x%08x %08x\n"
+ msgstr "    psect: %u, смещение: 0x%08x %08x\n"
+ 
+-#: vms-alpha.c:6408
++#: vms-alpha.c:6406
+ #, c-format
+ msgid "STA_LI (stack literal)\n"
+ msgstr "STA_LI (стек литерала)\n"
+ 
+-#: vms-alpha.c:6411
++#: vms-alpha.c:6409
+ #, c-format
+ msgid "STA_MOD (stack module)\n"
+ msgstr "STA_MOD (стек модулей)\n"
+ 
+-#: vms-alpha.c:6414
++#: vms-alpha.c:6412
+ #, c-format
+ msgid "STA_CKARG (compare procedure argument)\n"
+ msgstr "STA_CKARG (аргумент процедуры сравнения)\n"
+ 
+-#: vms-alpha.c:6418
++#: vms-alpha.c:6416
+ #, c-format
+ msgid "STO_B (store byte)\n"
+ msgstr "STO_B (хранимый байт)\n"
+ 
+-#: vms-alpha.c:6421
++#: vms-alpha.c:6419
+ #, c-format
+ msgid "STO_W (store word)\n"
+ msgstr "STO_W (хранимое слово)\n"
+ 
+-#: vms-alpha.c:6424
++#: vms-alpha.c:6422
+ #, c-format
+ msgid "STO_LW (store longword)\n"
+ msgstr "STO_LW (хранимое длинное слово)\n"
+ 
+-#: vms-alpha.c:6427
++#: vms-alpha.c:6425
+ #, c-format
+ msgid "STO_QW (store quadword)\n"
+ msgstr "STO_QW (хранимое учетверённое слово)\n"
+ 
+-#: vms-alpha.c:6433
++#: vms-alpha.c:6431
+ #, c-format
+ msgid "STO_IMMR (store immediate repeat) %u bytes\n"
+ msgstr "STO_IMMR (хранимый непосредственный повтор) %u байт\n"
+ 
+-#: vms-alpha.c:6440
++#: vms-alpha.c:6438
+ #, c-format
+ msgid "STO_GBL (store global) %.*s\n"
+ msgstr "STO_GBL (хранимая глобальная) %.*s\n"
+ 
+-#: vms-alpha.c:6444
++#: vms-alpha.c:6442
+ #, c-format
+ msgid "STO_CA (store code address) %.*s\n"
+ msgstr "STO_CA (хранимый адрес кода) %.*s\n"
+ 
+-#: vms-alpha.c:6448
++#: vms-alpha.c:6446
+ #, c-format
+ msgid "STO_RB (store relative branch)\n"
+ msgstr "STO_RB (хранимое относительное ветвление)\n"
+ 
+-#: vms-alpha.c:6451
++#: vms-alpha.c:6449
+ #, c-format
+ msgid "STO_AB (store absolute branch)\n"
+ msgstr "STO_AB (хранимое абсолютное ветвление)\n"
+ 
+-#: vms-alpha.c:6454
++#: vms-alpha.c:6452
+ #, c-format
+ msgid "STO_OFF (store offset to psect)\n"
+ msgstr "STO_OFF (хранимое смещение на psect)\n"
+ 
+-#: vms-alpha.c:6460
++#: vms-alpha.c:6458
+ #, c-format
+ msgid "STO_IMM (store immediate) %u bytes\n"
+ msgstr "STO_IMM (хранимая непосредственно) %u байт\n"
+ 
+-#: vms-alpha.c:6467
++#: vms-alpha.c:6465
+ #, c-format
+ msgid "STO_GBL_LW (store global longword) %.*s\n"
+ msgstr "STO_GBL_LW (хранимое глобальное длинное слово) %.*s\n"
+ 
+-#: vms-alpha.c:6471
++#: vms-alpha.c:6469
+ #, c-format
+ msgid "STO_OFF (store LP with procedure signature)\n"
+ msgstr "STO_OFF (хранимый LP с сигнатурой процедуры)\n"
+ 
+-#: vms-alpha.c:6474
++#: vms-alpha.c:6472
+ #, c-format
+ msgid "STO_BR_GBL (store branch global) *todo*\n"
+ msgstr "STO_BR_GBL (хранимое глобальное ветвление) *todo*\n"
+ 
+-#: vms-alpha.c:6477
++#: vms-alpha.c:6475
+ #, c-format
+ msgid "STO_BR_PS (store branch psect + offset) *todo*\n"
+ msgstr "STO_BR_PS (хранимое ветвление psect + смещение) *todo*\n"
+ 
+-#: vms-alpha.c:6481
++#: vms-alpha.c:6479
+ #, c-format
+ msgid "OPR_NOP (no-operation)\n"
+ msgstr "OPR_NOP (нет операции)\n"
+ 
+-#: vms-alpha.c:6484
++#: vms-alpha.c:6482
+ #, c-format
+ msgid "OPR_ADD (add)\n"
+ msgstr "OPR_ADD (сложение)\n"
+ 
+-#: vms-alpha.c:6487
++#: vms-alpha.c:6485
+ #, c-format
+ msgid "OPR_SUB (subtract)\n"
+ msgstr "OPR_SUB (вычитание)\n"
+ 
+-#: vms-alpha.c:6490
++#: vms-alpha.c:6488
+ #, c-format
+ msgid "OPR_MUL (multiply)\n"
+ msgstr "OPR_MUL (умножение)\n"
+ 
+-#: vms-alpha.c:6493
++#: vms-alpha.c:6491
+ #, c-format
+ msgid "OPR_DIV (divide)\n"
+ msgstr "OPR_DIV (деление)\n"
+ 
+-#: vms-alpha.c:6496
++#: vms-alpha.c:6494
+ #, c-format
+ msgid "OPR_AND (logical and)\n"
+ msgstr "OPR_AND (логическое и)\n"
+ 
+-#: vms-alpha.c:6499
++#: vms-alpha.c:6497
+ #, c-format
+ msgid "OPR_IOR (logical inclusive or)\n"
+ msgstr "OPR_IOR (логическое включающее или)\n"
+ 
+-#: vms-alpha.c:6502
++#: vms-alpha.c:6500
+ #, c-format
+ msgid "OPR_EOR (logical exclusive or)\n"
+ msgstr "OPR_EOR (логическое не включающее или)\n"
+ 
+-#: vms-alpha.c:6505
++#: vms-alpha.c:6503
+ #, c-format
+ msgid "OPR_NEG (negate)\n"
+ msgstr "OPR_NEG (инверсия)\n"
+ 
+-#: vms-alpha.c:6508
++#: vms-alpha.c:6506
+ #, c-format
+ msgid "OPR_COM (complement)\n"
+ msgstr "OPR_COM (дополнение)\n"
+ 
+-#: vms-alpha.c:6511
++#: vms-alpha.c:6509
+ #, c-format
+ msgid "OPR_INSV (insert field)\n"
+ msgstr "OPR_INSV (поле вставки)\n"
+ 
+-#: vms-alpha.c:6514
++#: vms-alpha.c:6512
+ #, c-format
+ msgid "OPR_ASH (arithmetic shift)\n"
+ msgstr "OPR_ASH (арифметический сдвиг)\n"
+ 
+-#: vms-alpha.c:6517
++#: vms-alpha.c:6515
+ #, c-format
+ msgid "OPR_USH (unsigned shift)\n"
+ msgstr "OPR_USH (беззнаковый сдвиг)\n"
+ 
+-#: vms-alpha.c:6520
++#: vms-alpha.c:6518
+ #, c-format
+ msgid "OPR_ROT (rotate)\n"
+ msgstr "OPR_ROT (циклический сдвиг)\n"
+ 
+-#: vms-alpha.c:6523
++#: vms-alpha.c:6521
+ #, c-format
+ msgid "OPR_SEL (select)\n"
+ msgstr "OPR_SEL (выбор)\n"
+ 
+-#: vms-alpha.c:6526
++#: vms-alpha.c:6524
+ #, c-format
+ msgid "OPR_REDEF (redefine symbol to curr location)\n"
+ msgstr "OPR_REDEF (переопределение символа в текущей позиции)\n"
+ 
+-#: vms-alpha.c:6529
++#: vms-alpha.c:6527
+ #, c-format
+ msgid "OPR_REDEF (define a literal)\n"
+ msgstr "OPR_REDEF (определение литерала)\n"
+ 
+-#: vms-alpha.c:6533
++#: vms-alpha.c:6531
+ #, c-format
+ msgid "STC_LP (store cond linkage pair)\n"
+ msgstr "STC_LP (хранимая условно компонуемая пара)\n"
+ 
+-#: vms-alpha.c:6537
++#: vms-alpha.c:6535
+ #, c-format
+ msgid "STC_LP_PSB (store cond linkage pair + signature)\n"
+ msgstr "STC_LP_PSB (хранимая условно компонуемая пара + сигнатура)\n"
+ 
+-#: vms-alpha.c:6539
++#: vms-alpha.c:6537
+ #, c-format
+ msgid "   linkage index: %u, procedure: %.*s\n"
+ msgstr "   индекс компоновки: %u, процедура: %.*s\n"
+ 
+-#: vms-alpha.c:6542
++#: vms-alpha.c:6540
+ #, c-format
+ msgid "   signature: %.*s\n"
+ msgstr "   сигнатура: %.*s\n"
+ 
+-#: vms-alpha.c:6545
++#: vms-alpha.c:6543
+ #, c-format
+ msgid "STC_GBL (store cond global)\n"
+ msgstr "STC_GBL (хранимая глобальное условие)\n"
+ 
+-#: vms-alpha.c:6547
++#: vms-alpha.c:6545
+ #, c-format
+ msgid "   linkage index: %u, global: %.*s\n"
+ msgstr "   индекс компоновки: %u, глобальный: %.*s\n"
+ 
+-#: vms-alpha.c:6551
++#: vms-alpha.c:6549
+ #, c-format
+ msgid "STC_GCA (store cond code address)\n"
+ msgstr "STC_GCA (хранимый адрес условного кода)\n"
+ 
+-#: vms-alpha.c:6553
++#: vms-alpha.c:6551
+ #, c-format
+ msgid "   linkage index: %u, procedure name: %.*s\n"
+ msgstr "   индекс компоновки: %u, имя процедуры: %.*s\n"
+ 
+-#: vms-alpha.c:6557
++#: vms-alpha.c:6555
+ #, c-format
+ msgid "STC_PS (store cond psect + offset)\n"
+ msgstr "STC_PS (хранимое условие psect + смещение)\n"
+ 
+-#: vms-alpha.c:6560
++#: vms-alpha.c:6558
+ #, c-format
+ msgid "   linkage index: %u, psect: %u, offset: 0x%08x %08x\n"
+ msgstr "   индекс компоновки: %u, psect: %u, смещение: 0x%08x %08x\n"
+ 
+-#: vms-alpha.c:6567
++#: vms-alpha.c:6565
+ #, c-format
+ msgid "STC_NOP_GBL (store cond NOP at global addr)\n"
+ msgstr "STC_NOP_GBL (хранимое условие NOP по глобальному адресу)\n"
+ 
+-#: vms-alpha.c:6571
++#: vms-alpha.c:6569
+ #, c-format
+ msgid "STC_NOP_PS (store cond NOP at psect + offset)\n"
+ msgstr "STC_NOP_PS (хранимое условие NOP по psect + смещение)\n"
+ 
+-#: vms-alpha.c:6575
++#: vms-alpha.c:6573
+ #, c-format
+ msgid "STC_BSR_GBL (store cond BSR at global addr)\n"
+ msgstr "STC_BSR_GBL (хранимое условие BSR по глобальному адресу)\n"
+ 
+-#: vms-alpha.c:6579
++#: vms-alpha.c:6577
+ #, c-format
+ msgid "STC_BSR_PS (store cond BSR at psect + offset)\n"
+ msgstr "STC_BSR_PS (хранимое условие BSR по psect + смещение)\n"
+ 
+-#: vms-alpha.c:6583
++#: vms-alpha.c:6581
+ #, c-format
+ msgid "STC_LDA_GBL (store cond LDA at global addr)\n"
+ msgstr "STC_LDA_GBL (хранимое условие LDA по глобальному адресу)\n"
+ 
+-#: vms-alpha.c:6587
++#: vms-alpha.c:6585
+ #, c-format
+ msgid "STC_LDA_PS (store cond LDA at psect + offset)\n"
+ msgstr "STC_LDA_PS (хранимое условие LDA по psect + смещение)\n"
+ 
+-#: vms-alpha.c:6591
++#: vms-alpha.c:6589
+ #, c-format
+ msgid "STC_BOH_GBL (store cond BOH at global addr)\n"
+ msgstr "STC_BOH_GBL (хранимое условие BOH по глобальному адресу)\n"
+ 
+-#: vms-alpha.c:6595
++#: vms-alpha.c:6593
+ #, c-format
+ msgid "STC_BOH_PS (store cond BOH at psect + offset)\n"
+ msgstr "STC_BOH_PS (хранимое условие BOH по psect + смещение)\n"
+ 
+-#: vms-alpha.c:6600
++#: vms-alpha.c:6598
+ #, c-format
+ msgid "STC_NBH_GBL (store cond or hint at global addr)\n"
+ msgstr "STC_NBH_GBL (хранимое условие или указание по глобальному адресу)\n"
+ 
+-#: vms-alpha.c:6604
++#: vms-alpha.c:6602
+ #, c-format
+ msgid "STC_NBH_PS (store cond or hint at psect + offset)\n"
+ msgstr "STC_NBH_PS (хранимое условие или указание по psect + смещение)\n"
+ 
+-#: vms-alpha.c:6608
++#: vms-alpha.c:6606
+ #, c-format
+ msgid "CTL_SETRB (set relocation base)\n"
+ msgstr "CTL_SETRB (установка базы перемещения)\n"
+ 
+-#: vms-alpha.c:6614
++#: vms-alpha.c:6612
+ #, c-format
+ msgid "CTL_AUGRB (augment relocation base) %u\n"
+ msgstr "CTL_AUGRB (дополнение базы перемещения) %u\n"
+ 
+-#: vms-alpha.c:6618
++#: vms-alpha.c:6616
+ #, c-format
+ msgid "CTL_DFLOC (define location)\n"
+ msgstr "CTL_DFLOC (определение положения)\n"
+ 
+-#: vms-alpha.c:6621
++#: vms-alpha.c:6619
+ #, c-format
+ msgid "CTL_STLOC (set location)\n"
+ msgstr "CTL_STLOC (задание положения)\n"
+ 
+-#: vms-alpha.c:6624
++#: vms-alpha.c:6622
+ #, c-format
+ msgid "CTL_STKDL (stack defined location)\n"
+ msgstr "CTL_STKDL (положение определяемое стеком)\n"
+ 
+-#: vms-alpha.c:6627 vms-alpha.c:7051 vms-alpha.c:7177
++#: vms-alpha.c:6625 vms-alpha.c:7049 vms-alpha.c:7175
+ #, c-format
+ msgid "*unhandled*\n"
+ msgstr "*не обработано*\n"
+ 
+-#: vms-alpha.c:6657 vms-alpha.c:6696
++#: vms-alpha.c:6655 vms-alpha.c:6694
+ #, c-format
+ msgid "cannot read GST record length\n"
+ msgstr "не удалось прочитать длину записи GST\n"
+ 
+ #. Ill-formed.
+-#: vms-alpha.c:6678
++#: vms-alpha.c:6676
+ #, c-format
+ msgid "cannot find EMH in first GST record\n"
+ msgstr "не удалось найти EMH в первой записи GST\n"
+ 
+-#: vms-alpha.c:6704
++#: vms-alpha.c:6702
+ #, c-format
+ msgid "cannot read GST record header\n"
+ msgstr "не удалось прочитать заголовок записи GST\n"
+ 
+-#: vms-alpha.c:6717
++#: vms-alpha.c:6715
+ #, c-format
+ msgid " corrupted GST\n"
+ msgstr " повреждённый GST\n"
+ 
+-#: vms-alpha.c:6725
++#: vms-alpha.c:6723
+ #, c-format
+ msgid "cannot read GST record\n"
+ msgstr "не удалось прочитать запись GST\n"
+ 
+-#: vms-alpha.c:6754
++#: vms-alpha.c:6752
+ #, c-format
+ msgid " unhandled EOBJ record type %u\n"
+ msgstr " необработанный тип записи EOBJ %u\n"
+ 
+-#: vms-alpha.c:6778
++#: vms-alpha.c:6776
+ #, c-format
+ msgid "  bitcount: %u, base addr: 0x%08x\n"
+ msgstr "  счётчик бит: %u, базовый адрес: 0x%08x\n"
+ 
+-#: vms-alpha.c:6792
++#: vms-alpha.c:6790
+ #, c-format
+ msgid "   bitmap: 0x%08x (count: %u):\n"
+ msgstr "   bitmap: 0x%08x (счётчик: %u):\n"
+ 
+-#: vms-alpha.c:6799
++#: vms-alpha.c:6797
+ #, c-format
+ msgid " %08x"
+ msgstr " %08x"
+ 
+-#: vms-alpha.c:6825
++#: vms-alpha.c:6823
+ #, c-format
+ msgid "  image %u (%u entries)\n"
+ msgstr "  образ %u (%u элементов)\n"
+ 
+-#: vms-alpha.c:6831
++#: vms-alpha.c:6829
+ #, c-format
+ msgid "   offset: 0x%08x, val: 0x%08x\n"
+ msgstr "   смещение: 0x%08x, значение: 0x%08x\n"
+ 
+-#: vms-alpha.c:6853
++#: vms-alpha.c:6851
+ #, c-format
+ msgid "  image %u (%u entries), offsets:\n"
+ msgstr "  образ %u (%u элементов), смещения:\n"
+ 
+-#: vms-alpha.c:6860
++#: vms-alpha.c:6858
+ #, c-format
+ msgid " 0x%08x"
+ msgstr " 0x%08x"
+ 
+ #. 64 bits.
+-#: vms-alpha.c:6982
++#: vms-alpha.c:6980
+ #, c-format
+ msgid "64 bits *unhandled*\n"
+ msgstr "64 бита *не обработано*\n"
+ 
+-#: vms-alpha.c:6987
++#: vms-alpha.c:6985
+ #, c-format
+ msgid "class: %u, dtype: %u, length: %u, pointer: 0x%08x\n"
+ msgstr "класс: %u, dtype: %u, длина: %u, указатель: 0x%08x\n"
+ 
+-#: vms-alpha.c:6998
++#: vms-alpha.c:6996
+ #, c-format
+ msgid "non-contiguous array of %s\n"
+ msgstr "несвязный массив %s\n"
+ 
+-#: vms-alpha.c:7003
++#: vms-alpha.c:7001
+ #, c-format
+ msgid "dimct: %u, aflags: 0x%02x, digits: %u, scale: %u\n"
+ msgstr "dimct: %u, aflags: 0x%02x, цифр: %u, шкала: %u\n"
+ 
+-#: vms-alpha.c:7008
++#: vms-alpha.c:7006
+ #, c-format
+ msgid "arsize: %u, a0: 0x%08x\n"
+ msgstr "arsize: %u, a0: 0x%08x\n"
+ 
+-#: vms-alpha.c:7012
++#: vms-alpha.c:7010
+ #, c-format
+ msgid "Strides:\n"
+ msgstr "Шаги:\n"
+ 
+-#: vms-alpha.c:7022
++#: vms-alpha.c:7020
+ #, c-format
+ msgid "Bounds:\n"
+ msgstr "Границы:\n"
+ 
+-#: vms-alpha.c:7028
++#: vms-alpha.c:7026
+ #, c-format
+ msgid "[%u]: Lower: %u, upper: %u\n"
+ msgstr "[%u]: нижняя: %u, верхняя: %u\n"
+ 
+-#: vms-alpha.c:7040
++#: vms-alpha.c:7038
+ #, c-format
+ msgid "unaligned bit-string of %s\n"
+ msgstr "невыровненная строка бит %s\n"
+ 
+-#: vms-alpha.c:7045
++#: vms-alpha.c:7043
+ #, c-format
+ msgid "base: %u, pos: %u\n"
+ msgstr "база: %u, позиция: %u\n"
+ 
+-#: vms-alpha.c:7066
++#: vms-alpha.c:7064
+ #, c-format
+ msgid "vflags: 0x%02x, value: 0x%08x "
+ msgstr "vflags: 0x%02x, значение: 0x%08x "
+ 
+-#: vms-alpha.c:7072
++#: vms-alpha.c:7070
+ #, c-format
+ msgid "(no value)\n"
+ msgstr "(нет значения)\n"
+ 
+-#: vms-alpha.c:7075
++#: vms-alpha.c:7073
+ #, c-format
+ msgid "(not active)\n"
+ msgstr "(не активно)\n"
+ 
+-#: vms-alpha.c:7078
++#: vms-alpha.c:7076
+ #, c-format
+ msgid "(not allocated)\n"
+ msgstr "(не выделено)\n"
+ 
+-#: vms-alpha.c:7081
++#: vms-alpha.c:7079
+ #, c-format
+ msgid "(descriptor)\n"
+ msgstr "(дескриптор)\n"
+ 
+-#: vms-alpha.c:7085
++#: vms-alpha.c:7083
+ #, c-format
+ msgid "(trailing value)\n"
+ msgstr "(конечное значение)\n"
+ 
+-#: vms-alpha.c:7088
++#: vms-alpha.c:7086
+ #, c-format
+ msgid "(value spec follows)\n"
+ msgstr "(далее значение спецификации)\n"
+ 
+-#: vms-alpha.c:7091
++#: vms-alpha.c:7089
+ #, c-format
+ msgid "(at bit offset %u)\n"
+ msgstr "(по битовому смещению %u)\n"
+ 
+-#: vms-alpha.c:7095
++#: vms-alpha.c:7093
+ #, c-format
+ msgid "(reg: %u, disp: %u, indir: %u, kind: "
+ msgstr "(reg: %u, disp: %u, indir: %u, kind: "
+ 
+-#: vms-alpha.c:7102
++#: vms-alpha.c:7100
+ msgid "literal"
+ msgstr "литерал"
+ 
+-#: vms-alpha.c:7105
++#: vms-alpha.c:7103
+ msgid "address"
+ msgstr "адрес"
+ 
+-#: vms-alpha.c:7108
++#: vms-alpha.c:7106
+ msgid "desc"
+ msgstr "опис"
+ 
+-#: vms-alpha.c:7111
++#: vms-alpha.c:7109
+ msgid "reg"
+ msgstr "рег"
+ 
+-#: vms-alpha.c:7128
++#: vms-alpha.c:7126
+ #, c-format
+ msgid "len: %2u, kind: %2u "
+ msgstr "len: %2u, kind: %2u "
+ 
+-#: vms-alpha.c:7134
++#: vms-alpha.c:7132
+ #, c-format
+ msgid "atomic, type=0x%02x %s\n"
+ msgstr "атомарно, тип=0x%02x %s\n"
+ 
+-#: vms-alpha.c:7138
++#: vms-alpha.c:7136
+ #, c-format
+ msgid "indirect, defined at 0x%08x\n"
+ msgstr "косвенно, определено по адресу 0x%08x\n"
+ 
+-#: vms-alpha.c:7142
++#: vms-alpha.c:7140
+ #, c-format
+ msgid "typed pointer\n"
+ msgstr "типизированный указатель\n"
+ 
+-#: vms-alpha.c:7146
++#: vms-alpha.c:7144
+ #, c-format
+ msgid "pointer\n"
+ msgstr "указатель\n"
+ 
+-#: vms-alpha.c:7154
++#: vms-alpha.c:7152
+ #, c-format
+ msgid "array, dim: %u, bitmap: "
+ msgstr "массив, размер: %u, bitmap: "
+ 
+-#: vms-alpha.c:7161
++#: vms-alpha.c:7159
+ #, c-format
+ msgid "array descriptor:\n"
+ msgstr "описатель массива:\n"
+ 
+-#: vms-alpha.c:7168
++#: vms-alpha.c:7166
+ #, c-format
+ msgid "type spec for element:\n"
+ msgstr "спецификация типа для элемента:\n"
+ 
+-#: vms-alpha.c:7170
++#: vms-alpha.c:7168
+ #, c-format
+ msgid "type spec for subscript %u:\n"
+ msgstr "спецификация типа для subscript %u:\n"
+ 
+-#: vms-alpha.c:7188
++#: vms-alpha.c:7186
+ #, c-format
+ msgid "Debug symbol table:\n"
+ msgstr "Таблица символов отладки:\n"
+ 
+-#: vms-alpha.c:7199
++#: vms-alpha.c:7197
+ #, c-format
+ msgid "cannot read DST header\n"
+ msgstr "не удалось прочитать заголовок DST\n"
+ 
+-#: vms-alpha.c:7205
++#: vms-alpha.c:7203
+ #, c-format
+ msgid " type: %3u, len: %3u (at 0x%08x): "
+ msgstr " тип: %3u, длина: %3u (по 0x%08x): "
+ 
+-#: vms-alpha.c:7219
++#: vms-alpha.c:7217
+ #, c-format
+ msgid "cannot read DST symbol\n"
+ msgstr "не удалось прочитать символ DST\n"
+ 
+-#: vms-alpha.c:7262
++#: vms-alpha.c:7260
+ #, c-format
+ msgid "standard data: %s\n"
+ msgstr "стандартные данные: %s\n"
+ 
+-#: vms-alpha.c:7265 vms-alpha.c:7353
++#: vms-alpha.c:7263 vms-alpha.c:7351
+ #, c-format
+ msgid "    name: %.*s\n"
+ msgstr "    имя: %.*s\n"
+ 
+-#: vms-alpha.c:7272
++#: vms-alpha.c:7270
+ #, c-format
+ msgid "modbeg\n"
+ msgstr "modbeg\n"
+ 
+-#: vms-alpha.c:7274
++#: vms-alpha.c:7272
+ #, c-format
+ msgid "   flags: %d, language: %u, major: %u, minor: %u\n"
+ msgstr "   флаги: %d, язык: %u, старший: %u, младший: %u\n"
+ 
+-#: vms-alpha.c:7280 vms-alpha.c:7554
++#: vms-alpha.c:7278 vms-alpha.c:7552
+ #, c-format
+ msgid "   module name: %.*s\n"
+ msgstr "   имя модуля: %.*s\n"
+ 
+-#: vms-alpha.c:7283
++#: vms-alpha.c:7281
+ #, c-format
+ msgid "   compiler   : %.*s\n"
+ msgstr "   компилятор   : %.*s\n"
+ 
+-#: vms-alpha.c:7288
++#: vms-alpha.c:7286
+ #, c-format
+ msgid "modend\n"
+ msgstr "modend\n"
+ 
+-#: vms-alpha.c:7295
++#: vms-alpha.c:7293
+ msgid "rtnbeg\n"
+ msgstr "rtnbeg\n"
+ 
+-#: vms-alpha.c:7297
++#: vms-alpha.c:7295
+ #, c-format
+ msgid "    flags: %u, address: 0x%08x, pd-address: 0x%08x\n"
+ msgstr "    флаги: %u, адрес: 0x%08x, pd-адрес: 0x%08x\n"
+ 
+-#: vms-alpha.c:7302
++#: vms-alpha.c:7300
+ #, c-format
+ msgid "    routine name: %.*s\n"
+ msgstr "    имя процедуры: %.*s\n"
+ 
+-#: vms-alpha.c:7310
++#: vms-alpha.c:7308
+ #, c-format
+ msgid "rtnend: size 0x%08x\n"
+ msgstr "rtnend: размер 0x%08x\n"
+ 
+-#: vms-alpha.c:7318
++#: vms-alpha.c:7316
+ #, c-format
+ msgid "prolog: bkpt address 0x%08x\n"
+ msgstr "пролог: адрес bkpt 0x%08x\n"
+ 
+-#: vms-alpha.c:7327
++#: vms-alpha.c:7325
+ #, c-format
+ msgid "epilog: flags: %u, count: %u\n"
+ msgstr "эпилог: флаги: %u, счётчик: %u\n"
+ 
+-#: vms-alpha.c:7337
++#: vms-alpha.c:7335
+ #, c-format
+ msgid "blkbeg: address: 0x%08x, name: %.*s\n"
+ msgstr "blkbeg: адрес: 0x%08x, имя: %.*s\n"
+ 
+-#: vms-alpha.c:7346
++#: vms-alpha.c:7344
+ #, c-format
+ msgid "blkend: size: 0x%08x\n"
+ msgstr "blkend: размер: 0x%08x\n"
+ 
+-#: vms-alpha.c:7352
++#: vms-alpha.c:7350
+ #, c-format
+ msgid "typspec (len: %u)\n"
+ msgstr "typspec (длина: %u)\n"
+ 
+-#: vms-alpha.c:7359
++#: vms-alpha.c:7357
+ #, c-format
+ msgid "septyp, name: %.*s\n"
+ msgstr "septyp, имя: %.*s\n"
+ 
+-#: vms-alpha.c:7368
++#: vms-alpha.c:7366
+ #, c-format
+ msgid "recbeg: name: %.*s\n"
+ msgstr "recbeg: имя: %.*s\n"
+ 
+-#: vms-alpha.c:7370
++#: vms-alpha.c:7368
+ #, c-format
+ msgid "    len: %u bits\n"
+ msgstr "    длина: %u бит\n"
+ 
+-#: vms-alpha.c:7375
++#: vms-alpha.c:7373
+ #, c-format
+ msgid "recend\n"
+ msgstr "recend\n"
+ 
+-#: vms-alpha.c:7379
++#: vms-alpha.c:7377
+ #, c-format
+ msgid "enumbeg, len: %u, name: %.*s\n"
+ msgstr "enumbeg, длина: %u, имя: %.*s\n"
+ 
+-#: vms-alpha.c:7383
++#: vms-alpha.c:7381
+ #, c-format
+ msgid "enumelt, name: %.*s\n"
+ msgstr "enumelt, имя: %.*s\n"
+ 
+-#: vms-alpha.c:7387
++#: vms-alpha.c:7385
+ #, c-format
+ msgid "enumend\n"
+ msgstr "enumend\n"
+ 
+-#: vms-alpha.c:7392
++#: vms-alpha.c:7390
+ #, c-format
+ msgid "label, name: %.*s\n"
+ msgstr "метка, имя: %.*s\n"
+ 
+-#: vms-alpha.c:7394
++#: vms-alpha.c:7392
+ #, c-format
+ msgid "    address: 0x%08x\n"
+ msgstr "   адрес: 0x%08x\n"
+ 
+-#: vms-alpha.c:7404
++#: vms-alpha.c:7402
+ #, c-format
+ msgid "discontiguous range (nbr: %u)\n"
+ msgstr "несмежный диапазон (nbr: %u)\n"
+ 
+-#: vms-alpha.c:7407
++#: vms-alpha.c:7405
+ #, c-format
+ msgid "    address: 0x%08x, size: %u\n"
+ msgstr "    адрес: 0x%08x, размер: %u\n"
+ 
+-#: vms-alpha.c:7417
++#: vms-alpha.c:7415
+ #, c-format
+ msgid "line num  (len: %u)\n"
+ msgstr "номер строки (длина: %u)\n"
+ 
+-#: vms-alpha.c:7434
++#: vms-alpha.c:7432
+ #, c-format
+ msgid "delta_pc_w %u\n"
+ msgstr "delta_pc_w %u\n"
+ 
+-#: vms-alpha.c:7441
++#: vms-alpha.c:7439
+ #, c-format
+ msgid "incr_linum(b): +%u\n"
+ msgstr "incr_linum(b): +%u\n"
+ 
+-#: vms-alpha.c:7447
++#: vms-alpha.c:7445
+ #, c-format
+ msgid "incr_linum_w: +%u\n"
+ msgstr "incr_linum_w: +%u\n"
+ 
+-#: vms-alpha.c:7453
++#: vms-alpha.c:7451
+ #, c-format
+ msgid "incr_linum_l: +%u\n"
+ msgstr "incr_linum_l: +%u\n"
+ 
+-#: vms-alpha.c:7459
++#: vms-alpha.c:7457
+ #, c-format
+ msgid "set_line_num(w) %u\n"
+ msgstr "set_line_num(w) %u\n"
+ 
+-#: vms-alpha.c:7464
++#: vms-alpha.c:7462
+ #, c-format
+ msgid "set_line_num_b %u\n"
+ msgstr "set_line_num_b %u\n"
+ 
+-#: vms-alpha.c:7469
++#: vms-alpha.c:7467
+ #, c-format
+ msgid "set_line_num_l %u\n"
+ msgstr "set_line_num_l %u\n"
+ 
+-#: vms-alpha.c:7474
++#: vms-alpha.c:7472
+ #, c-format
+ msgid "set_abs_pc: 0x%08x\n"
+ msgstr "set_abs_pc: 0x%08x\n"
+ 
+-#: vms-alpha.c:7478
++#: vms-alpha.c:7476
+ #, c-format
+ msgid "delta_pc_l: +0x%08x\n"
+ msgstr "delta_pc_l: +0x%08x\n"
+ 
+-#: vms-alpha.c:7483
++#: vms-alpha.c:7481
+ #, c-format
+ msgid "term(b): 0x%02x"
+ msgstr "term(b): 0x%02x"
+ 
+-#: vms-alpha.c:7485
++#: vms-alpha.c:7483
+ #, c-format
+ msgid "        pc: 0x%08x\n"
+ msgstr "        pc: 0x%08x\n"
+ 
+-#: vms-alpha.c:7490
++#: vms-alpha.c:7488
+ #, c-format
+ msgid "term_w: 0x%04x"
+ msgstr "term_w: 0x%04x"
+ 
+-#: vms-alpha.c:7492
++#: vms-alpha.c:7490
+ #, c-format
+ msgid "    pc: 0x%08x\n"
+ msgstr "    pc: 0x%08x\n"
+ 
+-#: vms-alpha.c:7498
++#: vms-alpha.c:7496
+ #, c-format
+ msgid "delta pc +%-4d"
+ msgstr "delta pc +%-4d"
+ 
+-#: vms-alpha.c:7502
++#: vms-alpha.c:7500
+ #, c-format
+ msgid "    pc: 0x%08x line: %5u\n"
+ msgstr "    pc: 0x%08x строка: %5u\n"
+ 
+-#: vms-alpha.c:7507
++#: vms-alpha.c:7505
+ #, c-format
+ msgid "    *unhandled* cmd %u\n"
+ msgstr "    *необработанная* команда %u\n"
+ 
+-#: vms-alpha.c:7522
++#: vms-alpha.c:7520
+ #, c-format
+ msgid "source (len: %u)\n"
+ msgstr "источник (длина: %u)\n"
+ 
+-#: vms-alpha.c:7537
++#: vms-alpha.c:7535
+ #, c-format
+ msgid "   declfile: len: %u, flags: %u, fileid: %u\n"
+ msgstr "   declfile: длина: %u, флаги: %u, fileid: %u\n"
+ 
+-#: vms-alpha.c:7542
++#: vms-alpha.c:7540
+ #, c-format
+ msgid "   rms: cdt: 0x%08x %08x, ebk: 0x%08x, ffb: 0x%04x, rfo: %u\n"
+ msgstr "   rms: cdt: 0x%08x %08x, ebk: 0x%08x, ffb: 0x%04x, rfo: %u\n"
+ 
+-#: vms-alpha.c:7551
++#: vms-alpha.c:7549
+ #, c-format
+ msgid "   filename   : %.*s\n"
+ msgstr "   имя файла   : %.*s\n"
+ 
+-#: vms-alpha.c:7560
++#: vms-alpha.c:7558
+ #, c-format
+ msgid "   setfile %u\n"
+ msgstr "   setfile %u\n"
+ 
+-#: vms-alpha.c:7565 vms-alpha.c:7570
++#: vms-alpha.c:7563 vms-alpha.c:7568
+ #, c-format
+ msgid "   setrec %u\n"
+ msgstr "   setrec %u\n"
+ 
+-#: vms-alpha.c:7575 vms-alpha.c:7580
++#: vms-alpha.c:7573 vms-alpha.c:7578
+ #, c-format
+ msgid "   setlnum %u\n"
+ msgstr "   setlnum %u\n"
+ 
+-#: vms-alpha.c:7585 vms-alpha.c:7590
++#: vms-alpha.c:7583 vms-alpha.c:7588
+ #, c-format
+ msgid "   deflines %u\n"
+ msgstr "   deflines %u\n"
+ 
+-#: vms-alpha.c:7594
++#: vms-alpha.c:7592
+ #, c-format
+ msgid "   formfeed\n"
+ msgstr "   formfeed\n"
+ 
+-#: vms-alpha.c:7598
++#: vms-alpha.c:7596
+ #, c-format
+ msgid "   *unhandled* cmd %u\n"
+ msgstr "   *необработанная* команда %u\n"
+ 
+-#: vms-alpha.c:7610
++#: vms-alpha.c:7608
+ #, c-format
+ msgid "*unhandled* dst type %u\n"
+ msgstr "*необработанный* тип назначения %u\n"
+ 
+-#: vms-alpha.c:7642
++#: vms-alpha.c:7640
+ #, c-format
+ msgid "cannot read EIHD\n"
+ msgstr "не удалось прочитать EIHD\n"
+ 
+-#: vms-alpha.c:7646
++#: vms-alpha.c:7644
+ #, c-format
+ msgid "EIHD: (size: %u, nbr blocks: %u)\n"
+ msgstr "EIHD: (размер: %u, nbr блоков: %u)\n"
+ 
+-#: vms-alpha.c:7650
++#: vms-alpha.c:7648
+ #, c-format
+ msgid " majorid: %u, minorid: %u\n"
+ msgstr " majorid: %u, minorid: %u\n"
+ 
+-#: vms-alpha.c:7658
++#: vms-alpha.c:7656
+ msgid "executable"
+ msgstr "исполняемый"
+ 
+-#: vms-alpha.c:7661
++#: vms-alpha.c:7659
+ msgid "linkable image"
+ msgstr "компонуемый образ"
+ 
+-#: vms-alpha.c:7668
++#: vms-alpha.c:7666
+ #, c-format
+ msgid " image type: %u (%s)"
+ msgstr " тип образа: %u (%s)"
+ 
+-#: vms-alpha.c:7674
++#: vms-alpha.c:7672
+ msgid "native"
+ msgstr "родной"
+ 
+-#: vms-alpha.c:7677
++#: vms-alpha.c:7675
+ msgid "CLI"
+ msgstr "CLI"
+ 
+-#: vms-alpha.c:7684
++#: vms-alpha.c:7682
+ #, c-format
+ msgid ", subtype: %u (%s)\n"
+ msgstr ", подтип: %u (%s)\n"
+ 
+-#: vms-alpha.c:7691
++#: vms-alpha.c:7689
+ #, c-format
+ msgid " offsets: isd: %u, activ: %u, symdbg: %u, imgid: %u, patch: %u\n"
+ msgstr " смещения: isd: %u, activ: %u, symdbg: %u, imgid: %u, patch: %u\n"
+ 
+-#: vms-alpha.c:7695
++#: vms-alpha.c:7693
+ #, c-format
+ msgid " fixup info rva: "
+ msgstr " fixup info rva: "
+ 
+-#: vms-alpha.c:7697
++#: vms-alpha.c:7695
+ #, c-format
+ msgid ", symbol vector rva: "
+ msgstr ", символьный вектор rva: "
+ 
+-#: vms-alpha.c:7700
++#: vms-alpha.c:7698
+ #, c-format
+ msgid ""
+ "\n"
+@@ -7604,690 +7775,719 @@ msgstr ""
+ "\n"
+ " смещение массива версий: %u\n"
+ 
+-#: vms-alpha.c:7705
++#: vms-alpha.c:7703
+ #, c-format
+ msgid " img I/O count: %u, nbr channels: %u, req pri: %08x%08x\n"
+ msgstr " img I/O count: %u, nbr channels: %u, req pri: %08x%08x\n"
+ 
+-#: vms-alpha.c:7711
++#: vms-alpha.c:7709
+ #, c-format
+ msgid " linker flags: %08x:"
+ msgstr " флаги компоновщика: %08x:"
+ 
+-#: vms-alpha.c:7742
++#: vms-alpha.c:7740
+ #, c-format
+ msgid " ident: 0x%08x, sysver: 0x%08x, match ctrl: %u, symvect_size: %u\n"
+ msgstr " ident: 0x%08x, sysver: 0x%08x, match ctrl: %u, symvect_size: %u\n"
+ 
+-#: vms-alpha.c:7748
++#: vms-alpha.c:7746
+ #, c-format
+ msgid " BPAGE: %u"
+ msgstr " BPAGE: %u"
+ 
+-#: vms-alpha.c:7755
++#: vms-alpha.c:7753
+ #, c-format
+ msgid ", ext fixup offset: %u, no_opt psect off: %u"
+ msgstr ", ext fixup offset: %u, no_opt psect off: %u"
+ 
+-#: vms-alpha.c:7758
++#: vms-alpha.c:7756
+ #, c-format
+ msgid ", alias: %u\n"
+ msgstr ", псевдоним: %u\n"
+ 
+-#: vms-alpha.c:7766
++#: vms-alpha.c:7764
+ #, c-format
+ msgid "system version array information:\n"
+ msgstr "массив информации версии системы:\n"
+ 
+-#: vms-alpha.c:7770
++#: vms-alpha.c:7768
+ #, c-format
+ msgid "cannot read EIHVN header\n"
+ msgstr "не удалось прочитать заголовок EIHVN\n"
+ 
+-#: vms-alpha.c:7780
++#: vms-alpha.c:7778
+ #, c-format
+ msgid "cannot read EIHVN version\n"
+ msgstr "не удалось прочитать версию EIHVN\n"
+ 
+-#: vms-alpha.c:7783
++#: vms-alpha.c:7781
+ #, c-format
+ msgid "   %02u "
+ msgstr "   %02u "
+ 
+-#: vms-alpha.c:7787
++#: vms-alpha.c:7785
+ msgid "BASE_IMAGE       "
+ msgstr "BASE_IMAGE       "
+ 
+-#: vms-alpha.c:7790
++#: vms-alpha.c:7788
+ msgid "MEMORY_MANAGEMENT"
+ msgstr "MEMORY_MANAGEMENT"
+ 
+-#: vms-alpha.c:7793
++#: vms-alpha.c:7791
+ msgid "IO               "
+ msgstr "IO               "
+ 
+-#: vms-alpha.c:7796
++#: vms-alpha.c:7794
+ msgid "FILES_VOLUMES    "
+ msgstr "FILES_VOLUMES    "
+ 
+-#: vms-alpha.c:7799
++#: vms-alpha.c:7797
+ msgid "PROCESS_SCHED    "
+ msgstr "PROCESS_SCHED    "
+ 
+-#: vms-alpha.c:7802
++#: vms-alpha.c:7800
+ msgid "SYSGEN           "
+ msgstr "SYSGEN           "
+ 
+-#: vms-alpha.c:7805
++#: vms-alpha.c:7803
+ msgid "CLUSTERS_LOCKMGR "
+ msgstr "CLUSTERS_LOCKMGR "
+ 
+-#: vms-alpha.c:7808
++#: vms-alpha.c:7806
+ msgid "LOGICAL_NAMES    "
+ msgstr "LOGICAL_NAMES    "
+ 
+-#: vms-alpha.c:7811
++#: vms-alpha.c:7809
+ msgid "SECURITY         "
+ msgstr "SECURITY         "
+ 
+-#: vms-alpha.c:7814
++#: vms-alpha.c:7812
+ msgid "IMAGE_ACTIVATOR  "
+ msgstr "IMAGE_ACTIVATOR  "
+ 
+-#: vms-alpha.c:7817
++#: vms-alpha.c:7815
+ msgid "NETWORKS         "
+ msgstr "NETWORKS         "
+ 
+-#: vms-alpha.c:7820
++#: vms-alpha.c:7818
+ msgid "COUNTERS         "
+ msgstr "COUNTERS         "
+ 
+-#: vms-alpha.c:7823
++#: vms-alpha.c:7821
+ msgid "STABLE           "
+ msgstr "STABLE           "
+ 
+-#: vms-alpha.c:7826
++#: vms-alpha.c:7824
+ msgid "MISC             "
+ msgstr "MISC             "
+ 
+-#: vms-alpha.c:7829
++#: vms-alpha.c:7827
+ msgid "CPU              "
+ msgstr "CPU              "
+ 
+-#: vms-alpha.c:7832
++#: vms-alpha.c:7830
+ msgid "VOLATILE         "
+ msgstr "VOLATILE         "
+ 
+-#: vms-alpha.c:7835
++#: vms-alpha.c:7833
+ msgid "SHELL            "
+ msgstr "SHELL            "
+ 
+-#: vms-alpha.c:7838
++#: vms-alpha.c:7836
+ msgid "POSIX            "
+ msgstr "POSIX            "
+ 
+-#: vms-alpha.c:7841
++#: vms-alpha.c:7839
+ msgid "MULTI_PROCESSING "
+ msgstr "MULTI_PROCESSING "
+ 
+-#: vms-alpha.c:7844
++#: vms-alpha.c:7842
+ msgid "GALAXY           "
+ msgstr "GALAXY           "
+ 
+-#: vms-alpha.c:7847
++#: vms-alpha.c:7845
+ msgid "*unknown*        "
+ msgstr "*неизвестно*        "
+ 
+-#: vms-alpha.c:7863 vms-alpha.c:8137
++#: vms-alpha.c:7861 vms-alpha.c:8135
+ #, c-format
+ msgid "cannot read EIHA\n"
+ msgstr "не удалось прочитать EIHA\n"
+ 
+-#: vms-alpha.c:7866
++#: vms-alpha.c:7864
+ #, c-format
+ msgid "Image activation:  (size=%u)\n"
+ msgstr "Активация образа:  (размер=%u)\n"
+ 
+-#: vms-alpha.c:7869
++#: vms-alpha.c:7867
+ #, c-format
+ msgid " First address : 0x%08x 0x%08x\n"
+ msgstr " Первый адрес: 0x%08x 0x%08x\n"
+ 
+-#: vms-alpha.c:7873
++#: vms-alpha.c:7871
+ #, c-format
+ msgid " Second address: 0x%08x 0x%08x\n"
+ msgstr " Второй адрес: 0x%08x 0x%08x\n"
+ 
+-#: vms-alpha.c:7877
++#: vms-alpha.c:7875
+ #, c-format
+ msgid " Third address : 0x%08x 0x%08x\n"
+ msgstr " Третий адрес: 0x%08x 0x%08x\n"
+ 
+-#: vms-alpha.c:7881
++#: vms-alpha.c:7879
+ #, c-format
+ msgid " Fourth address: 0x%08x 0x%08x\n"
+ msgstr " Четвёртый адрес: 0x%08x 0x%08x\n"
+ 
+-#: vms-alpha.c:7885
++#: vms-alpha.c:7883
+ #, c-format
+ msgid " Shared image  : 0x%08x 0x%08x\n"
+ msgstr " Общий образ: 0x%08x 0x%08x\n"
+ 
+-#: vms-alpha.c:7896
++#: vms-alpha.c:7894
+ #, c-format
+ msgid "cannot read EIHI\n"
+ msgstr "не удалось прочитать EIHI\n"
+ 
+-#: vms-alpha.c:7900
++#: vms-alpha.c:7898
+ #, c-format
+ msgid "Image identification: (major: %u, minor: %u)\n"
+ msgstr "Идентификация образа: (старший: %u, младший: %u)\n"
+ 
+-#: vms-alpha.c:7903
++#: vms-alpha.c:7901
+ #, c-format
+ msgid " image name       : %.*s\n"
+ msgstr " имя образа       : %.*s\n"
+ 
+-#: vms-alpha.c:7905
++#: vms-alpha.c:7903
+ #, c-format
+ msgid " link time        : %s\n"
+ msgstr " время компоновки : %s\n"
+ 
+-#: vms-alpha.c:7907
++#: vms-alpha.c:7905
+ #, c-format
+ msgid " image ident      : %.*s\n"
+ msgstr " идент-р образа      : %.*s\n"
+ 
+-#: vms-alpha.c:7909
++#: vms-alpha.c:7907
+ #, c-format
+ msgid " linker ident     : %.*s\n"
+ msgstr " идент-р компоновщика: %.*s\n"
+ 
+-#: vms-alpha.c:7911
++#: vms-alpha.c:7909
+ #, c-format
+ msgid " image build ident: %.*s\n"
+ msgstr " идент-р сборки образа: %.*s\n"
+ 
+-#: vms-alpha.c:7921
++#: vms-alpha.c:7919
+ #, c-format
+ msgid "cannot read EIHS\n"
+ msgstr "не удалось прочитать EIHS\n"
+ 
+-#: vms-alpha.c:7925
++#: vms-alpha.c:7923
+ #, c-format
+ msgid "Image symbol & debug table: (major: %u, minor: %u)\n"
+ msgstr "Таблица символов & отладки образа: (старший: %u, младший: %u)\n"
+ 
+-#: vms-alpha.c:7931
++#: vms-alpha.c:7929
+ #, c-format
+ msgid " debug symbol table : vbn: %u, size: %u (0x%x)\n"
+ msgstr " таблица отладочных символов: vbn: %u, размер: %u (0x%x)\n"
+ 
+-#: vms-alpha.c:7936
++#: vms-alpha.c:7934
+ #, c-format
+ msgid " global symbol table: vbn: %u, records: %u\n"
+ msgstr " глобальная таблица символов: vbn: %u, записей: %u\n"
+ 
+-#: vms-alpha.c:7941
++#: vms-alpha.c:7939
+ #, c-format
+ msgid " debug module table : vbn: %u, size: %u\n"
+ msgstr " таблица отладочных модулей: vbn: %u, размер: %u\n"
+ 
+-#: vms-alpha.c:7954
++#: vms-alpha.c:7952
+ #, c-format
+ msgid "cannot read EISD\n"
+ msgstr "не удалось прочитать EISD\n"
+ 
+-#: vms-alpha.c:7965
++#: vms-alpha.c:7963
+ #, c-format
+ msgid "Image section descriptor: (major: %u, minor: %u, size: %u, offset: %u)\n"
+ msgstr "Дескриптор раздела образа: (старший: %u, младший: %u, размер: %u, смещение: %u)\n"
+ 
+-#: vms-alpha.c:7973
++#: vms-alpha.c:7971
+ #, c-format
+ msgid " section: base: 0x%08x%08x size: 0x%08x\n"
+ msgstr " раздел: база: 0x%08x%08x размер: 0x%08x\n"
+ 
+-#: vms-alpha.c:7978
++#: vms-alpha.c:7976
+ #, c-format
+ msgid " flags: 0x%04x"
+ msgstr " флаги: 0x%04x"
+ 
+-#: vms-alpha.c:8016
++#: vms-alpha.c:8014
+ #, c-format
+ msgid " vbn: %u, pfc: %u, matchctl: %u type: %u ("
+ msgstr " vbn: %u, pfc: %u, matchctl: %u тип: %u ("
+ 
+-#: vms-alpha.c:8022
++#: vms-alpha.c:8020
+ msgid "NORMAL"
+ msgstr "NORMAL"
+ 
+-#: vms-alpha.c:8025
++#: vms-alpha.c:8023
+ msgid "SHRFXD"
+ msgstr "SHRFXD"
+ 
+-#: vms-alpha.c:8028
++#: vms-alpha.c:8026
+ msgid "PRVFXD"
+ msgstr "PRVFXD"
+ 
+-#: vms-alpha.c:8031
++#: vms-alpha.c:8029
+ msgid "SHRPIC"
+ msgstr "SHRPIC"
+ 
+-#: vms-alpha.c:8034
++#: vms-alpha.c:8032
+ msgid "PRVPIC"
+ msgstr "PRVPIC"
+ 
+-#: vms-alpha.c:8037
++#: vms-alpha.c:8035
+ msgid "USRSTACK"
+ msgstr "USRSTACK"
+ 
+-#: vms-alpha.c:8043
++#: vms-alpha.c:8041
+ msgid ")\n"
+ msgstr ")\n"
+ 
+-#: vms-alpha.c:8046
++#: vms-alpha.c:8044
+ #, c-format
+ msgid " ident: 0x%08x, name: %.*s\n"
+ msgstr " иден-р: 0x%08x, имя: %.*s\n"
+ 
+-#: vms-alpha.c:8056
++#: vms-alpha.c:8054
+ #, c-format
+ msgid "cannot read DMT\n"
+ msgstr "не удалось прочитать DMT\n"
+ 
+-#: vms-alpha.c:8060
++#: vms-alpha.c:8058
+ #, c-format
+ msgid "Debug module table:\n"
+ msgstr "Таблица отладочных модулей:\n"
+ 
+-#: vms-alpha.c:8069
++#: vms-alpha.c:8067
+ #, c-format
+ msgid "cannot read DMT header\n"
+ msgstr "не удалось прочитать заголовок DMT\n"
+ 
+-#: vms-alpha.c:8075
++#: vms-alpha.c:8073
+ #, c-format
+ msgid " module offset: 0x%08x, size: 0x%08x, (%u psects)\n"
+ msgstr " смещение модуля: 0x%08x, размер: 0x%08x, (%u psects)\n"
+ 
+-#: vms-alpha.c:8085
++#: vms-alpha.c:8083
+ #, c-format
+ msgid "cannot read DMT psect\n"
+ msgstr "не удалось прочитать DMT psect\n"
+ 
+-#: vms-alpha.c:8089
++#: vms-alpha.c:8087
+ #, c-format
+ msgid "  psect start: 0x%08x, length: %u\n"
+ msgstr "  начало psect: 0x%08x, длина: %u\n"
+ 
+-#: vms-alpha.c:8102
++#: vms-alpha.c:8100
+ #, c-format
+ msgid "cannot read DST\n"
+ msgstr "не удалось прочитать DST\n"
+ 
+-#: vms-alpha.c:8112
++#: vms-alpha.c:8110
+ #, c-format
+ msgid "cannot read GST\n"
+ msgstr "не удалось прочитать GST\n"
+ 
+-#: vms-alpha.c:8116
++#: vms-alpha.c:8114
+ #, c-format
+ msgid "Global symbol table:\n"
+ msgstr "Таблица глобальных символов:\n"
+ 
+-#: vms-alpha.c:8143
++#: vms-alpha.c:8141
+ #, c-format
+ msgid "Image activator fixup: (major: %u, minor: %u)\n"
+ msgstr "Активатор местоположения образа: (старший: %u, младший: %u)\n"
+ 
+-#: vms-alpha.c:8147
++#: vms-alpha.c:8145
+ #, c-format
+ msgid "  iaflink : 0x%08x %08x\n"
+ msgstr "  iaflink : 0x%08x %08x\n"
+ 
+-#: vms-alpha.c:8151
++#: vms-alpha.c:8149
+ #, c-format
+ msgid "  fixuplnk: 0x%08x %08x\n"
+ msgstr "  fixuplnk: 0x%08x %08x\n"
+ 
+-#: vms-alpha.c:8154
++#: vms-alpha.c:8152
+ #, c-format
+ msgid "  size : %u\n"
+ msgstr "  размер: %u\n"
+ 
+-#: vms-alpha.c:8156
++#: vms-alpha.c:8154
+ #, c-format
+ msgid "  flags: 0x%08x\n"
+ msgstr "  флаги: 0x%08x\n"
+ 
+-#: vms-alpha.c:8161
++#: vms-alpha.c:8159
+ #, c-format
+ msgid "  qrelfixoff: %5u, lrelfixoff: %5u\n"
+ msgstr "  qrelfixoff: %5u, lrelfixoff: %5u\n"
+ 
+-#: vms-alpha.c:8166
++#: vms-alpha.c:8164
+ #, c-format
+ msgid "  qdotadroff: %5u, ldotadroff: %5u\n"
+ msgstr "  qdotadroff: %5u, ldotadroff: %5u\n"
+ 
+-#: vms-alpha.c:8171
++#: vms-alpha.c:8169
+ #, c-format
+ msgid "  codeadroff: %5u, lpfixoff  : %5u\n"
+ msgstr "  codeadroff: %5u, lpfixoff  : %5u\n"
+ 
+-#: vms-alpha.c:8174
++#: vms-alpha.c:8172
+ #, c-format
+ msgid "  chgprtoff : %5u\n"
+ msgstr "  chgprtoff : %5u\n"
+ 
+-#: vms-alpha.c:8178
++#: vms-alpha.c:8176
+ #, c-format
+ msgid "  shlstoff  : %5u, shrimgcnt : %5u\n"
+ msgstr "  shlstoff  : %5u, shrimgcnt : %5u\n"
+ 
+-#: vms-alpha.c:8181
++#: vms-alpha.c:8179
+ #, c-format
+ msgid "  shlextra  : %5u, permctx   : %5u\n"
+ msgstr "  shlextra  : %5u, permctx   : %5u\n"
+ 
+-#: vms-alpha.c:8184
++#: vms-alpha.c:8182
+ #, c-format
+ msgid "  base_va : 0x%08x\n"
+ msgstr "  base_va : 0x%08x\n"
+ 
+-#: vms-alpha.c:8186
++#: vms-alpha.c:8184
+ #, c-format
+ msgid "  lppsbfixoff: %5u\n"
+ msgstr "  lppsbfixoff: %5u\n"
+ 
+-#: vms-alpha.c:8194
++#: vms-alpha.c:8192
+ #, c-format
+ msgid " Shareable images:\n"
+ msgstr " Общие образы:\n"
+ 
+-#: vms-alpha.c:8199
++#: vms-alpha.c:8197
+ #, c-format
+ msgid "  %u: size: %u, flags: 0x%02x, name: %.*s\n"
+ msgstr "  %u: размер: %u, флаги: 0x%02x, имя: %.*s\n"
+ 
+-#: vms-alpha.c:8206
++#: vms-alpha.c:8204
+ #, c-format
+ msgid " quad-word relocation fixups:\n"
+ msgstr " четверное слово перемещаемых местоположений:\n"
+ 
+-#: vms-alpha.c:8211
++#: vms-alpha.c:8209
+ #, c-format
+ msgid " long-word relocation fixups:\n"
+ msgstr " длинное слово перемещаемых местоположений:\n"
+ 
+-#: vms-alpha.c:8216
++#: vms-alpha.c:8214
+ #, c-format
+ msgid " quad-word .address reference fixups:\n"
+ msgstr " четверное слово ссылочных местоположений .address:\n"
+ 
+-#: vms-alpha.c:8221
++#: vms-alpha.c:8219
+ #, c-format
+ msgid " long-word .address reference fixups:\n"
+ msgstr " длинное слово ссылочных местоположений .address:\n"
+ 
+-#: vms-alpha.c:8226
++#: vms-alpha.c:8224
+ #, c-format
+ msgid " Code Address Reference Fixups:\n"
+ msgstr " Ссылочные местоположения адреса кода:\n"
+ 
+-#: vms-alpha.c:8231
++#: vms-alpha.c:8229
+ #, c-format
+ msgid " Linkage Pairs Reference Fixups:\n"
+ msgstr " Ссылочные местоположения компонуемых пар:\n"
+ 
+-#: vms-alpha.c:8240
++#: vms-alpha.c:8238
+ #, c-format
+ msgid " Change Protection (%u entries):\n"
+ msgstr " Изменение защиты (%u элементов):\n"
+ 
+-#: vms-alpha.c:8246
++#: vms-alpha.c:8244
+ #, c-format
+ msgid "  base: 0x%08x %08x, size: 0x%08x, prot: 0x%08x "
+ msgstr "  база: 0x%08x %08x, размер: 0x%08x, prot: 0x%08x "
+ 
+ #. FIXME: we do not yet support relocatable link.  It is not obvious
+ #. how to do it for debug infos.
+-#: vms-alpha.c:9123
++#: vms-alpha.c:9121
+ msgid "%P: relocatable link is not supported\n"
+ msgstr "%P: перемещаемая ссылка не поддерживается\n"
+ 
+-#: vms-alpha.c:9194
++#: vms-alpha.c:9192
+ #, c-format
+ msgid "%P: multiple entry points: in modules %pB and %pB\n"
+ msgstr "%P: несколько точек входа: в модулях %pB и %pB\n"
+ 
+-#: vms-lib.c:1525
++#: vms-lib.c:1527
+ #, c-format
+ msgid "could not open shared image '%s' from '%s'"
+ msgstr "не удалось открыть общий образ «%s» из «%s»"
+ 
+-#: vms-misc.c:367
++#: vms-misc.c:370
+ msgid "_bfd_vms_output_counted called with zero bytes"
+ msgstr "Вызов _bfd_vms_output_counted с нулевым количеством байт"
+ 
+-#: vms-misc.c:372
++#: vms-misc.c:375
+ msgid "_bfd_vms_output_counted called with too many bytes"
+ msgstr "Вызов _bfd_vms_output_counted со слишком большим количеством байт"
+ 
+-#: xcofflink.c:832
++#: xcofflink.c:835
+ #, c-format
+ msgid "%pB: XCOFF shared object when not producing XCOFF output"
+ msgstr "%pB: общий объект XCOFF без создания вывода XCOFF"
+ 
+-#: xcofflink.c:853
++#: xcofflink.c:856
+ #, c-format
+ msgid "%pB: dynamic object with no .loader section"
+ msgstr "%pB: динамический объект без раздела .loader"
+ 
+-#: xcofflink.c:1417
++#: xcofflink.c:1420
+ #, c-format
+ msgid "%pB: `%s' has line numbers but no enclosing section"
+ msgstr "%pB: «%s» содержит номера строк, но в обрамляющем разделе"
+ 
+-#: xcofflink.c:1470
++#: xcofflink.c:1473
+ #, c-format
+ msgid "%pB: class %d symbol `%s' has no aux entries"
+ msgstr "%pB: класс %d символа «%s» не имеет элементов aux"
+ 
+-#: xcofflink.c:1493
++#: xcofflink.c:1496
+ #, c-format
+ msgid "%pB: symbol `%s' has unrecognized csect type %d"
+ msgstr "%pB: символ «%s» имеет нераспознанный тип csect: %d"
+ 
+-#: xcofflink.c:1506
++#: xcofflink.c:1509
+ #, c-format
+ msgid "%pB: bad XTY_ER symbol `%s': class %d scnum %d scnlen %<PRId64>"
+ msgstr "%pB: неверный символ XTY_ER «%s»: класс %d scnum %d scnlen %<PRId64>"
+ 
+-#: xcofflink.c:1537
++#: xcofflink.c:1540
+ #, c-format
+ msgid "%pB: XMC_TC0 symbol `%s' is class %d scnlen %<PRId64>"
+ msgstr "%pB: символ XMC_TC0 «%s» является классом %d scnlen %<PRId64>"
+ 
+-#: xcofflink.c:1684
++#: xcofflink.c:1687
+ #, c-format
+ msgid "%pB: csect `%s' not in enclosing section"
+ msgstr "%pB: csect «%s» не в обрамляющем разделе"
+ 
+-#: xcofflink.c:1792
++#: xcofflink.c:1795
+ #, c-format
+ msgid "%pB: misplaced XTY_LD `%s'"
+ msgstr "%pB: неправильно расположенный XTY_LD «%s»"
+ 
+-#: xcofflink.c:2113
++#: xcofflink.c:2122
+ #, c-format
+ msgid "%pB: reloc %s:%<PRId64> not in csect"
+ msgstr "%pB: перемещение %s:%<PRId64> не в csect"
+ 
+-#: xcofflink.c:3193
++#: xcofflink.c:3223
+ #, c-format
+ msgid "%s: no such symbol"
+ msgstr "%s: нет такого символа"
+ 
+-#: xcofflink.c:3298
++#: xcofflink.c:3334
+ #, c-format
+ msgid "warning: attempt to export undefined symbol `%s'"
+ msgstr "предупреждение: попытка экспортировать неопределённый символ «%s»"
+ 
+-#: xcofflink.c:3677
++#: xcofflink.c:3713
+ msgid "error: undefined symbol __rtinit"
+ msgstr "ошибка: неопределённый символ __rtinit"
+ 
+-#: xcofflink.c:4055
++#: xcofflink.c:4095
+ #, c-format
+ msgid "%pB: loader reloc in unrecognized section `%s'"
+ msgstr "%pB: перемещение загрузчика в нераспознанном разделе «%s»"
+ 
+-#: xcofflink.c:4067
++#: xcofflink.c:4107
+ #, c-format
+ msgid "%pB: `%s' in loader reloc but not loader sym"
+ msgstr "%pB: «%s» в перемещении загрузчика, но не символе загрузчика"
+ 
+-#: xcofflink.c:4084
++#: xcofflink.c:4124
+ #, c-format
+ msgid "%pB: loader reloc in read-only section %pA"
+ msgstr "%pB: перемещение загрузчика в разделе %pA, доступном только для чтения"
+ 
+-#: xcofflink.c:5112
++#: xcofflink.c:5152
+ #, c-format
+ msgid "TOC overflow: %#<PRIx64> > 0x10000; try -mminimal-toc when compiling"
+ msgstr "переполнение TOC: %<PRIx64> > 0x10000; попробуйте скомпилировать с -mminimal-toc"
+ 
+ #. Not fatal, this callback cannot fail.
+-#: elfnn-aarch64.c:2872
++#: elfnn-aarch64.c:2869
+ #, c-format
+ msgid "unknown attribute for symbol `%s': 0x%02x"
+ msgstr "неизвестный атрибут символа «%s»: 0x%02x"
+ 
+-#: elfnn-aarch64.c:5246
++#: elfnn-aarch64.c:5245
+ #, c-format
+ msgid "%pB: error: erratum 835769 stub out of range (input file too large)"
+ msgstr "%pB: ошибка: заглушка для ошибки 835769 находится вне диапазона (слишком большой входной файл)"
+ 
+-#: elfnn-aarch64.c:5338
++#: elfnn-aarch64.c:5337
+ #, c-format
+ msgid "%pB: error: erratum 843419 stub out of range (input file too large)"
+ msgstr "%pB: ошибка: заглушка для ошибки 843419 находится вне диапазона (слишком большой входной файл)"
+ 
+-#: elfnn-aarch64.c:5351
++#: elfnn-aarch64.c:5350
+ msgid "%pB: error: erratum 843419 immediate 0x%"
+ msgstr "%pB: ошибка: заглушка для ошибки 843419 в 0x%"
+ 
+-#: elfnn-aarch64.c:5899
++#: elfnn-aarch64.c:5884
+ #, c-format
+ msgid "%pB: relocation %s against symbol `%s' which may bind externally can not be used when making a shared object; recompile with -fPIC"
+ msgstr "%pB: перемещение %s для «%s», который может быть привязан извне, не может использоваться при создании общего объекта; перекомпилируйте с -fPIC"
+ 
+-#: elfnn-aarch64.c:5990
++#: elfnn-aarch64.c:5904
++#, c-format
++msgid "%pB: conditional branch to undefined symbol `%s' not allowed"
++msgstr "%pB: запрещено условное ветвление на неопределённый символ «%s»"
++
++#: elfnn-aarch64.c:5992
+ #, c-format
+ msgid "%pB: local symbol descriptor table be NULL when applying relocation %s against local symbol"
+ msgstr "%pB: таблица описателей локальных символов будет равна NULL, если применить перемещение %s с локальным символом"
+ 
+-#: elfnn-aarch64.c:6103 elfnn-aarch64.c:6140
++#: elfnn-aarch64.c:6105 elfnn-aarch64.c:6142
+ #, c-format
+ msgid "%pB: TLS relocation %s against undefined symbol `%s'"
+ msgstr "%pB: перемещение TLS %s для неопределённого символа «%s»"
+ 
+-#: elfnn-aarch64.c:7125
++#: elfnn-aarch64.c:7127
+ msgid "too many GOT entries for -fpic, please recompile with -fPIC"
+ msgstr "слишком много элементов GOT для -fpic: перекомпилируйте с параметром -fPIC"
+ 
+-#: elfnn-aarch64.c:7153
++#: elfnn-aarch64.c:7155
+ msgid "one possible cause of this error is that the symbol is being referenced in the indicated code as if it had a larger alignment than was declared where it was defined"
+ msgstr "одной из возможных причин этой ошибки является то, что в указанном коде на символ ссылаются с большим выравниванием, чем было объявлено в его месте определения"
+ 
+-#: elfnn-aarch64.c:7720
++#: elfnn-aarch64.c:7722
+ #, c-format
+ msgid "%pB: relocation %s against `%s' can not be used when making a shared object"
+ msgstr "%pB: перемещение %s для «%s» не может использоваться при создании общего объекта"
+ 
+-#: elfnn-riscv.c:187 elfnn-riscv.c:222
++#: elfnn-riscv.c:223 elfnn-riscv.c:258
+ #, c-format
+ msgid "%pB: warning: RVE PLT generation not supported"
+ msgstr "%pB: предупреждение: генерация RVE PLT не поддерживается"
+ 
+-#: elfnn-riscv.c:1977
++#: elfnn-riscv.c:1911
++#, c-format
++msgid "%pcrel_lo missing matching %pcrel_hi"
++msgstr "для %pcrel_lo отсутствует соответствующий %pcrel_hi"
++
++#: elfnn-riscv.c:1914
++#, c-format
++msgid "%pcrel_lo with addend isn't allowed for R_RISCV_GOT_HI20"
++msgstr "%pcrel_lo с добавлением запрещён для R_RISCV_GOT_HI20"
++
++#: elfnn-riscv.c:1920
++#, c-format
++msgid "%%pcrel_lo overflow with an addend, the value of %%pcrel_hi is 0x%<PRIx64> without any addend, but may be 0x%<PRIx64> after adding the %%pcrel_lo addend"
++msgstr "переполнение %%pcrel_lo с добавлением, значение %%pcrel_hi равноs 0x%<PRIx64> без добавлений, но может стать 0x%<PRIx64> после подключения добавления %%pcrel_lo"
++
++#: elfnn-riscv.c:1927
++#, c-format
++msgid "%pcrel_lo overflow with an addend"
++msgstr "переполнение %pcrel_lo с добавлением"
++
++#: elfnn-riscv.c:2409
++msgid "The addend isn't allowed for R_RISCV_GOT_HI20"
++msgstr "Добавление запрещено для R_RISCV_GOT_HI20"
++
++#: elfnn-riscv.c:2553
+ #, c-format
+ msgid "%pcrel_lo section symbol with an addend"
+ msgstr "символ раздела %pcrel_lo с добавлением"
+ 
+-#: elfnn-riscv.c:2198
++#: elfnn-riscv.c:2776
+ #, c-format
+ msgid "%%X%%P: relocation %s against `%s' can not be used when making a shared object; recompile with -fPIC\n"
+ msgstr "%%X%%P: перемещение %s для «%s» нельзя использовать при создании общего объекта; перекомпилируйте с -fPIC\n"
+ 
+-#: elfnn-riscv.c:2208
++#: elfnn-riscv.c:2786
+ #, c-format
+ msgid "%%X%%P: unresolvable %s relocation against symbol `%s'\n"
+ msgstr "%%X%%P: неразрешимое перемещение %s для символа «%s»\n"
+ 
+-#: elfnn-riscv.c:2247
++#: elfnn-riscv.c:2826
+ msgid "%X%P: internal error: out of range error\n"
+ msgstr "%X%P: внутренняя ошибка: ошибка выхода из диапазона\n"
+ 
+-#: elfnn-riscv.c:2252
++#: elfnn-riscv.c:2831
+ msgid "%X%P: internal error: unsupported relocation error\n"
+ msgstr "%X%P: внутренняя ошибка: ошибка неподдерживаемого перемещения\n"
+ 
+-#: elfnn-riscv.c:2258
++#: elfnn-riscv.c:2837
+ msgid "dangerous relocation error"
+ msgstr "ошибка опасного перемещения"
+ 
+-#: elfnn-riscv.c:2264
++#: elfnn-riscv.c:2843
+ msgid "%X%P: internal error: unknown error\n"
+ msgstr "%X%P: внутренняя ошибка: неизвестная ошибка\n"
+ 
+-#: elfnn-riscv.c:2630
++#: elfnn-riscv.c:3384
+ #, c-format
+-msgid "error: %pB: Mis-matched ISA version for '%s' extension. %d.%d vs %d.%d"
+-msgstr "ошибка: %pB: несовпадение версии ISA расширения «%s». %d.%d и %d.%d"
++msgid "warning: %pB: mis-matched ISA version %d.%d for '%s' extension, the output version is %d.%d"
++msgstr "предупреждение: %pB: несовпадение версии ISA %d.%d для расширения «%s», выходная версия %d.%d"
+ 
+-#: elfnn-riscv.c:2648
++#: elfnn-riscv.c:3417
+ #, c-format
+-msgid "error: %pB: corrupted ISA string '%s'. First letter should be 'i' or 'e' but got '%s'."
+-msgstr "ошибка: %pB: повреждена строка ISA «%s». Первым символом должен быть «i» или «e», но имеем «%s»."
++msgid "error: %pB: corrupted ISA string '%s'.  First letter should be 'i' or 'e' but got '%s'"
++msgstr "ошибка: %pB: повреждена строка ISA «%s». Первым символом должен быть «i» или «e», но имеем «%s»"
+ 
+-#: elfnn-riscv.c:2692
++#: elfnn-riscv.c:3460
+ #, c-format
+-msgid "error: %pB: Mis-matched ISA string to merge '%s' and '%s'."
+-msgstr "ошибка: %pB: несовпадение строки ISA для объединения «%s» и «%s»."
++msgid "error: %pB: mis-matched ISA string to merge '%s' and '%s'"
++msgstr "ошибка: %pB: несовпадение строки ISA для объединения «%s» и «%s»"
+ 
+-#: elfnn-riscv.c:2893
++#: elfnn-riscv.c:3617
+ #, c-format
+-msgid "error: %pB: ISA string of input (%s) doesn't match output (%s)."
+-msgstr "ошибка: %pB: входная строка ISA (%s) не совпадает с выходной (%s)."
++msgid "error: %pB: ISA string of input (%s) doesn't match output (%s)"
++msgstr "ошибка: %pB: строка ISA входных данных (%s) не совпадает с выходной (%s)"
+ 
+-#: elfnn-riscv.c:2913
++#: elfnn-riscv.c:3637
+ #, c-format
+-msgid "error: %pB: XLEN of input (%u) doesn't match output (%u)."
+-msgstr "ошибка: %pB: XLEN входных данных (%u) не совпадает с выходными (%u)."
++msgid "error: %pB: XLEN of input (%u) doesn't match output (%u)"
++msgstr "ошибка: %pB: XLEN входных данных (%u) не совпадает с выходными (%u)"
+ 
+-#: elfnn-riscv.c:2921
++#: elfnn-riscv.c:3645
+ #, c-format
+-msgid "error: %pB: Unsupported XLEN (%u), you might be using wrong emulation."
+-msgstr "ошибка: %pB: неподдерживаемый XLEN (%u), вероятно, используется неправильная эмуляция."
++msgid "error: %pB: unsupported XLEN (%u), you might be using wrong emulation"
++msgstr "ошибка: %pB: неподдерживаемый XLEN (%u), вероятно, используется неправильная эмуляция"
+ 
+-#: elfnn-riscv.c:3035
++#: elfnn-riscv.c:3759
+ #, c-format
+-msgid "warning: %pB use privilege spec version %u.%u.%u but the output use version %u.%u.%u."
+-msgstr "предупреждение: %pB использует привилегированную версию спецификации %u.%u.%u, но для вывода используется версия %u.%u.%u."
++msgid "warning: %pB use privileged spec version %u.%u.%u but the output use version %u.%u.%u"
++msgstr "предупреждение: %pB использует привилегированную версию спецификации %u.%u.%u, но для вывода используется версия %u.%u.%u"
+ 
+-#: elfnn-riscv.c:3053
+-msgid "warning: privilege spec version 1.9.1 can not be linked with other spec versions."
+-msgstr "предупреждение: привилегированная версия спецификации 1.9.1 не может быть скомпонована с другими версиями спецификаций."
++#: elfnn-riscv.c:3776
++msgid "warning: privileged spec version 1.9.1 can not be linked with other spec versions"
++msgstr "предупреждение: привилегированная версия спецификации 1.9.1 не может быть скомпонована с другими версиями спецификации"
+ 
+-#: elfnn-riscv.c:3081
++#: elfnn-riscv.c:3804
+ #, c-format
+-msgid "error: %pB use %u-byte stack aligned but the output use %u-byte stack aligned."
+-msgstr "ошибка: для %pB требуется %u-байтовое выравнивание стека, но для результата используется %u-байтовое выравнивание стека."
++msgid "error: %pB use %u-byte stack aligned but the output use %u-byte stack aligned"
++msgstr "ошибка: для %pB используется %u-байтовое выравнивание стека, но для вывода используется %u-байтовое выравнивание стека"
+ 
+-#: elfnn-riscv.c:3122
++#: elfnn-riscv.c:3845
+ #, c-format
+ msgid ""
+ "%pB: ABI is incompatible with that of the selected emulation:\n"
+@@ -8296,111 +8496,121 @@ msgstr ""
+ "%pB: ABI не совместим с выбранным в эмуляции:\n"
+ "  цель эмуляции «%s» не совпадает с «%s»"
+ 
+-#: elfnn-riscv.c:3176
++#: elfnn-riscv.c:3901
+ #, c-format
+ msgid "%pB: can't link %s modules with %s modules"
+ msgstr "%pB: компоновка модуля %s с предыдущими модулями %s невозможна"
+ 
+-#: elfnn-riscv.c:3186
++#: elfnn-riscv.c:3911
+ #, c-format
+ msgid "%pB: can't link RVE with other target"
+ msgstr "%pB: невозможно скомпоновать RVE с другой целью"
+ 
+-#: elfnn-riscv.c:3724
++#: elfnn-riscv.c:4448
+ #, c-format
+ msgid "%pB(%pA+%#<PRIx64>): %<PRId64> bytes required for alignment to %<PRId64>-byte boundary, but only %<PRId64> present"
+ msgstr "%pB(%pA+%#<PRIx64>): требуется %<PRId64> байт для выравнивания по %<PRId64>-байтной границе, но есть только %<PRId64>"
+ 
+-#: peXXigen.c:164
++#: peXXigen.c:154
+ #, c-format
+ msgid "%pB: unable to find name for empty section"
+ msgstr "%pB: не удалось найти имя пустого раздела"
+ 
+-#: peXXigen.c:191
++#: peXXigen.c:181
+ #, c-format
+ msgid "%pB: out of memory creating name for empty section"
+ msgstr "%pB: не хватает памяти для создания имени пустого раздела"
+ 
+-#: peXXigen.c:201
++#: peXXigen.c:191
+ #, c-format
+ msgid "%pB: unable to create fake empty section"
+ msgstr "%pB: невозможно создать фиктивный пустой раздел"
+ 
+-#: peXXigen.c:539
++#: peXXigen.c:523
+ #, c-format
+ msgid "%pB: aout header specifies an invalid number of data-directory entries: %u"
+ msgstr "%pB: в заголовке aout указан некорректный номер элементов каталога данных: %u"
+ 
+-#: peXXigen.c:1088
++#: peXXigen.c:934
++#, c-format
++msgid "%pB:%.8s: section below image base"
++msgstr "%pB:%.8s: раздел ниже базового значения образа"
++
++#: peXXigen.c:937
++#, c-format
++msgid "%pB:%.8s: RVA truncated"
++msgstr "%pB:%.8s: RVA усечён"
++
++#: peXXigen.c:1065
+ #, c-format
+ msgid "%pB: line number overflow: 0x%lx > 0xffff"
+ msgstr "%pB: переполнение нумерации строк: 0x%lx > 0xffff"
+ 
+-#: peXXigen.c:1241
++#: peXXigen.c:1218
+ msgid "Export Directory [.edata (or where ever we found it)]"
+ msgstr "Каталог экспорта [.edata (или где он нашёлся)]"
+ 
+-#: peXXigen.c:1242
++#: peXXigen.c:1219
+ msgid "Import Directory [parts of .idata]"
+ msgstr "Каталог импорта [часть .idata]"
+ 
+-#: peXXigen.c:1243
++#: peXXigen.c:1220
+ msgid "Resource Directory [.rsrc]"
+ msgstr "Каталог ресурсов [.rsrc]"
+ 
+-#: peXXigen.c:1244
++#: peXXigen.c:1221
+ msgid "Exception Directory [.pdata]"
+ msgstr "Каталог исключений [.pdata]"
+ 
+-#: peXXigen.c:1245
++#: peXXigen.c:1222
+ msgid "Security Directory"
+ msgstr "Каталог безопасности"
+ 
+-#: peXXigen.c:1246
++#: peXXigen.c:1223
+ msgid "Base Relocation Directory [.reloc]"
+ msgstr "Каталог базового перемещения [.reloc]"
+ 
+-#: peXXigen.c:1247
++#: peXXigen.c:1224
+ msgid "Debug Directory"
+ msgstr "Каталог отладки"
+ 
+-#: peXXigen.c:1248
++#: peXXigen.c:1225
+ msgid "Description Directory"
+ msgstr "Каталог описаний"
+ 
+-#: peXXigen.c:1249
++#: peXXigen.c:1226
+ msgid "Special Directory"
+ msgstr "Специальный каталог"
+ 
+-#: peXXigen.c:1250
++#: peXXigen.c:1227
+ msgid "Thread Storage Directory [.tls]"
+ msgstr "Каталог хранилища нитей [.tls]"
+ 
+-#: peXXigen.c:1251
++#: peXXigen.c:1228
+ msgid "Load Configuration Directory"
+ msgstr "Каталог загрузки конфигурации"
+ 
+-#: peXXigen.c:1252
++#: peXXigen.c:1229
+ msgid "Bound Import Directory"
+ msgstr "Каталог обязательного импорта"
+ 
+-#: peXXigen.c:1253
++#: peXXigen.c:1230
+ msgid "Import Address Table Directory"
+ msgstr "Каталог таблицы импорта адресов"
+ 
+-#: peXXigen.c:1254
++#: peXXigen.c:1231
+ msgid "Delay Import Directory"
+ msgstr "Каталог отложенного импорта"
+ 
+-#: peXXigen.c:1255
++#: peXXigen.c:1232
+ msgid "CLR Runtime Header"
+ msgstr "Заголовок времени выполнения CLR"
+ 
+-#: peXXigen.c:1256
++#: peXXigen.c:1233
+ msgid "Reserved"
+ msgstr "Зарезервировано"
+ 
+-#: peXXigen.c:1316
++#: peXXigen.c:1280
+ #, c-format
+ msgid ""
+ "\n"
+@@ -8409,7 +8619,7 @@ msgstr ""
+ "\n"
+ "Существует таблица импорта, но не найден раздел, в котором она содержится\n"
+ 
+-#: peXXigen.c:1322
++#: peXXigen.c:1286
+ #, c-format
+ msgid ""
+ "\n"
+@@ -8418,7 +8628,7 @@ msgstr ""
+ "\n"
+ "Существует таблица импорта в %s, но этот раздел без содержимого\n"
+ 
+-#: peXXigen.c:1329
++#: peXXigen.c:1293
+ #, c-format
+ msgid ""
+ "\n"
+@@ -8427,30 +8637,7 @@ msgstr ""
+ "\n"
+ "В %s имеется таблица импорта по адресу 0x%lx\n"
+ 
+-#: peXXigen.c:1369
+-#, c-format
+-msgid ""
+-"\n"
+-"Function descriptor located at the start address: %04lx\n"
+-msgstr ""
+-"\n"
+-"Начальный адрес описателя функции: %04lx\n"
+-
+-#: peXXigen.c:1373
+-#, c-format
+-msgid "\tcode-base %08lx toc (loadable/actual) %08lx/%08lx\n"
+-msgstr "\tcode-base %08lx toc (загружаемый/реальный) %08lx/%08lx\n"
+-
+-#: peXXigen.c:1380
+-#, c-format
+-msgid ""
+-"\n"
+-"No reldata section! Function descriptor not decoded.\n"
+-msgstr ""
+-"\n"
+-"Нет раздела reldata! Описатель функции не расшифрован.\n"
+-
+-#: peXXigen.c:1385
++#: peXXigen.c:1299
+ #, c-format
+ msgid ""
+ "\n"
+@@ -8459,7 +8646,7 @@ msgstr ""
+ "\n"
+ "Таблицы импорта (обработан раздел %s)\n"
+ 
+-#: peXXigen.c:1388
++#: peXXigen.c:1302
+ #, c-format
+ msgid ""
+ " vma:            Hint    Time      Forward  DLL       First\n"
+@@ -8468,7 +8655,7 @@ msgstr ""
+ " vma:            Таблица    Отметка   Цепочка    Имя       Первый\n"
+ "                  Указаний  Времени   Пересылки  DLL       Шлюз\n"
+ 
+-#: peXXigen.c:1437
++#: peXXigen.c:1351
+ #, c-format
+ msgid ""
+ "\n"
+@@ -8477,12 +8664,12 @@ msgstr ""
+ "\n"
+ "\tИмя DLL: %.*s\n"
+ 
+-#: peXXigen.c:1453
++#: peXXigen.c:1367
+ #, c-format
+ msgid "\tvma:  Hint/Ord Member-Name Bound-To\n"
+ msgstr "\tvma:  Hint/Ord Имя-элемента Привязан-к\n"
+ 
+-#: peXXigen.c:1478
++#: peXXigen.c:1392
+ #, c-format
+ msgid ""
+ "\n"
+@@ -8491,12 +8678,12 @@ msgstr ""
+ "\n"
+ "Существует первый шлюз, но не найден раздел, в котором он содержится\n"
+ 
+-#: peXXigen.c:1522 peXXigen.c:1561
++#: peXXigen.c:1436 peXXigen.c:1475
+ #, c-format
+ msgid "\t<corrupt: 0x%04lx>"
+ msgstr "\t<повреждено: 0x%04lx>"
+ 
+-#: peXXigen.c:1654
++#: peXXigen.c:1568
+ #, c-format
+ msgid ""
+ "\n"
+@@ -8505,7 +8692,7 @@ msgstr ""
+ "\n"
+ "Существует таблица экспорта, но не найден раздел, в котором она содержится\n"
+ 
+-#: peXXigen.c:1660
++#: peXXigen.c:1574
+ #, c-format
+ msgid ""
+ "\n"
+@@ -8514,7 +8701,7 @@ msgstr ""
+ "\n"
+ "Существует таблица экспорта в %s, но этот раздел без содержимого\n"
+ 
+-#: peXXigen.c:1671
++#: peXXigen.c:1585
+ #, c-format
+ msgid ""
+ "\n"
+@@ -8523,7 +8710,7 @@ msgstr ""
+ "\n"
+ "Существует таблица экспорта в %s, но она не помещается в этот раздел\n"
+ 
+-#: peXXigen.c:1682
++#: peXXigen.c:1596
+ #, c-format
+ msgid ""
+ "\n"
+@@ -8532,7 +8719,7 @@ msgstr ""
+ "\n"
+ "Существует таблица экспорта в %s, но она слишком маленькая (%d)\n"
+ 
+-#: peXXigen.c:1688
++#: peXXigen.c:1602
+ #, c-format
+ msgid ""
+ "\n"
+@@ -8541,7 +8728,7 @@ msgstr ""
+ "\n"
+ "Существует таблица экспорта в %s по адресу 0x%lx\n"
+ 
+-#: peXXigen.c:1716
++#: peXXigen.c:1630
+ #, c-format
+ msgid ""
+ "\n"
+@@ -8552,67 +8739,67 @@ msgstr ""
+ "Таблицы экспорта (обработан раздел %s)\n"
+ "\n"
+ 
+-#: peXXigen.c:1720
++#: peXXigen.c:1634
+ #, c-format
+ msgid "Export Flags \t\t\t%lx\n"
+ msgstr "Флаги экспорта \t\t\t%lx\n"
+ 
+-#: peXXigen.c:1723
++#: peXXigen.c:1637
+ #, c-format
+ msgid "Time/Date stamp \t\t%lx\n"
+ msgstr "Метка времени/даты \t\t%lx\n"
+ 
+-#: peXXigen.c:1727
++#: peXXigen.c:1641
+ #, c-format
+ msgid "Major/Minor \t\t\t%d/%d\n"
+ msgstr "Старший/Младший \t\t\t%d/%d\n"
+ 
+-#: peXXigen.c:1730
++#: peXXigen.c:1644
+ #, c-format
+ msgid "Name \t\t\t\t"
+ msgstr "Имя \t\t\t\t"
+ 
+-#: peXXigen.c:1741
++#: peXXigen.c:1655
+ #, c-format
+ msgid "Ordinal Base \t\t\t%ld\n"
+ msgstr "Начальный порядковый номер \t\t\t%ld\n"
+ 
+-#: peXXigen.c:1744
++#: peXXigen.c:1658
+ #, c-format
+ msgid "Number in:\n"
+ msgstr "Номер в:\n"
+ 
+-#: peXXigen.c:1747
++#: peXXigen.c:1661
+ #, c-format
+ msgid "\tExport Address Table \t\t%08lx\n"
+ msgstr "\tТаблица экспортируемых адресов \t\t%08lx\n"
+ 
+-#: peXXigen.c:1751
++#: peXXigen.c:1665
+ #, c-format
+ msgid "\t[Name Pointer/Ordinal] Table\t%08lx\n"
+ msgstr "\tТаблица [указателей имён/порядковых номеров]\t%08lx\n"
+ 
+-#: peXXigen.c:1754
++#: peXXigen.c:1668
+ #, c-format
+ msgid "Table Addresses\n"
+ msgstr "Таблица адресов\n"
+ 
+-#: peXXigen.c:1757
++#: peXXigen.c:1671
+ #, c-format
+ msgid "\tExport Address Table \t\t"
+ msgstr "\tТаблица экспортируемых адресов \t\t"
+ 
+-#: peXXigen.c:1762
++#: peXXigen.c:1676
+ #, c-format
+ msgid "\tName Pointer Table \t\t"
+ msgstr "\tТаблица указателей имён \t\t"
+ 
+-#: peXXigen.c:1767
++#: peXXigen.c:1681
+ #, c-format
+ msgid "\tOrdinal Table \t\t\t"
+ msgstr "\tТаблица порядковых номеров \t\t\t"
+ 
+-#: peXXigen.c:1781
++#: peXXigen.c:1695
+ #, c-format
+ msgid ""
+ "\n"
+@@ -8621,20 +8808,20 @@ msgstr ""
+ "\n"
+ "Таблица экспортируемых адресов -- Начальный порядковый номер %ld\n"
+ 
+-#: peXXigen.c:1790
++#: peXXigen.c:1704
+ #, c-format
+ msgid "\tInvalid Export Address Table rva (0x%lx) or entry count (0x%lx)\n"
+ msgstr "\tНекорректная таблица экспортируемых адресов rva (0x%lx) или счётчик элементов (0x%lx)\n"
+ 
+-#: peXXigen.c:1809
++#: peXXigen.c:1723
+ msgid "Forwarder RVA"
+ msgstr "Переадресуемый RVA"
+ 
+-#: peXXigen.c:1821
++#: peXXigen.c:1735
+ msgid "Export RVA"
+ msgstr "Экспортируемый RVA"
+ 
+-#: peXXigen.c:1828
++#: peXXigen.c:1742
+ #, c-format
+ msgid ""
+ "\n"
+@@ -8643,27 +8830,27 @@ msgstr ""
+ "\n"
+ "Таблица [порядковых номеров/указателей имён]\n"
+ 
+-#: peXXigen.c:1836
++#: peXXigen.c:1750
+ #, c-format
+ msgid "\tInvalid Name Pointer Table rva (0x%lx) or entry count (0x%lx)\n"
+ msgstr "\tНекорректная таблица указателей имён (0x%lx) или счётчик элементов (0x%lx)\n"
+ 
+-#: peXXigen.c:1843
++#: peXXigen.c:1757
+ #, c-format
+ msgid "\tInvalid Ordinal Table rva (0x%lx) or entry count (0x%lx)\n"
+ msgstr "\tНекорректная обычная таблица rva (0x%lx) или счётчик элементов (0x%lx)\n"
+ 
+-#: peXXigen.c:1857
++#: peXXigen.c:1771
+ #, c-format
+ msgid "\t[%4ld] <corrupt offset: %lx>\n"
+ msgstr "\t[%4ld] <повреждёно смещение: %lx>\n"
+ 
+-#: peXXigen.c:1911 peXXigen.c:2107
++#: peXXigen.c:1825 peXXigen.c:1994
+ #, c-format
+ msgid "warning, .pdata section size (%ld) is not a multiple of %d\n"
+ msgstr "предупреждение, размер раздела .pdata (%ld) не кратен %d\n"
+ 
+-#: peXXigen.c:1915 peXXigen.c:2111
++#: peXXigen.c:1829 peXXigen.c:1998
+ #, c-format
+ msgid ""
+ "\n"
+@@ -8672,12 +8859,12 @@ msgstr ""
+ "\n"
+ "Таблица функций (обработан раздел .pdata)\n"
+ 
+-#: peXXigen.c:1918
++#: peXXigen.c:1832
+ #, c-format
+ msgid " vma:\t\t\tBegin Address    End Address      Unwind Info\n"
+ msgstr " vma:\t\t\tНачальный адрес  Конечный адрес   Раскрывающая Информация\n"
+ 
+-#: peXXigen.c:1920
++#: peXXigen.c:1834
+ #, c-format
+ msgid ""
+ " vma:\t\tBegin    End      EH       EH       PrologEnd  Exception\n"
+@@ -8686,27 +8873,12 @@ msgstr ""
+ " vma:\t\tНачальный  Конечный   EH          EH       Адрес         Маска\n"
+ "     \t\tАдрес      Адрес      Обработчик  Данные   КонцаПролога  Исключения\n"
+ 
+-#: peXXigen.c:1933
++#: peXXigen.c:1847
+ #, c-format
+ msgid "Virtual size of .pdata section (%ld) larger than real size (%ld)\n"
+ msgstr "Виртуальный размер раздела .pdata (%ld) больше чем реальный размер (%ld)\n"
+ 
+-#: peXXigen.c:2002
+-#, c-format
+-msgid " Register save millicode"
+-msgstr " Милликод сохранения регистра"
+-
+-#: peXXigen.c:2005
+-#, c-format
+-msgid " Register restore millicode"
+-msgstr " Милликод восстановления регистра"
+-
+-#: peXXigen.c:2008
+-#, c-format
+-msgid " Glue code sequence"
+-msgstr " Последовательность связующего кода"
+-
+-#: peXXigen.c:2113
++#: peXXigen.c:2000
+ #, c-format
+ msgid ""
+ " vma:\t\tBegin    Prolog   Function Flags    Exception EH\n"
+@@ -8715,7 +8887,7 @@ msgstr ""
+ " vma:\t\tНачальный Длина    Длина   Флаги       Обработчик EH\n"
+ "     \t\tАдрес     Пролога  Функции 32b exc     Исключений Данные\n"
+ 
+-#: peXXigen.c:2234
++#: peXXigen.c:2121
+ #, c-format
+ msgid ""
+ "\n"
+@@ -8726,7 +8898,7 @@ msgstr ""
+ "\n"
+ "Начало перемещений в PE-файле (обработан раздел .reloc)\n"
+ 
+-#: peXXigen.c:2263
++#: peXXigen.c:2150
+ #, c-format
+ msgid ""
+ "\n"
+@@ -8735,62 +8907,62 @@ msgstr ""
+ "\n"
+ "Виртуальный адрес: %08lx Размер блока %ld (0x%lx) Число местоположений %ld\n"
+ 
+-#: peXXigen.c:2281
++#: peXXigen.c:2168
+ #, c-format
+ msgid "\treloc %4d offset %4x [%4lx] %s"
+ msgstr "\tперемещение %4d смещение %4x [%4lx] %s"
+ 
+-#: peXXigen.c:2342
++#: peXXigen.c:2229
+ #, c-format
+ msgid "%03x %*.s Entry: "
+ msgstr "%03x %*.s Элемент: "
+ 
+-#: peXXigen.c:2366
++#: peXXigen.c:2253
+ #, c-format
+ msgid "name: [val: %08lx len %d]: "
+ msgstr "имя: [значение: %08lx длина %d]: "
+ 
+-#: peXXigen.c:2386
++#: peXXigen.c:2273
+ #, c-format
+ msgid "<corrupt string length: %#x>\n"
+ msgstr "<повреждена длина строки: %#x>\n"
+ 
+-#: peXXigen.c:2396
++#: peXXigen.c:2283
+ #, c-format
+ msgid "<corrupt string offset: %#lx>\n"
+ msgstr "<повреждено смещение строки: %#lx>\n"
+ 
+-#: peXXigen.c:2401
++#: peXXigen.c:2288
+ #, c-format
+ msgid "ID: %#08lx"
+ msgstr "ID: %#08lx"
+ 
+-#: peXXigen.c:2404
++#: peXXigen.c:2291
+ #, c-format
+ msgid ", Value: %#08lx\n"
+ msgstr ", значение: %#08lx\n"
+ 
+-#: peXXigen.c:2426
++#: peXXigen.c:2313
+ #, c-format
+ msgid "%03x %*.s  Leaf: Addr: %#08lx, Size: %#08lx, Codepage: %d\n"
+ msgstr "%03x %*.s  лист: адрес: %#08lx, размер: %#08lx, кодовая страница: %d\n"
+ 
+-#: peXXigen.c:2468
++#: peXXigen.c:2355
+ #, c-format
+ msgid "<unknown directory type: %d>\n"
+ msgstr "<неизвестный тип каталога: %d>\n"
+ 
+-#: peXXigen.c:2476
++#: peXXigen.c:2363
+ #, c-format
+ msgid " Table: Char: %d, Time: %08lx, Ver: %d/%d, Num Names: %d, IDs: %d\n"
+ msgstr " Таблица: Символ: %d, Время: %08lx, Версия: %d/%d, Кол-во имён: %d, ID: %d\n"
+ 
+-#: peXXigen.c:2564
++#: peXXigen.c:2451
+ #, c-format
+ msgid "Corrupt .rsrc section detected!\n"
+ msgstr "Обнаружен повреждённый раздел .rsrc!\n"
+ 
+-#: peXXigen.c:2588
++#: peXXigen.c:2475
+ #, c-format
+ msgid ""
+ "\n"
+@@ -8799,17 +8971,17 @@ msgstr ""
+ "\n"
+ "ПРЕДУПРЕЖДЕНИЕ: дополнительные данные в разделе .rsrc — будут проигнорированы Windows:\n"
+ 
+-#: peXXigen.c:2594
++#: peXXigen.c:2481
+ #, c-format
+ msgid " String table starts at offset: %#03x\n"
+ msgstr " Таблица строк начинается со смещения: %#03x\n"
+ 
+-#: peXXigen.c:2597
++#: peXXigen.c:2484
+ #, c-format
+ msgid " Resources start at offset: %#03x\n"
+ msgstr " Ресурсы начинаются со смещения: %#03x\n"
+ 
+-#: peXXigen.c:2654
++#: peXXigen.c:2541
+ #, c-format
+ msgid ""
+ "\n"
+@@ -8818,7 +8990,7 @@ msgstr ""
+ "\n"
+ "Существует отладочный каталог, но не найден раздел, в котором он содержится\n"
+ 
+-#: peXXigen.c:2660
++#: peXXigen.c:2547
+ #, c-format
+ msgid ""
+ "\n"
+@@ -8827,7 +8999,7 @@ msgstr ""
+ "\n"
+ "Существует отладочный каталог в %s, но этот раздел без содержимого\n"
+ 
+-#: peXXigen.c:2667
++#: peXXigen.c:2554
+ #, c-format
+ msgid ""
+ "\n"
+@@ -8836,7 +9008,7 @@ msgstr ""
+ "\n"
+ "Ошибка: раздел %s содержит отладочные данные, начиная с адреса, который слишком мал\n"
+ 
+-#: peXXigen.c:2672
++#: peXXigen.c:2559
+ #, c-format
+ msgid ""
+ "\n"
+@@ -8847,22 +9019,22 @@ msgstr ""
+ "В %s имеется отладочный каталог по адресу 0x%lx\n"
+ "\n"
+ 
+-#: peXXigen.c:2679
++#: peXXigen.c:2566
+ #, c-format
+ msgid "The debug data size field in the data directory is too big for the section"
+ msgstr "Поле размера отладочных данных в каталоге данных слишком большое для раздела"
+ 
+-#: peXXigen.c:2684
++#: peXXigen.c:2571
+ #, c-format
+ msgid "Type                Size     Rva      Offset\n"
+ msgstr "Тип                Размер     Rva      Смещение\n"
+ 
+-#: peXXigen.c:2731
++#: peXXigen.c:2618
+ #, c-format
+ msgid "(format %c%c%c%c signature %s age %ld)\n"
+ msgstr "(формат %c%c%c%c подпись %s возраст %ld)\n"
+ 
+-#: peXXigen.c:2741
++#: peXXigen.c:2628
+ #, c-format
+ msgid "The debug directory size is not a multiple of the debug directory entry size\n"
+ msgstr "Размер отладочного каталога не кратен размеру элемента отладочного каталога\n"
+@@ -8870,7 +9042,7 @@ msgstr "Размер отладочного каталога не кратен 
+ #. The MS dumpbin program reportedly ands with 0xff0f before
+ #. printing the characteristics field.  Not sure why.  No reason to
+ #. emulate it here.
+-#: peXXigen.c:2825
++#: peXXigen.c:2712
+ #, c-format
+ msgid ""
+ "\n"
+@@ -8879,91 +9051,138 @@ msgstr ""
+ "\n"
+ "Характеристики 0x%x\n"
+ 
+-#: peXXigen.c:3072
++#: peXXigen.c:2989
+ #, c-format
+-msgid "%pB: Data Directory size (%lx) exceeds space left in section (%<PRIx64>)"
+-msgstr "%pB: размер каталога данных (%lx) превышает оставшееся место в разделе (%<PRIx64>)"
++msgid "%pB: Data Directory (%lx bytes at %<PRIx64>) extends across section boundary at %<PRIx64>"
++msgstr "%pB: каталог данных (%lx байт по адресу %<PRIx64>) расширяется за границу раздела по адресу %<PRIx64>"
+ 
+-#: peXXigen.c:3104
++#: peXXigen.c:3026
+ msgid "failed to update file offsets in debug directory"
+ msgstr "не удалось обновить файловые смещения в отладочном каталоге"
+ 
+-#: peXXigen.c:3112
++#: peXXigen.c:3034
+ #, c-format
+ msgid "%pB: failed to read debug data section"
+ msgstr "%pB: не удалось прочитать раздел отладочных данных"
+ 
+-#: peXXigen.c:3928
++#: peXXigen.c:3833
+ #, c-format
+ msgid ".rsrc merge failure: duplicate string resource: %d"
+ msgstr "ошибка при слиянии .rsrc: повторная строка ресурса: %d"
+ 
+-#: peXXigen.c:4063
++#: peXXigen.c:3968
+ msgid ".rsrc merge failure: multiple non-default manifests"
+ msgstr "ошибка при слиянии .rsrc: несколько манифестов не по умолчанию"
+ 
+-#: peXXigen.c:4081
++#: peXXigen.c:3986
+ msgid ".rsrc merge failure: a directory matches a leaf"
+ msgstr "ошибка при слиянии .rsrc: каталог совпадает с листом"
+ 
+-#: peXXigen.c:4123
++#: peXXigen.c:4028
+ msgid ".rsrc merge failure: duplicate leaf"
+ msgstr "ошибка при слиянии .rsrc: повторяющийся лист"
+ 
+-#: peXXigen.c:4125
++#: peXXigen.c:4033
+ #, c-format
+ msgid ".rsrc merge failure: duplicate leaf: %s"
+ msgstr "ошибка при слиянии .rsrc: повторяющийся лист: %s"
+ 
+-#: peXXigen.c:4191
++#: peXXigen.c:4100
+ msgid ".rsrc merge failure: dirs with differing characteristics"
+ msgstr "ошибка при слиянии .rsrc: каталоги с разным характеристиками"
+ 
+-#: peXXigen.c:4198
++#: peXXigen.c:4107
+ msgid ".rsrc merge failure: differing directory versions"
+ msgstr "ошибка при слиянии .rsrc: версии каталогов отличаются"
+ 
+ #. Corrupted .rsrc section - cannot merge.
+-#: peXXigen.c:4315
++#: peXXigen.c:4224
+ #, c-format
+ msgid "%pB: .rsrc merge failure: corrupt .rsrc section"
+ msgstr "%pB: ошибка при слиянии .rsrc: раздел .rsrc повреждён"
+ 
+-#: peXXigen.c:4323
++#: peXXigen.c:4232
+ #, c-format
+ msgid "%pB: .rsrc merge failure: unexpected .rsrc size"
+ msgstr "%pB: ошибка при слиянии rsrc: неожиданный размер раздела .rsrc"
+ 
+-#: peXXigen.c:4462
++#: peXXigen.c:4371
+ #, c-format
+ msgid "%pB: unable to fill in DataDictionary[1] because .idata$2 is missing"
+ msgstr "%pB: невозможно заполнить DataDictionary[1], так как отсутствует .idata$2"
+ 
+-#: peXXigen.c:4482
++#: peXXigen.c:4391
+ #, c-format
+ msgid "%pB: unable to fill in DataDictionary[1] because .idata$4 is missing"
+ msgstr "%pB: невозможно заполнить DataDictionary[1], так как отсутствует .idata$4"
+ 
+-#: peXXigen.c:4503
++#: peXXigen.c:4412
+ #, c-format
+ msgid "%pB: unable to fill in DataDictionary[12] because .idata$5 is missing"
+ msgstr "%pB: невозможно заполнить DataDictionary[12], так как отсутствует .idata$5"
+ 
+-#: peXXigen.c:4523
++#: peXXigen.c:4432
+ #, c-format
+ msgid "%pB: unable to fill in DataDictionary[PE_IMPORT_ADDRESS_TABLE (12)] because .idata$6 is missing"
+ msgstr "%pB: невозможно заполнить DataDictionary[PE_IMPORT_ADDRESS_TABLE (12)], так как отсутствует .idata$6"
+ 
+-#: peXXigen.c:4565
++#: peXXigen.c:4474
+ #, c-format
+ msgid "%pB: unable to fill in DataDictionary[PE_IMPORT_ADDRESS_TABLE(12)] because .idata$6 is missing"
+ msgstr "%pB: невозможно заполнить DataDictionary[PE_IMPORT_ADDRESS_TABLE(12)], так как отсутствует .idata$6"
+ 
+-#: peXXigen.c:4590
++#: peXXigen.c:4499
+ #, c-format
+ msgid "%pB: unable to fill in DataDictionary[9] because __tls_used is missing"
+ msgstr "%pB: невозможно заполнить DataDictionary[9], так как отсутствует __tls_used"
+ 
++#~ msgid "%pB: warning: sh_link not set for section `%pA'"
++#~ msgstr "%pB: предупреждение: не задан sh_link для раздела «%pA»"
++
++#~ msgid "%pA has both ordered [`%pA' in %pB] and unordered [`%pA' in %pB] sections"
++#~ msgstr "%pA содержит упорядоченные [«%pA» в %pB] и неупорядоченные [«%pA» в %pB] разделы"
++
++#~ msgid "%pA has both ordered and unordered sections"
++#~ msgstr "%pA содержит упорядоченные и неупорядоченные разделы"
++
++#~ msgid "-march=%s: unsupported ISA subset `%c'"
++#~ msgstr "-march=%s: неподдерживаемый поднабор ISA «%c»"
++
++#~ msgid "-march=%s: unexpected ISA string at end: %s"
++#~ msgstr "-march=%s: неожиданная строка ISA в конце: %s"
++
++#~ msgid "-march=%s: `d' extension requires `f' extension"
++#~ msgstr "-march=%s: расширению «d» необходимо расширение «f»"
++
++#~ msgid "-march=%s: `q' extension requires `d' extension"
++#~ msgstr "-march=%s: расширению «q» необходимо расширение «d»"
++
++#~ msgid ""
++#~ "\n"
++#~ "Function descriptor located at the start address: %04lx\n"
++#~ msgstr ""
++#~ "\n"
++#~ "Начальный адрес описателя функции: %04lx\n"
++
++#~ msgid "\tcode-base %08lx toc (loadable/actual) %08lx/%08lx\n"
++#~ msgstr "\tcode-base %08lx toc (загружаемый/реальный) %08lx/%08lx\n"
++
++#~ msgid ""
++#~ "\n"
++#~ "No reldata section! Function descriptor not decoded.\n"
++#~ msgstr ""
++#~ "\n"
++#~ "Нет раздела reldata! Описатель функции не расшифрован.\n"
++
++#~ msgid " Register save millicode"
++#~ msgstr " Милликод сохранения регистра"
++
++#~ msgid " Register restore millicode"
++#~ msgstr " Милликод восстановления регистра"
++
++#~ msgid " Glue code sequence"
++#~ msgstr " Последовательность связующего кода"
++
+ #~ msgid "%pB: corrupt symbol count: %#<PRIx64>"
+ #~ msgstr "%pB: повреждён счётчик символов: %#<PRIx64>"
+ 
+@@ -9188,9 +9407,6 @@ msgstr "%pB: невозможно заполнить DataDictionary[9], так 
+ #~ msgid "%B: Relocation %s is not yet supported for symbol %s."
+ #~ msgstr "%B: перемещение %s пока не поддерживается для символа %s."
+ 
+-#~ msgid "%B: invalid relocation type %d"
+-#~ msgstr "%B: неверный тип перемещения %d"
+-
+ #~ msgid "%B: invalid i960 reloc number: %d"
+ #~ msgstr "%B: некорректный номер перемещения i960: %d"
+ 
+diff --git a/bfd/version.h b/bfd/version.h
+index d374ca5518f..65a27b9cd6f 100644
+--- a/bfd/version.h
++++ b/bfd/version.h
+@@ -16,7 +16,7 @@
+ 
+    In releases, the date is not included in either version strings or
+    sonames.  */
+-#define BFD_VERSION_DATE 20210718
++#define BFD_VERSION_DATE 20211102
+ #define BFD_VERSION @bfd_version@
+ #define BFD_VERSION_STRING  @bfd_version_package@ @bfd_version_string@
+ #define REPORT_BUGS_TO @report_bugs_to@
+diff --git a/bfd/version.m4 b/bfd/version.m4
+index a1a9968a298..c5bb62347f8 100644
+--- a/bfd/version.m4
++++ b/bfd/version.m4
+@@ -1 +1 @@
+-m4_define([BFD_VERSION], [2.37])
++m4_define([BFD_VERSION], [2.37.0])
+diff --git a/binutils/ChangeLog b/binutils/ChangeLog
+index 7869e1b9d2c..eaa17e80f02 100644
+--- a/binutils/ChangeLog
++++ b/binutils/ChangeLog
+@@ -1,3 +1,11 @@
++2021-09-07  Luis Machado  <luis.machado@linaro.org>
++
++	Revert: [AArch64] MTE corefile support
++
++	2021-05-21  Luis Machado  <luis.machado@linaro.org>
++
++	* readelf.c (get_note_type): Handle NT_MEMTAG note types.
++
+ 2021-07-16  Nick Clifton  <nickc@redhat.com>
+ 
+ 	* po/sv.po: Updated Swedish translation.
+diff --git a/binutils/ar.c b/binutils/ar.c
+index 5d6976c7027..8885585ef75 100644
+--- a/binutils/ar.c
++++ b/binutils/ar.c
+@@ -1180,6 +1180,9 @@ extract_file (bfd *abfd)
+   bfd_size_type size;
+   struct stat buf;
+ 
++  if (preserve_dates)
++    memset (&buf, 0, sizeof (buf));
++
+   if (bfd_stat_arch_elt (abfd, &buf) != 0)
+     /* xgettext:c-format */
+     fatal (_("internal stat error on %s"), bfd_get_filename (abfd));
+diff --git a/binutils/dwarf.c b/binutils/dwarf.c
+index 1e7f4db7b7c..e73078f496f 100644
+--- a/binutils/dwarf.c
++++ b/binutils/dwarf.c
+@@ -7727,7 +7727,6 @@ display_debug_ranges (struct dwarf_section *section,
+ 	      return 0;
+ 	    }
+ 	}
+-      finish = start + initial_length;
+ 
+       /* Get and check the version number.  */
+       SAFE_BYTE_GET_AND_INC (version, start, 2, finish);
+diff --git a/binutils/objcopy.c b/binutils/objcopy.c
+index a6c2e0dcc26..fd7557fe433 100644
+--- a/binutils/objcopy.c
++++ b/binutils/objcopy.c
+@@ -3600,6 +3600,7 @@ copy_archive (bfd *ibfd, bfd *obfd, const char *output_target,
+ 
+       if (preserve_dates)
+ 	{
++	  memset (&buf, 0, sizeof (buf));
+ 	  stat_status = bfd_stat_arch_elt (this_element, &buf);
+ 
+ 	  if (stat_status != 0)
+diff --git a/binutils/readelf.c b/binutils/readelf.c
+index a6073f7ec80..af10bcd0e17 100644
+--- a/binutils/readelf.c
++++ b/binutils/readelf.c
+@@ -18843,8 +18843,6 @@ get_note_type (Filedata * filedata, unsigned e_type)
+ 	return _("NT_SIGINFO (siginfo_t data)");
+       case NT_FILE:
+ 	return _("NT_FILE (mapped files)");
+-      case NT_MEMTAG:
+-	return _("NT_MEMTAG (memory tags)");
+       default:
+ 	break;
+       }
+diff --git a/binutils/rename.c b/binutils/rename.c
+index 8826917c18c..48ae3014806 100644
+--- a/binutils/rename.c
++++ b/binutils/rename.c
+@@ -131,6 +131,7 @@ get_stat_mtime_ns (struct stat const *st ATTRIBUTE_UNUSED)
+ # endif
+ }
+ 
++#if defined HAVE_UTIMENSAT
+ /* Return *ST's access time.  */
+ static inline struct timespec
+ get_stat_atime (struct stat const *st)
+@@ -158,6 +159,7 @@ get_stat_mtime (struct stat const *st)
+   return t;
+ #endif
+ }
++#endif
+ /* End FIXME.  */
+ 
+ /* Set the times of the file DESTINATION to be the same as those in
+diff --git a/cpu/mep.opc b/cpu/mep.opc
+index 5a4c93dc3ab..6ad0c5879e8 100644
+--- a/cpu/mep.opc
++++ b/cpu/mep.opc
+@@ -626,7 +626,7 @@ typedef struct
+   int len;
+ } arg;
+ 
+-macro macros[] =
++static macro const macros[] =
+ {
+   { "sizeof", "(`1.end + (- `1))"},
+   { "startof", "(`1 | 0)" },
+@@ -659,10 +659,10 @@ str_append (char *dest, const char *input, int len)
+   return strncat (new_dest, input, len);
+ }
+ 
+-static macro *
++static const macro *
+ lookup_macro (const char *name)
+ {
+-  macro *m;
++  const macro *m;
+ 
+   for (m = macros; m->name; ++m)
+     if (strncmp (m->name, name, strlen(m->name)) == 0)
+@@ -672,7 +672,7 @@ lookup_macro (const char *name)
+ }
+ 
+ static char *
+-expand_macro (arg *args, int narg, macro *mac)
++expand_macro (arg *args, int narg, const macro *mac)
+ {
+   char *result = 0, *rescanned_result = 0;
+   char *e = mac->expansion;
+@@ -722,7 +722,7 @@ expand_string (const char *in, int first_only)
+   arg args[MAXARGS];
+   int state = IN_TEXT;
+   const char *mark = in;
+-  macro *pmacro = NULL;
++  const macro *pmacro = NULL;
+   char *expansion = 0;
+   char *result = 0;
+ 
+diff --git a/etc/texi2pod.pl b/etc/texi2pod.pl
+index 11f70d156be..dcf2b437640 100644
+--- a/etc/texi2pod.pl
++++ b/etc/texi2pod.pl
+@@ -59,6 +59,8 @@ while ($_ = shift) {
+ 	    $flag = shift;
+ 	}
+         push (@ipath, $flag);
++    } elsif (/^--no-split$/) {
++	# ignore option for makeinfo compatibility
+     } elsif (/^-/) {
+ 	usage();
+     } else {
+diff --git a/gas/testsuite/gas/ppc/power4.d b/gas/testsuite/gas/ppc/power4.d
+index fd277a2a286..e4d9ea97918 100644
+--- a/gas/testsuite/gas/ppc/power4.d
++++ b/gas/testsuite/gas/ppc/power4.d
+@@ -21,6 +21,7 @@ Idx Name +Size +VMA +LMA +File off +Algn
+ SYMBOL TABLE:
+ 0+ l +d +\.text	0+ (|\.text)
+ 0+ l +d +\.data	0+ (|\.data)
++0+ l +d +\.bss	0+ (|\.bss)
+ 0+ l +\.data	0+ dsym0
+ 0+10 l +\.data	0+ dsym1
+ 0+ l +d +\.toc	0+ (|\.toc)
+diff --git a/gas/testsuite/gas/ppc/test1elf32.d b/gas/testsuite/gas/ppc/test1elf32.d
+index fee834e0f32..d8d6835c270 100644
+--- a/gas/testsuite/gas/ppc/test1elf32.d
++++ b/gas/testsuite/gas/ppc/test1elf32.d
+@@ -18,6 +18,7 @@ Idx Name +Size +VMA +LMA +File off +Algn
+ SYMBOL TABLE:
+ 0+0000 l    d  \.text	0+0000 (|\.text)
+ 0+0000 l    d  \.data	0+0000 (|\.data)
++0+0000 l    d  \.bss	0+0000 (|\.bss)
+ 0+0000 l       \.data	0+0000 dsym0
+ 0+0004 l       \.data	0+0000 dsym1
+ 0+0004 l       \.data	0+0000 usym0
+diff --git a/gas/testsuite/gas/ppc/test1elf64.d b/gas/testsuite/gas/ppc/test1elf64.d
+index 24b75bc3f74..4df9e00a157 100644
+--- a/gas/testsuite/gas/ppc/test1elf64.d
++++ b/gas/testsuite/gas/ppc/test1elf64.d
+@@ -21,6 +21,7 @@ Idx Name          Size      VMA               LMA               File off  Algn
+ SYMBOL TABLE:
+ 0000000000000000 l    d  \.text	0000000000000000 (|\.text)
+ 0000000000000000 l    d  \.data	0000000000000000 (|\.data)
++0000000000000000 l    d  \.bss	0000000000000000 (|\.bss)
+ 0000000000000000 l       \.data	0000000000000000 dsym0
+ 0000000000000008 l       \.data	0000000000000000 dsym1
+ 0000000000000000 l    d  \.toc	0000000000000000 (|\.toc)
+diff --git a/gas/testsuite/gas/s390/zarch-arch14.d b/gas/testsuite/gas/s390/zarch-arch14.d
+index 97c4fd54719..62db69ccb2d 100644
+--- a/gas/testsuite/gas/s390/zarch-arch14.d
++++ b/gas/testsuite/gas/s390/zarch-arch14.d
+@@ -25,7 +25,8 @@ Disassembly of section .text:
+ .*:	e6 f1 00 0c d4 55 [	 ]*vcnf	%v15,%v17,13,12
+ .*:	b9 8b 90 6b [	 ]*rdp	%r6,%r9,%r11
+ .*:	b9 8b 9d 6b [	 ]*rdp	%r6,%r9,%r11,13
+-.*:	eb fd 68 f0 fd 71 [	 ]*lpswey	-10000\(%r6\),253
++.*:	eb 00 68 f0 fd 71 [	 ]*lpswey	-10000\(%r6\)
+ .*:	b2 00 6f a0 [	 ]*lbear	4000\(%r6\)
+ .*:	b2 01 6f a0 [	 ]*stbear	4000\(%r6\)
++.*:	b2 8f 5f ff [	 ]*qpaci	4095\(%r5\)
+ .*:	07 07 [	 ]*nopr	%r7
+diff --git a/gas/testsuite/gas/s390/zarch-arch14.s b/gas/testsuite/gas/s390/zarch-arch14.s
+index 830382f0ac5..c887a8895bb 100644
+--- a/gas/testsuite/gas/s390/zarch-arch14.s
++++ b/gas/testsuite/gas/s390/zarch-arch14.s
+@@ -19,6 +19,7 @@ foo:
+ 	vcnf	%v15,%v17,13,12
+ 	rdp	%r6,%r9,%r11
+ 	rdp	%r6,%r9,%r11,13
+-	lpswey	-10000(%r6),253
++	lpswey	-10000(%r6)
+ 	lbear	4000(%r6)
+ 	stbear	4000(%r6)
++	qpaci	4095(%r5)
+diff --git a/gold/ChangeLog b/gold/ChangeLog
+index 79207900dfc..deb0aa504b5 100644
+--- a/gold/ChangeLog
++++ b/gold/ChangeLog
+@@ -1,3 +1,9 @@
++2021-07-20  Alan Modra  <amodra@gmail.com>
++
++	PR gold/28106
++	PR gold/27815
++	* gc.h (gc_process_relocs): Use static_cast in Section_id constructor.
++
+ 2021-07-18  Nick Clifton  <nickc@redhat.com>
+ 
+ 	* 2.37 release.
+diff --git a/gold/gc.h b/gold/gc.h
+index 6ebd81f3fd0..4a1368f5abe 100644
+--- a/gold/gc.h
++++ b/gold/gc.h
+@@ -247,7 +247,7 @@ gc_process_relocs(
+ 	      if (is_ordinary) 
+ 		(*secvec).push_back(Section_id(src_obj, dst_indx));
+ 	      else
+-		(*secvec).push_back(Section_id(reinterpret_cast<Relobj*>(NULL), 0));
++		(*secvec).push_back(Section_id(static_cast<Relobj*>(NULL), 0));
+               // If the target of the relocation is an STT_SECTION symbol,
+               // make a note of that by storing -1 in the symbol vector.
+               if (lsym.get_st_type() == elfcpp::STT_SECTION)
+@@ -329,7 +329,7 @@ gc_process_relocs(
+               if (is_ordinary && dst_obj != NULL)
+ 		(*secvec).push_back(Section_id(dst_obj, dst_indx));
+ 	      else
+-		(*secvec).push_back(Section_id(reinterpret_cast<Relobj*>(NULL), 0));
++		(*secvec).push_back(Section_id(static_cast<Relobj*>(NULL), 0));
+               (*symvec).push_back(gsym);
+ 	      (*addendvec).push_back(std::make_pair(
+ 					static_cast<long long>(symvalue),
+diff --git a/gold/incremental.cc b/gold/incremental.cc
+index ab258dd1896..327a1527a29 100644
+--- a/gold/incremental.cc
++++ b/gold/incremental.cc
+@@ -1848,7 +1848,7 @@ class Local_got_offset_visitor : public Got_offset_list::Visitor
+   { }
+ 
+   void
+-  visit(unsigned int got_type, unsigned int got_offset)
++  visit(unsigned int got_type, unsigned int got_offset, uint64_t)
+   {
+     unsigned int got_index = got_offset / this->info_.got_entry_size;
+     gold_assert(got_index < this->info_.got_count);
+@@ -1860,6 +1860,12 @@ class Local_got_offset_visitor : public Got_offset_list::Visitor
+     unsigned char* pov = this->info_.got_desc_p + got_index * 8;
+     elfcpp::Swap<32, big_endian>::writeval(pov, this->info_.sym_index);
+     elfcpp::Swap<32, big_endian>::writeval(pov + 4, this->info_.input_index);
++    // FIXME: the uint64_t addend should be written here if powerpc64
++    // sym+addend got entries are to be supported, with similar changes
++    // to Global_got_offset_visitor and support to read them back in
++    // do_process_got_plt.
++    // FIXME: don't we need this for section symbol plus addend anyway?
++    // (See 2015-12-03 commit 7ef8ae7c5f35)
+   }
+ 
+  private:
+@@ -1879,7 +1885,7 @@ class Global_got_offset_visitor : public Got_offset_list::Visitor
+   { }
+ 
+   void
+-  visit(unsigned int got_type, unsigned int got_offset)
++  visit(unsigned int got_type, unsigned int got_offset, uint64_t)
+   {
+     unsigned int got_index = got_offset / this->info_.got_entry_size;
+     gold_assert(got_index < this->info_.got_count);
+@@ -2280,7 +2286,7 @@ Sized_relobj_incr<size, big_endian>::do_section_name(unsigned int shndx) const
+   const Output_sections& out_sections(this->output_sections());
+   const Output_section* os = out_sections[shndx];
+   if (os == NULL)
+-    return NULL;
++    return std::string();
+   return os->name();
+ }
+ 
+diff --git a/gold/object.cc b/gold/object.cc
+index 45cf30d4aaf..b7a2a6cfdfa 100644
+--- a/gold/object.cc
++++ b/gold/object.cc
+@@ -427,7 +427,7 @@ Sized_relobj<size, big_endian>::do_for_all_local_got_entries(
+   unsigned int nsyms = this->local_symbol_count();
+   for (unsigned int i = 0; i < nsyms; i++)
+     {
+-      Local_got_entry_key key(i, 0);
++      Local_got_entry_key key(i);
+       Local_got_offsets::const_iterator p = this->local_got_offsets_.find(key);
+       if (p != this->local_got_offsets_.end())
+ 	{
+diff --git a/gold/object.h b/gold/object.h
+index 38f4a2fd3ff..dc089f5a417 100644
+--- a/gold/object.h
++++ b/gold/object.h
+@@ -214,11 +214,13 @@ class Got_offset_list
+ {
+  public:
+   Got_offset_list()
+-    : got_type_(-1U), got_offset_(0), got_next_(NULL)
++    : got_type_(-1U), got_offset_(0), addend_(0), got_next_(NULL)
+   { }
+ 
+-  Got_offset_list(unsigned int got_type, unsigned int got_offset)
+-    : got_type_(got_type), got_offset_(got_offset), got_next_(NULL)
++  Got_offset_list(unsigned int got_type, unsigned int got_offset,
++		  uint64_t addend)
++    : got_type_(got_type), got_offset_(got_offset), addend_(addend),
++      got_next_(NULL)
+   { }
+ 
+   ~Got_offset_list()
+@@ -236,29 +238,31 @@ class Got_offset_list
+   {
+     this->got_type_ = -1U;
+     this->got_offset_ = 0;
++    this->addend_ = 0;
+     this->got_next_ = NULL;
+   }
+ 
+   // Set the offset for the GOT entry of type GOT_TYPE.
+   void
+-  set_offset(unsigned int got_type, unsigned int got_offset)
++  set_offset(unsigned int got_type, unsigned int got_offset, uint64_t addend)
+   {
+     if (this->got_type_ == -1U)
+       {
+         this->got_type_ = got_type;
+         this->got_offset_ = got_offset;
++        this->addend_ = addend;
+       }
+     else
+       {
+         for (Got_offset_list* g = this; g != NULL; g = g->got_next_)
+           {
+-            if (g->got_type_ == got_type)
++            if (g->got_type_ == got_type && g->addend_ == addend)
+               {
+                 g->got_offset_ = got_offset;
+                 return;
+               }
+           }
+-        Got_offset_list* g = new Got_offset_list(got_type, got_offset);
++        Got_offset_list* g = new Got_offset_list(got_type, got_offset, addend);
+         g->got_next_ = this->got_next_;
+         this->got_next_ = g;
+       }
+@@ -266,11 +270,11 @@ class Got_offset_list
+ 
+   // Return the offset for a GOT entry of type GOT_TYPE.
+   unsigned int
+-  get_offset(unsigned int got_type) const
++  get_offset(unsigned int got_type, uint64_t addend) const
+   {
+     for (const Got_offset_list* g = this; g != NULL; g = g->got_next_)
+       {
+-        if (g->got_type_ == got_type)
++        if (g->got_type_ == got_type && g->addend_ == addend)
+           return g->got_offset_;
+       }
+     return -1U;
+@@ -297,7 +301,7 @@ class Got_offset_list
+     { }
+ 
+     virtual void
+-    visit(unsigned int, unsigned int) = 0;
++    visit(unsigned int, unsigned int, uint64_t) = 0;
+   };
+ 
+   // Loop over all GOT offset entries, calling a visitor class V for each.
+@@ -307,12 +311,13 @@ class Got_offset_list
+     if (this->got_type_ == -1U)
+       return;
+     for (const Got_offset_list* g = this; g != NULL; g = g->got_next_)
+-      v->visit(g->got_type_, g->got_offset_);
++      v->visit(g->got_type_, g->got_offset_, g->addend_);
+   }
+ 
+  private:
+   unsigned int got_type_;
+   unsigned int got_offset_;
++  uint64_t addend_;
+   Got_offset_list* got_next_;
+ };
+ 
+@@ -322,15 +327,15 @@ class Got_offset_list
+ class Local_got_entry_key
+ {
+  public:
+-  Local_got_entry_key(unsigned int symndx, uint64_t addend)
+-    : symndx_(symndx), addend_(addend)
++  Local_got_entry_key(unsigned int symndx)
++    : symndx_(symndx)
+   {}
+ 
+   // Whether this equals to another Local_got_entry_key.
+   bool
+   eq(const Local_got_entry_key& key) const
+   {
+-    return (this->symndx_ == key.symndx_ && this->addend_ == key.addend_);
++    return this->symndx_ == key.symndx_;
+   }
+ 
+   // Compute a hash value for this using 64-bit FNV-1a hash.
+@@ -340,7 +345,6 @@ class Local_got_entry_key
+     uint64_t h = 14695981039346656037ULL; // FNV offset basis.
+     uint64_t prime = 1099511628211ULL;
+     h = (h ^ static_cast<uint64_t>(this->symndx_)) * prime;
+-    h = (h ^ static_cast<uint64_t>(this->addend_)) * prime;
+     return h;
+   }
+ 
+@@ -363,8 +367,6 @@ class Local_got_entry_key
+  private:
+   // The local symbol index.
+   unsigned int symndx_;
+-  // The addend.
+-  uint64_t addend_;
+ };
+ 
+ // Type for mapping section index to uncompressed size and contents.
+@@ -1214,46 +1216,27 @@ class Relobj : public Object
+   local_plt_offset(unsigned int symndx) const
+   { return this->do_local_plt_offset(symndx); }
+ 
+-  // Return whether the local symbol SYMNDX has a GOT offset of type
+-  // GOT_TYPE.
+-  bool
+-  local_has_got_offset(unsigned int symndx, unsigned int got_type) const
+-  { return this->do_local_has_got_offset(symndx, got_type, 0); }
+-
+-  // Return whether the local symbol SYMNDX plus ADDEND has a GOT offset
+-  // of type GOT_TYPE.
++  // Return whether there is a GOT entry of type GOT_TYPE for the
++  // local symbol SYMNDX with given ADDEND.
+   bool
+   local_has_got_offset(unsigned int symndx, unsigned int got_type,
+-		       uint64_t addend) const
++		       uint64_t addend = 0) const
+   { return this->do_local_has_got_offset(symndx, got_type, addend); }
+ 
+-  // Return the GOT offset of type GOT_TYPE of the local symbol
+-  // SYMNDX.  It is an error to call this if the symbol does not have
+-  // a GOT offset of the specified type.
+-  unsigned int
+-  local_got_offset(unsigned int symndx, unsigned int got_type) const
+-  { return this->do_local_got_offset(symndx, got_type, 0); }
+-
+-  // Return the GOT offset of type GOT_TYPE of the local symbol
+-  // SYMNDX plus ADDEND.  It is an error to call this if the symbol
+-  // does not have a GOT offset of the specified type.
++  // Return the GOT offset of the GOT entry with type GOT_TYPE for the
++  // local symbol SYMNDX with given ADDEND.  It is an error to call
++  // this function if the symbol does not have such a GOT entry.
+   unsigned int
+   local_got_offset(unsigned int symndx, unsigned int got_type,
+-		       uint64_t addend) const
++		   uint64_t addend = 0) const
+   { return this->do_local_got_offset(symndx, got_type, addend); }
+ 
+-  // Set the GOT offset with type GOT_TYPE of the local symbol SYMNDX
+-  // to GOT_OFFSET.
+-  void
+-  set_local_got_offset(unsigned int symndx, unsigned int got_type,
+-		       unsigned int got_offset)
+-  { this->do_set_local_got_offset(symndx, got_type, got_offset, 0); }
+-
+-  // Set the GOT offset with type GOT_TYPE of the local symbol SYMNDX
+-  // plus ADDEND to GOT_OFFSET.
++  // Set the GOT offset for a GOT entry with type GOT_TYPE for the
++  // local symbol SYMNDX with ADDEND to GOT_OFFSET.  Create such an
++  // entry if none exists.
+   void
+   set_local_got_offset(unsigned int symndx, unsigned int got_type,
+-		       unsigned int got_offset, uint64_t addend)
++		       unsigned int got_offset, uint64_t addend = 0)
+   { this->do_set_local_got_offset(symndx, got_type, got_offset, addend); }
+ 
+   // Return whether the local symbol SYMNDX is a TLS symbol.
+@@ -2130,11 +2113,11 @@ class Sized_relobj : public Relobj
+   do_local_has_got_offset(unsigned int symndx, unsigned int got_type,
+ 			  uint64_t addend) const
+   {
+-    Local_got_entry_key key(symndx, addend);
++    Local_got_entry_key key(symndx);
+     Local_got_offsets::const_iterator p =
+         this->local_got_offsets_.find(key);
+     return (p != this->local_got_offsets_.end()
+-            && p->second->get_offset(got_type) != -1U);
++            && p->second->get_offset(got_type, addend) != -1U);
+   }
+ 
+   // Return the GOT offset of type GOT_TYPE of the local symbol
+@@ -2143,11 +2126,11 @@ class Sized_relobj : public Relobj
+   do_local_got_offset(unsigned int symndx, unsigned int got_type,
+ 			  uint64_t addend) const
+   {
+-    Local_got_entry_key key(symndx, addend);
++    Local_got_entry_key key(symndx);
+     Local_got_offsets::const_iterator p =
+         this->local_got_offsets_.find(key);
+     gold_assert(p != this->local_got_offsets_.end());
+-    unsigned int off = p->second->get_offset(got_type);
++    unsigned int off = p->second->get_offset(got_type, addend);
+     gold_assert(off != -1U);
+     return off;
+   }
+@@ -2158,14 +2141,14 @@ class Sized_relobj : public Relobj
+   do_set_local_got_offset(unsigned int symndx, unsigned int got_type,
+ 			  unsigned int got_offset, uint64_t addend)
+   {
+-    Local_got_entry_key key(symndx, addend);
++    Local_got_entry_key key(symndx);
+     Local_got_offsets::const_iterator p =
+         this->local_got_offsets_.find(key);
+     if (p != this->local_got_offsets_.end())
+-      p->second->set_offset(got_type, got_offset);
++      p->second->set_offset(got_type, got_offset, addend);
+     else
+       {
+-        Got_offset_list* g = new Got_offset_list(got_type, got_offset);
++	Got_offset_list* g = new Got_offset_list(got_type, got_offset, addend);
+         std::pair<Local_got_offsets::iterator, bool> ins =
+             this->local_got_offsets_.insert(std::make_pair(key, g));
+         gold_assert(ins.second);
+diff --git a/gold/options.h b/gold/options.h
+index 757ebf18fec..47299a37834 100644
+--- a/gold/options.h
++++ b/gold/options.h
+@@ -611,7 +611,7 @@ class Search_directory
+   // We need a default constructor because we put this in a
+   // std::vector.
+   Search_directory()
+-    : name_(NULL), put_in_sysroot_(false), is_in_sysroot_(false)
++    : name_(), put_in_sysroot_(false), is_in_sysroot_(false)
+   { }
+ 
+   // This is the usual constructor.
+diff --git a/gold/output.cc b/gold/output.cc
+index afdba06753e..f2890c87f8c 100644
+--- a/gold/output.cc
++++ b/gold/output.cc
+@@ -1367,6 +1367,7 @@ Output_data_group<size, big_endian>::do_write(Output_file* of)
+ template<int got_size, bool big_endian>
+ void
+ Output_data_got<got_size, big_endian>::Got_entry::write(
++    Output_data_got_base* got,
+     unsigned int got_indx,
+     unsigned char* pov) const
+ {
+@@ -1412,10 +1413,17 @@ Output_data_got<got_size, big_endian>::Got_entry::write(
+ 	      default:
+ 		gold_unreachable();
+ 	      }
++	    // If this is a GOT entry for a known value global symbol,
++	    // then the value should include the addend.  If the value
++	    // is not known leave the value as zero; The GOT entry
++	    // will be set by a dynamic relocation.
++	    if (this->addend_ && gsym->final_value_is_known())
++	      val += this->addend_;
+ 	    if (this->use_plt_or_tls_offset_
+ 		&& gsym->type() == elfcpp::STT_TLS)
+ 	      val += parameters->target().tls_offset_for_global(gsym,
+-								got_indx);
++								got, got_indx,
++								this->addend_);
+ 	  }
+       }
+       break;
+@@ -1444,7 +1452,8 @@ Output_data_got<got_size, big_endian>::Got_entry::write(
+ 	    val = convert_types<Valtype, uint64_t>(lval);
+ 	    if (this->use_plt_or_tls_offset_ && is_tls)
+ 	      val += parameters->target().tls_offset_for_local(object, lsi,
+-							       got_indx);
++							       got, got_indx,
++							       this->addend_);
+ 	  }
+       }
+       break;
+@@ -1461,15 +1470,15 @@ Output_data_got<got_size, big_endian>::Got_entry::write(
+ 
+ template<int got_size, bool big_endian>
+ bool
+-Output_data_got<got_size, big_endian>::add_global(
+-    Symbol* gsym,
+-    unsigned int got_type)
++Output_data_got<got_size, big_endian>::add_global(Symbol* gsym,
++						  unsigned int got_type,
++						  uint64_t addend)
+ {
+-  if (gsym->has_got_offset(got_type))
++  if (gsym->has_got_offset(got_type, addend))
+     return false;
+ 
+-  unsigned int got_offset = this->add_got_entry(Got_entry(gsym, false));
+-  gsym->set_got_offset(got_type, got_offset);
++  unsigned int got_offset = this->add_got_entry(Got_entry(gsym, false, addend));
++  gsym->set_got_offset(got_type, got_offset, addend);
+   return true;
+ }
+ 
+@@ -1478,13 +1487,14 @@ Output_data_got<got_size, big_endian>::add_global(
+ template<int got_size, bool big_endian>
+ bool
+ Output_data_got<got_size, big_endian>::add_global_plt(Symbol* gsym,
+-						      unsigned int got_type)
++						      unsigned int got_type,
++						      uint64_t addend)
+ {
+-  if (gsym->has_got_offset(got_type))
++  if (gsym->has_got_offset(got_type, addend))
+     return false;
+ 
+-  unsigned int got_offset = this->add_got_entry(Got_entry(gsym, true));
+-  gsym->set_got_offset(got_type, got_offset);
++  unsigned int got_offset = this->add_got_entry(Got_entry(gsym, true, addend));
++  gsym->set_got_offset(got_type, got_offset, addend);
+   return true;
+ }
+ 
+@@ -1497,14 +1507,15 @@ Output_data_got<got_size, big_endian>::add_global_with_rel(
+     Symbol* gsym,
+     unsigned int got_type,
+     Output_data_reloc_generic* rel_dyn,
+-    unsigned int r_type)
++    unsigned int r_type,
++    uint64_t addend)
+ {
+-  if (gsym->has_got_offset(got_type))
++  if (gsym->has_got_offset(got_type, addend))
+     return;
+ 
+   unsigned int got_offset = this->add_got_entry(Got_entry());
+-  gsym->set_got_offset(got_type, got_offset);
+-  rel_dyn->add_global_generic(gsym, r_type, this, got_offset, 0);
++  gsym->set_got_offset(got_type, got_offset, addend);
++  rel_dyn->add_global_generic(gsym, r_type, this, got_offset, addend);
+ }
+ 
+ // Add a pair of entries for a global symbol to the GOT, and add
+@@ -1517,38 +1528,19 @@ Output_data_got<got_size, big_endian>::add_global_pair_with_rel(
+     unsigned int got_type,
+     Output_data_reloc_generic* rel_dyn,
+     unsigned int r_type_1,
+-    unsigned int r_type_2)
++    unsigned int r_type_2,
++    uint64_t addend)
+ {
+-  if (gsym->has_got_offset(got_type))
++  if (gsym->has_got_offset(got_type, addend))
+     return;
+ 
+   unsigned int got_offset = this->add_got_entry_pair(Got_entry(), Got_entry());
+-  gsym->set_got_offset(got_type, got_offset);
+-  rel_dyn->add_global_generic(gsym, r_type_1, this, got_offset, 0);
++  gsym->set_got_offset(got_type, got_offset, addend);
++  rel_dyn->add_global_generic(gsym, r_type_1, this, got_offset, addend);
+ 
+   if (r_type_2 != 0)
+     rel_dyn->add_global_generic(gsym, r_type_2, this,
+-				got_offset + got_size / 8, 0);
+-}
+-
+-// Add an entry for a local symbol to the GOT.  This returns true if
+-// this is a new GOT entry, false if the symbol already has a GOT
+-// entry.
+-
+-template<int got_size, bool big_endian>
+-bool
+-Output_data_got<got_size, big_endian>::add_local(
+-    Relobj* object,
+-    unsigned int symndx,
+-    unsigned int got_type)
+-{
+-  if (object->local_has_got_offset(symndx, got_type))
+-    return false;
+-
+-  unsigned int got_offset = this->add_got_entry(Got_entry(object, symndx,
+-							  false));
+-  object->set_local_got_offset(symndx, got_type, got_offset);
+-  return true;
++				got_offset + got_size / 8, addend);
+ }
+ 
+ // Add an entry for a local symbol plus ADDEND to the GOT.  This returns
+@@ -1579,37 +1571,18 @@ bool
+ Output_data_got<got_size, big_endian>::add_local_plt(
+     Relobj* object,
+     unsigned int symndx,
+-    unsigned int got_type)
++    unsigned int got_type,
++    uint64_t addend)
+ {
+-  if (object->local_has_got_offset(symndx, got_type))
++  if (object->local_has_got_offset(symndx, got_type, addend))
+     return false;
+ 
+   unsigned int got_offset = this->add_got_entry(Got_entry(object, symndx,
+-							  true));
+-  object->set_local_got_offset(symndx, got_type, got_offset);
++							  true, addend));
++  object->set_local_got_offset(symndx, got_type, got_offset, addend);
+   return true;
+ }
+ 
+-// Add an entry for a local symbol to the GOT, and add a dynamic
+-// relocation of type R_TYPE for the GOT entry.
+-
+-template<int got_size, bool big_endian>
+-void
+-Output_data_got<got_size, big_endian>::add_local_with_rel(
+-    Relobj* object,
+-    unsigned int symndx,
+-    unsigned int got_type,
+-    Output_data_reloc_generic* rel_dyn,
+-    unsigned int r_type)
+-{
+-  if (object->local_has_got_offset(symndx, got_type))
+-    return;
+-
+-  unsigned int got_offset = this->add_got_entry(Got_entry());
+-  object->set_local_got_offset(symndx, got_type, got_offset);
+-  rel_dyn->add_local_generic(object, symndx, r_type, this, got_offset, 0);
+-}
+-
+ // Add an entry for a local symbol plus ADDEND to the GOT, and add a dynamic
+ // relocation of type R_TYPE for the GOT entry.
+ 
+@@ -1620,7 +1593,8 @@ Output_data_got<got_size, big_endian>::add_local_with_rel(
+     unsigned int symndx,
+     unsigned int got_type,
+     Output_data_reloc_generic* rel_dyn,
+-    unsigned int r_type, uint64_t addend)
++    unsigned int r_type,
++    uint64_t addend)
+ {
+   if (object->local_has_got_offset(symndx, got_type, addend))
+     return;
+@@ -1631,32 +1605,6 @@ Output_data_got<got_size, big_endian>::add_local_with_rel(
+                              addend);
+ }
+ 
+-// Add a pair of entries for a local symbol to the GOT, and add
+-// a dynamic relocation of type R_TYPE using the section symbol of
+-// the output section to which input section SHNDX maps, on the first.
+-// The first got entry will have a value of zero, the second the
+-// value of the local symbol.
+-template<int got_size, bool big_endian>
+-void
+-Output_data_got<got_size, big_endian>::add_local_pair_with_rel(
+-    Relobj* object,
+-    unsigned int symndx,
+-    unsigned int shndx,
+-    unsigned int got_type,
+-    Output_data_reloc_generic* rel_dyn,
+-    unsigned int r_type)
+-{
+-  if (object->local_has_got_offset(symndx, got_type))
+-    return;
+-
+-  unsigned int got_offset =
+-      this->add_got_entry_pair(Got_entry(),
+-			       Got_entry(object, symndx, false));
+-  object->set_local_got_offset(symndx, got_type, got_offset);
+-  Output_section* os = object->output_section(shndx);
+-  rel_dyn->add_output_section_generic(os, r_type, this, got_offset, 0);
+-}
+-
+ // Add a pair of entries for a local symbol plus ADDEND to the GOT, and add
+ // a dynamic relocation of type R_TYPE using the section symbol of
+ // the output section to which input section SHNDX maps, on the first.
+@@ -1670,7 +1618,8 @@ Output_data_got<got_size, big_endian>::add_local_pair_with_rel(
+     unsigned int shndx,
+     unsigned int got_type,
+     Output_data_reloc_generic* rel_dyn,
+-    unsigned int r_type, uint64_t addend)
++    unsigned int r_type,
++    uint64_t addend)
+ {
+   if (object->local_has_got_offset(symndx, got_type, addend))
+     return;
+@@ -1694,16 +1643,17 @@ Output_data_got<got_size, big_endian>::add_local_tls_pair(
+     unsigned int symndx,
+     unsigned int got_type,
+     Output_data_reloc_generic* rel_dyn,
+-    unsigned int r_type)
++    unsigned int r_type,
++    uint64_t addend)
+ {
+-  if (object->local_has_got_offset(symndx, got_type))
++  if (object->local_has_got_offset(symndx, got_type, addend))
+     return;
+ 
+   unsigned int got_offset
+     = this->add_got_entry_pair(Got_entry(),
+-			       Got_entry(object, symndx, true));
+-  object->set_local_got_offset(symndx, got_type, got_offset);
+-  rel_dyn->add_local_generic(object, 0, r_type, this, got_offset, 0);
++			       Got_entry(object, symndx, true, addend));
++  object->set_local_got_offset(symndx, got_type, got_offset, addend);
++  rel_dyn->add_local_generic(object, 0, r_type, this, got_offset, addend);
+ }
+ 
+ // Reserve a slot in the GOT for a local symbol or the second slot of a pair.
+@@ -1714,10 +1664,11 @@ Output_data_got<got_size, big_endian>::reserve_local(
+     unsigned int i,
+     Relobj* object,
+     unsigned int sym_index,
+-    unsigned int got_type)
++    unsigned int got_type,
++    uint64_t addend)
+ {
+   this->do_reserve_slot(i);
+-  object->set_local_got_offset(sym_index, got_type, this->got_offset(i));
++  object->set_local_got_offset(sym_index, got_type, this->got_offset(i), addend);
+ }
+ 
+ // Reserve a slot in the GOT for a global symbol.
+@@ -1727,10 +1678,11 @@ void
+ Output_data_got<got_size, big_endian>::reserve_global(
+     unsigned int i,
+     Symbol* gsym,
+-    unsigned int got_type)
++    unsigned int got_type,
++    uint64_t addend)
+ {
+   this->do_reserve_slot(i);
+-  gsym->set_got_offset(got_type, this->got_offset(i));
++  gsym->set_got_offset(got_type, this->got_offset(i), addend);
+ }
+ 
+ // Write out the GOT.
+@@ -1748,7 +1700,7 @@ Output_data_got<got_size, big_endian>::do_write(Output_file* of)
+   unsigned char* pov = oview;
+   for (unsigned int i = 0; i < this->entries_.size(); ++i)
+     {
+-      this->entries_[i].write(i, pov);
++      this->entries_[i].write(this, i, pov);
+       pov += add;
+     }
+ 
+diff --git a/gold/output.h b/gold/output.h
+index 9c44f6259a2..9f1ed6cc567 100644
+--- a/gold/output.h
++++ b/gold/output.h
+@@ -2459,83 +2459,65 @@ class Output_data_got : public Output_data_got_base
+     this->free_list_.init(data_size, false);
+   }
+ 
+-  // Add an entry for a global symbol to the GOT.  Return true if this
+-  // is a new GOT entry, false if the symbol was already in the GOT.
++  // Add an entry for a global symbol GSYM plus ADDEND to the GOT.
++  // Return true if this is a new GOT entry, false if the symbol plus
++  // addend was already in the GOT.
+   bool
+-  add_global(Symbol* gsym, unsigned int got_type);
++  add_global(Symbol* gsym, unsigned int got_type, uint64_t addend = 0);
+ 
+   // Like add_global, but use the PLT offset of the global symbol if
+   // it has one.
+   bool
+-  add_global_plt(Symbol* gsym, unsigned int got_type);
++  add_global_plt(Symbol* gsym, unsigned int got_type, uint64_t addend = 0);
+ 
+   // Like add_global, but for a TLS symbol where the value will be
+   // offset using Target::tls_offset_for_global.
+   bool
+-  add_global_tls(Symbol* gsym, unsigned int got_type)
+-  { return add_global_plt(gsym, got_type); }
++  add_global_tls(Symbol* gsym, unsigned int got_type, uint64_t addend = 0)
++  { return this->add_global_plt(gsym, got_type, addend); }
+ 
+-  // Add an entry for a global symbol to the GOT, and add a dynamic
+-  // relocation of type R_TYPE for the GOT entry.
++  // Add an entry for a global symbol GSYM plus ADDEND to the GOT, and
++  // add a dynamic relocation of type R_TYPE for the GOT entry.
+   void
+   add_global_with_rel(Symbol* gsym, unsigned int got_type,
+-		      Output_data_reloc_generic* rel_dyn, unsigned int r_type);
++		      Output_data_reloc_generic* rel_dyn, unsigned int r_type,
++		      uint64_t addend = 0);
+ 
+-  // Add a pair of entries for a global symbol to the GOT, and add
+-  // dynamic relocations of type R_TYPE_1 and R_TYPE_2, respectively.
++  // Add a pair of entries for a global symbol GSYM plus ADDEND to the
++  // GOT, and add dynamic relocations of type R_TYPE_1 and R_TYPE_2,
++  // respectively.
+   void
+   add_global_pair_with_rel(Symbol* gsym, unsigned int got_type,
+ 			   Output_data_reloc_generic* rel_dyn,
+-			   unsigned int r_type_1, unsigned int r_type_2);
+-
+-  // Add an entry for a local symbol to the GOT.  This returns true if
+-  // this is a new GOT entry, false if the symbol already has a GOT
+-  // entry.
+-  bool
+-  add_local(Relobj* object, unsigned int sym_index, unsigned int got_type);
++			   unsigned int r_type_1, unsigned int r_type_2,
++			   uint64_t addend = 0);
+ 
+   // Add an entry for a local symbol plus ADDEND to the GOT.  This returns
+   // true if this is a new GOT entry, false if the symbol already has a GOT
+   // entry.
+   bool
+   add_local(Relobj* object, unsigned int sym_index, unsigned int got_type,
+-	    uint64_t addend);
++	    uint64_t addend = 0);
+ 
+   // Like add_local, but use the PLT offset of the local symbol if it
+   // has one.
+   bool
+-  add_local_plt(Relobj* object, unsigned int sym_index, unsigned int got_type);
++  add_local_plt(Relobj* object, unsigned int sym_index, unsigned int got_type,
++		uint64_t addend = 0);
+ 
+   // Like add_local, but for a TLS symbol where the value will be
+   // offset using Target::tls_offset_for_local.
+   bool
+-  add_local_tls(Relobj* object, unsigned int sym_index, unsigned int got_type)
+-  { return add_local_plt(object, sym_index, got_type); }
+-
+-  // Add an entry for a local symbol to the GOT, and add a dynamic
+-  // relocation of type R_TYPE for the GOT entry.
+-  void
+-  add_local_with_rel(Relobj* object, unsigned int sym_index,
+-		     unsigned int got_type, Output_data_reloc_generic* rel_dyn,
+-		     unsigned int r_type);
++  add_local_tls(Relobj* object, unsigned int sym_index, unsigned int got_type,
++		uint64_t addend = 0)
++  { return this->add_local_plt(object, sym_index, got_type, addend); }
+ 
+   // Add an entry for a local symbol plus ADDEND to the GOT, and add a dynamic
+   // relocation of type R_TYPE for the GOT entry.
+   void
+   add_local_with_rel(Relobj* object, unsigned int sym_index,
+ 		     unsigned int got_type, Output_data_reloc_generic* rel_dyn,
+-		     unsigned int r_type, uint64_t addend);
+-
+-  // Add a pair of entries for a local symbol to the GOT, and add
+-  // a dynamic relocation of type R_TYPE using the section symbol of
+-  // the output section to which input section SHNDX maps, on the first.
+-  // The first got entry will have a value of zero, the second the
+-  // value of the local symbol.
+-  void
+-  add_local_pair_with_rel(Relobj* object, unsigned int sym_index,
+-			  unsigned int shndx, unsigned int got_type,
+-			  Output_data_reloc_generic* rel_dyn,
+-			  unsigned int r_type);
++		     unsigned int r_type, uint64_t addend = 0);
+ 
+   // Add a pair of entries for a local symbol plus ADDEND to the GOT, and add
+   // a dynamic relocation of type R_TYPE using the section symbol of
+@@ -2546,17 +2528,18 @@ class Output_data_got : public Output_data_got_base
+   add_local_pair_with_rel(Relobj* object, unsigned int sym_index,
+ 			  unsigned int shndx, unsigned int got_type,
+ 			  Output_data_reloc_generic* rel_dyn,
+-			  unsigned int r_type, uint64_t addend);
++			  unsigned int r_type, uint64_t addend = 0);
+ 
+-  // Add a pair of entries for a local symbol to the GOT, and add
+-  // a dynamic relocation of type R_TYPE using STN_UNDEF on the first.
+-  // The first got entry will have a value of zero, the second the
+-  // value of the local symbol offset by Target::tls_offset_for_local.
++  // Add a pair of entries for a local symbol plus ADDEND to the GOT,
++  // and add a dynamic relocation of type R_TYPE using STN_UNDEF on
++  // the first.  The first got entry will have a value of zero, the
++  // second the value of the local symbol plus ADDEND offset by
++  // Target::tls_offset_for_local.
+   void
+   add_local_tls_pair(Relobj* object, unsigned int sym_index,
+ 		     unsigned int got_type,
+ 		     Output_data_reloc_generic* rel_dyn,
+-		     unsigned int r_type);
++		     unsigned int r_type, uint64_t addend = 0);
+ 
+   // Add a constant to the GOT.  This returns the offset of the new
+   // entry from the start of the GOT.
+@@ -2577,14 +2560,15 @@ class Output_data_got : public Output_data_got_base
+     this->replace_got_entry(i, Got_entry(constant));
+   }
+ 
+-  // Reserve a slot in the GOT for a local symbol.
++  // Reserve a slot in the GOT for a local symbol plus ADDEND.
+   void
+   reserve_local(unsigned int i, Relobj* object, unsigned int sym_index,
+-		unsigned int got_type);
++		unsigned int got_type, uint64_t addend = 0);
+ 
+-  // Reserve a slot in the GOT for a global symbol.
++  // Reserve a slot in the GOT for a global symbol plus ADDEND.
+   void
+-  reserve_global(unsigned int i, Symbol* gsym, unsigned int got_type);
++  reserve_global(unsigned int i, Symbol* gsym, unsigned int got_type,
++		 uint64_t addend = 0);
+ 
+  protected:
+   // Write out the GOT table.
+@@ -2623,16 +2607,16 @@ class Output_data_got : public Output_data_got_base
+     { this->u_.constant = 0; }
+ 
+     // Create a global symbol entry.
+-    Got_entry(Symbol* gsym, bool use_plt_or_tls_offset)
++    Got_entry(Symbol* gsym, bool use_plt_or_tls_offset, uint64_t addend)
+       : local_sym_index_(GSYM_CODE),
+-	use_plt_or_tls_offset_(use_plt_or_tls_offset), addend_(0)
++	use_plt_or_tls_offset_(use_plt_or_tls_offset), addend_(addend)
+     { this->u_.gsym = gsym; }
+ 
+     // Create a local symbol entry.
+     Got_entry(Relobj* object, unsigned int local_sym_index,
+-	      bool use_plt_or_tls_offset)
++	      bool use_plt_or_tls_offset, uint64_t addend)
+       : local_sym_index_(local_sym_index),
+-	use_plt_or_tls_offset_(use_plt_or_tls_offset), addend_(0)
++	use_plt_or_tls_offset_(use_plt_or_tls_offset), addend_(addend)
+     {
+       gold_assert(local_sym_index != GSYM_CODE
+ 		  && local_sym_index != CONSTANT_CODE
+@@ -2641,19 +2625,6 @@ class Output_data_got : public Output_data_got_base
+       this->u_.object = object;
+     }
+ 
+-    // Create a local symbol entry plus addend.
+-    Got_entry(Relobj* object, unsigned int local_sym_index,
+-	bool use_plt_or_tls_offset, uint64_t addend)
+-      : local_sym_index_(local_sym_index),
+-	use_plt_or_tls_offset_(use_plt_or_tls_offset), addend_(addend)
+-    {
+-      gold_assert(local_sym_index != GSYM_CODE
+-      && local_sym_index != CONSTANT_CODE
+-      && local_sym_index != RESERVED_CODE
+-      && local_sym_index == this->local_sym_index_);
+-      this->u_.object = object;
+-    }
+-
+     // Create a constant entry.  The constant is a host value--it will
+     // be swapped, if necessary, when it is written out.
+     explicit Got_entry(Valtype constant)
+@@ -2662,7 +2633,8 @@ class Output_data_got : public Output_data_got_base
+ 
+     // Write the GOT entry to an output view.
+     void
+-    write(unsigned int got_indx, unsigned char* pov) const;
++    write(Output_data_got_base* got, unsigned int got_indx,
++	  unsigned char* pov) const;
+ 
+    private:
+     enum
+diff --git a/gold/powerpc.cc b/gold/powerpc.cc
+index 6b12ed8869b..3a6d3c6f612 100644
+--- a/gold/powerpc.cc
++++ b/gold/powerpc.cc
+@@ -101,7 +101,6 @@ public:
+     : Sized_relobj_file<size, big_endian>(name, input_file, offset, ehdr),
+       uniq_(object_id++), special_(0), relatoc_(0), toc_(0),
+       has_small_toc_reloc_(false), opd_valid_(false),
+-      no_tls_marker_(false), tls_marker_(false), tls_opt_error_(false),
+       e_flags_(ehdr.get_e_flags()), no_toc_opt_(), opd_ent_(),
+       access_from_map_(), has14_(), stub_table_index_(), st_other_(),
+       attributes_section_data_(NULL)
+@@ -162,30 +161,6 @@ public:
+     return this->no_toc_opt_[off];
+   }
+ 
+-  void
+-  set_no_tls_marker()
+-  {
+-    if (!this->no_tls_marker_ && this->tls_marker_)
+-      this->tls_opt_error_ = true;
+-    this->no_tls_marker_ = true;
+-  }
+-
+-  bool
+-  no_tls_marker() const
+-  { return this->no_tls_marker_; }
+-
+-  void
+-  set_tls_marker()
+-  { this->tls_marker_ = true; }
+-
+-  bool
+-  tls_marker() const
+-  { return this->tls_marker_; }
+-
+-  bool
+-  tls_opt_error() const
+-  { return this->tls_opt_error_; }
+-
+   // The .got2 section shndx.
+   unsigned int
+   got2_shndx() const
+@@ -341,12 +316,6 @@ public:
+ 	}
+   }
+ 
+-  // Return offset in output GOT section that this object will use
+-  // as a TOC pointer.  Won't be just a constant with multi-toc support.
+-  Address
+-  toc_base_offset() const
+-  { return 0x8000; }
+-
+   void
+   set_has_small_toc_reloc()
+   { has_small_toc_reloc_ = true; }
+@@ -479,19 +448,6 @@ private:
+   // access_from_map_.
+   bool opd_valid_;
+ 
+-  // Set when finding a __tls_get_addr call without marker relocs.
+-  // Such a call disables GD and LD tls optimisations for the object file.
+-  bool no_tls_marker_;
+-
+-  // Set when finding a __tls_get_addr call with marker relocs, or
+-  // when finding a relocation that needs __tls_get_addr calls with
+-  // marker relocs.
+-  bool tls_marker_;
+-
+-  // Set when seeing a __tls_get_addr call without marker relocs after
+-  // seeing some __tls_get_addr calls with marker relocs.
+-  bool tls_opt_error_;
+-
+   // Header e_flags
+   elfcpp::Elf_Word e_flags_;
+ 
+@@ -665,6 +621,21 @@ class Powerpc_copy_relocs : public Copy_relocs<sh_type, size, big_endian>
+   emit(Output_data_reloc<sh_type, true, size, big_endian>*);
+ };
+ 
++// The types of GOT entries needed for this platform.
++// These values are exposed to the ABI in an incremental link, but
++// powerpc does not support incremental linking as yet.
++enum Got_type
++  {
++    GOT_TYPE_STANDARD = 0,
++    GOT_TYPE_TLSGD = 1,		// double entry for @got@tlsgd
++    GOT_TYPE_DTPREL = 2,	// entry for @got@dtprel
++    GOT_TYPE_TPREL = 3,		// entry for @got@tprel
++    GOT_TYPE_SMALL = 4,
++    GOT_TYPE_SMALL_TLSGD = 5,
++    GOT_TYPE_SMALL_DTPREL = 6,
++    GOT_TYPE_SMALL_TPREL = 7
++  };
++
+ template<int size, bool big_endian>
+ class Target_powerpc : public Sized_target<size, big_endian>
+ {
+@@ -681,8 +652,8 @@ class Target_powerpc : public Sized_target<size, big_endian>
+ 
+   Target_powerpc()
+     : Sized_target<size, big_endian>(&powerpc_info),
+-      got_(NULL), plt_(NULL), iplt_(NULL), lplt_(NULL), brlt_section_(NULL),
+-      glink_(NULL), rela_dyn_(NULL), copy_relocs_(),
++      got_(NULL), biggot_(NULL), plt_(NULL), iplt_(NULL), lplt_(NULL),
++      brlt_section_(NULL), glink_(NULL), rela_dyn_(NULL), copy_relocs_(),
+       tlsld_got_offset_(-1U),
+       stub_tables_(), branch_lookup_table_(), branch_info_(), tocsave_loc_(),
+       power10_relocs_(false), plt_thread_safe_(false), plt_localentry0_(false),
+@@ -825,12 +796,16 @@ class Target_powerpc : public Sized_target<size, big_endian>
+   int64_t
+   do_tls_offset_for_local(const Relobj* object,
+ 			  unsigned int symndx,
+-			  unsigned int got_indx) const;
++			  Output_data_got_base* got,
++			  unsigned int got_indx,
++			  uint64_t addend) const;
+ 
+   // Return the offset to use for the GOT_INDX'th got entry which is
+   // for global tls symbol GSYM.
+   int64_t
+-  do_tls_offset_for_global(Symbol* gsym, unsigned int got_indx) const;
++  do_tls_offset_for_global(Symbol* gsym,
++			   Output_data_got_base* got, unsigned int got_indx,
++			   uint64_t addend) const;
+ 
+   void
+   do_function_location(Symbol_location*) const;
+@@ -912,12 +887,13 @@ class Target_powerpc : public Sized_target<size, big_endian>
+     return strcmp(sym->name(), "__tls_get_addr") == 0;
+   }
+ 
+-  // Return the size of the GOT section.
++  // Return the size of the GOT section, for incremental linking
+   section_size_type
+   got_size() const
+   {
+     gold_assert(this->got_ != NULL);
+-    return this->got_->data_size();
++    return this->got_->data_size() + (this->biggot_
++				      ? this->biggot_->data_size() : 0);
+   }
+ 
+   // Get the PLT section.
+@@ -990,15 +966,34 @@ class Target_powerpc : public Sized_target<size, big_endian>
+ 
+   // Get the GOT section.
+   const Output_data_got_powerpc<size, big_endian>*
+-  got_section() const
++  got_section(Got_type got_type) const
+   {
+     gold_assert(this->got_ != NULL);
+-    return this->got_;
++    if (size == 32 || (got_type & GOT_TYPE_SMALL))
++      return this->got_;
++    gold_assert(this->biggot_ != NULL);
++    return this->biggot_;
+   }
+ 
+   // Get the GOT section, creating it if necessary.
+   Output_data_got_powerpc<size, big_endian>*
+-  got_section(Symbol_table*, Layout*);
++  got_section(Symbol_table*, Layout*, Got_type);
++
++  // The toc/got pointer reg will be set to this value.
++  Address
++  toc_pointer() const
++  {
++    return this->got_->address() + this->got_->g_o_t();
++  }
++
++  // Offset of base used to access the GOT/TOC relative to the GOT section.
++  Address
++  got_base_offset(Got_type got_type) const
++  {
++    if (size == 32 || (got_type & GOT_TYPE_SMALL))
++      return this->got_->g_o_t();
++    return this->toc_pointer() - this->biggot_->address();
++  }
+ 
+   Object*
+   do_make_elf_object(const std::string&, Input_file*, off_t,
+@@ -1688,20 +1683,13 @@ class Target_powerpc : public Sized_target<size, big_endian>
+   // general Target structure.
+   static Target::Target_info powerpc_info;
+ 
+-  // The types of GOT entries needed for this platform.
+-  // These values are exposed to the ABI in an incremental link.
+-  // Do not renumber existing values without changing the version
+-  // number of the .gnu_incremental_inputs section.
+-  enum Got_type
+-  {
+-    GOT_TYPE_STANDARD,
+-    GOT_TYPE_TLSGD,	// double entry for @got@tlsgd
+-    GOT_TYPE_DTPREL,	// entry for @got@dtprel
+-    GOT_TYPE_TPREL	// entry for @got@tprel
+-  };
+-
+-  // The GOT section.
++  // The small GOT section used by ppc32, and by ppc64 for entries that
++  // must be addresseed +/-32k from the got pointer.
+   Output_data_got_powerpc<size, big_endian>* got_;
++  // Another GOT section used for entries that can be addressed +/- 2G
++  // from the got pointer.
++  Output_data_got_powerpc<size, big_endian>* biggot_;
++
+   // The PLT section.  This is a container for a table of addresses,
+   // and their relocations.  Each address in the PLT has a dynamic
+   // relocation (R_*_JMP_SLOT) and each address will have a
+@@ -1921,7 +1909,7 @@ is_plt16_reloc(unsigned int r_type)
+ 	  || (size == 64 && r_type == elfcpp::R_PPC64_PLT16_LO_DS));
+ }
+ 
+-// GOT_TYPE_STANDARD (ie. not TLS) GOT relocs
++// GOT_TYPE_STANDARD or GOT_TYPE_SMALL (ie. not TLS) GOT relocs
+ inline bool
+ is_got_reloc(unsigned int r_type)
+ {
+@@ -2442,15 +2430,15 @@ Powerpc_relobj<size, big_endian>::make_toc_relative(
+   // With -mcmodel=medium code it is quite possible to have
+   // toc-relative relocs referring to objects outside the TOC.
+   // Don't try to look at a non-existent TOC.
+-  if (this->toc_shndx() == 0)
++  if (this->toc_shndx() == 0
++      || this->output_section(this->toc_shndx()) == 0)
+     return false;
+ 
+   // Convert VALUE back to an address by adding got_base (see below),
+   // then to an offset in the TOC by subtracting the TOC output
+-  // section address and the TOC output offset.  Since this TOC output
+-  // section and the got output section are one and the same, we can
+-  // omit adding and subtracting the output section address.
+-  Address off = (*value + this->toc_base_offset()
++  // section address and the TOC output offset.
++  Address off = (*value + target->toc_pointer()
++		 - this->output_section(this->toc_shndx())->address()
+ 		 - this->output_section_offset(this->toc_shndx()));
+   // Is this offset in the TOC?  -mcmodel=medium code may be using
+   // TOC relative access to variables outside the TOC.  Those of
+@@ -2466,8 +2454,7 @@ Powerpc_relobj<size, big_endian>::make_toc_relative(
+   unsigned char* view = this->get_output_view(this->toc_shndx(), &vlen);
+   Address addr = elfcpp::Swap<size, big_endian>::readval(view + off);
+   // The TOC pointer
+-  Address got_base = (target->got_section()->output_section()->address()
+-		      + this->toc_base_offset());
++  Address got_base = target->toc_pointer();
+   addr -= got_base;
+   if (addr + (uint64_t) 0x80008000 >= (uint64_t) 1 << 32)
+     return false;
+@@ -2485,8 +2472,7 @@ Powerpc_relobj<size, big_endian>::make_got_relative(
+     Address* value)
+ {
+   Address addr = psymval->value(this, addend);
+-  Address got_base = (target->got_section()->output_section()->address()
+-		      + this->toc_base_offset());
++  Address got_base = target->toc_pointer();
+   addr -= got_base;
+   if (addr + 0x80008000 > 0xffffffff)
+     return false;
+@@ -2835,7 +2821,7 @@ Target_powerpc<size, big_endian>::do_define_standard_symbols(
+ 	    static_cast<Target_powerpc<size, big_endian>*>(
+ 		parameters->sized_target<size, big_endian>());
+ 	  Output_data_got_powerpc<size, big_endian>* got
+-	    = target->got_section(symtab, layout);
++	    = target->got_section(symtab, layout, GOT_TYPE_SMALL);
+ 	  symtab->define_in_output_data("_GLOBAL_OFFSET_TABLE_", NULL,
+ 					Symbol_table::PREDEFINED,
+ 					got, 0, 0,
+@@ -2872,7 +2858,7 @@ Target_powerpc<size, big_endian>::do_define_standard_symbols(
+ 	    static_cast<Target_powerpc<size, big_endian>*>(
+ 		parameters->sized_target<size, big_endian>());
+ 	  Output_data_got_powerpc<size, big_endian>* got
+-	    = target->got_section(symtab, layout);
++	    = target->got_section(symtab, layout, GOT_TYPE_SMALL);
+ 	  symtab->define_in_output_data(".TOC.", NULL,
+ 					Symbol_table::PREDEFINED,
+ 					got, 0x8000, 0,
+@@ -2955,90 +2941,101 @@ public:
+   typedef typename elfcpp::Elf_types<size>::Elf_Addr Valtype;
+   typedef Output_data_reloc<elfcpp::SHT_RELA, true, size, big_endian> Rela_dyn;
+ 
+-  Output_data_got_powerpc(Symbol_table* symtab, Layout* layout)
++  Output_data_got_powerpc(Symbol_table* symtab, Layout* layout,
++			  Got_type got_type)
+     : Output_data_got<size, big_endian>(),
+       symtab_(symtab), layout_(layout),
+       header_ent_cnt_(size == 32 ? 3 : 1),
+-      header_index_(size == 32 ? 0x2000 : 0)
++      header_index_(size == 32 ? 0x2000 : -1u)
+   {
+     if (size == 64)
+       this->set_addralign(256);
++    if (size == 64 && (got_type & GOT_TYPE_SMALL))
++      this->make_header();
+   }
+ 
+   // Override all the Output_data_got methods we use so as to first call
+   // reserve_ent().
+   bool
+-  add_global(Symbol* gsym, unsigned int got_type)
++  add_global(Symbol* gsym, unsigned int got_type, uint64_t addend)
+   {
+     this->reserve_ent();
+-    return Output_data_got<size, big_endian>::add_global(gsym, got_type);
++    return Output_data_got<size, big_endian>::add_global(gsym, got_type,
++							 addend);
+   }
+ 
+   bool
+-  add_global_plt(Symbol* gsym, unsigned int got_type)
++  add_global_plt(Symbol* gsym, unsigned int got_type, uint64_t addend)
+   {
+     this->reserve_ent();
+-    return Output_data_got<size, big_endian>::add_global_plt(gsym, got_type);
++    return Output_data_got<size, big_endian>::add_global_plt(gsym, got_type,
++							     addend);
+   }
+ 
+   bool
+-  add_global_tls(Symbol* gsym, unsigned int got_type)
+-  { return this->add_global_plt(gsym, got_type); }
++  add_global_tls(Symbol* gsym, unsigned int got_type, uint64_t addend)
++  { return this->add_global_plt(gsym, got_type, addend); }
+ 
+   void
+   add_global_with_rel(Symbol* gsym, unsigned int got_type,
+-		      Output_data_reloc_generic* rel_dyn, unsigned int r_type)
++		      Output_data_reloc_generic* rel_dyn,
++		      unsigned int r_type, uint64_t addend)
+   {
+     this->reserve_ent();
+     Output_data_got<size, big_endian>::
+-      add_global_with_rel(gsym, got_type, rel_dyn, r_type);
++      add_global_with_rel(gsym, got_type, rel_dyn, r_type, addend);
+   }
+ 
+   void
+   add_global_pair_with_rel(Symbol* gsym, unsigned int got_type,
+ 			   Output_data_reloc_generic* rel_dyn,
+-			   unsigned int r_type_1, unsigned int r_type_2)
++			   unsigned int r_type_1, unsigned int r_type_2,
++			   uint64_t addend)
+   {
+     if (gsym->has_got_offset(got_type))
+       return;
+ 
+     this->reserve_ent(2);
+     Output_data_got<size, big_endian>::
+-      add_global_pair_with_rel(gsym, got_type, rel_dyn, r_type_1, r_type_2);
++      add_global_pair_with_rel(gsym, got_type, rel_dyn, r_type_1, r_type_2,
++			       addend);
+   }
+ 
+   bool
+-  add_local(Relobj* object, unsigned int sym_index, unsigned int got_type)
++  add_local(Relobj* object, unsigned int sym_index, unsigned int got_type,
++	    uint64_t addend)
+   {
+     this->reserve_ent();
+     return Output_data_got<size, big_endian>::add_local(object, sym_index,
+-							got_type);
++							got_type, addend);
+   }
+ 
+   bool
+-  add_local_plt(Relobj* object, unsigned int sym_index, unsigned int got_type)
++  add_local_plt(Relobj* object, unsigned int sym_index,
++		unsigned int got_type, uint64_t addend)
+   {
+     this->reserve_ent();
+     return Output_data_got<size, big_endian>::add_local_plt(object, sym_index,
+-							    got_type);
++							    got_type, addend);
+   }
+ 
+   bool
+-  add_local_tls(Relobj* object, unsigned int sym_index, unsigned int got_type)
+-  { return this->add_local_plt(object, sym_index, got_type); }
++  add_local_tls(Relobj* object, unsigned int sym_index,
++		unsigned int got_type, uint64_t addend)
++  { return this->add_local_plt(object, sym_index, got_type, addend); }
+ 
+   void
+   add_local_tls_pair(Relobj* object, unsigned int sym_index,
+ 		     unsigned int got_type,
+ 		     Output_data_reloc_generic* rel_dyn,
+-		     unsigned int r_type)
++		     unsigned int r_type, uint64_t addend)
+   {
+-    if (object->local_has_got_offset(sym_index, got_type))
++    if (object->local_has_got_offset(sym_index, got_type, addend))
+       return;
+ 
+     this->reserve_ent(2);
+     Output_data_got<size, big_endian>::
+-      add_local_tls_pair(object, sym_index, got_type, rel_dyn, r_type);
++      add_local_tls_pair(object, sym_index, got_type, rel_dyn, r_type, addend);
+   }
+ 
+   unsigned int
+@@ -3055,31 +3052,23 @@ public:
+     return Output_data_got<size, big_endian>::add_constant_pair(c1, c2);
+   }
+ 
+-  // Offset of _GLOBAL_OFFSET_TABLE_.
++  // Offset of _GLOBAL_OFFSET_TABLE_ and .TOC. in this section.
+   unsigned int
+   g_o_t() const
+-  {
+-    return this->got_offset(this->header_index_);
+-  }
+-
+-  // Offset of base used to access the GOT/TOC.
+-  // The got/toc pointer reg will be set to this value.
+-  Valtype
+-  got_base_offset(const Powerpc_relobj<size, big_endian>* object) const
+   {
+     if (size == 32)
+-      return this->g_o_t();
++      return this->got_offset(this->header_index_);
++    else if (this->header_index_ != -1u)
++      return this->got_offset(this->header_index_) + 0x8000;
+     else
+-      return (this->output_section()->address()
+-	      + object->toc_base_offset()
+-	      - this->address());
++      gold_unreachable();
+   }
+ 
+   // Ensure our GOT has a header.
+   void
+   set_final_data_size()
+   {
+-    if (this->header_ent_cnt_ != 0)
++    if (size == 32 && this->header_ent_cnt_ != 0)
+       this->make_header();
+     Output_data_got<size, big_endian>::set_final_data_size();
+   }
+@@ -3090,12 +3079,15 @@ public:
+   void
+   do_write(Output_file* of)
+   {
+-    Valtype val = 0;
+-    if (size == 32 && this->layout_->dynamic_data() != NULL)
+-      val = this->layout_->dynamic_section()->address();
+-    if (size == 64)
+-      val = this->output_section()->address() + 0x8000;
+-    this->replace_constant(this->header_index_, val);
++    if (this->header_index_ != -1u)
++      {
++	Valtype val = 0;
++	if (size == 32 && this->layout_->dynamic_data() != NULL)
++	  val = this->layout_->dynamic_section()->address();
++	if (size == 64)
++	  val = this->address() + this->g_o_t();
++	this->replace_constant(this->header_index_, val);
++      }
+     Output_data_got<size, big_endian>::do_write(of);
+   }
+ 
+@@ -3103,7 +3095,7 @@ private:
+   void
+   reserve_ent(unsigned int cnt = 1)
+   {
+-    if (this->header_ent_cnt_ == 0)
++    if (size != 32 || this->header_ent_cnt_ == 0)
+       return;
+     if (this->num_entries() + cnt > this->header_index_)
+       this->make_header();
+@@ -3155,21 +3147,37 @@ private:
+ template<int size, bool big_endian>
+ Output_data_got_powerpc<size, big_endian>*
+ Target_powerpc<size, big_endian>::got_section(Symbol_table* symtab,
+-					      Layout* layout)
++					      Layout* layout,
++					      Got_type got_type)
+ {
+   if (this->got_ == NULL)
+     {
+       gold_assert(symtab != NULL && layout != NULL);
+ 
+       this->got_
+-	= new Output_data_got_powerpc<size, big_endian>(symtab, layout);
++	= new Output_data_got_powerpc<size, big_endian>(symtab, layout,
++							GOT_TYPE_SMALL);
+ 
+       layout->add_output_section_data(".got", elfcpp::SHT_PROGBITS,
+ 				      elfcpp::SHF_ALLOC | elfcpp::SHF_WRITE,
+ 				      this->got_, ORDER_DATA, false);
+     }
+ 
+-  return this->got_;
++  if (size == 32 || (got_type & GOT_TYPE_SMALL))
++    return this->got_;
++
++  if (this->biggot_ == NULL)
++    {
++      this->biggot_
++	= new Output_data_got_powerpc<size, big_endian>(symtab, layout,
++							GOT_TYPE_STANDARD);
++
++      layout->add_output_section_data(".got", elfcpp::SHT_PROGBITS,
++				      elfcpp::SHF_ALLOC | elfcpp::SHF_WRITE,
++				      this->biggot_, ORDER_DATA, false);
++    }
++
++  return this->biggot_;
+ }
+ 
+ // Get the dynamic reloc section, creating it if necessary.
+@@ -3658,8 +3666,7 @@ Target_powerpc<size, big_endian>::Branch_info::make_stub(
+ 			   && gsym != NULL
+ 			   && gsym->source() == Symbol::IN_OUTPUT_DATA
+ 			   && gsym->output_data() == target->savres_section());
+-	  ok = stub_table->add_long_branch_entry(this->object_,
+-						 this->r_type_,
++	  ok = stub_table->add_long_branch_entry(this->r_type_,
+ 						 from, to, other, save_res);
+ 	}
+     }
+@@ -4354,7 +4361,7 @@ Target_powerpc<size, big_endian>::make_plt_section(Symbol_table* symtab,
+   if (this->plt_ == NULL)
+     {
+       if (this->got_ == NULL)
+-	this->got_section(symtab, layout);
++	this->got_section(symtab, layout, GOT_TYPE_SMALL);
+ 
+       if (this->glink_ == NULL)
+ 	make_glink_section(layout);
+@@ -4801,12 +4808,10 @@ class Stub_table : public Output_relaxed_input_section
+ 
+   // Add a long branch stub.
+   bool
+-  add_long_branch_entry(const Powerpc_relobj<size, big_endian>*,
+-			unsigned int, Address, Address, unsigned int, bool);
++  add_long_branch_entry(unsigned int, Address, Address, unsigned int, bool);
+ 
+   const Branch_stub_ent*
+-  find_long_branch_entry(const Powerpc_relobj<size, big_endian>*,
+-			 Address) const;
++  find_long_branch_entry(Address) const;
+ 
+   bool
+   can_reach_stub(Address from, unsigned int off, unsigned int r_type)
+@@ -5086,29 +5091,23 @@ class Stub_table : public Output_relaxed_input_section
+   class Branch_stub_key
+   {
+   public:
+-    Branch_stub_key(const Powerpc_relobj<size, big_endian>* obj, Address to)
+-      : dest_(to), toc_base_off_(0)
+-    {
+-      if (size == 64)
+-	toc_base_off_ = obj->toc_base_offset();
+-    }
++    Branch_stub_key(Address to)
++      : dest_(to)
++    { }
+ 
+     bool operator==(const Branch_stub_key& that) const
+     {
+-      return (this->dest_ == that.dest_
+-	      && (size == 32
+-		  || this->toc_base_off_ == that.toc_base_off_));
++      return this->dest_ == that.dest_;
+     }
+ 
+     Address dest_;
+-    unsigned int toc_base_off_;
+   };
+ 
+   class Branch_stub_key_hash
+   {
+   public:
+     size_t operator()(const Branch_stub_key& key) const
+-    { return key.dest_ ^ key.toc_base_off_; }
++    { return key.dest_; }
+   };
+ 
+   // In a sane world this would be a global.
+@@ -5318,14 +5317,13 @@ Stub_table<size, big_endian>::find_plt_call_entry(
+ template<int size, bool big_endian>
+ bool
+ Stub_table<size, big_endian>::add_long_branch_entry(
+-    const Powerpc_relobj<size, big_endian>* object,
+     unsigned int r_type,
+     Address from,
+     Address to,
+     unsigned int other,
+     bool save_res)
+ {
+-  Branch_stub_key key(object, to);
++  Branch_stub_key key(to);
+   bool notoc = (size == 64 && r_type == elfcpp::R_PPC64_REL24_NOTOC);
+   Branch_stub_ent ent(this->branch_size_, notoc, save_res);
+   std::pair<typename Branch_stub_entries::iterator, bool> p
+@@ -5370,11 +5368,9 @@ Stub_table<size, big_endian>::add_long_branch_entry(
+ 
+ template<int size, bool big_endian>
+ const typename Stub_table<size, big_endian>::Branch_stub_ent*
+-Stub_table<size, big_endian>::find_long_branch_entry(
+-    const Powerpc_relobj<size, big_endian>* object,
+-    Address to) const
++Stub_table<size, big_endian>::find_long_branch_entry(Address to) const
+ {
+-  Branch_stub_key key(object, to);
++  Branch_stub_key key(to);
+   typename Branch_stub_entries::const_iterator p
+     = this->long_branch_stubs_.find(key);
+   if (p == this->long_branch_stubs_.end())
+@@ -6094,11 +6090,7 @@ Stub_table<size, big_endian>::plt_call_size(
+ 	    }
+ 	  if (p->second.r2save_)
+ 	    bytes += 4;
+-	  uint64_t got_addr
+-	    = this->targ_->got_section()->output_section()->address();
+-	  const Powerpc_relobj<size, big_endian>* ppcobj = static_cast
+-	    <const Powerpc_relobj<size, big_endian>*>(p->first.object_);
+-	  got_addr += ppcobj->toc_base_offset();
++	  uint64_t got_addr = this->targ_->toc_pointer();
+ 	  uint64_t off = plt_addr - got_addr;
+ 	  bytes += 3 * 4 + 4 * (ha(off) != 0);
+ 	}
+@@ -6159,10 +6151,7 @@ Stub_table<size, big_endian>::plt_call_size(
+ 	  return bytes + tail;
+ 	}
+ 
+-      uint64_t got_addr = this->targ_->got_section()->output_section()->address();
+-      const Powerpc_relobj<size, big_endian>* ppcobj = static_cast
+-	<const Powerpc_relobj<size, big_endian>*>(p->first.object_);
+-      got_addr += ppcobj->toc_base_offset();
++      uint64_t got_addr = this->targ_->toc_pointer();
+       uint64_t off = plt_addr - got_addr;
+       bytes += 3 * 4 + 4 * (ha(off) != 0);
+       if (this->targ_->abiversion() < 2)
+@@ -6283,10 +6272,6 @@ Stub_table<size, big_endian>::do_write(Output_file* of)
+   if (size == 64
+       && this->targ_->power10_stubs())
+     {
+-      const Output_data_got_powerpc<size, big_endian>* got
+-	= this->targ_->got_section();
+-      Address got_os_addr = got->output_section()->address();
+-
+       if (!this->plt_call_stubs_.empty())
+ 	{
+ 	  // Write out plt call stubs.
+@@ -6323,10 +6308,7 @@ Stub_table<size, big_endian>::do_write(Output_file* of)
+ 			    = cs->second.r2save_ && !cs->second.localentry0_;
+ 			  this->build_tls_opt_head(&p, save_lr);
+ 			}
+-		      const Powerpc_relobj<size, big_endian>* ppcobj
+-			= static_cast<const Powerpc_relobj<size, big_endian>*>(
+-			    cs->first.object_);
+-		      Address got_addr = got_os_addr + ppcobj->toc_base_offset();
++		      Address got_addr = this->targ_->toc_pointer();
+ 		      Address off = plt_addr - got_addr;
+ 
+ 		      if (off + 0x80008000 > 0xffffffff || (off & 7) != 0)
+@@ -6428,7 +6410,7 @@ Stub_table<size, big_endian>::do_write(Output_file* of)
+ 			= this->targ_->find_branch_lookup_table(bs->first.dest_);
+ 		      gold_assert(brlt_addr != invalid_address);
+ 		      brlt_addr += this->targ_->brlt_section()->address();
+-		      Address got_addr = got_os_addr + bs->first.toc_base_off_;
++		      Address got_addr = this->targ_->toc_pointer();
+ 		      Address brltoff = brlt_addr - got_addr;
+ 		      if (ha(brltoff) == 0)
+ 			{
+@@ -6477,9 +6459,6 @@ Stub_table<size, big_endian>::do_write(Output_file* of)
+     }
+   else if (size == 64)
+     {
+-      const Output_data_got_powerpc<size, big_endian>* got
+-	= this->targ_->got_section();
+-      Address got_os_addr = got->output_section()->address();
+ 
+       if (!this->plt_call_stubs_.empty()
+ 	  && this->targ_->abiversion() >= 2)
+@@ -6513,9 +6492,7 @@ Stub_table<size, big_endian>::do_write(Output_file* of)
+ 		}
+ 	      else
+ 		{
+-		  const Powerpc_relobj<size, big_endian>* ppcobj = static_cast
+-		    <const Powerpc_relobj<size, big_endian>*>(cs->first.object_);
+-		  Address got_addr = got_os_addr + ppcobj->toc_base_offset();
++		  Address got_addr = this->targ_->toc_pointer();
+ 		  Address off = plt_addr - got_addr;
+ 
+ 		  if (off + 0x80008000 > 0xffffffff || (off & 7) != 0)
+@@ -6555,9 +6532,7 @@ Stub_table<size, big_endian>::do_write(Output_file* of)
+ 	      const Output_data_plt_powerpc<size, big_endian>* plt;
+ 	      Address pltoff = this->plt_off(cs, &plt);
+ 	      Address plt_addr = pltoff + plt->address();
+-	      const Powerpc_relobj<size, big_endian>* ppcobj = static_cast
+-		<const Powerpc_relobj<size, big_endian>*>(cs->first.object_);
+-	      Address got_addr = got_os_addr + ppcobj->toc_base_offset();
++	      Address got_addr = this->targ_->toc_pointer();
+ 	      Address off = plt_addr - got_addr;
+ 
+ 	      if (off + 0x80008000 > 0xffffffff || (off & 7) != 0
+@@ -6701,7 +6676,7 @@ Stub_table<size, big_endian>::do_write(Output_file* of)
+ 		= this->targ_->find_branch_lookup_table(bs->first.dest_);
+ 	      gold_assert(brlt_addr != invalid_address);
+ 	      brlt_addr += this->targ_->brlt_section()->address();
+-	      Address got_addr = got_os_addr + bs->first.toc_base_off_;
++	      Address got_addr = this->targ_->toc_pointer();
+ 	      Address brltoff = brlt_addr - got_addr;
+ 	      if (ha(brltoff) == 0)
+ 		{
+@@ -6763,11 +6738,7 @@ Stub_table<size, big_endian>::do_write(Output_file* of)
+ 		  else
+ 		    {
+ 		      if (g_o_t == invalid_address)
+-			{
+-			  const Output_data_got_powerpc<size, big_endian>* got
+-			    = this->targ_->got_section();
+-			  g_o_t = got->address() + got->g_o_t();
+-			}
++			g_o_t = this->targ_->toc_pointer();
+ 		      got_addr = g_o_t;
+ 		    }
+ 
+@@ -6969,10 +6940,8 @@ Output_data_glink<size, big_endian>::do_write(Output_file* of)
+     }
+   else
+     {
+-      const Output_data_got_powerpc<size, big_endian>* got
+-	= this->targ_->got_section();
+       // The address of _GLOBAL_OFFSET_TABLE_.
+-      Address g_o_t = got->address() + got->g_o_t();
++      Address g_o_t = this->targ_->toc_pointer();
+ 
+       // Write out pltresolve branch table.
+       p = oview;
+@@ -7496,7 +7465,7 @@ Target_powerpc<size, big_endian>::tlsld_got_offset(
+       gold_assert(symtab != NULL && layout != NULL && object != NULL);
+       Reloc_section* rela_dyn = this->rela_dyn_section(layout);
+       Output_data_got_powerpc<size, big_endian>* got
+-	= this->got_section(symtab, layout);
++	= this->got_section(symtab, layout, GOT_TYPE_SMALL);
+       unsigned int got_offset = got->add_constant_pair(0, 0);
+       rela_dyn->add_local(object, 0, elfcpp::R_POWERPC_DTPMOD, got,
+ 			  got_offset, 0);
+@@ -7904,42 +7873,23 @@ Target_powerpc<size, big_endian>::Scan::local(
+   Powerpc_relobj<size, big_endian>* ppc_object
+     = static_cast<Powerpc_relobj<size, big_endian>*>(object);
+ 
+-  switch (this->maybe_skip_tls_get_addr_call(target, r_type, NULL))
+-    {
+-    case Track_tls::NOT_EXPECTED:
+-      ppc_object->set_no_tls_marker();
+-      break;
+-    default:
+-      break;
+-    }
++  this->maybe_skip_tls_get_addr_call(target, r_type, NULL);
+ 
+   if ((size == 64 && r_type == elfcpp::R_PPC64_TLSGD)
+       || (size == 32 && r_type == elfcpp::R_PPC_TLSGD))
+     {
+       this->expect_tls_get_addr_call();
+-      if (!ppc_object->no_tls_marker())
+-	{
+-	  tls::Tls_optimization tls_type = target->optimize_tls_gd(true);
+-	  if (tls_type != tls::TLSOPT_NONE)
+-	    {
+-	      this->skip_next_tls_get_addr_call();
+-	      ppc_object->set_tls_marker();
+-	    }
+-	}
++      tls::Tls_optimization tls_type = target->optimize_tls_gd(true);
++      if (tls_type != tls::TLSOPT_NONE)
++	this->skip_next_tls_get_addr_call();
+     }
+   else if ((size == 64 && r_type == elfcpp::R_PPC64_TLSLD)
+ 	   || (size == 32 && r_type == elfcpp::R_PPC_TLSLD))
+     {
+       this->expect_tls_get_addr_call();
+-      if (!ppc_object->no_tls_marker())
+-	{
+-	  tls::Tls_optimization tls_type = target->optimize_tls_ld();
+-	  if (tls_type != tls::TLSOPT_NONE)
+-	    {
+-	      this->skip_next_tls_get_addr_call();
+-	      ppc_object->set_tls_marker();
+-	    }
+-	}
++      tls::Tls_optimization tls_type = target->optimize_tls_ld();
++      if (tls_type != tls::TLSOPT_NONE)
++	this->skip_next_tls_get_addr_call();
+     }
+ 
+   if (is_discarded)
+@@ -7995,7 +7945,7 @@ Target_powerpc<size, big_endian>::Scan::local(
+     case elfcpp::R_PPC64_TOC:
+       {
+ 	Output_data_got_powerpc<size, big_endian>* got
+-	  = target->got_section(symtab, layout);
++	  = target->got_section(symtab, layout, GOT_TYPE_SMALL);
+ 	if (parameters->options().output_is_position_independent())
+ 	  {
+ 	    Address off = reloc.get_r_offset();
+@@ -8006,12 +7956,12 @@ Target_powerpc<size, big_endian>::Scan::local(
+ 	      break;
+ 
+ 	    Reloc_section* rela_dyn = target->rela_dyn_section(layout);
+-	    Powerpc_relobj<size, big_endian>* symobj = ppc_object;
++	    Address got_off = got->g_o_t();
+ 	    rela_dyn->add_output_section_relative(got->output_section(),
+ 						  elfcpp::R_POWERPC_RELATIVE,
+ 						  output_section,
+ 						  object, data_shndx, off,
+-						  symobj->toc_base_offset());
++						  got_off);
+ 	  }
+       }
+       break;
+@@ -8190,32 +8140,37 @@ Target_powerpc<size, big_endian>::Scan::local(
+     case elfcpp::R_PPC64_GOT16_LO_DS:
+       {
+ 	// The symbol requires a GOT entry.
++	Got_type got_type = ((size == 32
++			      || r_type == elfcpp::R_POWERPC_GOT16
++			      || r_type == elfcpp::R_PPC64_GOT16_DS)
++			     ? GOT_TYPE_SMALL : GOT_TYPE_STANDARD);
+ 	Output_data_got_powerpc<size, big_endian>* got
+-	  = target->got_section(symtab, layout);
++	  = target->got_section(symtab, layout, got_type);
+ 	unsigned int r_sym = elfcpp::elf_r_sym<size>(reloc.get_r_info());
++	uint64_t addend = size == 32 ? 0 : reloc.get_r_addend();
+ 
+ 	if (!parameters->options().output_is_position_independent())
+ 	  {
+ 	    if (is_ifunc
+ 		&& (size == 32 || target->abiversion() >= 2))
+-	      got->add_local_plt(object, r_sym, GOT_TYPE_STANDARD);
++	      got->add_local_plt(object, r_sym, got_type, addend);
+ 	    else
+-	      got->add_local(object, r_sym, GOT_TYPE_STANDARD);
++	      got->add_local(object, r_sym, got_type, addend);
+ 	  }
+-	else if (!object->local_has_got_offset(r_sym, GOT_TYPE_STANDARD))
++	else if (!object->local_has_got_offset(r_sym, got_type, addend))
+ 	  {
+ 	    // If we are generating a shared object or a pie, this
+ 	    // symbol's GOT entry will be set by a dynamic relocation.
+ 	    unsigned int off;
+ 	    off = got->add_constant(0);
+-	    object->set_local_got_offset(r_sym, GOT_TYPE_STANDARD, off);
++	    object->set_local_got_offset(r_sym, got_type, off, addend);
+ 
+ 	    Reloc_section* rela_dyn = target->rela_dyn_section(symtab, layout,
+ 							       is_ifunc);
+ 	    unsigned int dynrel = (is_ifunc ? elfcpp::R_POWERPC_IRELATIVE
+ 				   : elfcpp::R_POWERPC_RELATIVE);
+ 	    rela_dyn->add_local_relative(object, r_sym, dynrel,
+-					 got, off, 0, false);
++					 got, off, addend, false);
+ 	  }
+       }
+       break;
+@@ -8227,7 +8182,7 @@ Target_powerpc<size, big_endian>::Scan::local(
+     case elfcpp::R_PPC64_TOC16_DS:
+     case elfcpp::R_PPC64_TOC16_LO_DS:
+       // We need a GOT section.
+-      target->got_section(symtab, layout);
++      target->got_section(symtab, layout, GOT_TYPE_SMALL);
+       break;
+ 
+     case elfcpp::R_PPC64_GOT_TLSGD_PCREL34:
+@@ -8236,22 +8191,24 @@ Target_powerpc<size, big_endian>::Scan::local(
+     case elfcpp::R_POWERPC_GOT_TLSGD16_HI:
+     case elfcpp::R_POWERPC_GOT_TLSGD16_HA:
+       {
+-	tls::Tls_optimization tls_type = tls::TLSOPT_NONE;
+-	if (!ppc_object->no_tls_marker())
+-	  tls_type = target->optimize_tls_gd(true);
++	tls::Tls_optimization tls_type = target->optimize_tls_gd(true);
+ 	if (tls_type == tls::TLSOPT_NONE)
+ 	  {
++	    Got_type got_type = ((size == 32
++				  || r_type == elfcpp::R_POWERPC_GOT_TLSGD16)
++				 ? GOT_TYPE_SMALL_TLSGD : GOT_TYPE_TLSGD);
+ 	    Output_data_got_powerpc<size, big_endian>* got
+-	      = target->got_section(symtab, layout);
++	      = target->got_section(symtab, layout, got_type);
+ 	    unsigned int r_sym = elfcpp::elf_r_sym<size>(reloc.get_r_info());
++	    uint64_t addend = size == 32 ? 0 : reloc.get_r_addend();
+ 	    Reloc_section* rela_dyn = target->rela_dyn_section(layout);
+-	    got->add_local_tls_pair(object, r_sym, GOT_TYPE_TLSGD,
+-				    rela_dyn, elfcpp::R_POWERPC_DTPMOD);
++	    got->add_local_tls_pair(object, r_sym, got_type,
++				    rela_dyn, elfcpp::R_POWERPC_DTPMOD,
++				    addend);
+ 	  }
+ 	else if (tls_type == tls::TLSOPT_TO_LE)
+ 	  {
+ 	    // no GOT relocs needed for Local Exec.
+-	    ppc_object->set_tls_marker();
+ 	  }
+ 	else
+ 	  gold_unreachable();
+@@ -8264,9 +8221,7 @@ Target_powerpc<size, big_endian>::Scan::local(
+     case elfcpp::R_POWERPC_GOT_TLSLD16_HI:
+     case elfcpp::R_POWERPC_GOT_TLSLD16_HA:
+       {
+-	tls::Tls_optimization tls_type = tls::TLSOPT_NONE;
+-	if (!ppc_object->no_tls_marker())
+-	  tls_type = target->optimize_tls_ld();
++	tls::Tls_optimization tls_type = target->optimize_tls_ld();
+ 	if (tls_type == tls::TLSOPT_NONE)
+ 	  target->tlsld_got_offset(symtab, layout, object);
+ 	else if (tls_type == tls::TLSOPT_TO_LE)
+@@ -8278,7 +8233,6 @@ Target_powerpc<size, big_endian>::Scan::local(
+ 		gold_assert(os != NULL);
+ 		os->set_needs_symtab_index();
+ 	      }
+-	    ppc_object->set_tls_marker();
+ 	  }
+ 	else
+ 	  gold_unreachable();
+@@ -8291,10 +8245,14 @@ Target_powerpc<size, big_endian>::Scan::local(
+     case elfcpp::R_POWERPC_GOT_DTPREL16_HI:
+     case elfcpp::R_POWERPC_GOT_DTPREL16_HA:
+       {
++	Got_type got_type = ((size == 32
++			      || r_type == elfcpp::R_POWERPC_GOT_DTPREL16)
++			     ? GOT_TYPE_SMALL_DTPREL : GOT_TYPE_DTPREL);
+ 	Output_data_got_powerpc<size, big_endian>* got
+-	  = target->got_section(symtab, layout);
++	  = target->got_section(symtab, layout, got_type);
+ 	unsigned int r_sym = elfcpp::elf_r_sym<size>(reloc.get_r_info());
+-	got->add_local_tls(object, r_sym, GOT_TYPE_DTPREL);
++	uint64_t addend = size == 32 ? 0 : reloc.get_r_addend();
++	got->add_local_tls(object, r_sym, got_type, addend);
+       }
+       break;
+ 
+@@ -8308,17 +8266,21 @@ Target_powerpc<size, big_endian>::Scan::local(
+ 	if (tls_type == tls::TLSOPT_NONE)
+ 	  {
+ 	    unsigned int r_sym = elfcpp::elf_r_sym<size>(reloc.get_r_info());
+-	    if (!object->local_has_got_offset(r_sym, GOT_TYPE_TPREL))
++	    uint64_t addend = size == 32 ? 0 : reloc.get_r_addend();
++	    Got_type got_type = ((size == 32
++				  || r_type == elfcpp::R_POWERPC_GOT_TPREL16)
++				 ? GOT_TYPE_SMALL_TPREL : GOT_TYPE_TPREL);
++	    if (!object->local_has_got_offset(r_sym, got_type, addend))
+ 	      {
+ 		Output_data_got_powerpc<size, big_endian>* got
+-		  = target->got_section(symtab, layout);
++		  = target->got_section(symtab, layout, got_type);
+ 		unsigned int off = got->add_constant(0);
+-		object->set_local_got_offset(r_sym, GOT_TYPE_TPREL, off);
++		object->set_local_got_offset(r_sym, got_type, off, addend);
+ 
+ 		Reloc_section* rela_dyn = target->rela_dyn_section(layout);
+ 		rela_dyn->add_symbolless_local_addend(object, r_sym,
+ 						      elfcpp::R_POWERPC_TPREL,
+-						      got, off, 0);
++						      got, off, addend);
+ 	      }
+ 	  }
+ 	else if (tls_type == tls::TLSOPT_TO_LE)
+@@ -8613,9 +8575,6 @@ Target_powerpc<size, big_endian>::Scan::global(
+ 
+   switch (this->maybe_skip_tls_get_addr_call(target, r_type, gsym))
+     {
+-    case Track_tls::NOT_EXPECTED:
+-      ppc_object->set_no_tls_marker();
+-      break;
+     case Track_tls::SKIP:
+       return;
+     default:
+@@ -8631,30 +8590,18 @@ Target_powerpc<size, big_endian>::Scan::global(
+       || (size == 32 && r_type == elfcpp::R_PPC_TLSGD))
+     {
+       this->expect_tls_get_addr_call();
+-      if (!ppc_object->no_tls_marker())
+-	{
+-	  bool final = gsym->final_value_is_known();
+-	  tls::Tls_optimization tls_type = target->optimize_tls_gd(final);
+-	  if (tls_type != tls::TLSOPT_NONE)
+-	    {
+-	      this->skip_next_tls_get_addr_call();
+-	      ppc_object->set_tls_marker();
+-	    }
+-	}
++      bool final = gsym->final_value_is_known();
++      tls::Tls_optimization tls_type = target->optimize_tls_gd(final);
++      if (tls_type != tls::TLSOPT_NONE)
++	this->skip_next_tls_get_addr_call();
+     }
+   else if ((size == 64 && r_type == elfcpp::R_PPC64_TLSLD)
+ 	   || (size == 32 && r_type == elfcpp::R_PPC_TLSLD))
+     {
+       this->expect_tls_get_addr_call();
+-      if (!ppc_object->no_tls_marker())
+-	{
+-	  tls::Tls_optimization tls_type = target->optimize_tls_ld();
+-	  if (tls_type != tls::TLSOPT_NONE)
+-	    {
+-	      this->skip_next_tls_get_addr_call();
+-	      ppc_object->set_tls_marker();
+-	    }
+-	}
++      tls::Tls_optimization tls_type = target->optimize_tls_ld();
++      if (tls_type != tls::TLSOPT_NONE)
++	this->skip_next_tls_get_addr_call();
+     }
+ 
+   // A STT_GNU_IFUNC symbol may require a PLT entry.
+@@ -8704,7 +8651,7 @@ Target_powerpc<size, big_endian>::Scan::global(
+     case elfcpp::R_PPC64_TOC:
+       {
+ 	Output_data_got_powerpc<size, big_endian>* got
+-	  = target->got_section(symtab, layout);
++	  = target->got_section(symtab, layout, GOT_TYPE_SMALL);
+ 	if (parameters->options().output_is_position_independent())
+ 	  {
+ 	    Address off = reloc.get_r_offset();
+@@ -8714,15 +8661,12 @@ Target_powerpc<size, big_endian>::Scan::global(
+ 	      break;
+ 
+ 	    Reloc_section* rela_dyn = target->rela_dyn_section(layout);
+-	    Powerpc_relobj<size, big_endian>* symobj = ppc_object;
+-	    if (data_shndx != ppc_object->opd_shndx())
+-	      symobj = static_cast
+-		<Powerpc_relobj<size, big_endian>*>(gsym->object());
++	    Address got_off = got->g_o_t();
+ 	    rela_dyn->add_output_section_relative(got->output_section(),
+ 						  elfcpp::R_POWERPC_RELATIVE,
+ 						  output_section,
+ 						  object, data_shndx, off,
+-						  symobj->toc_base_offset());
++						  got_off);
+ 	  }
+       }
+       break;
+@@ -8978,22 +8922,27 @@ Target_powerpc<size, big_endian>::Scan::global(
+       {
+ 	// The symbol requires a GOT entry.
+ 	Output_data_got_powerpc<size, big_endian>* got;
++	uint64_t addend = size == 32 ? 0 : reloc.get_r_addend();
++	Got_type got_type = ((size == 32
++			      || r_type == elfcpp::R_POWERPC_GOT16
++			      || r_type == elfcpp::R_PPC64_GOT16_DS)
++			     ? GOT_TYPE_SMALL : GOT_TYPE_STANDARD);
+ 
+-	got = target->got_section(symtab, layout);
++	got = target->got_section(symtab, layout, got_type);
+ 	if (gsym->final_value_is_known())
+ 	  {
+ 	    if (is_ifunc
+ 		&& (size == 32 || target->abiversion() >= 2))
+-	      got->add_global_plt(gsym, GOT_TYPE_STANDARD);
++	      got->add_global_plt(gsym, got_type, addend);
+ 	    else
+-	      got->add_global(gsym, GOT_TYPE_STANDARD);
++	      got->add_global(gsym, got_type, addend);
+ 	  }
+-	else if (!gsym->has_got_offset(GOT_TYPE_STANDARD))
++	else if (!gsym->has_got_offset(got_type, addend))
+ 	  {
+ 	    // If we are generating a shared object or a pie, this
+ 	    // symbol's GOT entry will be set by a dynamic relocation.
+ 	    unsigned int off = got->add_constant(0);
+-	    gsym->set_got_offset(GOT_TYPE_STANDARD, off);
++	    gsym->set_got_offset(got_type, off, addend);
+ 
+ 	    Reloc_section* rela_dyn
+ 	      = target->rela_dyn_section(symtab, layout, is_ifunc);
+@@ -9006,12 +8955,13 @@ Target_powerpc<size, big_endian>::Scan::global(
+ 	      {
+ 		unsigned int dynrel = (is_ifunc ? elfcpp::R_POWERPC_IRELATIVE
+ 				       : elfcpp::R_POWERPC_RELATIVE);
+-		rela_dyn->add_global_relative(gsym, dynrel, got, off, 0, false);
++		rela_dyn->add_global_relative(gsym, dynrel, got, off,
++					      addend, false);
+ 	      }
+ 	    else
+ 	      {
+ 		unsigned int dynrel = elfcpp::R_POWERPC_GLOB_DAT;
+-		rela_dyn->add_global(gsym, dynrel, got, off, 0);
++		rela_dyn->add_global(gsym, dynrel, got, off, addend);
+ 	      }
+ 	  }
+       }
+@@ -9024,7 +8974,7 @@ Target_powerpc<size, big_endian>::Scan::global(
+     case elfcpp::R_PPC64_TOC16_DS:
+     case elfcpp::R_PPC64_TOC16_LO_DS:
+       // We need a GOT section.
+-      target->got_section(symtab, layout);
++      target->got_section(symtab, layout, GOT_TYPE_SMALL);
+       break;
+ 
+     case elfcpp::R_PPC64_GOT_TLSGD_PCREL34:
+@@ -9033,49 +8983,52 @@ Target_powerpc<size, big_endian>::Scan::global(
+     case elfcpp::R_POWERPC_GOT_TLSGD16_HI:
+     case elfcpp::R_POWERPC_GOT_TLSGD16_HA:
+       {
+-	tls::Tls_optimization tls_type = tls::TLSOPT_NONE;
+-	if (!ppc_object->no_tls_marker())
+-	  {
+-	    bool final = gsym->final_value_is_known();
+-	    tls_type = target->optimize_tls_gd(final);
+-	  }
++	bool final = gsym->final_value_is_known();
++	tls::Tls_optimization tls_type = target->optimize_tls_gd(final);
+ 	if (tls_type == tls::TLSOPT_NONE)
+ 	  {
++	    Got_type got_type = ((size == 32
++				  || r_type == elfcpp::R_POWERPC_GOT_TLSGD16)
++				 ? GOT_TYPE_SMALL_TLSGD : GOT_TYPE_TLSGD);
+ 	    Output_data_got_powerpc<size, big_endian>* got
+-	      = target->got_section(symtab, layout);
++	      = target->got_section(symtab, layout, got_type);
+ 	    Reloc_section* rela_dyn = target->rela_dyn_section(layout);
+-	    got->add_global_pair_with_rel(gsym, GOT_TYPE_TLSGD, rela_dyn,
++	    uint64_t addend = size == 32 ? 0 : reloc.get_r_addend();
++	    got->add_global_pair_with_rel(gsym, got_type, rela_dyn,
+ 					  elfcpp::R_POWERPC_DTPMOD,
+-					  elfcpp::R_POWERPC_DTPREL);
++					  elfcpp::R_POWERPC_DTPREL,
++					  addend);
+ 	  }
+ 	else if (tls_type == tls::TLSOPT_TO_IE)
+ 	  {
+-	    if (!gsym->has_got_offset(GOT_TYPE_TPREL))
++	    Got_type got_type = ((size == 32
++				  || r_type == elfcpp::R_POWERPC_GOT_TLSGD16)
++				 ? GOT_TYPE_SMALL_TPREL : GOT_TYPE_TPREL);
++	    if (!gsym->has_got_offset(got_type))
+ 	      {
+ 		Output_data_got_powerpc<size, big_endian>* got
+-		  = target->got_section(symtab, layout);
++		  = target->got_section(symtab, layout, got_type);
+ 		Reloc_section* rela_dyn = target->rela_dyn_section(layout);
++		uint64_t addend = size == 32 ? 0 : reloc.get_r_addend();
+ 		if (gsym->is_undefined()
+ 		    || gsym->is_from_dynobj())
+ 		  {
+-		    got->add_global_with_rel(gsym, GOT_TYPE_TPREL, rela_dyn,
+-					     elfcpp::R_POWERPC_TPREL);
++		    got->add_global_with_rel(gsym, got_type, rela_dyn,
++					     elfcpp::R_POWERPC_TPREL, addend);
+ 		  }
+ 		else
+ 		  {
+ 		    unsigned int off = got->add_constant(0);
+-		    gsym->set_got_offset(GOT_TYPE_TPREL, off);
++		    gsym->set_got_offset(got_type, off);
+ 		    unsigned int dynrel = elfcpp::R_POWERPC_TPREL;
+ 		    rela_dyn->add_symbolless_global_addend(gsym, dynrel,
+-							   got, off, 0);
++							   got, off, addend);
+ 		  }
+ 	      }
+-	    ppc_object->set_tls_marker();
+ 	  }
+ 	else if (tls_type == tls::TLSOPT_TO_LE)
+ 	  {
+ 	    // no GOT relocs needed for Local Exec.
+-	    ppc_object->set_tls_marker();
+ 	  }
+ 	else
+ 	  gold_unreachable();
+@@ -9088,9 +9041,7 @@ Target_powerpc<size, big_endian>::Scan::global(
+     case elfcpp::R_POWERPC_GOT_TLSLD16_HI:
+     case elfcpp::R_POWERPC_GOT_TLSLD16_HA:
+       {
+-	tls::Tls_optimization tls_type = tls::TLSOPT_NONE;
+-	if (!ppc_object->no_tls_marker())
+-	  tls_type = target->optimize_tls_ld();
++	tls::Tls_optimization tls_type = target->optimize_tls_ld();
+ 	if (tls_type == tls::TLSOPT_NONE)
+ 	  target->tlsld_got_offset(symtab, layout, object);
+ 	else if (tls_type == tls::TLSOPT_TO_LE)
+@@ -9102,7 +9053,6 @@ Target_powerpc<size, big_endian>::Scan::global(
+ 		gold_assert(os != NULL);
+ 		os->set_needs_symtab_index();
+ 	      }
+-	    ppc_object->set_tls_marker();
+ 	  }
+ 	else
+ 	  gold_unreachable();
+@@ -9115,17 +9065,21 @@ Target_powerpc<size, big_endian>::Scan::global(
+     case elfcpp::R_POWERPC_GOT_DTPREL16_HI:
+     case elfcpp::R_POWERPC_GOT_DTPREL16_HA:
+       {
++	Got_type got_type = ((size == 32
++			      || r_type == elfcpp::R_POWERPC_GOT_DTPREL16)
++			     ? GOT_TYPE_SMALL_DTPREL : GOT_TYPE_DTPREL);
+ 	Output_data_got_powerpc<size, big_endian>* got
+-	  = target->got_section(symtab, layout);
++	  = target->got_section(symtab, layout, got_type);
++	uint64_t addend = size == 32 ? 0 : reloc.get_r_addend();
+ 	if (!gsym->final_value_is_known()
+ 	    && (gsym->is_from_dynobj()
+ 		|| gsym->is_undefined()
+ 		|| gsym->is_preemptible()))
+-	  got->add_global_with_rel(gsym, GOT_TYPE_DTPREL,
++	  got->add_global_with_rel(gsym, got_type,
+ 				   target->rela_dyn_section(layout),
+-				   elfcpp::R_POWERPC_DTPREL);
++				   elfcpp::R_POWERPC_DTPREL, addend);
+ 	else
+-	  got->add_global_tls(gsym, GOT_TYPE_DTPREL);
++	  got->add_global_tls(gsym, got_type, addend);
+       }
+       break;
+ 
+@@ -9139,24 +9093,28 @@ Target_powerpc<size, big_endian>::Scan::global(
+ 	tls::Tls_optimization tls_type = target->optimize_tls_ie(final);
+ 	if (tls_type == tls::TLSOPT_NONE)
+ 	  {
+-	    if (!gsym->has_got_offset(GOT_TYPE_TPREL))
++	    Got_type got_type = ((size == 32
++				  || r_type == elfcpp::R_POWERPC_GOT_TPREL16)
++				 ? GOT_TYPE_SMALL_TPREL : GOT_TYPE_TPREL);
++	    if (!gsym->has_got_offset(got_type))
+ 	      {
+ 		Output_data_got_powerpc<size, big_endian>* got
+-		  = target->got_section(symtab, layout);
++		  = target->got_section(symtab, layout, got_type);
+ 		Reloc_section* rela_dyn = target->rela_dyn_section(layout);
++		uint64_t addend = size == 32 ? 0 : reloc.get_r_addend();
+ 		if (gsym->is_undefined()
+ 		    || gsym->is_from_dynobj())
+ 		  {
+-		    got->add_global_with_rel(gsym, GOT_TYPE_TPREL, rela_dyn,
+-					     elfcpp::R_POWERPC_TPREL);
++		    got->add_global_with_rel(gsym, got_type, rela_dyn,
++					     elfcpp::R_POWERPC_TPREL, addend);
+ 		  }
+ 		else
+ 		  {
+ 		    unsigned int off = got->add_constant(0);
+-		    gsym->set_got_offset(GOT_TYPE_TPREL, off);
++		    gsym->set_got_offset(got_type, off);
+ 		    unsigned int dynrel = elfcpp::R_POWERPC_TPREL;
+ 		    rela_dyn->add_symbolless_global_addend(gsym, dynrel,
+-							   got, off, 0);
++							   got, off, addend);
+ 		  }
+ 	      }
+ 	  }
+@@ -9811,22 +9769,35 @@ Target_powerpc<size, big_endian>::define_save_restore_funcs(
+ template<bool big_endian>
+ class Sort_toc_sections
+ {
++  const Output_section_data*
++  small_got_section() const
++  {
++    return (static_cast<Target_powerpc<64, big_endian>*>(
++		parameters->sized_target<64, big_endian>())
++	    ->got_section(GOT_TYPE_SMALL));
++  }
++
++  int
++  rank(const Output_section::Input_section& isec) const
++  {
++    if (!isec.is_input_section())
++      {
++	if (isec.output_section_data() == this->small_got_section())
++	  return 0;
++	return 2;
++      }
++    if (static_cast<const Powerpc_relobj<64, big_endian>*>(isec.relobj())
++	->has_small_toc_reloc())
++      return 1;
++    return 3;
++  }
++
+  public:
+   bool
+   operator()(const Output_section::Input_section& is1,
+ 	     const Output_section::Input_section& is2) const
+   {
+-    if (!is1.is_input_section() && is2.is_input_section())
+-      return true;
+-    bool small1
+-      = (is1.is_input_section()
+-	 && (static_cast<const Powerpc_relobj<64, big_endian>*>(is1.relobj())
+-	     ->has_small_toc_reloc()));
+-    bool small2
+-      = (is2.is_input_section()
+-	 && (static_cast<const Powerpc_relobj<64, big_endian>*>(is2.relobj())
+-	     ->has_small_toc_reloc()));
+-    return small1 && !small2;
++    return rank(is1) < rank(is2);
+   }
+ };
+ 
+@@ -9881,9 +9852,13 @@ Target_powerpc<size, big_endian>::do_finalize_sections(
+ 	  // Annoyingly, we need to make these sections now whether or
+ 	  // not we need them.  If we delay until do_relax then we
+ 	  // need to mess with the relaxation machinery checkpointing.
+-	  this->got_section(symtab, layout);
++	  this->got_section(symtab, layout, GOT_TYPE_STANDARD);
+ 	  this->make_brlt_section(layout);
+ 
++	  // FIXME, maybe.  Here we could run through all the got
++	  // entries in the small got section, removing any duplicates
++	  // found in the big got section and renumbering offsets.
++
+ 	  if (parameters->options().toc_sort())
+ 	    {
+ 	      Output_section* os = this->got_->output_section();
+@@ -10453,20 +10428,11 @@ Target_powerpc<size, big_endian>::Relocate::relocate(
+   switch (this->maybe_skip_tls_get_addr_call(target, r_type, gsym))
+     {
+     case Track_tls::NOT_EXPECTED:
+-      if (!parameters->options().shared()
+-	  && parameters->options().tls_optimize())
+-	{
+-	  // It is a hard error to see a __tls_get_addr call without
+-	  // marker relocs after seeing calls with marker relocs in the
+-	  // same object file, because dynamic relocation accounting
+-	  // will be wrong.
+-	  if (object->tls_opt_error())
+-	    gold_error_at_location(relinfo, relnum, rela.get_r_offset(),
+-				   _("__tls_get_addr call lacks marker reloc"));
+-	  else
+-	    gold_warning_at_location(relinfo, relnum, rela.get_r_offset(),
+-				     _("__tls_get_addr call lacks marker reloc"));
+-	}
++      // No warning.  This will result in really old code without tls
++      // marker relocs being mis-optimised, but there shouldn't be too
++      // much of that code around.  The problem with warning is that
++      // glibc and libphobos both construct direct calls to
++      // __tls_get_addr in a way that is harmless.
+       break;
+     case Track_tls::EXPECTED:
+       // We have already complained.
+@@ -10616,8 +10582,7 @@ Target_powerpc<size, big_endian>::Relocate::relocate(
+ 	{
+ 	  if (r_type != elfcpp::R_PPC64_PLT_PCREL34
+ 	      && r_type != elfcpp::R_PPC64_PLT_PCREL34_NOTOC)
+-	    value -= (target->got_section()->output_section()->address()
+-		      + object->toc_base_offset());
++	    value -= target->toc_pointer();
+ 	}
+       else if (parameters->options().output_is_position_independent())
+ 	{
+@@ -10629,8 +10594,7 @@ Target_powerpc<size, big_endian>::Relocate::relocate(
+ 			+ rela.get_r_addend());
+ 	    }
+ 	  else
+-	    value -= (target->got_section()->address()
+-		      + target->got_section()->g_o_t());
++	    value -= target->toc_pointer();
+ 	}
+     }
+   else if (!has_plt_offset
+@@ -10653,25 +10617,23 @@ Target_powerpc<size, big_endian>::Relocate::relocate(
+     }
+   else if (is_got_reloc(r_type))
+     {
++      uint64_t addend = size == 32 ? 0 : rela.get_r_addend();
++      Got_type got_type = ((size == 32
++			    || r_type == elfcpp::R_POWERPC_GOT16
++			    || r_type == elfcpp::R_PPC64_GOT16_DS)
++			   ? GOT_TYPE_SMALL : GOT_TYPE_STANDARD);
+       if (gsym != NULL)
+-	{
+-	  gold_assert(gsym->has_got_offset(GOT_TYPE_STANDARD));
+-	  value = gsym->got_offset(GOT_TYPE_STANDARD);
+-	}
++	value = gsym->got_offset(got_type, addend);
+       else
+-	{
+-	  gold_assert(object->local_has_got_offset(r_sym, GOT_TYPE_STANDARD));
+-	  value = object->local_got_offset(r_sym, GOT_TYPE_STANDARD);
+-	}
++	value = object->local_got_offset(r_sym, got_type, addend);
+       if (r_type == elfcpp::R_PPC64_GOT_PCREL34)
+-	value += target->got_section()->address();
++	value += target->got_section(got_type)->address();
+       else
+-	value -= target->got_section()->got_base_offset(object);
++	value -= target->got_base_offset(got_type);
+     }
+   else if (r_type == elfcpp::R_PPC64_TOC)
+     {
+-      value = (target->got_section()->output_section()->address()
+-	       + object->toc_base_offset());
++      value = target->toc_pointer();
+     }
+   else if (gsym != NULL
+ 	   && (r_type == elfcpp::R_POWERPC_REL24
+@@ -10749,33 +10711,26 @@ Target_powerpc<size, big_endian>::Relocate::relocate(
+ 	   || r_type == elfcpp::R_PPC64_GOT_TLSGD_PCREL34)
+     {
+       // First instruction of a global dynamic sequence, arg setup insn.
+-      tls::Tls_optimization tls_type = tls::TLSOPT_NONE;
+-      if (!object->no_tls_marker())
+-	{
+-	  bool final = gsym == NULL || gsym->final_value_is_known();
+-	  tls_type = target->optimize_tls_gd(final);
+-	}
+-      enum Got_type got_type = GOT_TYPE_STANDARD;
++      bool final = gsym == NULL || gsym->final_value_is_known();
++      tls::Tls_optimization tls_type = target->optimize_tls_gd(final);
++      Got_type got_type = ((size == 32
++			    || r_type == elfcpp::R_POWERPC_GOT_TLSGD16)
++			   ? GOT_TYPE_SMALL : GOT_TYPE_STANDARD);
+       if (tls_type == tls::TLSOPT_NONE)
+-	got_type = GOT_TYPE_TLSGD;
++	got_type = Got_type(got_type | GOT_TYPE_TLSGD);
+       else if (tls_type == tls::TLSOPT_TO_IE)
+-	got_type = GOT_TYPE_TPREL;
+-      if (got_type != GOT_TYPE_STANDARD)
++	got_type = Got_type(got_type | GOT_TYPE_TPREL);
++      if ((got_type & ~GOT_TYPE_SMALL) != GOT_TYPE_STANDARD)
+ 	{
++	  uint64_t addend = size == 32 ? 0 : rela.get_r_addend();
+ 	  if (gsym != NULL)
+-	    {
+-	      gold_assert(gsym->has_got_offset(got_type));
+-	      value = gsym->got_offset(got_type);
+-	    }
++	    value = gsym->got_offset(got_type, addend);
+ 	  else
+-	    {
+-	      gold_assert(object->local_has_got_offset(r_sym, got_type));
+-	      value = object->local_got_offset(r_sym, got_type);
+-	    }
++	    value = object->local_got_offset(r_sym, got_type, addend);
+ 	  if (r_type == elfcpp::R_PPC64_GOT_TLSGD_PCREL34)
+-	    value += target->got_section()->address();
++	    value += target->got_section(got_type)->address();
+ 	  else
+-	    value -= target->got_section()->got_base_offset(object);
++	    value -= target->got_base_offset(got_type);
+ 	}
+       if (tls_type == tls::TLSOPT_TO_IE)
+ 	{
+@@ -10859,16 +10814,14 @@ Target_powerpc<size, big_endian>::Relocate::relocate(
+ 	   || r_type == elfcpp::R_PPC64_GOT_TLSLD_PCREL34)
+     {
+       // First instruction of a local dynamic sequence, arg setup insn.
+-      tls::Tls_optimization tls_type = tls::TLSOPT_NONE;
+-      if (!object->no_tls_marker())
+-	tls_type = target->optimize_tls_ld();
++      tls::Tls_optimization tls_type = target->optimize_tls_ld();
+       if (tls_type == tls::TLSOPT_NONE)
+ 	{
+ 	  value = target->tlsld_got_offset();
+ 	  if (r_type == elfcpp::R_PPC64_GOT_TLSLD_PCREL34)
+-	    value += target->got_section()->address();
++	    value += target->got_section(GOT_TYPE_SMALL)->address();
+ 	  else
+-	    value -= target->got_section()->got_base_offset(object);
++	    value -= target->got_base_offset(GOT_TYPE_SMALL);
+ 	}
+       else
+ 	{
+@@ -10918,20 +10871,18 @@ Target_powerpc<size, big_endian>::Relocate::relocate(
+     {
+       // Accesses relative to a local dynamic sequence address,
+       // no optimisation here.
++      uint64_t addend = size == 32 ? 0 : rela.get_r_addend();
++      Got_type got_type = ((size == 32
++			    || r_type == elfcpp::R_POWERPC_GOT_DTPREL16)
++			   ? GOT_TYPE_SMALL_DTPREL : GOT_TYPE_DTPREL);
+       if (gsym != NULL)
+-	{
+-	  gold_assert(gsym->has_got_offset(GOT_TYPE_DTPREL));
+-	  value = gsym->got_offset(GOT_TYPE_DTPREL);
+-	}
++	value = gsym->got_offset(got_type, addend);
+       else
+-	{
+-	  gold_assert(object->local_has_got_offset(r_sym, GOT_TYPE_DTPREL));
+-	  value = object->local_got_offset(r_sym, GOT_TYPE_DTPREL);
+-	}
++	value = object->local_got_offset(r_sym, got_type, addend);
+       if (r_type == elfcpp::R_PPC64_GOT_DTPREL_PCREL34)
+-	value += target->got_section()->address();
++	value += target->got_section(got_type)->address();
+       else
+-	value -= target->got_section()->got_base_offset(object);
++	value -= target->got_base_offset(got_type);
+     }
+   else if (r_type == elfcpp::R_POWERPC_GOT_TPREL16
+ 	   || r_type == elfcpp::R_POWERPC_GOT_TPREL16_LO
+@@ -10944,20 +10895,18 @@ Target_powerpc<size, big_endian>::Relocate::relocate(
+       tls::Tls_optimization tls_type = target->optimize_tls_ie(final);
+       if (tls_type == tls::TLSOPT_NONE)
+ 	{
++	  uint64_t addend = size == 32 ? 0 : rela.get_r_addend();
++	  Got_type got_type = ((size == 32
++				|| r_type == elfcpp::R_POWERPC_GOT_TPREL16)
++			       ? GOT_TYPE_SMALL_TPREL : GOT_TYPE_TPREL);
+ 	  if (gsym != NULL)
+-	    {
+-	      gold_assert(gsym->has_got_offset(GOT_TYPE_TPREL));
+-	      value = gsym->got_offset(GOT_TYPE_TPREL);
+-	    }
++	    value = gsym->got_offset(got_type, addend);
+ 	  else
+-	    {
+-	      gold_assert(object->local_has_got_offset(r_sym, GOT_TYPE_TPREL));
+-	      value = object->local_got_offset(r_sym, GOT_TYPE_TPREL);
+-	    }
++	    value = object->local_got_offset(r_sym, got_type, addend);
+ 	  if (r_type == elfcpp::R_PPC64_GOT_TPREL_PCREL34)
+-	    value += target->got_section()->address();
++	    value += target->got_section(got_type)->address();
+ 	  else
+-	    value -= target->got_section()->got_base_offset(object);
++	    value -= target->got_base_offset(got_type);
+ 	}
+       else
+ 	{
+@@ -11006,12 +10955,8 @@ Target_powerpc<size, big_endian>::Relocate::relocate(
+       // Second instruction of a global dynamic sequence,
+       // the __tls_get_addr call
+       this->expect_tls_get_addr_call(relinfo, relnum, rela.get_r_offset());
+-      tls::Tls_optimization tls_type = tls::TLSOPT_NONE;
+-      if (!object->no_tls_marker())
+-	{
+-	  bool final = gsym == NULL || gsym->final_value_is_known();
+-	  tls_type = target->optimize_tls_gd(final);
+-	}
++      bool final = gsym == NULL || gsym->final_value_is_known();
++      tls::Tls_optimization tls_type =  target->optimize_tls_gd(final);
+       if (tls_type != tls::TLSOPT_NONE)
+ 	{
+ 	  if (tls_type == tls::TLSOPT_TO_IE)
+@@ -11062,9 +11007,7 @@ Target_powerpc<size, big_endian>::Relocate::relocate(
+       // Second instruction of a local dynamic sequence,
+       // the __tls_get_addr call
+       this->expect_tls_get_addr_call(relinfo, relnum, rela.get_r_offset());
+-      tls::Tls_optimization tls_type = tls::TLSOPT_NONE;
+-      if (!object->no_tls_marker())
+-	tls_type = target->optimize_tls_ld();
++      tls::Tls_optimization tls_type = target->optimize_tls_ld();
+       if (tls_type == tls::TLSOPT_TO_LE)
+ 	{
+ 	  bool is_pcrel = false;
+@@ -11196,11 +11139,13 @@ Target_powerpc<size, big_endian>::Relocate::relocate(
+ 	  if (stub_table != NULL)
+ 	    {
+ 	      const typename Stub_table<size, big_endian>::Branch_stub_ent* ent
+-		= stub_table->find_long_branch_entry(object, value);
++		= stub_table->find_long_branch_entry(value);
+ 	      if (ent != NULL)
+ 		{
+ 		  if (ent->save_res_)
+ 		    value = (value - target->savres_section()->address()
++			     + stub_table->stub_address()
++			     + stub_table->plt_size()
+ 			     + stub_table->branch_size());
+ 		  else
+ 		    {
+@@ -11267,8 +11212,7 @@ Target_powerpc<size, big_endian>::Relocate::relocate(
+     case elfcpp::R_PPC64_TOC16_DS:
+     case elfcpp::R_PPC64_TOC16_LO_DS:
+       // Subtract the TOC base address.
+-      value -= (target->got_section()->output_section()->address()
+-		+ object->toc_base_offset());
++      value -= target->toc_pointer();
+       break;
+ 
+     case elfcpp::R_POWERPC_SECTOFF:
+@@ -11591,8 +11535,7 @@ Target_powerpc<size, big_endian>::Relocate::relocate(
+ 	case elfcpp::R_PPC64_ENTRY:
+ 	  if (size == 64)
+ 	    {
+-	      value = (target->got_section()->output_section()->address()
+-		       + object->toc_base_offset());
++	      value = target->toc_pointer();
+ 	      if (value + 0x80008000 <= 0xffffffff
+ 		  && !parameters->options().output_is_position_independent())
+ 		{
+@@ -12554,12 +12497,8 @@ Target_powerpc<size, big_endian>::relocate_relocs(
+ 	    {
+ 	      // First instruction of a global dynamic sequence,
+ 	      // arg setup insn.
+-	      tls::Tls_optimization tls_type = tls::TLSOPT_NONE;
+-	      if (!object->no_tls_marker())
+-		{
+-		  bool final = gsym == NULL || gsym->final_value_is_known();
+-		  tls_type = this->optimize_tls_gd(final);
+-		}
++	      bool final = gsym == NULL || gsym->final_value_is_known();
++	      tls::Tls_optimization tls_type = this->optimize_tls_gd(final);
+ 	      switch (tls_type)
+ 		{
+ 		case tls::TLSOPT_TO_IE:
+@@ -12587,9 +12526,7 @@ Target_powerpc<size, big_endian>::relocate_relocs(
+ 	    {
+ 	      // First instruction of a local dynamic sequence,
+ 	      // arg setup insn.
+-	      tls::Tls_optimization tls_type = tls::TLSOPT_NONE;
+-	      if (!object->no_tls_marker())
+-		tls_type = this->optimize_tls_ld();
++	      tls::Tls_optimization tls_type = this->optimize_tls_ld();
+ 	      if (tls_type == tls::TLSOPT_TO_LE)
+ 		{
+ 		  if (r_type == elfcpp::R_POWERPC_GOT_TLSLD16
+@@ -12634,12 +12571,8 @@ Target_powerpc<size, big_endian>::relocate_relocs(
+ 	    {
+ 	      // Second instruction of a global dynamic sequence,
+ 	      // the __tls_get_addr call
+-	      tls::Tls_optimization tls_type = tls::TLSOPT_NONE;
+-	      if (!object->no_tls_marker())
+-		{
+-		  bool final = gsym == NULL || gsym->final_value_is_known();
+-		  tls_type = this->optimize_tls_gd(final);
+-		}
++	      bool final = gsym == NULL || gsym->final_value_is_known();
++	      tls::Tls_optimization tls_type = this->optimize_tls_gd(final);
+ 	      switch (tls_type)
+ 		{
+ 		case tls::TLSOPT_TO_IE:
+@@ -12660,9 +12593,7 @@ Target_powerpc<size, big_endian>::relocate_relocs(
+ 	    {
+ 	      // Second instruction of a local dynamic sequence,
+ 	      // the __tls_get_addr call
+-	      tls::Tls_optimization tls_type = tls::TLSOPT_NONE;
+-	      if (!object->no_tls_marker())
+-		tls_type = this->optimize_tls_ld();
++	      tls::Tls_optimization tls_type = this->optimize_tls_ld();
+ 	      if (tls_type == tls::TLSOPT_TO_LE)
+ 		{
+ 		  const Output_section* os = relinfo->layout->tls_segment()
+@@ -12788,23 +12719,29 @@ int64_t
+ Target_powerpc<size, big_endian>::do_tls_offset_for_local(
+     const Relobj* object,
+     unsigned int symndx,
+-    unsigned int got_indx) const
++    Output_data_got_base* got,
++    unsigned int got_indx,
++    uint64_t addend) const
+ {
+   const Powerpc_relobj<size, big_endian>* ppc_object
+     = static_cast<const Powerpc_relobj<size, big_endian>*>(object);
+   if (ppc_object->local_symbol(symndx)->is_tls_symbol())
+     {
+-      for (Got_type got_type = GOT_TYPE_TLSGD;
+-	   got_type <= GOT_TYPE_TPREL;
++      for (Got_type got_type = (size == 32
++				? GOT_TYPE_SMALL_TLSGD : GOT_TYPE_TLSGD);
++	   got_type <= GOT_TYPE_SMALL_TPREL;
+ 	   got_type = Got_type(got_type + 1))
+-	if (ppc_object->local_has_got_offset(symndx, got_type))
++	if (got_type != GOT_TYPE_SMALL
++	    && ppc_object->local_has_got_offset(symndx, got_type, addend))
+ 	  {
+-	    unsigned int off = ppc_object->local_got_offset(symndx, got_type);
+-	    if (got_type == GOT_TYPE_TLSGD)
++	    unsigned int off
++	      = ppc_object->local_got_offset(symndx, got_type, addend);
++	    if ((got_type & ~GOT_TYPE_SMALL) == GOT_TYPE_TLSGD)
+ 	      off += size / 8;
+-	    if (off == got_indx * (size / 8))
++	    if (off == got_indx * (size / 8)
++		&& (size == 32 || got == this->got_section(got_type)))
+ 	      {
+-		if (got_type == GOT_TYPE_TPREL)
++		if ((got_type & ~GOT_TYPE_SMALL) == GOT_TYPE_TPREL)
+ 		  return -tp_offset;
+ 		else
+ 		  return -dtp_offset;
+@@ -12820,21 +12757,26 @@ template<int size, bool big_endian>
+ int64_t
+ Target_powerpc<size, big_endian>::do_tls_offset_for_global(
+     Symbol* gsym,
+-    unsigned int got_indx) const
++    Output_data_got_base* got,
++    unsigned int got_indx,
++    uint64_t addend) const
+ {
+   if (gsym->type() == elfcpp::STT_TLS)
+     {
+-      for (Got_type got_type = GOT_TYPE_TLSGD;
+-	   got_type <= GOT_TYPE_TPREL;
++      for (Got_type got_type = (size == 32
++				? GOT_TYPE_SMALL_TLSGD : GOT_TYPE_TLSGD);
++	   got_type <= GOT_TYPE_SMALL_TPREL;
+ 	   got_type = Got_type(got_type + 1))
+-	if (gsym->has_got_offset(got_type))
++	if (got_type != GOT_TYPE_SMALL
++	    && gsym->has_got_offset(got_type, addend))
+ 	  {
+-	    unsigned int off = gsym->got_offset(got_type);
+-	    if (got_type == GOT_TYPE_TLSGD)
++	    unsigned int off = gsym->got_offset(got_type, addend);
++	    if ((got_type & ~GOT_TYPE_SMALL) == GOT_TYPE_TLSGD)
+ 	      off += size / 8;
+-	    if (off == got_indx * (size / 8))
++	    if (off == got_indx * (size / 8)
++		&& (size == 32 || got == this->got_section(got_type)))
+ 	      {
+-		if (got_type == GOT_TYPE_TPREL)
++		if ((got_type & ~GOT_TYPE_SMALL) == GOT_TYPE_TPREL)
+ 		  return -tp_offset;
+ 		else
+ 		  return -dtp_offset;
+diff --git a/gold/s390.cc b/gold/s390.cc
+index 600e70810d3..a515f801c58 100644
+--- a/gold/s390.cc
++++ b/gold/s390.cc
+@@ -401,12 +401,17 @@ class Target_s390 : public Sized_target<size, true>
+   int64_t
+   do_tls_offset_for_local(const Relobj* object,
+ 			  unsigned int symndx,
+-			  unsigned int got_indx) const;
++			  Output_data_got_base* got,
++			  unsigned int got_indx,
++			  uint64_t addend) const;
+ 
+   // Return the offset to use for the GOT_INDX'th got entry which is
+   // for global tls symbol GSYM.
+   int64_t
+-  do_tls_offset_for_global(Symbol* gsym, unsigned int got_indx) const;
++  do_tls_offset_for_global(Symbol* gsym,
++			   Output_data_got_base* got,
++			   unsigned int got_indx,
++			   uint64_t addend) const;
+ 
+   // This function should be defined in targets that can use relocation
+   // types to determine (implemented in local_reloc_may_be_function_pointer
+@@ -4218,7 +4223,9 @@ int64_t
+ Target_s390<size>::do_tls_offset_for_local(
+     const Relobj*,
+     unsigned int,
+-    unsigned int) const
++    Output_data_got_base*,
++    unsigned int,
++    uint64_t) const
+ {
+   // The only way we can get called is when IEENT/GOTIE12/GOTIE20
+   // couldn't be optimised to LE.
+@@ -4232,7 +4239,9 @@ template<int size>
+ int64_t
+ Target_s390<size>::do_tls_offset_for_global(
+     Symbol*,
+-    unsigned int) const
++    Output_data_got_base*,
++    unsigned int,
++    uint64_t) const
+ {
+   Output_segment* tls_segment = layout_->tls_segment();
+   return -tls_segment->memsz();
+diff --git a/gold/symtab.h b/gold/symtab.h
+index 104429a5af1..a60cfb9ca19 100644
+--- a/gold/symtab.h
++++ b/gold/symtab.h
+@@ -428,22 +428,23 @@ class Symbol
+   // Return whether this symbol has an entry in the GOT section.
+   // For a TLS symbol, this GOT entry will hold its tp-relative offset.
+   bool
+-  has_got_offset(unsigned int got_type) const
+-  { return this->got_offsets_.get_offset(got_type) != -1U; }
++  has_got_offset(unsigned int got_type, uint64_t addend = 0) const
++  { return this->got_offsets_.get_offset(got_type, addend) != -1U; }
+ 
+   // Return the offset into the GOT section of this symbol.
+   unsigned int
+-  got_offset(unsigned int got_type) const
++  got_offset(unsigned int got_type, uint64_t addend = 0) const
+   {
+-    unsigned int got_offset = this->got_offsets_.get_offset(got_type);
++    unsigned int got_offset = this->got_offsets_.get_offset(got_type, addend);
+     gold_assert(got_offset != -1U);
+     return got_offset;
+   }
+ 
+   // Set the GOT offset of this symbol.
+   void
+-  set_got_offset(unsigned int got_type, unsigned int got_offset)
+-  { this->got_offsets_.set_offset(got_type, got_offset); }
++  set_got_offset(unsigned int got_type, unsigned int got_offset,
++		 uint64_t addend = 0)
++  { this->got_offsets_.set_offset(got_type, got_offset, addend); }
+ 
+   // Return the GOT offset list.
+   const Got_offset_list*
+diff --git a/gold/target.h b/gold/target.h
+index 24f7111e922..b9a27d5a0d2 100644
+--- a/gold/target.h
++++ b/gold/target.h
+@@ -289,14 +289,19 @@ class Target
+   int64_t
+   tls_offset_for_local(const Relobj* object,
+ 		       unsigned int symndx,
+-		       unsigned int got_indx) const
+-  { return do_tls_offset_for_local(object, symndx, got_indx); }
++		       Output_data_got_base* got,
++		       unsigned int got_indx,
++		       uint64_t addend) const
++  { return do_tls_offset_for_local(object, symndx, got, got_indx, addend); }
+ 
+   // Return the offset to use for the GOT_INDX'th got entry which is
+   // for global tls symbol GSYM.
+   int64_t
+-  tls_offset_for_global(Symbol* gsym, unsigned int got_indx) const
+-  { return do_tls_offset_for_global(gsym, got_indx); }
++  tls_offset_for_global(Symbol* gsym,
++			Output_data_got_base* got,
++			unsigned int got_indx,
++			uint64_t addend) const
++  { return do_tls_offset_for_global(gsym, got, got_indx, addend); }
+ 
+   // For targets that use function descriptors, if LOC is the location
+   // of a function, modify it to point at the function entry location.
+@@ -648,11 +653,14 @@ class Target
+   { gold_unreachable(); }
+ 
+   virtual int64_t
+-  do_tls_offset_for_local(const Relobj*, unsigned int, unsigned int) const
++  do_tls_offset_for_local(const Relobj*, unsigned int,
++			  Output_data_got_base*, unsigned int,
++			  uint64_t) const
+   { gold_unreachable(); }
+ 
+   virtual int64_t
+-  do_tls_offset_for_global(Symbol*, unsigned int) const
++  do_tls_offset_for_global(Symbol*, Output_data_got_base*, unsigned int,
++			   uint64_t) const
+   { gold_unreachable(); }
+ 
+   virtual void
+diff --git a/include/ChangeLog b/include/ChangeLog
+index 11001a3d1e3..0e99cf39170 100644
+--- a/include/ChangeLog
++++ b/include/ChangeLog
+@@ -1,3 +1,12 @@
++2021-09-07  Luis Machado  <luis.machado@linaro.org>
++
++	Revert: [AArch64] MTE corefile support
++
++	2021-05-21  Luis Machado  <luis.machado@linaro.org>
++
++	* elf/common.h (NT_MEMTAG): New constant.
++	(NT_MEMTAG_TYPE_AARCH_MTE): New constant.
++
+ 2021-07-03  Nick Clifton  <nickc@redhat.com>
+ 
+ 	* 2.37 release branch created.
+diff --git a/include/elf/common.h b/include/elf/common.h
+index 0cca28673dd..7eefef9c7c4 100644
+--- a/include/elf/common.h
++++ b/include/elf/common.h
+@@ -685,12 +685,6 @@
+ /* The range 0xff000000 to 0xffffffff is set aside for notes that don't
+    originate from any particular operating system.  */
+ #define NT_GDB_TDESC	0xff000000	/* Contains copy of GDB's target description XML.  */
+-#define NT_MEMTAG	0xff000001	/* Contains a copy of the memory tags.  */
+-
+-/* NT_MEMTAG record types.  */
+-
+-/* ARM-specific NT_MEMTAG types.  */
+-#define NT_MEMTAG_TYPE_AARCH_MTE  0x400	/* MTE memory tags for AArch64.  */
+ 
+ /* Note segments for core files on dir-style procfs systems.  */
+ 
+diff --git a/ld/ChangeLog b/ld/ChangeLog
+index 79304e12103..ee3259a06de 100644
+--- a/ld/ChangeLog
++++ b/ld/ChangeLog
+@@ -1,3 +1,8 @@
++2021-09-30  Dimitar Dimitrov  <dimitar@dinux.eu>
++
++	* scripttempl/pru.sc (.resource_table): Align the output
++	section, not the first symbol.
++
+ 2021-07-18  Nick Clifton  <nickc@redhat.com>
+ 
+ 	* 2.37 release.
+@@ -999,20 +1004,6 @@
+ 
+ 	* configure.tgt: Add *-*-genode* as a target for AArch64 and x86.
+ 
+-2021-02-01  Alan Modra  <amodra@gmail.com>
+-
+-	* ldgram.y (defsym_expr): Use assignment rule.
+-	* ldlex.h (ldlex_defsym): Delete.
+-	* ldlex.l (DEFSYMEXP, ldlex_defsym): Delete.
+-
+-2021-02-01  Alan Modra  <amodra@gmail.com>
+-
+-	* ldgram.y (section): Call ldlex_backup.  Remove empty action.
+-	* ldlex.h (ldlex_backup): Declare.
+-	* ldlex.l (<EXPRESSION>NAME): Don't use NOCFILENAMECHAR set of
+-	chars, use SYMBOLNAMECHAR.
+-	(ldlex_backup): New function.
+-
+ 2021-02-01  Alan Modra  <amodra@gmail.com>
+ 
+ 	* ldgram.y: Whitespace fixes.
+diff --git a/ld/ldgram.y b/ld/ldgram.y
+index dd911f46169..7f8f03570dc 100644
+--- a/ld/ldgram.y
++++ b/ld/ldgram.y
+@@ -176,9 +176,12 @@ filename:  NAME;
+ 
+ 
+ defsym_expr:
+-		{ ldlex_expression(); }
+-		assignment
+-		{ ldlex_popstate(); }
++		{ ldlex_defsym(); }
++		NAME '=' exp
++		{
++		  ldlex_popstate();
++		  lang_add_assignment (exp_defsym ($2, $4));
++		}
+ 	;
+ 
+ /* SYNTAX WITHIN AN MRI SCRIPT FILE */
+@@ -1068,15 +1071,11 @@ section:	NAME		{ ldlex_expression(); }
+ 		'}' { ldlex_popstate (); ldlex_expression (); }
+ 		memspec_opt memspec_at_opt phdr_opt fill_opt
+ 		{
+-		  if (yychar == NAME)
+-		    {
+-		      yyclearin;
+-		      ldlex_backup ();
+-		    }
+ 		  ldlex_popstate ();
+ 		  lang_leave_output_section_statement ($18, $15, $17, $16);
+ 		}
+ 		opt_comma
++		{}
+ 	|	OVERLAY
+ 			{ ldlex_expression (); }
+ 		opt_exp_without_type opt_nocrossrefs opt_at opt_subalign
+@@ -1090,11 +1089,6 @@ section:	NAME		{ ldlex_expression(); }
+ 			{ ldlex_popstate (); ldlex_expression (); }
+ 		memspec_opt memspec_at_opt phdr_opt fill_opt
+ 			{
+-			  if (yychar == NAME)
+-			    {
+-			      yyclearin;
+-			      ldlex_backup ();
+-			    }
+ 			  ldlex_popstate ();
+ 			  lang_leave_overlay ($5, (int) $4,
+ 					      $16, $13, $15, $14);
+diff --git a/ld/ldlex.h b/ld/ldlex.h
+index 9e8bf5fb835..f035ce8ae4d 100644
+--- a/ld/ldlex.h
++++ b/ld/ldlex.h
+@@ -189,10 +189,10 @@ extern void ldlex_inputlist (void);
+ extern void ldlex_mri_script (void);
+ extern void ldlex_version_script (void);
+ extern void ldlex_version_file (void);
++extern void ldlex_defsym (void);
+ extern void ldlex_expression (void);
+ extern void ldlex_both (void);
+ extern void ldlex_popstate (void);
+-extern void ldlex_backup (void);
+ extern const char* ldlex_filename (void);
+ 
+ /* In lexsup.c.  */
+diff --git a/ld/ldlex.l b/ld/ldlex.l
+index c1b15263587..237892c0ec3 100644
+--- a/ld/ldlex.l
++++ b/ld/ldlex.l
+@@ -79,6 +79,7 @@ static void lex_warn_invalid (char *where, char *what);
+ 	SCRIPT		definitely in a script
+ 	INPUTLIST	definitely in a script, a filename-list
+ 	BOTH		either EXPRESSION or SCRIPT
++	DEFSYMEXP	in an argument to -defsym
+ 	MRI		in an MRI script
+ 	VERS_START	starting a Sun style mapfile
+ 	VERS_SCRIPT	a Sun style mapfile
+@@ -106,6 +107,7 @@ V_IDENTIFIER [*?.$_a-zA-Z\[\]\-\!\^\\]([*?.$_a-zA-Z0-9\[\]\-\!\^\\]|::)*
+ %s INPUTLIST
+ %s EXPRESSION
+ %s BOTH
++%s DEFSYMEXP
+ %s MRI
+ %s VERS_START
+ %s VERS_SCRIPT
+@@ -131,6 +133,12 @@ V_IDENTIFIER [*?.$_a-zA-Z\[\]\-\!\^\\]([*?.$_a-zA-Z0-9\[\]\-\!\^\\]|::)*
+ <BOTH,SCRIPT,EXPRESSION,VERS_START,VERS_NODE,VERS_SCRIPT,INPUTLIST>"/*"	{ comment (); }
+ 
+ 
++<DEFSYMEXP>"-"			{ RTOKEN('-');}
++<DEFSYMEXP>"+"			{ RTOKEN('+');}
++<DEFSYMEXP>{SYMBOLNAMECHAR1}{SYMBOLNAMECHAR}* { yylval.name = xstrdup (yytext);
++						return NAME; }
++<DEFSYMEXP>"="			{ RTOKEN('='); }
++
+ <MRI,EXPRESSION>"$"([0-9A-Fa-f])+ {
+ 				yylval.integer = bfd_scan_vma (yytext + 1, 0, 16);
+ 				yylval.bigint.str = NULL;
+@@ -162,7 +170,7 @@ V_IDENTIFIER [*?.$_a-zA-Z\[\]\-\!\^\\]([*?.$_a-zA-Z0-9\[\]\-\!\^\\]|::)*
+ 				   yylval.bigint.str = NULL;
+ 				   return INT;
+ 				 }
+-<SCRIPT,MRI,BOTH,EXPRESSION>((("$"|0[xX])([0-9A-Fa-f])+)|(([0-9])+))(M|K|m|k)? {
++<SCRIPT,DEFSYMEXP,MRI,BOTH,EXPRESSION>((("$"|0[xX])([0-9A-Fa-f])+)|(([0-9])+))(M|K|m|k)? {
+ 				  char *s = yytext;
+ 				  int ibase = 0;
+ 
+@@ -377,7 +385,7 @@ V_IDENTIFIER [*?.$_a-zA-Z\[\]\-\!\^\\]([*?.$_a-zA-Z0-9\[\]\-\!\^\\]|::)*
+ 				  yylval.name = xstrdup (yytext + 2);
+ 				  return LNAME;
+ 				}
+-<EXPRESSION>{SYMBOLNAMECHAR1}{SYMBOLNAMECHAR}* {
++<EXPRESSION>{SYMBOLNAMECHAR1}{NOCFILENAMECHAR}* {
+ 				  yylval.name = xstrdup (yytext);
+ 				  return NAME;
+ 				}
+@@ -472,7 +480,7 @@ V_IDENTIFIER [*?.$_a-zA-Z\[\]\-\!\^\\]([*?.$_a-zA-Z0-9\[\]\-\!\^\\]|::)*
+ }
+ 
+ <SCRIPT,MRI,VERS_START,VERS_SCRIPT,VERS_NODE>.	lex_warn_invalid (" in script", yytext);
+-<EXPRESSION,BOTH>.	lex_warn_invalid (" in expression", yytext);
++<EXPRESSION,DEFSYMEXP,BOTH>.	lex_warn_invalid (" in expression", yytext);
+ 
+ %%
+ 
+@@ -601,6 +609,13 @@ ldlex_version_file (void)
+   BEGIN (VERS_SCRIPT);
+ }
+ 
++void
++ldlex_defsym (void)
++{
++  *(state_stack_p)++ = yy_start;
++  BEGIN (DEFSYMEXP);
++}
++
+ void
+ ldlex_expression (void)
+ {
+@@ -621,16 +636,6 @@ ldlex_popstate (void)
+   yy_start = *(--state_stack_p);
+ }
+ 
+-/* In cases where the parser needs to look ahead and the context
+-   changes from expression to script or vice-versa, throw away a
+-   NAME.  What constitutes a NAME depends on context.  */
+-
+-void
+-ldlex_backup (void)
+-{
+-  yyless (0);
+-}
+-
+ /* Return the current file name, or the previous file if no file is
+    current.  */
+ 
+diff --git a/ld/scripttempl/pru.sc b/ld/scripttempl/pru.sc
+index b2c941b7911..97d8be0a0a4 100644
+--- a/ld/scripttempl/pru.sc
++++ b/ld/scripttempl/pru.sc
+@@ -151,11 +151,10 @@ SECTIONS
+     ${RELOCATING+ PROVIDE (_data_end = .) ; }
+   } ${RELOCATING+ > dmem }
+ 
+-  .resource_table ${RELOCATING-0} :
++  /* Linux remoteproc loader requires the resource_table section
++     start address to be aligned to 8 bytes.  */
++  .resource_table ${RELOCATING-0} ${RELOCATING+ ALIGN(8)} :
+   {
+-    /* Linux remoteproc loader requires the resource table address
+-       to be aligned to 8 bytes.  */
+-    ${RELOCATING+. = ALIGN(8);}
+     KEEP (*(.resource_table))
+   } ${RELOCATING+ > dmem}
+ 
+diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp
+index def69e43ab3..999d911ce6a 100644
+--- a/ld/testsuite/ld-plugin/lto.exp
++++ b/ld/testsuite/ld-plugin/lto.exp
+@@ -687,6 +687,40 @@ if { [is_elf_format] && [check_lto_shared_available] } {
+     }
+ }
+ 
++run_cc_link_tests [list \
++    [list \
++	"Build pr28138.a" \
++	"-T" "" \
++	{pr28138-1.c pr28138-2.c pr28138-3.c pr28138-4.c pr28138-5.c \
++	 pr28138-6.c pr28138-7.c} {} "pr28138.a" \
++    ] \
++    [list \
++	"Build pr28138.o" \
++	"" "" \
++	{pr28138.c} {} \
++    ] \
++]
++
++set exec_output [run_host_cmd "sh" \
++			      "-c \"ulimit -n 20; \
++			      $CC -Btmpdir/ld -o tmpdir/pr28138 \
++			      tmpdir/pr28138.o tmpdir/pr28138.a\""]
++set exec_output [prune_warnings $exec_output]
++if [string match "" $exec_output] then {
++    if { [isnative] } {
++	set exec_output [run_host_cmd "tmpdir/pr28138" ""]
++	if [string match "PASS" $exec_output] then {
++	    pass "PR ld/28138"
++	} else {
++	    fail "PR ld/28138"
++	}
++    } else {
++	pass "PR ld/28138"
++    }
++} else {
++    fail "PR ld/28138"
++}
++
+ set testname "Build liblto-11.a"
+ remote_file host delete "tmpdir/liblto-11.a"
+ set catch_output [run_host_cmd "$ar" "rc $plug_opt tmpdir/liblto-11.a tmpdir/lto-11a.o tmpdir/lto-11b.o tmpdir/lto-11c.o"]
+diff --git a/ld/testsuite/ld-plugin/pr28138-1.c b/ld/testsuite/ld-plugin/pr28138-1.c
+new file mode 100644
+index 00000000000..51d119e1642
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-1.c
+@@ -0,0 +1,6 @@
++extern int a0(void);
++int
++a1(void)
++{
++  return 1 + a0();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-2.c b/ld/testsuite/ld-plugin/pr28138-2.c
+new file mode 100644
+index 00000000000..1120cd797e9
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-2.c
+@@ -0,0 +1,6 @@
++extern int a1(void);
++int
++a2(void)
++{
++  return 1 + a1();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-3.c b/ld/testsuite/ld-plugin/pr28138-3.c
+new file mode 100644
+index 00000000000..ec464947ee6
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-3.c
+@@ -0,0 +1,6 @@
++extern int a2(void);
++int
++a3(void)
++{
++  return 1 + a2();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-4.c b/ld/testsuite/ld-plugin/pr28138-4.c
+new file mode 100644
+index 00000000000..475701b2c5c
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-4.c
+@@ -0,0 +1,6 @@
++extern int a3(void);
++int
++a4(void)
++{
++  return 1 + a3();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-5.c b/ld/testsuite/ld-plugin/pr28138-5.c
+new file mode 100644
+index 00000000000..e24f86c363e
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-5.c
+@@ -0,0 +1,6 @@
++extern int a4(void);
++int
++a5(void)
++{
++  return 1 + a4();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-6.c b/ld/testsuite/ld-plugin/pr28138-6.c
+new file mode 100644
+index 00000000000..b5b938bdb21
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-6.c
+@@ -0,0 +1,6 @@
++extern int a5(void);
++int
++a6(void)
++{
++  return 1 + a5();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-7.c b/ld/testsuite/ld-plugin/pr28138-7.c
+new file mode 100644
+index 00000000000..4ef75bf0f0c
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-7.c
+@@ -0,0 +1,6 @@
++extern int a6(void);
++int
++a7(void)
++{
++  return 1 + a6();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138.c b/ld/testsuite/ld-plugin/pr28138.c
+new file mode 100644
+index 00000000000..68252c9f382
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138.c
+@@ -0,0 +1,20 @@
++#include <stdio.h>
++
++extern int a7(void);
++
++int
++a0(void)
++{
++  return 0;
++}
++
++int
++main()
++{
++  if (a7() == 7)
++    {
++      printf ("PASS\n");
++      return 0;
++    }
++  return 1;
++}
+diff --git a/ld/testsuite/ld-powerpc/tlsexe.r b/ld/testsuite/ld-powerpc/tlsexe.r
+index 13c3efb12d5..bae5aac0664 100644
+--- a/ld/testsuite/ld-powerpc/tlsexe.r
++++ b/ld/testsuite/ld-powerpc/tlsexe.r
+@@ -70,6 +70,19 @@ Symbol table '\.dynsym' contains [0-9]+ entries:
+ Symbol table '\.symtab' contains [0-9]+ entries:
+  +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
+ .* 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND *
++.* SECTION +LOCAL +DEFAULT +1 \.interp
++.* SECTION +LOCAL +DEFAULT +2 \.hash
++.* SECTION +LOCAL +DEFAULT +3 \.dynsym
++.* SECTION +LOCAL +DEFAULT +4 \.dynstr
++.* SECTION +LOCAL +DEFAULT +5 \.rela\.dyn
++.* SECTION +LOCAL +DEFAULT +6 \.rela\.plt
++.* SECTION +LOCAL +DEFAULT +7 \.text
++.* SECTION +LOCAL +DEFAULT +8 \.tdata
++.* SECTION +LOCAL +DEFAULT +9 \.tbss
++.* SECTION +LOCAL +DEFAULT +10 \.dynamic
++.* SECTION +LOCAL +DEFAULT +11 \.opd
++.* SECTION +LOCAL +DEFAULT +12 \.got
++.* SECTION +LOCAL +DEFAULT +13 \.plt
+ .* FILE +LOCAL +DEFAULT +ABS .*
+ .* NOTYPE +LOCAL +DEFAULT +ABS TLSMARK
+ .* TLS +LOCAL +DEFAULT +8 gd4
+diff --git a/ld/testsuite/ld-powerpc/tlsexe32.r b/ld/testsuite/ld-powerpc/tlsexe32.r
+index 9017069ad84..43db7379a4c 100644
+--- a/ld/testsuite/ld-powerpc/tlsexe32.r
++++ b/ld/testsuite/ld-powerpc/tlsexe32.r
+@@ -69,6 +69,18 @@ Symbol table '\.dynsym' contains [0-9]+ entries:
+ Symbol table '\.symtab' contains [0-9]+ entries:
+  +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
+ .* NOTYPE +LOCAL +DEFAULT +UND 
++.* SECTION +LOCAL +DEFAULT +1 \.interp
++.* SECTION +LOCAL +DEFAULT +2 \.hash
++.* SECTION +LOCAL +DEFAULT +3 \.dynsym
++.* SECTION +LOCAL +DEFAULT +4 \.dynstr
++.* SECTION +LOCAL +DEFAULT +5 \.rela\.dyn
++.* SECTION +LOCAL +DEFAULT +6 \.rela\.plt
++.* SECTION +LOCAL +DEFAULT +7 \.text
++.* SECTION +LOCAL +DEFAULT +8 \.tdata
++.* SECTION +LOCAL +DEFAULT +9 \.tbss
++.* SECTION +LOCAL +DEFAULT +10 \.dynamic
++.* SECTION +LOCAL +DEFAULT +11 \.got
++.* SECTION +LOCAL +DEFAULT +12 \.plt
+ .* FILE +LOCAL +DEFAULT +ABS .*
+ .* NOTYPE +LOCAL +DEFAULT +ABS TLSMARK
+ .* TLS +LOCAL +DEFAULT +8 gd4
+diff --git a/ld/testsuite/ld-powerpc/tlsexe32no.r b/ld/testsuite/ld-powerpc/tlsexe32no.r
+index 9715b6bc631..e254eeadf71 100644
+--- a/ld/testsuite/ld-powerpc/tlsexe32no.r
++++ b/ld/testsuite/ld-powerpc/tlsexe32no.r
+@@ -70,6 +70,18 @@ Symbol table '\.dynsym' contains [0-9]+ entries:
+ Symbol table '\.symtab' contains [0-9]+ entries:
+  +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
+ .* NOTYPE +LOCAL +DEFAULT +UND 
++.* SECTION +LOCAL +DEFAULT +1 \.interp
++.* SECTION +LOCAL +DEFAULT +2 \.hash
++.* SECTION +LOCAL +DEFAULT +3 \.dynsym
++.* SECTION +LOCAL +DEFAULT +4 \.dynstr
++.* SECTION +LOCAL +DEFAULT +5 \.rela\.dyn
++.* SECTION +LOCAL +DEFAULT +6 \.rela\.plt
++.* SECTION +LOCAL +DEFAULT +7 \.text
++.* SECTION +LOCAL +DEFAULT +8 \.tdata
++.* SECTION +LOCAL +DEFAULT +9 \.tbss
++.* SECTION +LOCAL +DEFAULT +10 \.dynamic
++.* SECTION +LOCAL +DEFAULT +11 \.got
++.* SECTION +LOCAL +DEFAULT +12 \.plt
+ .* FILE +LOCAL +DEFAULT +ABS .*
+ .* NOTYPE +LOCAL +DEFAULT +ABS TLSMARK
+ .* TLS +LOCAL +DEFAULT +8 gd4
+diff --git a/ld/testsuite/ld-powerpc/tlsexeno.r b/ld/testsuite/ld-powerpc/tlsexeno.r
+index d4dcebf4ec2..59e2f89ffd9 100644
+--- a/ld/testsuite/ld-powerpc/tlsexeno.r
++++ b/ld/testsuite/ld-powerpc/tlsexeno.r
+@@ -71,6 +71,19 @@ Symbol table '\.dynsym' contains [0-9]+ entries:
+ Symbol table '\.symtab' contains [0-9]+ entries:
+  +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
+ .* 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND *
++.* SECTION +LOCAL +DEFAULT +1 \.interp
++.* SECTION +LOCAL +DEFAULT +2 \.hash
++.* SECTION +LOCAL +DEFAULT +3 \.dynsym
++.* SECTION +LOCAL +DEFAULT +4 \.dynstr
++.* SECTION +LOCAL +DEFAULT +5 \.rela\.dyn
++.* SECTION +LOCAL +DEFAULT +6 \.rela\.plt
++.* SECTION +LOCAL +DEFAULT +7 \.text
++.* SECTION +LOCAL +DEFAULT +8 \.tdata
++.* SECTION +LOCAL +DEFAULT +9 \.tbss
++.* SECTION +LOCAL +DEFAULT +10 \.dynamic
++.* SECTION +LOCAL +DEFAULT +11 \.opd
++.* SECTION +LOCAL +DEFAULT +12 \.got
++.* SECTION +LOCAL +DEFAULT +13 \.plt
+ .* FILE +LOCAL +DEFAULT +ABS .*
+ .* NOTYPE +LOCAL +DEFAULT +ABS TLSMARK
+ .* TLS +LOCAL +DEFAULT +8 gd4
+diff --git a/ld/testsuite/ld-powerpc/tlsexenors.r b/ld/testsuite/ld-powerpc/tlsexenors.r
+index aec6a8dec88..3a9af781c0d 100644
+--- a/ld/testsuite/ld-powerpc/tlsexenors.r
++++ b/ld/testsuite/ld-powerpc/tlsexenors.r
+@@ -71,6 +71,19 @@ Symbol table '\.dynsym' contains [0-9]+ entries:
+ Symbol table '\.symtab' contains [0-9]+ entries:
+  +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
+ .* 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND *
++.* SECTION +LOCAL +DEFAULT +1 \.interp
++.* SECTION +LOCAL +DEFAULT +2 \.hash
++.* SECTION +LOCAL +DEFAULT +3 \.dynsym
++.* SECTION +LOCAL +DEFAULT +4 \.dynstr
++.* SECTION +LOCAL +DEFAULT +5 \.rela\.dyn
++.* SECTION +LOCAL +DEFAULT +6 \.rela\.plt
++.* SECTION +LOCAL +DEFAULT +7 \.text
++.* SECTION +LOCAL +DEFAULT +8 \.tdata
++.* SECTION +LOCAL +DEFAULT +9 \.tbss
++.* SECTION +LOCAL +DEFAULT +10 \.dynamic
++.* SECTION +LOCAL +DEFAULT +11 \.opd
++.* SECTION +LOCAL +DEFAULT +12 \.got
++.* SECTION +LOCAL +DEFAULT +13 \.plt
+ .* FILE +LOCAL +DEFAULT +ABS .*
+ .* NOTYPE +LOCAL +DEFAULT +ABS TLSMARK
+ .* TLS +LOCAL +DEFAULT +8 gd4
+diff --git a/ld/testsuite/ld-powerpc/tlsexers.r b/ld/testsuite/ld-powerpc/tlsexers.r
+index bb852310574..0c623b6eaa9 100644
+--- a/ld/testsuite/ld-powerpc/tlsexers.r
++++ b/ld/testsuite/ld-powerpc/tlsexers.r
+@@ -70,6 +70,19 @@ Symbol table '\.dynsym' contains [0-9]+ entries:
+ Symbol table '\.symtab' contains [0-9]+ entries:
+  +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
+ .* 0+ +0 +NOTYPE +LOCAL +DEFAULT +UND *
++.* SECTION +LOCAL +DEFAULT +1 \.interp
++.* SECTION +LOCAL +DEFAULT +2 \.hash
++.* SECTION +LOCAL +DEFAULT +3 \.dynsym
++.* SECTION +LOCAL +DEFAULT +4 \.dynstr
++.* SECTION +LOCAL +DEFAULT +5 \.rela\.dyn
++.* SECTION +LOCAL +DEFAULT +6 \.rela\.plt
++.* SECTION +LOCAL +DEFAULT +7 \.text
++.* SECTION +LOCAL +DEFAULT +8 \.tdata
++.* SECTION +LOCAL +DEFAULT +9 \.tbss
++.* SECTION +LOCAL +DEFAULT +10 \.dynamic
++.* SECTION +LOCAL +DEFAULT +11 \.opd
++.* SECTION +LOCAL +DEFAULT +12 \.got
++.* SECTION +LOCAL +DEFAULT +13 \.plt
+ .* FILE +LOCAL +DEFAULT +ABS .*
+ .* NOTYPE +LOCAL +DEFAULT +ABS TLSMARK
+ .* TLS +LOCAL +DEFAULT +8 gd4
+diff --git a/ld/testsuite/ld-powerpc/tlsexetoc.r b/ld/testsuite/ld-powerpc/tlsexetoc.r
+index 6e676e15dfc..4c6b9189bbb 100644
+--- a/ld/testsuite/ld-powerpc/tlsexetoc.r
++++ b/ld/testsuite/ld-powerpc/tlsexetoc.r
+@@ -71,6 +71,19 @@ Symbol table '\.dynsym' contains [0-9]+ entries:
+ Symbol table '\.symtab' contains [0-9]+ entries:
+  +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
+ .* NOTYPE +LOCAL +DEFAULT +UND *
++.* SECTION +LOCAL +DEFAULT +1 \.interp
++.* SECTION +LOCAL +DEFAULT +2 \.hash
++.* SECTION +LOCAL +DEFAULT +3 \.dynsym
++.* SECTION +LOCAL +DEFAULT +4 \.dynstr
++.* SECTION +LOCAL +DEFAULT +5 \.rela\.dyn
++.* SECTION +LOCAL +DEFAULT +6 \.rela\.plt
++.* SECTION +LOCAL +DEFAULT +7 \.text
++.* SECTION +LOCAL +DEFAULT +8 \.tdata
++.* SECTION +LOCAL +DEFAULT +9 \.tbss
++.* SECTION +LOCAL +DEFAULT +10 \.dynamic
++.* SECTION +LOCAL +DEFAULT +11 \.opd
++.* SECTION +LOCAL +DEFAULT +12 \.got
++.* SECTION +LOCAL +DEFAULT +13 \.plt
+ .* FILE +LOCAL +DEFAULT +ABS .*
+ .* TLS +LOCAL +DEFAULT +8 gd4
+ .* TLS +LOCAL +DEFAULT +8 ld4
+diff --git a/ld/testsuite/ld-powerpc/tlsexetocrs.r b/ld/testsuite/ld-powerpc/tlsexetocrs.r
+index 36919c7aedc..a41fd2e10a5 100644
+--- a/ld/testsuite/ld-powerpc/tlsexetocrs.r
++++ b/ld/testsuite/ld-powerpc/tlsexetocrs.r
+@@ -71,6 +71,19 @@ Symbol table '\.dynsym' contains [0-9]+ entries:
+ Symbol table '\.symtab' contains [0-9]+ entries:
+  +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
+ .* NOTYPE +LOCAL +DEFAULT +UND *
++.* SECTION +LOCAL +DEFAULT +1 \.interp
++.* SECTION +LOCAL +DEFAULT +2 \.hash
++.* SECTION +LOCAL +DEFAULT +3 \.dynsym
++.* SECTION +LOCAL +DEFAULT +4 \.dynstr
++.* SECTION +LOCAL +DEFAULT +5 \.rela\.dyn
++.* SECTION +LOCAL +DEFAULT +6 \.rela\.plt
++.* SECTION +LOCAL +DEFAULT +7 \.text
++.* SECTION +LOCAL +DEFAULT +8 \.tdata
++.* SECTION +LOCAL +DEFAULT +9 \.tbss
++.* SECTION +LOCAL +DEFAULT +10 \.dynamic
++.* SECTION +LOCAL +DEFAULT +11 \.opd
++.* SECTION +LOCAL +DEFAULT +12 \.got
++.* SECTION +LOCAL +DEFAULT +13 \.plt
+ .* FILE +LOCAL +DEFAULT +ABS .*
+ .* TLS +LOCAL +DEFAULT +8 gd4
+ .* TLS +LOCAL +DEFAULT +8 ld4
+diff --git a/ld/testsuite/ld-powerpc/tlsget.d b/ld/testsuite/ld-powerpc/tlsget.d
+index 31ee8482d9e..f419fca4d29 100644
+--- a/ld/testsuite/ld-powerpc/tlsget.d
++++ b/ld/testsuite/ld-powerpc/tlsget.d
+@@ -8,6 +8,16 @@
+ 
+ Disassembly of section \.text:
+ 
++.* <.*\.plt_call\..*>:
++.*:	(04 10 .. ..|.. .. 10 04) 	pld     r12,.*
++.*:	(e5 80 .. ..|.. .. 80 e5) 
++.*:	(7d 89 03 a6|a6 03 89 7d) 	mtctr   r12
++.*:	(4e 80 04 20|20 04 80 4e) 	bctr
++.*:	(f8 41 00 18|18 00 41 f8) 	std     r2,24\(r1\)
++.*:	(e9 82 .. ..|.. .. 82 e9) 	ld      r12,.*\(r2\)
++.*:	(7d 89 03 a6|a6 03 89 7d) 	mtctr   r12
++.*:	(4e 80 04 20|20 04 80 4e) 	bctr
++
+ .* <.*\.plt_call\.__tls_get_addr_opt.*>:
+ .*:	(e8 03 00 00|00 00 03 e8) 	ld      r0,0\(r3\)
+ .*:	(e9 83 00 08|08 00 83 e9) 	ld      r12,8\(r3\)
+@@ -38,17 +48,6 @@ Disassembly of section \.text:
+ .*:	(e8 01 00 08|08 00 01 e8) 	ld      r0,8\(r1\)
+ .*:	(7c 08 03 a6|a6 03 08 7c) 	mtlr    r0
+ .*:	(4e 80 00 20|20 00 80 4e) 	blr
+-
+-.* <.*\.plt_call\..*>:
+-.*:	(60 00 00 00|00 00 00 60) 	nop
+-.*:	(04 10 .. ..|.. .. 10 04) 	pld     r12,.*
+-.*:	(e5 80 .. ..|.. .. 80 e5) 
+-.*:	(7d 89 03 a6|a6 03 89 7d) 	mtctr   r12
+-.*:	(4e 80 04 20|20 04 80 4e) 	bctr
+-.*:	(f8 41 00 18|18 00 41 f8) 	std     r2,24\(r1\)
+-.*:	(e9 82 .. ..|.. .. 82 e9) 	ld      r12,.*\(r2\)
+-.*:	(7d 89 03 a6|a6 03 89 7d) 	mtctr   r12
+-.*:	(4e 80 04 20|20 04 80 4e) 	bctr
+ #...
+ 
+ .* <_start>:
+@@ -60,7 +59,7 @@ Disassembly of section \.text:
+ .*:	(4b ff .. ..|.. .. ff 4b) 	bl      .* <.*\.plt_call\.__tls_get_addr_opt.*\+0x30>
+ .*:	(60 00 00 00|00 00 00 60) 	nop
+ .*:	(4b ff .. ..|.. .. ff 4b) 	bl      .* <.*\.plt_call\..*:[^\+]*>
+-.*:	(4b ff .. ..|.. .. ff 4b) 	bl      .* <.*.plt_call\..*:.*\+0x14>
++.*:	(4b ff .. ..|.. .. ff 4b) 	bl      .* <.*.plt_call\..*:.*\+0x10>
+ .*:	(e8 41 00 18|18 00 41 e8) 	ld      r2,24\(r1\)
+ 
+ .* <fun>:
+diff --git a/ld/testsuite/ld-powerpc/tlsget.wf b/ld/testsuite/ld-powerpc/tlsget.wf
+index 181bb397f97..bc9ccadf442 100644
+--- a/ld/testsuite/ld-powerpc/tlsget.wf
++++ b/ld/testsuite/ld-powerpc/tlsget.wf
+@@ -9,8 +9,8 @@ Contents of the .eh_frame section:
+   Augmentation data:     1b
+   DW_CFA_def_cfa: r1 ofs 0
+ 
+-0+14 0+14 0+18 FDE cie=0+ pc=0+280..0+318
+-  DW_CFA_advance_loc: 96 to 0+2e0
++0+14 0+14 0+18 FDE cie=0+ pc=0+280..0+314
++  DW_CFA_advance_loc: 128 to 0+300
+   DW_CFA_offset_extended_sf: r65 at cfa\+8
+   DW_CFA_advance_loc: 16 to .*
+   DW_CFA_restore_extended: r65
+diff --git a/ld/testsuite/ld-powerpc/tlsget2.d b/ld/testsuite/ld-powerpc/tlsget2.d
+index 03798075942..13dc64b595e 100644
+--- a/ld/testsuite/ld-powerpc/tlsget2.d
++++ b/ld/testsuite/ld-powerpc/tlsget2.d
+@@ -8,6 +8,14 @@
+ 
+ Disassembly of section \.text:
+ 
++.* <.*\.plt_call\..*>:
++.*:	(f8 41 00 18|18 00 41 f8) 	std     r2,24\(r1\)
++.*:	(60 00 00 00|00 00 00 60) 	nop
++.*:	(04 10 .. ..|.. .. 10 04) 	pld     r12,.*
++.*:	(e5 80 .. ..|.. .. 80 e5) 
++.*:	(7d 89 03 a6|a6 03 89 7d) 	mtctr   r12
++.*:	(4e 80 04 20|20 04 80 4e) 	bctr
++
+ .* <.*\.plt_call\.__tls_get_addr_opt.*>:
+ .*:	(e8 03 00 00|00 00 03 e8) 	ld      r0,0\(r3\)
+ .*:	(e9 83 00 08|08 00 83 e9) 	ld      r12,8\(r3\)
+@@ -27,14 +35,6 @@ Disassembly of section \.text:
+ .*:	(e8 01 00 08|08 00 01 e8) 	ld      r0,8\(r1\)
+ .*:	(7c 08 03 a6|a6 03 08 7c) 	mtlr    r0
+ .*:	(4e 80 00 20|20 00 80 4e) 	blr
+-
+-.* <.*\.plt_call\..*>:
+-.*:	(f8 41 00 18|18 00 41 f8) 	std     r2,24\(r1\)
+-.*:	(60 00 00 00|00 00 00 60) 	nop
+-.*:	(04 10 .. ..|.. .. 10 04) 	pld     r12,.*
+-.*:	(e5 80 .. ..|.. .. 80 e5) 
+-.*:	(7d 89 03 a6|a6 03 89 7d) 	mtctr   r12
+-.*:	(4e 80 04 20|20 04 80 4e) 	bctr
+ #...
+ 
+ .* <_start>:
+diff --git a/ld/testsuite/ld-powerpc/tlsget2.wf b/ld/testsuite/ld-powerpc/tlsget2.wf
+index 0d09c701760..359e62de760 100644
+--- a/ld/testsuite/ld-powerpc/tlsget2.wf
++++ b/ld/testsuite/ld-powerpc/tlsget2.wf
+@@ -10,7 +10,7 @@ Contents of the .eh_frame section:
+   DW_CFA_def_cfa: r1 ofs 0
+ 
+ 0+14 0+14 0+18 FDE cie=0+ pc=0+280..0+2e0
+-  DW_CFA_advance_loc: 52 to 0+2b4
++  DW_CFA_advance_loc: 76 to 0+2cc
+   DW_CFA_offset_extended_sf: r65 at cfa\+8
+   DW_CFA_advance_loc: 16 to .*
+   DW_CFA_restore_extended: r65
+diff --git a/ld/testsuite/ld-powerpc/tlsso.r b/ld/testsuite/ld-powerpc/tlsso.r
+index d56b2a046c6..b0453fb1967 100644
+--- a/ld/testsuite/ld-powerpc/tlsso.r
++++ b/ld/testsuite/ld-powerpc/tlsso.r
+@@ -91,6 +91,18 @@ Symbol table '\.dynsym' contains [0-9]+ entries:
+ Symbol table '\.symtab' contains [0-9]+ entries:
+  +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
+ .* NOTYPE +LOCAL +DEFAULT +UND *
++.* SECTION +LOCAL +DEFAULT +1 \.hash
++.* SECTION +LOCAL +DEFAULT +2 \.dynsym
++.* SECTION +LOCAL +DEFAULT +3 \.dynstr
++.* SECTION +LOCAL +DEFAULT +4 \.rela\.dyn
++.* SECTION +LOCAL +DEFAULT +5 \.rela\.plt
++.* SECTION +LOCAL +DEFAULT +6 \.text
++.* SECTION +LOCAL +DEFAULT +7 \.tdata
++.* SECTION +LOCAL +DEFAULT +8 \.tbss
++.* SECTION +LOCAL +DEFAULT +9 \.dynamic
++.* SECTION +LOCAL +DEFAULT +10 \.opd
++.* SECTION +LOCAL +DEFAULT +11 \.got
++.* SECTION +LOCAL +DEFAULT +12 \.plt
+ .* FILE +LOCAL +DEFAULT +ABS .*
+ .* NOTYPE +LOCAL +DEFAULT +ABS TLSMARK
+ .* TLS +LOCAL +DEFAULT +7 gd4
+diff --git a/ld/testsuite/ld-powerpc/tlsso32.r b/ld/testsuite/ld-powerpc/tlsso32.r
+index 0202440be9f..3f92f8066cf 100644
+--- a/ld/testsuite/ld-powerpc/tlsso32.r
++++ b/ld/testsuite/ld-powerpc/tlsso32.r
+@@ -89,6 +89,17 @@ Symbol table '\.dynsym' contains [0-9]+ entries:
+ Symbol table '\.symtab' contains [0-9]+ entries:
+  +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
+ .* NOTYPE +LOCAL +DEFAULT +UND 
++.* SECTION +LOCAL +DEFAULT +1 \.hash
++.* SECTION +LOCAL +DEFAULT +2 \.dynsym
++.* SECTION +LOCAL +DEFAULT +3 \.dynstr
++.* SECTION +LOCAL +DEFAULT +4 \.rela\.dyn
++.* SECTION +LOCAL +DEFAULT +5 \.rela\.plt
++.* SECTION +LOCAL +DEFAULT +6 \.text
++.* SECTION +LOCAL +DEFAULT +7 \.tdata
++.* SECTION +LOCAL +DEFAULT +8 \.tbss
++.* SECTION +LOCAL +DEFAULT +9 \.dynamic
++.* SECTION +LOCAL +DEFAULT +10 \.got
++.* SECTION +LOCAL +DEFAULT +11 \.plt
+ .* FILE +LOCAL +DEFAULT +ABS .*
+ .* NOTYPE +LOCAL +DEFAULT +ABS TLSMARK
+ .* TLS +LOCAL +DEFAULT +7 gd4
+diff --git a/ld/testsuite/ld-powerpc/tlstocso.r b/ld/testsuite/ld-powerpc/tlstocso.r
+index 026d483fcac..1011b7c347f 100644
+--- a/ld/testsuite/ld-powerpc/tlstocso.r
++++ b/ld/testsuite/ld-powerpc/tlstocso.r
+@@ -84,6 +84,18 @@ Symbol table '\.dynsym' contains [0-9]+ entries:
+ Symbol table '\.symtab' contains [0-9]+ entries:
+  +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
+ .* NOTYPE +LOCAL +DEFAULT +UND *
++.* SECTION +LOCAL +DEFAULT +1 \.hash
++.* SECTION +LOCAL +DEFAULT +2 \.dynsym
++.* SECTION +LOCAL +DEFAULT +3 \.dynstr
++.* SECTION +LOCAL +DEFAULT +4 \.rela\.dyn
++.* SECTION +LOCAL +DEFAULT +5 \.rela\.plt
++.* SECTION +LOCAL +DEFAULT +6 \.text
++.* SECTION +LOCAL +DEFAULT +7 \.tdata
++.* SECTION +LOCAL +DEFAULT +8 \.tbss
++.* SECTION +LOCAL +DEFAULT +9 \.dynamic
++.* SECTION +LOCAL +DEFAULT +10 \.opd
++.* SECTION +LOCAL +DEFAULT +11 \.got
++.* SECTION +LOCAL +DEFAULT +12 \.plt
+ .* FILE +LOCAL +DEFAULT +ABS .*
+ .* TLS +LOCAL +DEFAULT +7 gd4
+ .* TLS +LOCAL +DEFAULT +7 ld4
+diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
+index 8e39fd28eba..3f749455f05 100644
+--- a/libiberty/ChangeLog
++++ b/libiberty/ChangeLog
+@@ -1,3 +1,9 @@
++2021-07-19  Christopher Wellons  <wellons@nullprogram.com>
++
++	* rust-demangle.c (struct rust_demangler): Change type of
++	"recursion" to unsigned.
++	(RUST_NO_RECURSION_LIMIT): Similarly in cast.
++
+ 2021-07-15  Nick Clifton  <nickc@redhat.com>
+ 
+ 	PR 99935
+diff --git a/libiberty/rust-demangle.c b/libiberty/rust-demangle.c
+index df09b7b8fdd..ac1eb8eb02c 100644
+--- a/libiberty/rust-demangle.c
++++ b/libiberty/rust-demangle.c
+@@ -75,10 +75,10 @@ struct rust_demangler
+   int version;
+ 
+   /* Recursion depth.  */
+-  uint recursion;
++  unsigned recursion;
+   /* Maximum number of times demangle_path may be called recursively.  */
+ #define RUST_MAX_RECURSION_COUNT  1024
+-#define RUST_NO_RECURSION_LIMIT   ((uint) -1)
++#define RUST_NO_RECURSION_LIMIT   ((unsigned) -1)
+ 
+   uint64_t bound_lifetime_depth;
+ };
+diff --git a/opcodes/s390-opc.c b/opcodes/s390-opc.c
+index 5545dacffff..64453d945f8 100644
+--- a/opcodes/s390-opc.c
++++ b/opcodes/s390-opc.c
+@@ -442,6 +442,7 @@ const struct s390_operand s390_operands[] =
+ #define INSTR_RX_URRD      4, { U4_8,D_20,X_12,B_16,0,0 }        /* e.g. bc    */
+ #define INSTR_SI_RD        4, { D_20,B_16,0,0,0,0 }              /* e.g. lpsw  */
+ #define INSTR_SI_URD       4, { D_20,B_16,U8_8,0,0,0 }           /* e.g. cli   */
++#define INSTR_SIY_RD       6, { D20_20,B_16,0,0,0,0 }            /* e.g. lpswey*/
+ #define INSTR_SIY_URD      6, { D20_20,B_16,U8_8,0,0,0 }         /* e.g. tmy   */
+ #define INSTR_SIY_IRD      6, { D20_20,B_16,I8_8,0,0,0 }         /* e.g. asi   */
+ #define INSTR_SIL_RDI      6, { D_20,B_16,I16_32,0,0,0 }         /* e.g. chhsi */
+@@ -664,6 +665,7 @@ const struct s390_operand s390_operands[] =
+ #define MASK_RX_URRD      { 0xff, 0x00, 0x00, 0x00, 0x00, 0x00 }
+ #define MASK_SI_RD        { 0xff, 0x00, 0x00, 0x00, 0x00, 0x00 }
+ #define MASK_SI_URD       { 0xff, 0x00, 0x00, 0x00, 0x00, 0x00 }
++#define MASK_SIY_RD       { 0xff, 0xff, 0x00, 0x00, 0x00, 0xff }
+ #define MASK_SIY_URD      { 0xff, 0x00, 0x00, 0x00, 0x00, 0xff }
+ #define MASK_SIY_IRD      { 0xff, 0x00, 0x00, 0x00, 0x00, 0xff }
+ #define MASK_SIL_RDI      { 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }
+diff --git a/opcodes/s390-opc.txt b/opcodes/s390-opc.txt
+index aa00b4f3b69..ad4b6aebc2b 100644
+--- a/opcodes/s390-opc.txt
++++ b/opcodes/s390-opc.txt
+@@ -2041,6 +2041,8 @@ e60000000055 vcnf VRR_VV0UU2 " " arch14 zarch
+ 
+ b98B rdp RRF_RURR2 " " arch14 zarch optparm
+ 
+-eb0000000071 lpswey SIY_URD " " arch14 zarch
++eb0000000071 lpswey SIY_RD " " arch14 zarch
+ b200 lbear S_RD " " arch14 zarch
+ b201 stbear S_RD " " arch14 zarch
++
++b28f qpaci S_RD " " arch14 zarch
diff --git a/patches/branch-version.diff b/patches/branch-version.diff
new file mode 100644
index 000000000..c77863b86
--- /dev/null
+++ b/patches/branch-version.diff
@@ -0,0 +1,756 @@
+# DP: Don't bump the version when doing distro builds
+
+git diff acda0027559c6112ea91af13fb32dd4bef8f0b8b 9288e0fae61b716ce75334be906283de8b18b787
+
+--- a/bfd/ChangeLog
++++ b/bfd/ChangeLog
+@@ -4,11 +4,6 @@
+ 
+ 2021-07-18  Nick Clifton  <nickc@redhat.com>
+ 
+-	* version.m4 (BFD_VERSION): Set to 2.37/0
+-	* development.sh (development): Set to true.
+-
+-2021-07-18  Nick Clifton  <nickc@redhat.com>
+-
+ 	* 2.37 release.
+ 
+ 2021-07-08  H.J. Lu  <hongjiu.lu@intel.com>
+--- a/bfd/configure
++++ b/bfd/configure
+@@ -794,6 +794,7 @@ infodir
+ docdir
+ oldincludedir
+ includedir
++runstatedir
+ localstatedir
+ sharedstatedir
+ sysconfdir
+@@ -891,6 +892,7 @@ datadir='${datarootdir}'
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
++runstatedir='${localstatedir}/run'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+ docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+@@ -1143,6 +1145,15 @@ do
+   | -silent | --silent | --silen | --sile | --sil)
+     silent=yes ;;
+ 
++  -runstatedir | --runstatedir | --runstatedi | --runstated \
++  | --runstate | --runstat | --runsta | --runst | --runs \
++  | --run | --ru | --r)
++    ac_prev=runstatedir ;;
++  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
++  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
++  | --run=* | --ru=* | --r=*)
++    runstatedir=$ac_optarg ;;
++
+   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+     ac_prev=sbindir ;;
+   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+@@ -1280,7 +1291,7 @@ fi
+ for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+ 		datadir sysconfdir sharedstatedir localstatedir includedir \
+ 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+-		libdir localedir mandir
++		libdir localedir mandir runstatedir
+ do
+   eval ac_val=\$$ac_var
+   # Remove trailing slashes.
+@@ -1433,6 +1444,7 @@ Fine tuning of the installation director
+   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
++  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
+   --libdir=DIR            object code libraries [EPREFIX/lib]
+   --includedir=DIR        C header files [PREFIX/include]
+   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+@@ -11044,7 +11056,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 11047 "configure"
++#line 11059 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -11150,7 +11162,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 11153 "configure"
++#line 11165 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -11580,7 +11592,7 @@ else
+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
+     since some C++ compilers masquerading as C compilers
+     incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ 		       && LARGE_OFF_T % 2147483647 == 1)
+ 		      ? 1 : -1];
+@@ -11626,7 +11638,7 @@ else
+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
+     since some C++ compilers masquerading as C compilers
+     incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ 		       && LARGE_OFF_T % 2147483647 == 1)
+ 		      ? 1 : -1];
+@@ -11650,7 +11662,7 @@ rm -f core conftest.err conftest.$ac_obj
+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
+     since some C++ compilers masquerading as C compilers
+     incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ 		       && LARGE_OFF_T % 2147483647 == 1)
+ 		      ? 1 : -1];
+@@ -11695,7 +11707,7 @@ else
+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
+     since some C++ compilers masquerading as C compilers
+     incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ 		       && LARGE_OFF_T % 2147483647 == 1)
+ 		      ? 1 : -1];
+@@ -11719,7 +11731,7 @@ rm -f core conftest.err conftest.$ac_obj
+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
+     since some C++ compilers masquerading as C compilers
+     incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ 		       && LARGE_OFF_T % 2147483647 == 1)
+ 		      ? 1 : -1];
+@@ -14951,6 +14963,8 @@ main ()
+     if (*(data + i) != *(data3 + i))
+       return 14;
+   close (fd);
++  free (data);
++  free (data3);
+   return 0;
+ }
+ _ACEOF
+--- a/bfd/development.sh
++++ b/bfd/development.sh
+@@ -16,7 +16,7 @@
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+ # Controls whether to enable development-mode features by default.
+-development=true
++development=false
+ 
+ # Indicate whether this is a release branch.
+ experimental=false
+--- a/bfd/version.m4
++++ b/bfd/version.m4
+@@ -1 +1 @@
+-m4_define([BFD_VERSION], [2.37.0])
++m4_define([BFD_VERSION], [2.37])
+--- a/binutils/ChangeLog
++++ b/binutils/ChangeLog
+@@ -17,11 +17,6 @@
+ 
+ 2021-07-03  Nick Clifton  <nickc@redhat.com>
+ 
+-	* configure: Regenerate.
+-	* po/binutils.pot: Regenerate.
+-
+-2021-07-03  Nick Clifton  <nickc@redhat.com>
+-
+ 	* 2.37 release branch created.
+ 
+ 2021-07-02  Alan Modra  <amodra@gmail.com>
+--- a/binutils/configure
++++ b/binutils/configure
+@@ -785,6 +785,7 @@ infodir
+ docdir
+ oldincludedir
+ includedir
++runstatedir
+ localstatedir
+ sharedstatedir
+ sysconfdir
+@@ -888,6 +889,7 @@ datadir='${datarootdir}'
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
++runstatedir='${localstatedir}/run'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+ docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+@@ -1140,6 +1142,15 @@ do
+   | -silent | --silent | --silen | --sile | --sil)
+     silent=yes ;;
+ 
++  -runstatedir | --runstatedir | --runstatedi | --runstated \
++  | --runstate | --runstat | --runsta | --runst | --runs \
++  | --run | --ru | --r)
++    ac_prev=runstatedir ;;
++  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
++  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
++  | --run=* | --ru=* | --r=*)
++    runstatedir=$ac_optarg ;;
++
+   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+     ac_prev=sbindir ;;
+   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+@@ -1277,7 +1288,7 @@ fi
+ for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+ 		datadir sysconfdir sharedstatedir localstatedir includedir \
+ 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+-		libdir localedir mandir
++		libdir localedir mandir runstatedir
+ do
+   eval ac_val=\$$ac_var
+   # Remove trailing slashes.
+@@ -1430,6 +1441,7 @@ Fine tuning of the installation director
+   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
++  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
+   --libdir=DIR            object code libraries [EPREFIX/lib]
+   --includedir=DIR        C header files [PREFIX/include]
+   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+@@ -10931,7 +10943,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 10934 "configure"
++#line 10946 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -11037,7 +11049,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 11040 "configure"
++#line 11052 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -11465,7 +11477,7 @@ else
+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
+     since some C++ compilers masquerading as C compilers
+     incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ 		       && LARGE_OFF_T % 2147483647 == 1)
+ 		      ? 1 : -1];
+@@ -11511,7 +11523,7 @@ else
+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
+     since some C++ compilers masquerading as C compilers
+     incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ 		       && LARGE_OFF_T % 2147483647 == 1)
+ 		      ? 1 : -1];
+@@ -11535,7 +11547,7 @@ rm -f core conftest.err conftest.$ac_obj
+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
+     since some C++ compilers masquerading as C compilers
+     incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ 		       && LARGE_OFF_T % 2147483647 == 1)
+ 		      ? 1 : -1];
+@@ -11580,7 +11592,7 @@ else
+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
+     since some C++ compilers masquerading as C compilers
+     incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ 		       && LARGE_OFF_T % 2147483647 == 1)
+ 		      ? 1 : -1];
+@@ -11604,7 +11616,7 @@ rm -f core conftest.err conftest.$ac_obj
+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
+     since some C++ compilers masquerading as C compilers
+     incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ 		       && LARGE_OFF_T % 2147483647 == 1)
+ 		      ? 1 : -1];
+@@ -13274,6 +13286,8 @@ main ()
+     if (*(data + i) != *(data3 + i))
+       return 14;
+   close (fd);
++  free (data);
++  free (data3);
+   return 0;
+ }
+ _ACEOF
+--- a/gas/ChangeLog
++++ b/gas/ChangeLog
+@@ -9,11 +9,6 @@
+ 
+ 2021-07-03  Nick Clifton  <nickc@redhat.com>
+ 
+-	* configure: Regenerate.
+-	* po/gas.pot: Regenerate.
+-
+-2021-07-03  Nick Clifton  <nickc@redhat.com>
+-
+ 	* 2.37 release branch created.
+ 
+ 2021-07-02  Alan Modra  <amodra@gmail.com>
+--- a/gas/configure
++++ b/gas/configure
+@@ -770,6 +770,7 @@ infodir
+ docdir
+ oldincludedir
+ includedir
++runstatedir
+ localstatedir
+ sharedstatedir
+ sysconfdir
+@@ -867,6 +868,7 @@ datadir='${datarootdir}'
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
++runstatedir='${localstatedir}/run'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+ docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+@@ -1119,6 +1121,15 @@ do
+   | -silent | --silent | --silen | --sile | --sil)
+     silent=yes ;;
+ 
++  -runstatedir | --runstatedir | --runstatedi | --runstated \
++  | --runstate | --runstat | --runsta | --runst | --runs \
++  | --run | --ru | --r)
++    ac_prev=runstatedir ;;
++  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
++  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
++  | --run=* | --ru=* | --r=*)
++    runstatedir=$ac_optarg ;;
++
+   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+     ac_prev=sbindir ;;
+   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+@@ -1256,7 +1267,7 @@ fi
+ for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+ 		datadir sysconfdir sharedstatedir localstatedir includedir \
+ 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+-		libdir localedir mandir
++		libdir localedir mandir runstatedir
+ do
+   eval ac_val=\$$ac_var
+   # Remove trailing slashes.
+@@ -1409,6 +1420,7 @@ Fine tuning of the installation director
+   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
++  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
+   --libdir=DIR            object code libraries [EPREFIX/lib]
+   --includedir=DIR        C header files [PREFIX/include]
+   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+@@ -10656,7 +10668,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 10659 "configure"
++#line 10671 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -10762,7 +10774,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 10765 "configure"
++#line 10777 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -11190,7 +11202,7 @@ else
+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
+     since some C++ compilers masquerading as C compilers
+     incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ 		       && LARGE_OFF_T % 2147483647 == 1)
+ 		      ? 1 : -1];
+@@ -11236,7 +11248,7 @@ else
+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
+     since some C++ compilers masquerading as C compilers
+     incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ 		       && LARGE_OFF_T % 2147483647 == 1)
+ 		      ? 1 : -1];
+@@ -11260,7 +11272,7 @@ rm -f core conftest.err conftest.$ac_obj
+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
+     since some C++ compilers masquerading as C compilers
+     incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ 		       && LARGE_OFF_T % 2147483647 == 1)
+ 		      ? 1 : -1];
+@@ -11305,7 +11317,7 @@ else
+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
+     since some C++ compilers masquerading as C compilers
+     incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ 		       && LARGE_OFF_T % 2147483647 == 1)
+ 		      ? 1 : -1];
+@@ -11329,7 +11341,7 @@ rm -f core conftest.err conftest.$ac_obj
+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
+     since some C++ compilers masquerading as C compilers
+     incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ 		       && LARGE_OFF_T % 2147483647 == 1)
+ 		      ? 1 : -1];
+--- a/gprof/configure
++++ b/gprof/configure
+@@ -752,6 +752,7 @@ infodir
+ docdir
+ oldincludedir
+ includedir
++runstatedir
+ localstatedir
+ sharedstatedir
+ sysconfdir
+@@ -836,6 +837,7 @@ datadir='${datarootdir}'
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
++runstatedir='${localstatedir}/run'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+ docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+@@ -1088,6 +1090,15 @@ do
+   | -silent | --silent | --silen | --sile | --sil)
+     silent=yes ;;
+ 
++  -runstatedir | --runstatedir | --runstatedi | --runstated \
++  | --runstate | --runstat | --runsta | --runst | --runs \
++  | --run | --ru | --r)
++    ac_prev=runstatedir ;;
++  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
++  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
++  | --run=* | --ru=* | --r=*)
++    runstatedir=$ac_optarg ;;
++
+   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+     ac_prev=sbindir ;;
+   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+@@ -1225,7 +1236,7 @@ fi
+ for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+ 		datadir sysconfdir sharedstatedir localstatedir includedir \
+ 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+-		libdir localedir mandir
++		libdir localedir mandir runstatedir
+ do
+   eval ac_val=\$$ac_var
+   # Remove trailing slashes.
+@@ -1378,6 +1389,7 @@ Fine tuning of the installation director
+   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
++  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
+   --libdir=DIR            object code libraries [EPREFIX/lib]
+   --includedir=DIR        C header files [PREFIX/include]
+   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+@@ -10558,7 +10570,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 10561 "configure"
++#line 10573 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -10664,7 +10676,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 10667 "configure"
++#line 10679 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -11092,7 +11104,7 @@ else
+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
+     since some C++ compilers masquerading as C compilers
+     incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ 		       && LARGE_OFF_T % 2147483647 == 1)
+ 		      ? 1 : -1];
+@@ -11138,7 +11150,7 @@ else
+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
+     since some C++ compilers masquerading as C compilers
+     incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ 		       && LARGE_OFF_T % 2147483647 == 1)
+ 		      ? 1 : -1];
+@@ -11162,7 +11174,7 @@ rm -f core conftest.err conftest.$ac_obj
+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
+     since some C++ compilers masquerading as C compilers
+     incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ 		       && LARGE_OFF_T % 2147483647 == 1)
+ 		      ? 1 : -1];
+@@ -11207,7 +11219,7 @@ else
+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
+     since some C++ compilers masquerading as C compilers
+     incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ 		       && LARGE_OFF_T % 2147483647 == 1)
+ 		      ? 1 : -1];
+@@ -11231,7 +11243,7 @@ rm -f core conftest.err conftest.$ac_obj
+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
+     since some C++ compilers masquerading as C compilers
+     incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ 		       && LARGE_OFF_T % 2147483647 == 1)
+ 		      ? 1 : -1];
+--- a/ld/ChangeLog
++++ b/ld/ChangeLog
+@@ -44,11 +44,6 @@
+ 
+ 2021-07-03  Nick Clifton  <nickc@redhat.com>
+ 
+-	* configure: Regenerate.
+-	* po/ld.pot: Regenerate.
+-
+-2021-07-03  Nick Clifton  <nickc@redhat.com>
+-
+ 	* 2.37 release branch created.
+ 
+ 2021-06-22  Nelson Chu  <nelson.chu@sifive.com>
+--- a/ld/configure
++++ b/ld/configure
+@@ -791,6 +791,7 @@ infodir
+ docdir
+ oldincludedir
+ includedir
++runstatedir
+ localstatedir
+ sharedstatedir
+ sysconfdir
+@@ -898,6 +899,7 @@ datadir='${datarootdir}'
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
++runstatedir='${localstatedir}/run'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+ docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+@@ -1150,6 +1152,15 @@ do
+   | -silent | --silent | --silen | --sile | --sil)
+     silent=yes ;;
+ 
++  -runstatedir | --runstatedir | --runstatedi | --runstated \
++  | --runstate | --runstat | --runsta | --runst | --runs \
++  | --run | --ru | --r)
++    ac_prev=runstatedir ;;
++  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
++  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
++  | --run=* | --ru=* | --r=*)
++    runstatedir=$ac_optarg ;;
++
+   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+     ac_prev=sbindir ;;
+   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+@@ -1287,7 +1298,7 @@ fi
+ for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+ 		datadir sysconfdir sharedstatedir localstatedir includedir \
+ 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+-		libdir localedir mandir
++		libdir localedir mandir runstatedir
+ do
+   eval ac_val=\$$ac_var
+   # Remove trailing slashes.
+@@ -1440,6 +1451,7 @@ Fine tuning of the installation director
+   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
++  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
+   --libdir=DIR            object code libraries [EPREFIX/lib]
+   --includedir=DIR        C header files [PREFIX/include]
+   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+@@ -11412,7 +11424,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 11415 "configure"
++#line 11427 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -11518,7 +11530,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 11521 "configure"
++#line 11533 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -14952,7 +14964,7 @@ else
+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
+     since some C++ compilers masquerading as C compilers
+     incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ 		       && LARGE_OFF_T % 2147483647 == 1)
+ 		      ? 1 : -1];
+@@ -14998,7 +15010,7 @@ else
+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
+     since some C++ compilers masquerading as C compilers
+     incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ 		       && LARGE_OFF_T % 2147483647 == 1)
+ 		      ? 1 : -1];
+@@ -15022,7 +15034,7 @@ rm -f core conftest.err conftest.$ac_obj
+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
+     since some C++ compilers masquerading as C compilers
+     incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ 		       && LARGE_OFF_T % 2147483647 == 1)
+ 		      ? 1 : -1];
+@@ -15067,7 +15079,7 @@ else
+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
+     since some C++ compilers masquerading as C compilers
+     incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ 		       && LARGE_OFF_T % 2147483647 == 1)
+ 		      ? 1 : -1];
+@@ -15091,7 +15103,7 @@ rm -f core conftest.err conftest.$ac_obj
+     We can't simply define LARGE_OFF_T to be 9223372036854775807,
+     since some C++ compilers masquerading as C compilers
+     incorrectly reject 9223372036854775807.  */
+-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+ 		       && LARGE_OFF_T % 2147483647 == 1)
+ 		      ? 1 : -1];
+@@ -16519,6 +16531,8 @@ main ()
+     if (*(data + i) != *(data3 + i))
+       return 14;
+   close (fd);
++  free (data);
++  free (data3);
+   return 0;
+ }
+ _ACEOF
+--- a/opcodes/ChangeLog
++++ b/opcodes/ChangeLog
+@@ -10,11 +10,6 @@
+ 
+ 2021-07-03  Nick Clifton  <nickc@redhat.com>
+ 
+-	* configure: Regenerate.
+-	* po/opcodes.pot: Regenerate.
+-
+-2021-07-03  Nick Clifton  <nickc@redhat.com>
+-
+ 	* 2.37 release branch created.
+ 
+ 2021-07-02  Alan Modra  <amodra@gmail.com>
+--- a/opcodes/configure
++++ b/opcodes/configure
+@@ -769,6 +769,7 @@ infodir
+ docdir
+ oldincludedir
+ includedir
++runstatedir
+ localstatedir
+ sharedstatedir
+ sysconfdir
+@@ -855,6 +856,7 @@ datadir='${datarootdir}'
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
++runstatedir='${localstatedir}/run'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+ docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+@@ -1107,6 +1109,15 @@ do
+   | -silent | --silent | --silen | --sile | --sil)
+     silent=yes ;;
+ 
++  -runstatedir | --runstatedir | --runstatedi | --runstated \
++  | --runstate | --runstat | --runsta | --runst | --runs \
++  | --run | --ru | --r)
++    ac_prev=runstatedir ;;
++  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
++  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
++  | --run=* | --ru=* | --r=*)
++    runstatedir=$ac_optarg ;;
++
+   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+     ac_prev=sbindir ;;
+   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+@@ -1244,7 +1255,7 @@ fi
+ for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+ 		datadir sysconfdir sharedstatedir localstatedir includedir \
+ 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+-		libdir localedir mandir
++		libdir localedir mandir runstatedir
+ do
+   eval ac_val=\$$ac_var
+   # Remove trailing slashes.
+@@ -1397,6 +1408,7 @@ Fine tuning of the installation director
+   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
++  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
+   --libdir=DIR            object code libraries [EPREFIX/lib]
+   --includedir=DIR        C header files [PREFIX/include]
+   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+@@ -10808,7 +10820,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 10811 "configure"
++#line 10823 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -10914,7 +10926,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 10917 "configure"
++#line 10929 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
diff --git a/patches/gold-mips.diff b/patches/gold-mips.diff
new file mode 100644
index 000000000..291a2aae6
--- /dev/null
+++ b/patches/gold-mips.diff
@@ -0,0 +1,39 @@
+# DP: Fix gold on mips64 targets.
+
+gold/
+
+2016-08-09  Aurelien Jarno  <aurelien@aurel32.net>
+
+	* configure.tgt: Add mips64el*-*-*|mips64le*-*-* and mips64*-*-*.
+
+ 
+--- a/gold/configure.tgt
++++ b/gold/configure.tgt
+@@ -153,6 +153,13 @@ aarch64*-*)
+  targ_big_endian=false
+  targ_extra_big_endian=true
+  ;;
++mips*64*el*-*-*|mips*64*le*-*-*)
++ targ_obj=mips
++ targ_machine=EM_MIPS_RS3_LE
++ targ_size=64
++ targ_big_endian=false
++ targ_extra_big_endian=true
++ ;;
+ mips*el*-*-*|mips*le*-*-*)
+  targ_obj=mips
+  targ_machine=EM_MIPS_RS3_LE
+@@ -160,6 +167,13 @@ mips*el*-*-*|mips*le*-*-*)
+  targ_big_endian=false
+  targ_extra_big_endian=true
+  ;;
++mips*64*-*-*)
++ targ_obj=mips
++ targ_machine=EM_MIPS
++ targ_size=64
++ targ_big_endian=true
++ targ_extra_big_endian=false
++ ;;
+ mips*-*-*)
+  targ_obj=mips
+  targ_machine=EM_MIPS
diff --git a/patches/gold-no-keep-files-mapped.diff b/patches/gold-no-keep-files-mapped.diff
new file mode 100644
index 000000000..6a60eefea
--- /dev/null
+++ b/patches/gold-no-keep-files-mapped.diff
@@ -0,0 +1,14 @@
+# DP: gold on 32bit archs: Release mapped files after each pass.
+
+--- a/gold/options.h
++++ b/gold/options.h
+@@ -1012,7 +1012,8 @@ class General_options
+ 
+   // k
+ 
+-  DEFINE_bool(keep_files_mapped, options::TWO_DASHES, '\0', true,
++  DEFINE_bool(keep_files_mapped, options::TWO_DASHES, '\0',
++	      sizeof(void*) >= 8,
+ 	      N_("Keep files mapped across passes"),
+ 	      N_("Release mapped files after each pass"));
+ 
diff --git a/patches/gprof-build.diff b/patches/gprof-build.diff
new file mode 100644
index 000000000..c6d3bb037
--- /dev/null
+++ b/patches/gprof-build.diff
@@ -0,0 +1,14 @@
+# DP: Fix gprof build error.
+
+--- a/gprof/gconfig.in
++++ b/gprof/gconfig.in
+@@ -99,9 +99,6 @@
+ #endif
+ 
+ 
+-/* Version number of package */
+-#undef VERSION
+-
+ /* Enable large inode numbers on Mac OS X 10.5.  */
+ #ifndef _DARWIN_USE_64_BIT_INODE
+ # define _DARWIN_USE_64_BIT_INODE 1
diff --git a/patches/infinity-notes.diff b/patches/infinity-notes.diff
new file mode 100644
index 000000000..985420188
--- /dev/null
+++ b/patches/infinity-notes.diff
@@ -0,0 +1,183 @@
+# git clone https://gitlab.com/gbenson/binutils-gdb.git gdb/src
+# git diff 1f1c02597cc199227226251a2ea51fe5f44b4d6d ec7642f5d7ba9bdbc35f08f3ffa3c360bd4618d0
+
+--- a/include/elf/common.h
++++ b/include/elf/common.h
+@@ -717,6 +717,7 @@
+ #define NT_GNU_BUILD_ID		3	/* Generated by ld --build-id.  */
+ #define NT_GNU_GOLD_VERSION	4	/* Generated by gold.  */
+ #define NT_GNU_PROPERTY_TYPE_0  5	/* Generated by gcc.  */
++#define NT_GNU_INFINITY		8995	/* Generated by i8c.  */
+ 
+ #define NT_GNU_BUILD_ATTRIBUTE_OPEN	0x100
+ #define NT_GNU_BUILD_ATTRIBUTE_FUNC	0x101
+--- a/binutils/readelf.c
++++ b/binutils/readelf.c
+@@ -17500,6 +17500,8 @@ get_gnu_elf_note_type (unsigned e_type)
+       return _("NT_GNU_BUILD_ATTRIBUTE_OPEN");
+     case NT_GNU_BUILD_ATTRIBUTE_FUNC:
+       return _("NT_GNU_BUILD_ATTRIBUTE_FUNC");
++    case NT_GNU_INFINITY:
++      return _("NT_GNU_INFINITY (Infinity function)");
+     default:
+       {
+ 	static char buff[64];
+@@ -17990,6 +17992,133 @@ next:
+   printf ("\n");
+ }
+ 
++#define I8_CHUNK_SIGNATURE	1
++#define I8_CHUNK_STRINGS	4
++
++typedef enum
++{
++  I8_NOTE_OK,
++  I8_NOTE_CORRUPT,
++  I8_NOTE_UNHANDLED,
++}
++i8_err_e;
++
++static i8_err_e
++infinity_get_string (const char **result,
++		     unsigned char **ptr, unsigned char *limit,
++		     unsigned char *table_start,
++		     unsigned char *table_limit)
++{
++  dwarf_vma offset;
++  unsigned int length;
++  const char *c;
++
++  /* Read the offset.  */
++  if (*ptr > limit)
++    return I8_NOTE_CORRUPT;
++
++  offset = read_uleb128 (*ptr, &length, limit);
++  *ptr += length;
++  if (*ptr > limit)
++    return I8_NOTE_CORRUPT;
++
++  /* Get the string.  */
++  *result = (const char *) (table_start + offset);
++
++  /* Check the result.  */
++  for (c = *result; c < (const char *) table_limit; c++)
++    {
++      if (*c == '\0')
++	return I8_NOTE_OK;
++
++      if (*c < ' ' || *c > '~')
++	return I8_NOTE_UNHANDLED;
++    }
++
++  return I8_NOTE_CORRUPT;
++}
++
++static i8_err_e
++print_infinity_note (Elf_Internal_Note *pnote)
++{
++  unsigned char *ptr = (unsigned char *) pnote->descdata;
++  unsigned char *limit = ptr + pnote->descsz;
++  unsigned char *sig_start = NULL;
++  unsigned char *str_start = NULL;
++  unsigned char *sig_limit, *str_limit;
++  const char *provider, *name, *ptypes, *rtypes;
++  i8_err_e status;
++
++  /* Locate the info and string table chunks.  */
++  while (ptr < limit)
++    {
++      dwarf_vma type_id, version, size;
++      unsigned int length;
++
++      type_id = read_uleb128 (ptr, &length, limit);
++      ptr += length;
++      if (ptr >= limit)
++	return I8_NOTE_CORRUPT;
++
++      version = read_uleb128 (ptr, &length, limit);
++      ptr += length;
++      if (ptr >= limit)
++	return I8_NOTE_CORRUPT;
++
++      size = read_uleb128 (ptr, &length, limit);
++      ptr += length;
++      if (ptr + size > limit)
++	return I8_NOTE_CORRUPT;
++
++      switch (type_id)
++	{
++	case I8_CHUNK_SIGNATURE:
++	  if (sig_start != NULL || (version != 1 && version != 2))
++	    return I8_NOTE_UNHANDLED;
++
++	  sig_start = ptr;
++	  sig_limit = ptr + size;
++	  break;
++
++	case I8_CHUNK_STRINGS:
++	  if (str_start != NULL || version != 1)
++	    return I8_NOTE_UNHANDLED;
++
++	  str_start = ptr;
++	  str_limit = ptr + size;
++	  break;
++	}
++
++      ptr += size;
++    }
++  if (sig_start == NULL || str_start == NULL)
++    return I8_NOTE_UNHANDLED;
++
++  ptr = sig_start;
++  status = infinity_get_string (&provider,
++				&ptr, sig_limit,
++				str_start, str_limit);
++  if (status != I8_NOTE_OK)
++    return status;
++  status = infinity_get_string (&name, &ptr, sig_limit,
++				str_start, str_limit);
++  if (status != I8_NOTE_OK)
++    return status;
++  status = infinity_get_string (&ptypes, &ptr, sig_limit,
++				str_start, str_limit);
++  if (status != I8_NOTE_OK)
++    return status;
++  status = infinity_get_string (&rtypes, &ptr, sig_limit,
++				str_start, str_limit);
++  if (status != I8_NOTE_OK)
++    return status;
++
++  printf (_("    Signature: %s::%s(%s)%s\n"),
++	  provider, name, ptypes, rtypes);
++
++  return I8_NOTE_OK;
++}
++
+ static bfd_boolean
+ print_gnu_note (Filedata * filedata, Elf_Internal_Note *pnote)
+ {
+@@ -18107,6 +18236,24 @@ print_gnu_note (Filedata * filedata, Elf
+ 	printf ("\n");
+       }
+       break;
++
++    case NT_GNU_INFINITY:
++      {
++	switch (print_infinity_note (pnote))
++	  {
++	  case I8_NOTE_OK:
++	    break;
++
++	  case I8_NOTE_CORRUPT:
++	    printf (_("    <corrupt note>\n"));
++	    break;
++
++	  case I8_NOTE_UNHANDLED:
++	    printf (_("    <unhandled note>\n"));
++	    break;
++	  }
++	break;
++      }
+     }
+ 
+   return TRUE;
diff --git a/patches/libctf-soname.diff b/patches/libctf-soname.diff
new file mode 100644
index 000000000..b24ddd7bc
--- /dev/null
+++ b/patches/libctf-soname.diff
@@ -0,0 +1,1177 @@
+--- a/binutils/configure
++++ b/binutils/configure
+@@ -634,6 +634,7 @@ ac_subst_vars='am__EXEEXT_FALSE
+ am__EXEEXT_TRUE
+ LTLIBOBJS
+ LIBOBJS
++CTF_SOVER_EXT
+ EMULATION_VECTOR
+ EMULATION
+ OBJDUMP_PRIVATE_OFILES
+@@ -785,7 +786,6 @@ infodir
+ docdir
+ oldincludedir
+ includedir
+-runstatedir
+ localstatedir
+ sharedstatedir
+ sysconfdir
+@@ -889,7 +889,6 @@ datadir='${datarootdir}'
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
+-runstatedir='${localstatedir}/run'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+ docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+@@ -1142,15 +1141,6 @@ do
+   | -silent | --silent | --silen | --sile | --sil)
+     silent=yes ;;
+ 
+-  -runstatedir | --runstatedir | --runstatedi | --runstated \
+-  | --runstate | --runstat | --runsta | --runst | --runs \
+-  | --run | --ru | --r)
+-    ac_prev=runstatedir ;;
+-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+-  | --run=* | --ru=* | --r=*)
+-    runstatedir=$ac_optarg ;;
+-
+   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+     ac_prev=sbindir ;;
+   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+@@ -1288,7 +1278,7 @@ fi
+ for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+ 		datadir sysconfdir sharedstatedir localstatedir includedir \
+ 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+-		libdir localedir mandir runstatedir
++		libdir localedir mandir
+ do
+   eval ac_val=\$$ac_var
+   # Remove trailing slashes.
+@@ -1441,7 +1431,6 @@ Fine tuning of the installation director
+   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
+   --libdir=DIR            object code libraries [EPREFIX/lib]
+   --includedir=DIR        C header files [PREFIX/include]
+   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+@@ -10983,7 +10972,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 10986 "configure"
++#line 10975 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -11089,7 +11078,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 11092 "configure"
++#line 11081 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -14744,6 +14733,9 @@ EMULATION_VECTOR=$targ_emul_vector
+ 
+ 
+ 
++CTF_SOVER_EXT=$CTF_SOVER_EXT
++
++
+ # Required for html and install-html
+ 
+ 
+--- a/binutils/configure.ac
++++ b/binutils/configure.ac
+@@ -529,6 +529,9 @@ EMULATION_VECTOR=$targ_emul_vector
+ AC_SUBST(EMULATION)
+ AC_SUBST(EMULATION_VECTOR)
+ 
++CTF_SOVER_EXT=$CTF_SOVER_EXT
++AC_SUBST(CTF_SOVER_EXT)
++
+ # Required for html and install-html
+ AC_SUBST(datarootdir)
+ AC_SUBST(docdir)
+--- a/binutils/Makefile.am
++++ b/binutils/Makefile.am
+@@ -169,8 +169,8 @@ BFDLIB = ../bfd/libbfd.la
+ OPCODES = ../opcodes/libopcodes.la
+ 
+ if ENABLE_LIBCTF
+-LIBCTF = ../libctf/libctf.la
+-LIBCTF_NOBFD = ../libctf/libctf-nobfd.la
++LIBCTF = ../libctf/libctf@CTF_SOVER_EXT@.la
++LIBCTF_NOBFD = ../libctf/libctf-nobfd@CTF_SOVER_EXT@.la
+ else
+ LIBCTF =
+ LIBCTF_NOBFD =
+--- a/binutils/Makefile.in
++++ b/binutils/Makefile.in
+@@ -245,7 +245,8 @@ am_objdump_OBJECTS = objdump.$(OBJEXT) d
+ 	demanguse.$(OBJEXT) $(am__objects_3) $(am__objects_1) \
+ 	$(am__objects_2)
+ objdump_OBJECTS = $(am_objdump_OBJECTS)
+-@ENABLE_LIBCTF_TRUE@am__DEPENDENCIES_2 = ../libctf/libctf.la
++@ENABLE_LIBCTF_TRUE@am__DEPENDENCIES_2 =  \
++@ENABLE_LIBCTF_TRUE@	../libctf/libctf@CTF_SOVER_EXT@.la
+ am_ranlib_OBJECTS = ar.$(OBJEXT) is-ranlib.$(OBJEXT) arparse.$(OBJEXT) \
+ 	arlex.$(OBJEXT) arsup.$(OBJEXT) rename.$(OBJEXT) \
+ 	binemul.$(OBJEXT) emul_$(EMULATION).$(OBJEXT) $(am__objects_1)
+@@ -254,7 +255,8 @@ am_readelf_OBJECTS = readelf.$(OBJEXT) v
+ 	unwind-ia64.$(OBJEXT) dwarf.$(OBJEXT) demanguse.$(OBJEXT) \
+ 	$(am__objects_2)
+ readelf_OBJECTS = $(am_readelf_OBJECTS)
+-@ENABLE_LIBCTF_TRUE@am__DEPENDENCIES_3 = ../libctf/libctf-nobfd.la
++@ENABLE_LIBCTF_TRUE@am__DEPENDENCIES_3 =  \
++@ENABLE_LIBCTF_TRUE@	../libctf/libctf-nobfd@CTF_SOVER_EXT@.la
+ am_size_OBJECTS = size.$(OBJEXT) $(am__objects_1)
+ size_OBJECTS = $(am_size_OBJECTS)
+ size_LDADD = $(LDADD)
+@@ -485,6 +487,7 @@ CC_FOR_BUILD = @CC_FOR_BUILD@
+ CFLAGS = @CFLAGS@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CTF_SOVER_EXT = @CTF_SOVER_EXT@
+ CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUGINFOD_CFLAGS = @DEBUGINFOD_CFLAGS@
+@@ -734,9 +737,9 @@ ELFLIBS = elfcomm.c
+ BFDLIB = ../bfd/libbfd.la
+ OPCODES = ../opcodes/libopcodes.la
+ @ENABLE_LIBCTF_FALSE@LIBCTF = 
+-@ENABLE_LIBCTF_TRUE@LIBCTF = ../libctf/libctf.la
++@ENABLE_LIBCTF_TRUE@LIBCTF = ../libctf/libctf@CTF_SOVER_EXT@.la
+ @ENABLE_LIBCTF_FALSE@LIBCTF_NOBFD = 
+-@ENABLE_LIBCTF_TRUE@LIBCTF_NOBFD = ../libctf/libctf-nobfd.la
++@ENABLE_LIBCTF_TRUE@LIBCTF_NOBFD = ../libctf/libctf-nobfd@CTF_SOVER_EXT@.la
+ LIBIBERTY = ../libiberty/libiberty.a
+ POTFILES = $(CFILES) $(DEBUG_SRCS) $(HFILES)
+ EXPECT = expect
+--- a/ld/configure
++++ b/ld/configure
+@@ -634,6 +634,7 @@ ac_subst_vars='am__EXEEXT_FALSE
+ am__EXEEXT_TRUE
+ LTLIBOBJS
+ LIBOBJS
++CTF_SOVER_EXT
+ TESTCTFLIB
+ TESTBFDLIB
+ EMULATION_LIBPATH
+@@ -793,7 +794,6 @@ infodir
+ docdir
+ oldincludedir
+ includedir
+-runstatedir
+ localstatedir
+ sharedstatedir
+ sysconfdir
+@@ -901,7 +901,6 @@ datadir='${datarootdir}'
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
+-runstatedir='${localstatedir}/run'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+ docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+@@ -1154,15 +1153,6 @@ do
+   | -silent | --silent | --silen | --sile | --sil)
+     silent=yes ;;
+ 
+-  -runstatedir | --runstatedir | --runstatedi | --runstated \
+-  | --runstate | --runstat | --runsta | --runst | --runs \
+-  | --run | --ru | --r)
+-    ac_prev=runstatedir ;;
+-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+-  | --run=* | --ru=* | --r=*)
+-    runstatedir=$ac_optarg ;;
+-
+   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+     ac_prev=sbindir ;;
+   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+@@ -1300,7 +1290,7 @@ fi
+ for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+ 		datadir sysconfdir sharedstatedir localstatedir includedir \
+ 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+-		libdir localedir mandir runstatedir
++		libdir localedir mandir
+ do
+   eval ac_val=\$$ac_var
+   # Remove trailing slashes.
+@@ -1453,7 +1443,6 @@ Fine tuning of the installation director
+   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
+   --libdir=DIR            object code libraries [EPREFIX/lib]
+   --includedir=DIR        C header files [PREFIX/include]
+   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+@@ -11466,7 +11455,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 11469 "configure"
++#line 11458 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -11572,7 +11561,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 11575 "configure"
++#line 11564 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -17042,6 +17031,9 @@ fi
+ ac_config_commands="$ac_config_commands default"
+ 
+ 
++CTF_SOVER_EXT=$CTF_SOVER_EXT
++
++
+ 
+ 
+ 
+--- a/ld/configure.ac
++++ b/ld/configure.ac
+@@ -591,6 +591,9 @@ sed -e '/^SRC-POTFILES =/r po/SRC-POTFIL
+     -e "s,@GMOFILES@,$GMOFILES," \
+     po/Makefile.in > po/Makefile]],[[]])
+ 
++CTF_SOVER_EXT=$CTF_SOVER_EXT
++AC_SUBST(CTF_SOVER_EXT)
++
+ dnl Required by html, pdf, install-pdf and install-html
+ AC_SUBST(datarootdir)
+ AC_SUBST(docdir)
+--- a/ld/Makefile.am
++++ b/ld/Makefile.am
+@@ -145,7 +145,7 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -
+ BFDLIB = ../bfd/libbfd.la
+ LIBIBERTY = ../libiberty/libiberty.a
+ if ENABLE_LIBCTF
+-LIBCTF = ../libctf/libctf.la
++LIBCTF = ../libctf/libctf@CTF_SOVER_EXT@.la
+ else
+ LIBCTF =
+ endif
+--- a/ld/Makefile.in
++++ b/ld/Makefile.in
+@@ -213,7 +213,8 @@ am_ld_new_OBJECTS = ldgram.$(OBJEXT) ldl
+ 	plugin.$(OBJEXT) ldbuildid.$(OBJEXT)
+ ld_new_OBJECTS = $(am_ld_new_OBJECTS)
+ am__DEPENDENCIES_1 =
+-@ENABLE_LIBCTF_TRUE@am__DEPENDENCIES_2 = ../libctf/libctf.la
++@ENABLE_LIBCTF_TRUE@am__DEPENDENCIES_2 =  \
++@ENABLE_LIBCTF_TRUE@	../libctf/libctf@CTF_SOVER_EXT@.la
+ AM_V_P = $(am__v_P_@AM_V@)
+ am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+ am__v_P_0 = false
+@@ -374,6 +375,7 @@ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CTF_SOVER_EXT = @CTF_SOVER_EXT@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+@@ -640,7 +642,7 @@ AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -
+ BFDLIB = ../bfd/libbfd.la
+ LIBIBERTY = ../libiberty/libiberty.a
+ @ENABLE_LIBCTF_FALSE@LIBCTF = 
+-@ENABLE_LIBCTF_TRUE@LIBCTF = ../libctf/libctf.la
++@ENABLE_LIBCTF_TRUE@LIBCTF = ../libctf/libctf@CTF_SOVER_EXT@.la
+ 
+ # These all start with e so 'make clean' can find them.
+ ALL_EMULATION_SOURCES = \
+--- a/libctf/configure
++++ b/libctf/configure
+@@ -635,6 +635,7 @@ ac_subst_vars='am__EXEEXT_FALSE
+ am__EXEEXT_TRUE
+ LTLIBOBJS
+ LIBOBJS
++CTF_SOVER_EXT
+ VERSION_FLAGS_NOBFD
+ VERSION_FLAGS
+ TCL_TRY_FALSE
+@@ -771,7 +772,6 @@ infodir
+ docdir
+ oldincludedir
+ includedir
+-runstatedir
+ localstatedir
+ sharedstatedir
+ sysconfdir
+@@ -856,7 +856,6 @@ datadir='${datarootdir}'
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
+-runstatedir='${localstatedir}/run'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+ docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+@@ -1109,15 +1108,6 @@ do
+   | -silent | --silent | --silen | --sile | --sil)
+     silent=yes ;;
+ 
+-  -runstatedir | --runstatedir | --runstatedi | --runstated \
+-  | --runstate | --runstat | --runsta | --runst | --runs \
+-  | --run | --ru | --r)
+-    ac_prev=runstatedir ;;
+-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+-  | --run=* | --ru=* | --r=*)
+-    runstatedir=$ac_optarg ;;
+-
+   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+     ac_prev=sbindir ;;
+   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+@@ -1255,7 +1245,7 @@ fi
+ for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+ 		datadir sysconfdir sharedstatedir localstatedir includedir \
+ 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+-		libdir localedir mandir runstatedir
++		libdir localedir mandir
+ do
+   eval ac_val=\$$ac_var
+   # Remove trailing slashes.
+@@ -1408,7 +1398,6 @@ Fine tuning of the installation director
+   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
+   --libdir=DIR            object code libraries [EPREFIX/lib]
+   --includedir=DIR        C header files [PREFIX/include]
+   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+@@ -11641,7 +11630,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 11644 "configure"
++#line 11633 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -11747,7 +11736,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 11750 "configure"
++#line 11739 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -13697,6 +13686,9 @@ fi
+ 
+ 
+ 
++CTF_SOVER_EXT=$CTF_SOVER_EXT
++
++
+ ac_config_files="$ac_config_files Makefile"
+ 
+ ac_config_headers="$ac_config_headers config.h"
+--- a/libctf/configure.ac
++++ b/libctf/configure.ac
+@@ -290,6 +290,9 @@ fi
+ AC_SUBST(VERSION_FLAGS)
+ AC_SUBST(VERSION_FLAGS_NOBFD)
+ 
++CTF_SOVER_EXT=$CTF_SOVER_EXT
++AC_SUBST(CTF_SOVER_EXT)
++
+ AC_CONFIG_FILES(Makefile)
+ AC_CONFIG_HEADERS(config.h)
+ AC_OUTPUT
+--- a/libctf/Makefile.am
++++ b/libctf/Makefile.am
+@@ -39,23 +39,23 @@ AM_CPPFLAGS = -D_GNU_SOURCE -I$(srcdir)
+ AM_CFLAGS = -std=gnu99 @ac_libctf_warn_cflags@ @warn@ @c_warn@ @WARN_PEDANTIC@ @WERROR@ $(ZLIBINC)
+ 
+ if INSTALL_LIBBFD
+-lib_LTLIBRARIES = libctf.la libctf-nobfd.la
++lib_LTLIBRARIES = libctf@CTF_SOVER_EXT@.la libctf-nobfd@CTF_SOVER_EXT@.la
+ include_HEADERS = $(INCDIR)/ctf.h $(INCDIR)/ctf-api.h
+ else
+ include_HEADERS =
+-noinst_LTLIBRARIES = libctf.la libctf-nobfd.la
++noinst_LTLIBRARIES = libctf@CTF_SOVER_EXT@.la libctf-nobfd@CTF_SOVER_EXT@.la
+ endif
+ 
+ libctf_nobfd_la_LIBADD = @CTF_LIBADD@ $(ZLIB)
+ libctf_ldflags_nover = -version-info 0:0:0 @SHARED_LDFLAGS@
+ libctf_nobfd_la_LDFLAGS = $(libctf_ldflags_nover) @VERSION_FLAGS_NOBFD@
+ libctf_nobfd_la_CPPFLAGS = $(AM_CPPFLAGS) -DNOBFD=1
+-libctf_nobfd_la_SOURCES = ctf-archive.c ctf-dump.c ctf-create.c ctf-decl.c ctf-error.c \
++COMMON_LIB_SOURCES = ctf-archive.c ctf-dump.c ctf-create.c ctf-decl.c ctf-error.c \
+ 			  ctf-hash.c ctf-labels.c ctf-dedup.c ctf-link.c ctf-lookup.c \
+ 			  ctf-open.c ctf-serialize.c ctf-sha1.c ctf-string.c ctf-subr.c \
+ 			  ctf-types.c ctf-util.c
+ if NEED_CTF_QSORT_R
+-libctf_nobfd_la_SOURCES += ctf-qsort_r.c
++COMMON_LIB_SOURCES += ctf-qsort_r.c
+ endif
+ 
+ # @CTF_LIBADD@ appears here twice: once, to force libiberty to get searched before
+@@ -67,6 +67,16 @@ libctf_la_CPPFLAGS = $(AM_CPPFLAGS) -DNO
+ libctf_la_LDFLAGS = $(libctf_ldflags_nover) @VERSION_FLAGS@
+ libctf_la_SOURCES = $(libctf_nobfd_la_SOURCES) ctf-open-bfd.c
+ 
++libctf_nobfd@CTF_SOVER_EXT@_la_LIBADD = @CTF_LIBADD@ $(LIBINTL) $(ZLIB)
++libctf_nobfd@CTF_SOVER_EXT@_la_LDFLAGS = -version-info 0:0:0 @SHARED_LDFLAGS@ @VERSION_FLAGS@
++libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS = $(AM_CPPFLAGS) -DNOBFD=1
++libctf_nobfd@CTF_SOVER_EXT@_la_SOURCES = $(COMMON_LIB_SOURCES)
++
++libctf@CTF_SOVER_EXT@_la_LIBADD = @CTF_LIBADD@ ../bfd/libbfd.la $(libctf_nobfd_la_LIBADD)
++libctf@CTF_SOVER_EXT@_la_CPPFLAGS = $(AM_CPPFLAGS) -DNOBFD=0
++libctf@CTF_SOVER_EXT@_la_LDFLAGS = $(libctf_nobfd_la_LDFLAGS)
++libctf@CTF_SOVER_EXT@_la_SOURCES = $(COMMON_LIB_SOURCES) ctf-open-bfd.c
++
+ # Setup the testing framework, if you have one
+ EXPECT = expect
+ RUNTEST = runtest
+--- a/libctf/Makefile.in
++++ b/libctf/Makefile.in
+@@ -188,58 +188,82 @@ am__installdirs = "$(DESTDIR)$(libdir)"
+ 	"$(DESTDIR)$(includedir)"
+ LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-libctf_nobfd_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am__libctf_nobfd_la_SOURCES_DIST = ctf-archive.c ctf-dump.c \
+-	ctf-create.c ctf-decl.c ctf-error.c ctf-hash.c ctf-labels.c \
+-	ctf-dedup.c ctf-link.c ctf-lookup.c ctf-open.c ctf-serialize.c \
+-	ctf-sha1.c ctf-string.c ctf-subr.c ctf-types.c ctf-util.c \
+-	ctf-qsort_r.c
+-@NEED_CTF_QSORT_R_TRUE@am__objects_1 = libctf_nobfd_la-ctf-qsort_r.lo
+-am_libctf_nobfd_la_OBJECTS = libctf_nobfd_la-ctf-archive.lo \
+-	libctf_nobfd_la-ctf-dump.lo libctf_nobfd_la-ctf-create.lo \
+-	libctf_nobfd_la-ctf-decl.lo libctf_nobfd_la-ctf-error.lo \
+-	libctf_nobfd_la-ctf-hash.lo libctf_nobfd_la-ctf-labels.lo \
+-	libctf_nobfd_la-ctf-dedup.lo libctf_nobfd_la-ctf-link.lo \
+-	libctf_nobfd_la-ctf-lookup.lo libctf_nobfd_la-ctf-open.lo \
+-	libctf_nobfd_la-ctf-serialize.lo libctf_nobfd_la-ctf-sha1.lo \
+-	libctf_nobfd_la-ctf-string.lo libctf_nobfd_la-ctf-subr.lo \
+-	libctf_nobfd_la-ctf-types.lo libctf_nobfd_la-ctf-util.lo \
+-	$(am__objects_1)
+-libctf_nobfd_la_OBJECTS = $(am_libctf_nobfd_la_OBJECTS)
++libctf_nobfd@CTF_SOVER_EXT@_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++	$(am__DEPENDENCIES_1)
++am__libctf_nobfd@CTF_SOVER_EXT@_la_SOURCES_DIST = ctf-archive.c \
++	ctf-dump.c ctf-create.c ctf-decl.c ctf-error.c ctf-hash.c \
++	ctf-labels.c ctf-dedup.c ctf-link.c ctf-lookup.c ctf-open.c \
++	ctf-serialize.c ctf-sha1.c ctf-string.c ctf-subr.c ctf-types.c \
++	ctf-util.c ctf-qsort_r.c
++@NEED_CTF_QSORT_R_TRUE@am__objects_1 = libctf_nobfd@CTF_SOVER_EXT@_la-ctf-qsort_r.lo
++am__objects_2 = libctf_nobfd@CTF_SOVER_EXT@_la-ctf-archive.lo \
++	libctf_nobfd@CTF_SOVER_EXT@_la-ctf-dump.lo \
++	libctf_nobfd@CTF_SOVER_EXT@_la-ctf-create.lo \
++	libctf_nobfd@CTF_SOVER_EXT@_la-ctf-decl.lo \
++	libctf_nobfd@CTF_SOVER_EXT@_la-ctf-error.lo \
++	libctf_nobfd@CTF_SOVER_EXT@_la-ctf-hash.lo \
++	libctf_nobfd@CTF_SOVER_EXT@_la-ctf-labels.lo \
++	libctf_nobfd@CTF_SOVER_EXT@_la-ctf-dedup.lo \
++	libctf_nobfd@CTF_SOVER_EXT@_la-ctf-link.lo \
++	libctf_nobfd@CTF_SOVER_EXT@_la-ctf-lookup.lo \
++	libctf_nobfd@CTF_SOVER_EXT@_la-ctf-open.lo \
++	libctf_nobfd@CTF_SOVER_EXT@_la-ctf-serialize.lo \
++	libctf_nobfd@CTF_SOVER_EXT@_la-ctf-sha1.lo \
++	libctf_nobfd@CTF_SOVER_EXT@_la-ctf-string.lo \
++	libctf_nobfd@CTF_SOVER_EXT@_la-ctf-subr.lo \
++	libctf_nobfd@CTF_SOVER_EXT@_la-ctf-types.lo \
++	libctf_nobfd@CTF_SOVER_EXT@_la-ctf-util.lo $(am__objects_1)
++am_libctf_nobfd@CTF_SOVER_EXT@_la_OBJECTS = $(am__objects_2)
++libctf_nobfd@CTF_SOVER_EXT@_la_OBJECTS =  \
++	$(am_libctf_nobfd@CTF_SOVER_EXT@_la_OBJECTS)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 = 
+-libctf_nobfd_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
++libctf_nobfd@CTF_SOVER_EXT@_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+-	$(AM_CFLAGS) $(CFLAGS) $(libctf_nobfd_la_LDFLAGS) $(LDFLAGS) \
+-	-o $@
+-@INSTALL_LIBBFD_FALSE@am_libctf_nobfd_la_rpath =
+-@INSTALL_LIBBFD_TRUE@am_libctf_nobfd_la_rpath = -rpath $(libdir)
++	$(AM_CFLAGS) $(CFLAGS) \
++	$(libctf_nobfd@CTF_SOVER_EXT@_la_LDFLAGS) $(LDFLAGS) -o $@
++@INSTALL_LIBBFD_FALSE@am_libctf_nobfd@CTF_SOVER_EXT@_la_rpath =
++@INSTALL_LIBBFD_TRUE@am_libctf_nobfd@CTF_SOVER_EXT@_la_rpath = -rpath \
++@INSTALL_LIBBFD_TRUE@	$(libdir)
+ am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
+-libctf_la_DEPENDENCIES = ../bfd/libbfd.la $(am__DEPENDENCIES_2)
+-am__libctf_la_SOURCES_DIST = ctf-archive.c ctf-dump.c ctf-create.c \
+-	ctf-decl.c ctf-error.c ctf-hash.c ctf-labels.c ctf-dedup.c \
+-	ctf-link.c ctf-lookup.c ctf-open.c ctf-serialize.c ctf-sha1.c \
+-	ctf-string.c ctf-subr.c ctf-types.c ctf-util.c ctf-qsort_r.c \
+-	ctf-open-bfd.c
+-@NEED_CTF_QSORT_R_TRUE@am__objects_2 = libctf_la-ctf-qsort_r.lo
+-am__objects_3 = libctf_la-ctf-archive.lo libctf_la-ctf-dump.lo \
+-	libctf_la-ctf-create.lo libctf_la-ctf-decl.lo \
+-	libctf_la-ctf-error.lo libctf_la-ctf-hash.lo \
+-	libctf_la-ctf-labels.lo libctf_la-ctf-dedup.lo \
+-	libctf_la-ctf-link.lo libctf_la-ctf-lookup.lo \
+-	libctf_la-ctf-open.lo libctf_la-ctf-serialize.lo \
+-	libctf_la-ctf-sha1.lo libctf_la-ctf-string.lo \
+-	libctf_la-ctf-subr.lo libctf_la-ctf-types.lo \
+-	libctf_la-ctf-util.lo $(am__objects_2)
+-am_libctf_la_OBJECTS = $(am__objects_3) libctf_la-ctf-open-bfd.lo
+-libctf_la_OBJECTS = $(am_libctf_la_OBJECTS)
+-libctf_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(libctf_la_LDFLAGS) $(LDFLAGS) -o $@
+-@INSTALL_LIBBFD_FALSE@am_libctf_la_rpath =
+-@INSTALL_LIBBFD_TRUE@am_libctf_la_rpath = -rpath $(libdir)
++libctf@CTF_SOVER_EXT@_la_DEPENDENCIES = ../bfd/libbfd.la \
++	$(am__DEPENDENCIES_2)
++am__libctf@CTF_SOVER_EXT@_la_SOURCES_DIST = ctf-archive.c ctf-dump.c \
++	ctf-create.c ctf-decl.c ctf-error.c ctf-hash.c ctf-labels.c \
++	ctf-dedup.c ctf-link.c ctf-lookup.c ctf-open.c ctf-serialize.c \
++	ctf-sha1.c ctf-string.c ctf-subr.c ctf-types.c ctf-util.c \
++	ctf-qsort_r.c ctf-open-bfd.c
++@NEED_CTF_QSORT_R_TRUE@am__objects_3 = libctf@CTF_SOVER_EXT@_la-ctf-qsort_r.lo
++am__objects_4 = libctf@CTF_SOVER_EXT@_la-ctf-archive.lo \
++	libctf@CTF_SOVER_EXT@_la-ctf-dump.lo \
++	libctf@CTF_SOVER_EXT@_la-ctf-create.lo \
++	libctf@CTF_SOVER_EXT@_la-ctf-decl.lo \
++	libctf@CTF_SOVER_EXT@_la-ctf-error.lo \
++	libctf@CTF_SOVER_EXT@_la-ctf-hash.lo \
++	libctf@CTF_SOVER_EXT@_la-ctf-labels.lo \
++	libctf@CTF_SOVER_EXT@_la-ctf-dedup.lo \
++	libctf@CTF_SOVER_EXT@_la-ctf-link.lo \
++	libctf@CTF_SOVER_EXT@_la-ctf-lookup.lo \
++	libctf@CTF_SOVER_EXT@_la-ctf-open.lo \
++	libctf@CTF_SOVER_EXT@_la-ctf-serialize.lo \
++	libctf@CTF_SOVER_EXT@_la-ctf-sha1.lo \
++	libctf@CTF_SOVER_EXT@_la-ctf-string.lo \
++	libctf@CTF_SOVER_EXT@_la-ctf-subr.lo \
++	libctf@CTF_SOVER_EXT@_la-ctf-types.lo \
++	libctf@CTF_SOVER_EXT@_la-ctf-util.lo $(am__objects_3)
++am_libctf@CTF_SOVER_EXT@_la_OBJECTS = $(am__objects_4) \
++	libctf@CTF_SOVER_EXT@_la-ctf-open-bfd.lo
++libctf@CTF_SOVER_EXT@_la_OBJECTS =  \
++	$(am_libctf@CTF_SOVER_EXT@_la_OBJECTS)
++libctf@CTF_SOVER_EXT@_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
++	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
++	$(AM_CFLAGS) $(CFLAGS) $(libctf@CTF_SOVER_EXT@_la_LDFLAGS) \
++	$(LDFLAGS) -o $@
++@INSTALL_LIBBFD_FALSE@am_libctf@CTF_SOVER_EXT@_la_rpath =
++@INSTALL_LIBBFD_TRUE@am_libctf@CTF_SOVER_EXT@_la_rpath = -rpath \
++@INSTALL_LIBBFD_TRUE@	$(libdir)
+ AM_V_P = $(am__v_P_@AM_V@)
+ am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+ am__v_P_0 = false
+@@ -274,9 +298,10 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo "  CCLD    " $@;
+ am__v_CCLD_1 = 
+-SOURCES = $(libctf_nobfd_la_SOURCES) $(libctf_la_SOURCES)
+-DIST_SOURCES = $(am__libctf_nobfd_la_SOURCES_DIST) \
+-	$(am__libctf_la_SOURCES_DIST)
++SOURCES = $(libctf_nobfd@CTF_SOVER_EXT@_la_SOURCES) \
++	$(libctf@CTF_SOVER_EXT@_la_SOURCES)
++DIST_SOURCES = $(am__libctf_nobfd@CTF_SOVER_EXT@_la_SOURCES_DIST) \
++	$(am__libctf@CTF_SOVER_EXT@_la_SOURCES_DIST)
+ AM_V_DVIPS = $(am__v_DVIPS_@AM_V@)
+ am__v_DVIPS_ = $(am__v_DVIPS_@AM_DEFAULT_V@)
+ am__v_DVIPS_0 = @echo "  DVIPS   " $@;
+@@ -389,6 +414,7 @@ CFLAGS = @CFLAGS@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CTF_LIBADD = @CTF_LIBADD@
++CTF_SOVER_EXT = @CTF_SOVER_EXT@
+ CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEFS = @DEFS@
+@@ -537,17 +563,17 @@ BFDDIR = $(BASEDIR)/bfd
+ INCDIR = $(srcdir)/../include
+ AM_CPPFLAGS = -D_GNU_SOURCE -I$(srcdir) -I$(srcdir)/../include -I$(srcdir)/../bfd -I../bfd @INCINTL@
+ AM_CFLAGS = -std=gnu99 @ac_libctf_warn_cflags@ @warn@ @c_warn@ @WARN_PEDANTIC@ @WERROR@ $(ZLIBINC)
+-@INSTALL_LIBBFD_TRUE@lib_LTLIBRARIES = libctf.la libctf-nobfd.la
++@INSTALL_LIBBFD_TRUE@lib_LTLIBRARIES = libctf@CTF_SOVER_EXT@.la libctf-nobfd@CTF_SOVER_EXT@.la
+ @INSTALL_LIBBFD_FALSE@include_HEADERS = 
+ @INSTALL_LIBBFD_TRUE@include_HEADERS = $(INCDIR)/ctf.h $(INCDIR)/ctf-api.h
+-@INSTALL_LIBBFD_FALSE@noinst_LTLIBRARIES = libctf.la libctf-nobfd.la
++@INSTALL_LIBBFD_FALSE@noinst_LTLIBRARIES = libctf@CTF_SOVER_EXT@.la libctf-nobfd@CTF_SOVER_EXT@.la
+ libctf_nobfd_la_LIBADD = @CTF_LIBADD@ $(ZLIB)
+ libctf_ldflags_nover = -version-info 0:0:0 @SHARED_LDFLAGS@
+ libctf_nobfd_la_LDFLAGS = $(libctf_ldflags_nover) @VERSION_FLAGS_NOBFD@
+ libctf_nobfd_la_CPPFLAGS = $(AM_CPPFLAGS) -DNOBFD=1
+-libctf_nobfd_la_SOURCES = ctf-archive.c ctf-dump.c ctf-create.c \
+-	ctf-decl.c ctf-error.c ctf-hash.c ctf-labels.c ctf-dedup.c \
+-	ctf-link.c ctf-lookup.c ctf-open.c ctf-serialize.c ctf-sha1.c \
++COMMON_LIB_SOURCES = ctf-archive.c ctf-dump.c ctf-create.c ctf-decl.c \
++	ctf-error.c ctf-hash.c ctf-labels.c ctf-dedup.c ctf-link.c \
++	ctf-lookup.c ctf-open.c ctf-serialize.c ctf-sha1.c \
+ 	ctf-string.c ctf-subr.c ctf-types.c ctf-util.c $(am__append_1)
+ 
+ # @CTF_LIBADD@ appears here twice: once, to force libiberty to get searched before
+@@ -558,6 +584,14 @@ libctf_la_LIBADD = @CTF_LIBADD@ ../bfd/l
+ libctf_la_CPPFLAGS = $(AM_CPPFLAGS) -DNOBFD=0
+ libctf_la_LDFLAGS = $(libctf_ldflags_nover) @VERSION_FLAGS@
+ libctf_la_SOURCES = $(libctf_nobfd_la_SOURCES) ctf-open-bfd.c
++libctf_nobfd@CTF_SOVER_EXT@_la_LIBADD = @CTF_LIBADD@ $(LIBINTL) $(ZLIB)
++libctf_nobfd@CTF_SOVER_EXT@_la_LDFLAGS = -version-info 0:0:0 @SHARED_LDFLAGS@ @VERSION_FLAGS@
++libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS = $(AM_CPPFLAGS) -DNOBFD=1
++libctf_nobfd@CTF_SOVER_EXT@_la_SOURCES = $(COMMON_LIB_SOURCES)
++libctf@CTF_SOVER_EXT@_la_LIBADD = @CTF_LIBADD@ ../bfd/libbfd.la $(libctf_nobfd_la_LIBADD)
++libctf@CTF_SOVER_EXT@_la_CPPFLAGS = $(AM_CPPFLAGS) -DNOBFD=0
++libctf@CTF_SOVER_EXT@_la_LDFLAGS = $(libctf_nobfd_la_LDFLAGS)
++libctf@CTF_SOVER_EXT@_la_SOURCES = $(COMMON_LIB_SOURCES) ctf-open-bfd.c
+ RUNTEST = runtest
+ RUNTESTFLAGS = 
+ @TCL_TRY_TRUE@CC_FOR_TARGET = ` \
+@@ -682,11 +716,11 @@ clean-noinstLTLIBRARIES:
+ 	  rm -f $${locs}; \
+ 	}
+ 
+-libctf-nobfd.la: $(libctf_nobfd_la_OBJECTS) $(libctf_nobfd_la_DEPENDENCIES) $(EXTRA_libctf_nobfd_la_DEPENDENCIES) 
+-	$(AM_V_CCLD)$(libctf_nobfd_la_LINK) $(am_libctf_nobfd_la_rpath) $(libctf_nobfd_la_OBJECTS) $(libctf_nobfd_la_LIBADD) $(LIBS)
++libctf-nobfd@CTF_SOVER_EXT@.la: $(libctf_nobfd@CTF_SOVER_EXT@_la_OBJECTS) $(libctf_nobfd@CTF_SOVER_EXT@_la_DEPENDENCIES) $(EXTRA_libctf_nobfd@CTF_SOVER_EXT@_la_DEPENDENCIES) 
++	$(AM_V_CCLD)$(libctf_nobfd@CTF_SOVER_EXT@_la_LINK) $(am_libctf_nobfd@CTF_SOVER_EXT@_la_rpath) $(libctf_nobfd@CTF_SOVER_EXT@_la_OBJECTS) $(libctf_nobfd@CTF_SOVER_EXT@_la_LIBADD) $(LIBS)
+ 
+-libctf.la: $(libctf_la_OBJECTS) $(libctf_la_DEPENDENCIES) $(EXTRA_libctf_la_DEPENDENCIES) 
+-	$(AM_V_CCLD)$(libctf_la_LINK) $(am_libctf_la_rpath) $(libctf_la_OBJECTS) $(libctf_la_LIBADD) $(LIBS)
++libctf@CTF_SOVER_EXT@.la: $(libctf@CTF_SOVER_EXT@_la_OBJECTS) $(libctf@CTF_SOVER_EXT@_la_DEPENDENCIES) $(EXTRA_libctf@CTF_SOVER_EXT@_la_DEPENDENCIES) 
++	$(AM_V_CCLD)$(libctf@CTF_SOVER_EXT@_la_LINK) $(am_libctf@CTF_SOVER_EXT@_la_rpath) $(libctf@CTF_SOVER_EXT@_la_OBJECTS) $(libctf@CTF_SOVER_EXT@_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -694,43 +728,43 @@ mostlyclean-compile:
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_la-ctf-archive.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_la-ctf-create.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_la-ctf-decl.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_la-ctf-dedup.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_la-ctf-dump.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_la-ctf-error.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_la-ctf-hash.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_la-ctf-labels.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_la-ctf-link.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_la-ctf-lookup.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_la-ctf-open-bfd.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_la-ctf-open.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_la-ctf-qsort_r.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_la-ctf-serialize.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_la-ctf-sha1.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_la-ctf-string.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_la-ctf-subr.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_la-ctf-types.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_la-ctf-util.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd_la-ctf-archive.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd_la-ctf-create.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd_la-ctf-decl.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd_la-ctf-dedup.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd_la-ctf-dump.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd_la-ctf-error.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd_la-ctf-hash.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd_la-ctf-labels.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd_la-ctf-link.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd_la-ctf-lookup.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd_la-ctf-open.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd_la-ctf-qsort_r.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd_la-ctf-serialize.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd_la-ctf-sha1.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd_la-ctf-string.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd_la-ctf-subr.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd_la-ctf-types.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd_la-ctf-util.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-archive.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-create.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-decl.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-dedup.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-dump.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-error.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-hash.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-labels.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-link.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-lookup.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-open-bfd.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-open.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-qsort_r.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-serialize.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-sha1.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-string.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-subr.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-types.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-util.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-archive.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-create.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-decl.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-dedup.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-dump.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-error.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-hash.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-labels.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-link.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-lookup.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-open.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-qsort_r.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-serialize.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-sha1.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-string.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-subr.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-types.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-util.Plo@am__quote@
+ 
+ .c.o:
+ @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@@ -753,264 +787,264 @@ distclean-compile:
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+ 
+-libctf_nobfd_la-ctf-archive.lo: ctf-archive.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd_la-ctf-archive.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd_la-ctf-archive.Tpo -c -o libctf_nobfd_la-ctf-archive.lo `test -f 'ctf-archive.c' || echo '$(srcdir)/'`ctf-archive.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd_la-ctf-archive.Tpo $(DEPDIR)/libctf_nobfd_la-ctf-archive.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-archive.c' object='libctf_nobfd_la-ctf-archive.lo' libtool=yes @AMDEPBACKSLASH@
++libctf_nobfd@CTF_SOVER_EXT@_la-ctf-archive.lo: ctf-archive.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd@CTF_SOVER_EXT@_la-ctf-archive.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-archive.Tpo -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-archive.lo `test -f 'ctf-archive.c' || echo '$(srcdir)/'`ctf-archive.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-archive.Tpo $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-archive.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-archive.c' object='libctf_nobfd@CTF_SOVER_EXT@_la-ctf-archive.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd_la-ctf-archive.lo `test -f 'ctf-archive.c' || echo '$(srcdir)/'`ctf-archive.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-archive.lo `test -f 'ctf-archive.c' || echo '$(srcdir)/'`ctf-archive.c
+ 
+-libctf_nobfd_la-ctf-dump.lo: ctf-dump.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd_la-ctf-dump.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd_la-ctf-dump.Tpo -c -o libctf_nobfd_la-ctf-dump.lo `test -f 'ctf-dump.c' || echo '$(srcdir)/'`ctf-dump.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd_la-ctf-dump.Tpo $(DEPDIR)/libctf_nobfd_la-ctf-dump.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-dump.c' object='libctf_nobfd_la-ctf-dump.lo' libtool=yes @AMDEPBACKSLASH@
++libctf_nobfd@CTF_SOVER_EXT@_la-ctf-dump.lo: ctf-dump.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd@CTF_SOVER_EXT@_la-ctf-dump.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-dump.Tpo -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-dump.lo `test -f 'ctf-dump.c' || echo '$(srcdir)/'`ctf-dump.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-dump.Tpo $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-dump.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-dump.c' object='libctf_nobfd@CTF_SOVER_EXT@_la-ctf-dump.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd_la-ctf-dump.lo `test -f 'ctf-dump.c' || echo '$(srcdir)/'`ctf-dump.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-dump.lo `test -f 'ctf-dump.c' || echo '$(srcdir)/'`ctf-dump.c
+ 
+-libctf_nobfd_la-ctf-create.lo: ctf-create.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd_la-ctf-create.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd_la-ctf-create.Tpo -c -o libctf_nobfd_la-ctf-create.lo `test -f 'ctf-create.c' || echo '$(srcdir)/'`ctf-create.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd_la-ctf-create.Tpo $(DEPDIR)/libctf_nobfd_la-ctf-create.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-create.c' object='libctf_nobfd_la-ctf-create.lo' libtool=yes @AMDEPBACKSLASH@
++libctf_nobfd@CTF_SOVER_EXT@_la-ctf-create.lo: ctf-create.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd@CTF_SOVER_EXT@_la-ctf-create.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-create.Tpo -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-create.lo `test -f 'ctf-create.c' || echo '$(srcdir)/'`ctf-create.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-create.Tpo $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-create.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-create.c' object='libctf_nobfd@CTF_SOVER_EXT@_la-ctf-create.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd_la-ctf-create.lo `test -f 'ctf-create.c' || echo '$(srcdir)/'`ctf-create.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-create.lo `test -f 'ctf-create.c' || echo '$(srcdir)/'`ctf-create.c
+ 
+-libctf_nobfd_la-ctf-decl.lo: ctf-decl.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd_la-ctf-decl.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd_la-ctf-decl.Tpo -c -o libctf_nobfd_la-ctf-decl.lo `test -f 'ctf-decl.c' || echo '$(srcdir)/'`ctf-decl.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd_la-ctf-decl.Tpo $(DEPDIR)/libctf_nobfd_la-ctf-decl.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-decl.c' object='libctf_nobfd_la-ctf-decl.lo' libtool=yes @AMDEPBACKSLASH@
++libctf_nobfd@CTF_SOVER_EXT@_la-ctf-decl.lo: ctf-decl.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd@CTF_SOVER_EXT@_la-ctf-decl.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-decl.Tpo -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-decl.lo `test -f 'ctf-decl.c' || echo '$(srcdir)/'`ctf-decl.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-decl.Tpo $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-decl.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-decl.c' object='libctf_nobfd@CTF_SOVER_EXT@_la-ctf-decl.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd_la-ctf-decl.lo `test -f 'ctf-decl.c' || echo '$(srcdir)/'`ctf-decl.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-decl.lo `test -f 'ctf-decl.c' || echo '$(srcdir)/'`ctf-decl.c
+ 
+-libctf_nobfd_la-ctf-error.lo: ctf-error.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd_la-ctf-error.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd_la-ctf-error.Tpo -c -o libctf_nobfd_la-ctf-error.lo `test -f 'ctf-error.c' || echo '$(srcdir)/'`ctf-error.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd_la-ctf-error.Tpo $(DEPDIR)/libctf_nobfd_la-ctf-error.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-error.c' object='libctf_nobfd_la-ctf-error.lo' libtool=yes @AMDEPBACKSLASH@
++libctf_nobfd@CTF_SOVER_EXT@_la-ctf-error.lo: ctf-error.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd@CTF_SOVER_EXT@_la-ctf-error.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-error.Tpo -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-error.lo `test -f 'ctf-error.c' || echo '$(srcdir)/'`ctf-error.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-error.Tpo $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-error.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-error.c' object='libctf_nobfd@CTF_SOVER_EXT@_la-ctf-error.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd_la-ctf-error.lo `test -f 'ctf-error.c' || echo '$(srcdir)/'`ctf-error.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-error.lo `test -f 'ctf-error.c' || echo '$(srcdir)/'`ctf-error.c
+ 
+-libctf_nobfd_la-ctf-hash.lo: ctf-hash.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd_la-ctf-hash.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd_la-ctf-hash.Tpo -c -o libctf_nobfd_la-ctf-hash.lo `test -f 'ctf-hash.c' || echo '$(srcdir)/'`ctf-hash.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd_la-ctf-hash.Tpo $(DEPDIR)/libctf_nobfd_la-ctf-hash.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-hash.c' object='libctf_nobfd_la-ctf-hash.lo' libtool=yes @AMDEPBACKSLASH@
++libctf_nobfd@CTF_SOVER_EXT@_la-ctf-hash.lo: ctf-hash.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd@CTF_SOVER_EXT@_la-ctf-hash.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-hash.Tpo -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-hash.lo `test -f 'ctf-hash.c' || echo '$(srcdir)/'`ctf-hash.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-hash.Tpo $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-hash.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-hash.c' object='libctf_nobfd@CTF_SOVER_EXT@_la-ctf-hash.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd_la-ctf-hash.lo `test -f 'ctf-hash.c' || echo '$(srcdir)/'`ctf-hash.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-hash.lo `test -f 'ctf-hash.c' || echo '$(srcdir)/'`ctf-hash.c
+ 
+-libctf_nobfd_la-ctf-labels.lo: ctf-labels.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd_la-ctf-labels.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd_la-ctf-labels.Tpo -c -o libctf_nobfd_la-ctf-labels.lo `test -f 'ctf-labels.c' || echo '$(srcdir)/'`ctf-labels.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd_la-ctf-labels.Tpo $(DEPDIR)/libctf_nobfd_la-ctf-labels.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-labels.c' object='libctf_nobfd_la-ctf-labels.lo' libtool=yes @AMDEPBACKSLASH@
++libctf_nobfd@CTF_SOVER_EXT@_la-ctf-labels.lo: ctf-labels.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd@CTF_SOVER_EXT@_la-ctf-labels.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-labels.Tpo -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-labels.lo `test -f 'ctf-labels.c' || echo '$(srcdir)/'`ctf-labels.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-labels.Tpo $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-labels.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-labels.c' object='libctf_nobfd@CTF_SOVER_EXT@_la-ctf-labels.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd_la-ctf-labels.lo `test -f 'ctf-labels.c' || echo '$(srcdir)/'`ctf-labels.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-labels.lo `test -f 'ctf-labels.c' || echo '$(srcdir)/'`ctf-labels.c
+ 
+-libctf_nobfd_la-ctf-dedup.lo: ctf-dedup.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd_la-ctf-dedup.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd_la-ctf-dedup.Tpo -c -o libctf_nobfd_la-ctf-dedup.lo `test -f 'ctf-dedup.c' || echo '$(srcdir)/'`ctf-dedup.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd_la-ctf-dedup.Tpo $(DEPDIR)/libctf_nobfd_la-ctf-dedup.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-dedup.c' object='libctf_nobfd_la-ctf-dedup.lo' libtool=yes @AMDEPBACKSLASH@
++libctf_nobfd@CTF_SOVER_EXT@_la-ctf-dedup.lo: ctf-dedup.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd@CTF_SOVER_EXT@_la-ctf-dedup.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-dedup.Tpo -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-dedup.lo `test -f 'ctf-dedup.c' || echo '$(srcdir)/'`ctf-dedup.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-dedup.Tpo $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-dedup.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-dedup.c' object='libctf_nobfd@CTF_SOVER_EXT@_la-ctf-dedup.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd_la-ctf-dedup.lo `test -f 'ctf-dedup.c' || echo '$(srcdir)/'`ctf-dedup.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-dedup.lo `test -f 'ctf-dedup.c' || echo '$(srcdir)/'`ctf-dedup.c
+ 
+-libctf_nobfd_la-ctf-link.lo: ctf-link.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd_la-ctf-link.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd_la-ctf-link.Tpo -c -o libctf_nobfd_la-ctf-link.lo `test -f 'ctf-link.c' || echo '$(srcdir)/'`ctf-link.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd_la-ctf-link.Tpo $(DEPDIR)/libctf_nobfd_la-ctf-link.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-link.c' object='libctf_nobfd_la-ctf-link.lo' libtool=yes @AMDEPBACKSLASH@
++libctf_nobfd@CTF_SOVER_EXT@_la-ctf-link.lo: ctf-link.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd@CTF_SOVER_EXT@_la-ctf-link.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-link.Tpo -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-link.lo `test -f 'ctf-link.c' || echo '$(srcdir)/'`ctf-link.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-link.Tpo $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-link.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-link.c' object='libctf_nobfd@CTF_SOVER_EXT@_la-ctf-link.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd_la-ctf-link.lo `test -f 'ctf-link.c' || echo '$(srcdir)/'`ctf-link.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-link.lo `test -f 'ctf-link.c' || echo '$(srcdir)/'`ctf-link.c
+ 
+-libctf_nobfd_la-ctf-lookup.lo: ctf-lookup.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd_la-ctf-lookup.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd_la-ctf-lookup.Tpo -c -o libctf_nobfd_la-ctf-lookup.lo `test -f 'ctf-lookup.c' || echo '$(srcdir)/'`ctf-lookup.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd_la-ctf-lookup.Tpo $(DEPDIR)/libctf_nobfd_la-ctf-lookup.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-lookup.c' object='libctf_nobfd_la-ctf-lookup.lo' libtool=yes @AMDEPBACKSLASH@
++libctf_nobfd@CTF_SOVER_EXT@_la-ctf-lookup.lo: ctf-lookup.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd@CTF_SOVER_EXT@_la-ctf-lookup.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-lookup.Tpo -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-lookup.lo `test -f 'ctf-lookup.c' || echo '$(srcdir)/'`ctf-lookup.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-lookup.Tpo $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-lookup.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-lookup.c' object='libctf_nobfd@CTF_SOVER_EXT@_la-ctf-lookup.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd_la-ctf-lookup.lo `test -f 'ctf-lookup.c' || echo '$(srcdir)/'`ctf-lookup.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-lookup.lo `test -f 'ctf-lookup.c' || echo '$(srcdir)/'`ctf-lookup.c
+ 
+-libctf_nobfd_la-ctf-open.lo: ctf-open.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd_la-ctf-open.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd_la-ctf-open.Tpo -c -o libctf_nobfd_la-ctf-open.lo `test -f 'ctf-open.c' || echo '$(srcdir)/'`ctf-open.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd_la-ctf-open.Tpo $(DEPDIR)/libctf_nobfd_la-ctf-open.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-open.c' object='libctf_nobfd_la-ctf-open.lo' libtool=yes @AMDEPBACKSLASH@
++libctf_nobfd@CTF_SOVER_EXT@_la-ctf-open.lo: ctf-open.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd@CTF_SOVER_EXT@_la-ctf-open.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-open.Tpo -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-open.lo `test -f 'ctf-open.c' || echo '$(srcdir)/'`ctf-open.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-open.Tpo $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-open.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-open.c' object='libctf_nobfd@CTF_SOVER_EXT@_la-ctf-open.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd_la-ctf-open.lo `test -f 'ctf-open.c' || echo '$(srcdir)/'`ctf-open.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-open.lo `test -f 'ctf-open.c' || echo '$(srcdir)/'`ctf-open.c
+ 
+-libctf_nobfd_la-ctf-serialize.lo: ctf-serialize.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd_la-ctf-serialize.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd_la-ctf-serialize.Tpo -c -o libctf_nobfd_la-ctf-serialize.lo `test -f 'ctf-serialize.c' || echo '$(srcdir)/'`ctf-serialize.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd_la-ctf-serialize.Tpo $(DEPDIR)/libctf_nobfd_la-ctf-serialize.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-serialize.c' object='libctf_nobfd_la-ctf-serialize.lo' libtool=yes @AMDEPBACKSLASH@
++libctf_nobfd@CTF_SOVER_EXT@_la-ctf-serialize.lo: ctf-serialize.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd@CTF_SOVER_EXT@_la-ctf-serialize.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-serialize.Tpo -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-serialize.lo `test -f 'ctf-serialize.c' || echo '$(srcdir)/'`ctf-serialize.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-serialize.Tpo $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-serialize.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-serialize.c' object='libctf_nobfd@CTF_SOVER_EXT@_la-ctf-serialize.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd_la-ctf-serialize.lo `test -f 'ctf-serialize.c' || echo '$(srcdir)/'`ctf-serialize.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-serialize.lo `test -f 'ctf-serialize.c' || echo '$(srcdir)/'`ctf-serialize.c
+ 
+-libctf_nobfd_la-ctf-sha1.lo: ctf-sha1.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd_la-ctf-sha1.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd_la-ctf-sha1.Tpo -c -o libctf_nobfd_la-ctf-sha1.lo `test -f 'ctf-sha1.c' || echo '$(srcdir)/'`ctf-sha1.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd_la-ctf-sha1.Tpo $(DEPDIR)/libctf_nobfd_la-ctf-sha1.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-sha1.c' object='libctf_nobfd_la-ctf-sha1.lo' libtool=yes @AMDEPBACKSLASH@
++libctf_nobfd@CTF_SOVER_EXT@_la-ctf-sha1.lo: ctf-sha1.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd@CTF_SOVER_EXT@_la-ctf-sha1.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-sha1.Tpo -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-sha1.lo `test -f 'ctf-sha1.c' || echo '$(srcdir)/'`ctf-sha1.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-sha1.Tpo $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-sha1.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-sha1.c' object='libctf_nobfd@CTF_SOVER_EXT@_la-ctf-sha1.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd_la-ctf-sha1.lo `test -f 'ctf-sha1.c' || echo '$(srcdir)/'`ctf-sha1.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-sha1.lo `test -f 'ctf-sha1.c' || echo '$(srcdir)/'`ctf-sha1.c
+ 
+-libctf_nobfd_la-ctf-string.lo: ctf-string.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd_la-ctf-string.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd_la-ctf-string.Tpo -c -o libctf_nobfd_la-ctf-string.lo `test -f 'ctf-string.c' || echo '$(srcdir)/'`ctf-string.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd_la-ctf-string.Tpo $(DEPDIR)/libctf_nobfd_la-ctf-string.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-string.c' object='libctf_nobfd_la-ctf-string.lo' libtool=yes @AMDEPBACKSLASH@
++libctf_nobfd@CTF_SOVER_EXT@_la-ctf-string.lo: ctf-string.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd@CTF_SOVER_EXT@_la-ctf-string.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-string.Tpo -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-string.lo `test -f 'ctf-string.c' || echo '$(srcdir)/'`ctf-string.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-string.Tpo $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-string.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-string.c' object='libctf_nobfd@CTF_SOVER_EXT@_la-ctf-string.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd_la-ctf-string.lo `test -f 'ctf-string.c' || echo '$(srcdir)/'`ctf-string.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-string.lo `test -f 'ctf-string.c' || echo '$(srcdir)/'`ctf-string.c
+ 
+-libctf_nobfd_la-ctf-subr.lo: ctf-subr.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd_la-ctf-subr.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd_la-ctf-subr.Tpo -c -o libctf_nobfd_la-ctf-subr.lo `test -f 'ctf-subr.c' || echo '$(srcdir)/'`ctf-subr.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd_la-ctf-subr.Tpo $(DEPDIR)/libctf_nobfd_la-ctf-subr.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-subr.c' object='libctf_nobfd_la-ctf-subr.lo' libtool=yes @AMDEPBACKSLASH@
++libctf_nobfd@CTF_SOVER_EXT@_la-ctf-subr.lo: ctf-subr.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd@CTF_SOVER_EXT@_la-ctf-subr.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-subr.Tpo -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-subr.lo `test -f 'ctf-subr.c' || echo '$(srcdir)/'`ctf-subr.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-subr.Tpo $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-subr.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-subr.c' object='libctf_nobfd@CTF_SOVER_EXT@_la-ctf-subr.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd_la-ctf-subr.lo `test -f 'ctf-subr.c' || echo '$(srcdir)/'`ctf-subr.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-subr.lo `test -f 'ctf-subr.c' || echo '$(srcdir)/'`ctf-subr.c
+ 
+-libctf_nobfd_la-ctf-types.lo: ctf-types.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd_la-ctf-types.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd_la-ctf-types.Tpo -c -o libctf_nobfd_la-ctf-types.lo `test -f 'ctf-types.c' || echo '$(srcdir)/'`ctf-types.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd_la-ctf-types.Tpo $(DEPDIR)/libctf_nobfd_la-ctf-types.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-types.c' object='libctf_nobfd_la-ctf-types.lo' libtool=yes @AMDEPBACKSLASH@
++libctf_nobfd@CTF_SOVER_EXT@_la-ctf-types.lo: ctf-types.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd@CTF_SOVER_EXT@_la-ctf-types.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-types.Tpo -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-types.lo `test -f 'ctf-types.c' || echo '$(srcdir)/'`ctf-types.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-types.Tpo $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-types.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-types.c' object='libctf_nobfd@CTF_SOVER_EXT@_la-ctf-types.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd_la-ctf-types.lo `test -f 'ctf-types.c' || echo '$(srcdir)/'`ctf-types.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-types.lo `test -f 'ctf-types.c' || echo '$(srcdir)/'`ctf-types.c
+ 
+-libctf_nobfd_la-ctf-util.lo: ctf-util.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd_la-ctf-util.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd_la-ctf-util.Tpo -c -o libctf_nobfd_la-ctf-util.lo `test -f 'ctf-util.c' || echo '$(srcdir)/'`ctf-util.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd_la-ctf-util.Tpo $(DEPDIR)/libctf_nobfd_la-ctf-util.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-util.c' object='libctf_nobfd_la-ctf-util.lo' libtool=yes @AMDEPBACKSLASH@
++libctf_nobfd@CTF_SOVER_EXT@_la-ctf-util.lo: ctf-util.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd@CTF_SOVER_EXT@_la-ctf-util.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-util.Tpo -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-util.lo `test -f 'ctf-util.c' || echo '$(srcdir)/'`ctf-util.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-util.Tpo $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-util.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-util.c' object='libctf_nobfd@CTF_SOVER_EXT@_la-ctf-util.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd_la-ctf-util.lo `test -f 'ctf-util.c' || echo '$(srcdir)/'`ctf-util.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-util.lo `test -f 'ctf-util.c' || echo '$(srcdir)/'`ctf-util.c
+ 
+-libctf_nobfd_la-ctf-qsort_r.lo: ctf-qsort_r.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd_la-ctf-qsort_r.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd_la-ctf-qsort_r.Tpo -c -o libctf_nobfd_la-ctf-qsort_r.lo `test -f 'ctf-qsort_r.c' || echo '$(srcdir)/'`ctf-qsort_r.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd_la-ctf-qsort_r.Tpo $(DEPDIR)/libctf_nobfd_la-ctf-qsort_r.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-qsort_r.c' object='libctf_nobfd_la-ctf-qsort_r.lo' libtool=yes @AMDEPBACKSLASH@
++libctf_nobfd@CTF_SOVER_EXT@_la-ctf-qsort_r.lo: ctf-qsort_r.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_nobfd@CTF_SOVER_EXT@_la-ctf-qsort_r.lo -MD -MP -MF $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-qsort_r.Tpo -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-qsort_r.lo `test -f 'ctf-qsort_r.c' || echo '$(srcdir)/'`ctf-qsort_r.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-qsort_r.Tpo $(DEPDIR)/libctf_nobfd@CTF_SOVER_EXT@_la-ctf-qsort_r.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-qsort_r.c' object='libctf_nobfd@CTF_SOVER_EXT@_la-ctf-qsort_r.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd_la-ctf-qsort_r.lo `test -f 'ctf-qsort_r.c' || echo '$(srcdir)/'`ctf-qsort_r.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_nobfd@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_nobfd@CTF_SOVER_EXT@_la-ctf-qsort_r.lo `test -f 'ctf-qsort_r.c' || echo '$(srcdir)/'`ctf-qsort_r.c
+ 
+-libctf_la-ctf-archive.lo: ctf-archive.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_la-ctf-archive.lo -MD -MP -MF $(DEPDIR)/libctf_la-ctf-archive.Tpo -c -o libctf_la-ctf-archive.lo `test -f 'ctf-archive.c' || echo '$(srcdir)/'`ctf-archive.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_la-ctf-archive.Tpo $(DEPDIR)/libctf_la-ctf-archive.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-archive.c' object='libctf_la-ctf-archive.lo' libtool=yes @AMDEPBACKSLASH@
++libctf@CTF_SOVER_EXT@_la-ctf-archive.lo: ctf-archive.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf@CTF_SOVER_EXT@_la-ctf-archive.lo -MD -MP -MF $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-archive.Tpo -c -o libctf@CTF_SOVER_EXT@_la-ctf-archive.lo `test -f 'ctf-archive.c' || echo '$(srcdir)/'`ctf-archive.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-archive.Tpo $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-archive.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-archive.c' object='libctf@CTF_SOVER_EXT@_la-ctf-archive.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_la-ctf-archive.lo `test -f 'ctf-archive.c' || echo '$(srcdir)/'`ctf-archive.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf@CTF_SOVER_EXT@_la-ctf-archive.lo `test -f 'ctf-archive.c' || echo '$(srcdir)/'`ctf-archive.c
+ 
+-libctf_la-ctf-dump.lo: ctf-dump.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_la-ctf-dump.lo -MD -MP -MF $(DEPDIR)/libctf_la-ctf-dump.Tpo -c -o libctf_la-ctf-dump.lo `test -f 'ctf-dump.c' || echo '$(srcdir)/'`ctf-dump.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_la-ctf-dump.Tpo $(DEPDIR)/libctf_la-ctf-dump.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-dump.c' object='libctf_la-ctf-dump.lo' libtool=yes @AMDEPBACKSLASH@
++libctf@CTF_SOVER_EXT@_la-ctf-dump.lo: ctf-dump.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf@CTF_SOVER_EXT@_la-ctf-dump.lo -MD -MP -MF $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-dump.Tpo -c -o libctf@CTF_SOVER_EXT@_la-ctf-dump.lo `test -f 'ctf-dump.c' || echo '$(srcdir)/'`ctf-dump.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-dump.Tpo $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-dump.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-dump.c' object='libctf@CTF_SOVER_EXT@_la-ctf-dump.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_la-ctf-dump.lo `test -f 'ctf-dump.c' || echo '$(srcdir)/'`ctf-dump.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf@CTF_SOVER_EXT@_la-ctf-dump.lo `test -f 'ctf-dump.c' || echo '$(srcdir)/'`ctf-dump.c
+ 
+-libctf_la-ctf-create.lo: ctf-create.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_la-ctf-create.lo -MD -MP -MF $(DEPDIR)/libctf_la-ctf-create.Tpo -c -o libctf_la-ctf-create.lo `test -f 'ctf-create.c' || echo '$(srcdir)/'`ctf-create.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_la-ctf-create.Tpo $(DEPDIR)/libctf_la-ctf-create.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-create.c' object='libctf_la-ctf-create.lo' libtool=yes @AMDEPBACKSLASH@
++libctf@CTF_SOVER_EXT@_la-ctf-create.lo: ctf-create.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf@CTF_SOVER_EXT@_la-ctf-create.lo -MD -MP -MF $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-create.Tpo -c -o libctf@CTF_SOVER_EXT@_la-ctf-create.lo `test -f 'ctf-create.c' || echo '$(srcdir)/'`ctf-create.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-create.Tpo $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-create.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-create.c' object='libctf@CTF_SOVER_EXT@_la-ctf-create.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_la-ctf-create.lo `test -f 'ctf-create.c' || echo '$(srcdir)/'`ctf-create.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf@CTF_SOVER_EXT@_la-ctf-create.lo `test -f 'ctf-create.c' || echo '$(srcdir)/'`ctf-create.c
+ 
+-libctf_la-ctf-decl.lo: ctf-decl.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_la-ctf-decl.lo -MD -MP -MF $(DEPDIR)/libctf_la-ctf-decl.Tpo -c -o libctf_la-ctf-decl.lo `test -f 'ctf-decl.c' || echo '$(srcdir)/'`ctf-decl.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_la-ctf-decl.Tpo $(DEPDIR)/libctf_la-ctf-decl.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-decl.c' object='libctf_la-ctf-decl.lo' libtool=yes @AMDEPBACKSLASH@
++libctf@CTF_SOVER_EXT@_la-ctf-decl.lo: ctf-decl.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf@CTF_SOVER_EXT@_la-ctf-decl.lo -MD -MP -MF $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-decl.Tpo -c -o libctf@CTF_SOVER_EXT@_la-ctf-decl.lo `test -f 'ctf-decl.c' || echo '$(srcdir)/'`ctf-decl.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-decl.Tpo $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-decl.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-decl.c' object='libctf@CTF_SOVER_EXT@_la-ctf-decl.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_la-ctf-decl.lo `test -f 'ctf-decl.c' || echo '$(srcdir)/'`ctf-decl.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf@CTF_SOVER_EXT@_la-ctf-decl.lo `test -f 'ctf-decl.c' || echo '$(srcdir)/'`ctf-decl.c
+ 
+-libctf_la-ctf-error.lo: ctf-error.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_la-ctf-error.lo -MD -MP -MF $(DEPDIR)/libctf_la-ctf-error.Tpo -c -o libctf_la-ctf-error.lo `test -f 'ctf-error.c' || echo '$(srcdir)/'`ctf-error.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_la-ctf-error.Tpo $(DEPDIR)/libctf_la-ctf-error.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-error.c' object='libctf_la-ctf-error.lo' libtool=yes @AMDEPBACKSLASH@
++libctf@CTF_SOVER_EXT@_la-ctf-error.lo: ctf-error.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf@CTF_SOVER_EXT@_la-ctf-error.lo -MD -MP -MF $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-error.Tpo -c -o libctf@CTF_SOVER_EXT@_la-ctf-error.lo `test -f 'ctf-error.c' || echo '$(srcdir)/'`ctf-error.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-error.Tpo $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-error.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-error.c' object='libctf@CTF_SOVER_EXT@_la-ctf-error.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_la-ctf-error.lo `test -f 'ctf-error.c' || echo '$(srcdir)/'`ctf-error.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf@CTF_SOVER_EXT@_la-ctf-error.lo `test -f 'ctf-error.c' || echo '$(srcdir)/'`ctf-error.c
+ 
+-libctf_la-ctf-hash.lo: ctf-hash.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_la-ctf-hash.lo -MD -MP -MF $(DEPDIR)/libctf_la-ctf-hash.Tpo -c -o libctf_la-ctf-hash.lo `test -f 'ctf-hash.c' || echo '$(srcdir)/'`ctf-hash.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_la-ctf-hash.Tpo $(DEPDIR)/libctf_la-ctf-hash.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-hash.c' object='libctf_la-ctf-hash.lo' libtool=yes @AMDEPBACKSLASH@
++libctf@CTF_SOVER_EXT@_la-ctf-hash.lo: ctf-hash.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf@CTF_SOVER_EXT@_la-ctf-hash.lo -MD -MP -MF $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-hash.Tpo -c -o libctf@CTF_SOVER_EXT@_la-ctf-hash.lo `test -f 'ctf-hash.c' || echo '$(srcdir)/'`ctf-hash.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-hash.Tpo $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-hash.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-hash.c' object='libctf@CTF_SOVER_EXT@_la-ctf-hash.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_la-ctf-hash.lo `test -f 'ctf-hash.c' || echo '$(srcdir)/'`ctf-hash.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf@CTF_SOVER_EXT@_la-ctf-hash.lo `test -f 'ctf-hash.c' || echo '$(srcdir)/'`ctf-hash.c
+ 
+-libctf_la-ctf-labels.lo: ctf-labels.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_la-ctf-labels.lo -MD -MP -MF $(DEPDIR)/libctf_la-ctf-labels.Tpo -c -o libctf_la-ctf-labels.lo `test -f 'ctf-labels.c' || echo '$(srcdir)/'`ctf-labels.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_la-ctf-labels.Tpo $(DEPDIR)/libctf_la-ctf-labels.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-labels.c' object='libctf_la-ctf-labels.lo' libtool=yes @AMDEPBACKSLASH@
++libctf@CTF_SOVER_EXT@_la-ctf-labels.lo: ctf-labels.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf@CTF_SOVER_EXT@_la-ctf-labels.lo -MD -MP -MF $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-labels.Tpo -c -o libctf@CTF_SOVER_EXT@_la-ctf-labels.lo `test -f 'ctf-labels.c' || echo '$(srcdir)/'`ctf-labels.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-labels.Tpo $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-labels.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-labels.c' object='libctf@CTF_SOVER_EXT@_la-ctf-labels.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_la-ctf-labels.lo `test -f 'ctf-labels.c' || echo '$(srcdir)/'`ctf-labels.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf@CTF_SOVER_EXT@_la-ctf-labels.lo `test -f 'ctf-labels.c' || echo '$(srcdir)/'`ctf-labels.c
+ 
+-libctf_la-ctf-dedup.lo: ctf-dedup.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_la-ctf-dedup.lo -MD -MP -MF $(DEPDIR)/libctf_la-ctf-dedup.Tpo -c -o libctf_la-ctf-dedup.lo `test -f 'ctf-dedup.c' || echo '$(srcdir)/'`ctf-dedup.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_la-ctf-dedup.Tpo $(DEPDIR)/libctf_la-ctf-dedup.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-dedup.c' object='libctf_la-ctf-dedup.lo' libtool=yes @AMDEPBACKSLASH@
++libctf@CTF_SOVER_EXT@_la-ctf-dedup.lo: ctf-dedup.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf@CTF_SOVER_EXT@_la-ctf-dedup.lo -MD -MP -MF $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-dedup.Tpo -c -o libctf@CTF_SOVER_EXT@_la-ctf-dedup.lo `test -f 'ctf-dedup.c' || echo '$(srcdir)/'`ctf-dedup.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-dedup.Tpo $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-dedup.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-dedup.c' object='libctf@CTF_SOVER_EXT@_la-ctf-dedup.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_la-ctf-dedup.lo `test -f 'ctf-dedup.c' || echo '$(srcdir)/'`ctf-dedup.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf@CTF_SOVER_EXT@_la-ctf-dedup.lo `test -f 'ctf-dedup.c' || echo '$(srcdir)/'`ctf-dedup.c
+ 
+-libctf_la-ctf-link.lo: ctf-link.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_la-ctf-link.lo -MD -MP -MF $(DEPDIR)/libctf_la-ctf-link.Tpo -c -o libctf_la-ctf-link.lo `test -f 'ctf-link.c' || echo '$(srcdir)/'`ctf-link.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_la-ctf-link.Tpo $(DEPDIR)/libctf_la-ctf-link.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-link.c' object='libctf_la-ctf-link.lo' libtool=yes @AMDEPBACKSLASH@
++libctf@CTF_SOVER_EXT@_la-ctf-link.lo: ctf-link.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf@CTF_SOVER_EXT@_la-ctf-link.lo -MD -MP -MF $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-link.Tpo -c -o libctf@CTF_SOVER_EXT@_la-ctf-link.lo `test -f 'ctf-link.c' || echo '$(srcdir)/'`ctf-link.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-link.Tpo $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-link.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-link.c' object='libctf@CTF_SOVER_EXT@_la-ctf-link.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_la-ctf-link.lo `test -f 'ctf-link.c' || echo '$(srcdir)/'`ctf-link.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf@CTF_SOVER_EXT@_la-ctf-link.lo `test -f 'ctf-link.c' || echo '$(srcdir)/'`ctf-link.c
+ 
+-libctf_la-ctf-lookup.lo: ctf-lookup.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_la-ctf-lookup.lo -MD -MP -MF $(DEPDIR)/libctf_la-ctf-lookup.Tpo -c -o libctf_la-ctf-lookup.lo `test -f 'ctf-lookup.c' || echo '$(srcdir)/'`ctf-lookup.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_la-ctf-lookup.Tpo $(DEPDIR)/libctf_la-ctf-lookup.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-lookup.c' object='libctf_la-ctf-lookup.lo' libtool=yes @AMDEPBACKSLASH@
++libctf@CTF_SOVER_EXT@_la-ctf-lookup.lo: ctf-lookup.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf@CTF_SOVER_EXT@_la-ctf-lookup.lo -MD -MP -MF $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-lookup.Tpo -c -o libctf@CTF_SOVER_EXT@_la-ctf-lookup.lo `test -f 'ctf-lookup.c' || echo '$(srcdir)/'`ctf-lookup.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-lookup.Tpo $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-lookup.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-lookup.c' object='libctf@CTF_SOVER_EXT@_la-ctf-lookup.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_la-ctf-lookup.lo `test -f 'ctf-lookup.c' || echo '$(srcdir)/'`ctf-lookup.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf@CTF_SOVER_EXT@_la-ctf-lookup.lo `test -f 'ctf-lookup.c' || echo '$(srcdir)/'`ctf-lookup.c
+ 
+-libctf_la-ctf-open.lo: ctf-open.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_la-ctf-open.lo -MD -MP -MF $(DEPDIR)/libctf_la-ctf-open.Tpo -c -o libctf_la-ctf-open.lo `test -f 'ctf-open.c' || echo '$(srcdir)/'`ctf-open.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_la-ctf-open.Tpo $(DEPDIR)/libctf_la-ctf-open.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-open.c' object='libctf_la-ctf-open.lo' libtool=yes @AMDEPBACKSLASH@
++libctf@CTF_SOVER_EXT@_la-ctf-open.lo: ctf-open.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf@CTF_SOVER_EXT@_la-ctf-open.lo -MD -MP -MF $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-open.Tpo -c -o libctf@CTF_SOVER_EXT@_la-ctf-open.lo `test -f 'ctf-open.c' || echo '$(srcdir)/'`ctf-open.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-open.Tpo $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-open.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-open.c' object='libctf@CTF_SOVER_EXT@_la-ctf-open.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_la-ctf-open.lo `test -f 'ctf-open.c' || echo '$(srcdir)/'`ctf-open.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf@CTF_SOVER_EXT@_la-ctf-open.lo `test -f 'ctf-open.c' || echo '$(srcdir)/'`ctf-open.c
+ 
+-libctf_la-ctf-serialize.lo: ctf-serialize.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_la-ctf-serialize.lo -MD -MP -MF $(DEPDIR)/libctf_la-ctf-serialize.Tpo -c -o libctf_la-ctf-serialize.lo `test -f 'ctf-serialize.c' || echo '$(srcdir)/'`ctf-serialize.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_la-ctf-serialize.Tpo $(DEPDIR)/libctf_la-ctf-serialize.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-serialize.c' object='libctf_la-ctf-serialize.lo' libtool=yes @AMDEPBACKSLASH@
++libctf@CTF_SOVER_EXT@_la-ctf-serialize.lo: ctf-serialize.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf@CTF_SOVER_EXT@_la-ctf-serialize.lo -MD -MP -MF $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-serialize.Tpo -c -o libctf@CTF_SOVER_EXT@_la-ctf-serialize.lo `test -f 'ctf-serialize.c' || echo '$(srcdir)/'`ctf-serialize.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-serialize.Tpo $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-serialize.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-serialize.c' object='libctf@CTF_SOVER_EXT@_la-ctf-serialize.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_la-ctf-serialize.lo `test -f 'ctf-serialize.c' || echo '$(srcdir)/'`ctf-serialize.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf@CTF_SOVER_EXT@_la-ctf-serialize.lo `test -f 'ctf-serialize.c' || echo '$(srcdir)/'`ctf-serialize.c
+ 
+-libctf_la-ctf-sha1.lo: ctf-sha1.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_la-ctf-sha1.lo -MD -MP -MF $(DEPDIR)/libctf_la-ctf-sha1.Tpo -c -o libctf_la-ctf-sha1.lo `test -f 'ctf-sha1.c' || echo '$(srcdir)/'`ctf-sha1.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_la-ctf-sha1.Tpo $(DEPDIR)/libctf_la-ctf-sha1.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-sha1.c' object='libctf_la-ctf-sha1.lo' libtool=yes @AMDEPBACKSLASH@
++libctf@CTF_SOVER_EXT@_la-ctf-sha1.lo: ctf-sha1.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf@CTF_SOVER_EXT@_la-ctf-sha1.lo -MD -MP -MF $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-sha1.Tpo -c -o libctf@CTF_SOVER_EXT@_la-ctf-sha1.lo `test -f 'ctf-sha1.c' || echo '$(srcdir)/'`ctf-sha1.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-sha1.Tpo $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-sha1.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-sha1.c' object='libctf@CTF_SOVER_EXT@_la-ctf-sha1.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_la-ctf-sha1.lo `test -f 'ctf-sha1.c' || echo '$(srcdir)/'`ctf-sha1.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf@CTF_SOVER_EXT@_la-ctf-sha1.lo `test -f 'ctf-sha1.c' || echo '$(srcdir)/'`ctf-sha1.c
+ 
+-libctf_la-ctf-string.lo: ctf-string.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_la-ctf-string.lo -MD -MP -MF $(DEPDIR)/libctf_la-ctf-string.Tpo -c -o libctf_la-ctf-string.lo `test -f 'ctf-string.c' || echo '$(srcdir)/'`ctf-string.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_la-ctf-string.Tpo $(DEPDIR)/libctf_la-ctf-string.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-string.c' object='libctf_la-ctf-string.lo' libtool=yes @AMDEPBACKSLASH@
++libctf@CTF_SOVER_EXT@_la-ctf-string.lo: ctf-string.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf@CTF_SOVER_EXT@_la-ctf-string.lo -MD -MP -MF $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-string.Tpo -c -o libctf@CTF_SOVER_EXT@_la-ctf-string.lo `test -f 'ctf-string.c' || echo '$(srcdir)/'`ctf-string.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-string.Tpo $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-string.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-string.c' object='libctf@CTF_SOVER_EXT@_la-ctf-string.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_la-ctf-string.lo `test -f 'ctf-string.c' || echo '$(srcdir)/'`ctf-string.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf@CTF_SOVER_EXT@_la-ctf-string.lo `test -f 'ctf-string.c' || echo '$(srcdir)/'`ctf-string.c
+ 
+-libctf_la-ctf-subr.lo: ctf-subr.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_la-ctf-subr.lo -MD -MP -MF $(DEPDIR)/libctf_la-ctf-subr.Tpo -c -o libctf_la-ctf-subr.lo `test -f 'ctf-subr.c' || echo '$(srcdir)/'`ctf-subr.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_la-ctf-subr.Tpo $(DEPDIR)/libctf_la-ctf-subr.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-subr.c' object='libctf_la-ctf-subr.lo' libtool=yes @AMDEPBACKSLASH@
++libctf@CTF_SOVER_EXT@_la-ctf-subr.lo: ctf-subr.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf@CTF_SOVER_EXT@_la-ctf-subr.lo -MD -MP -MF $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-subr.Tpo -c -o libctf@CTF_SOVER_EXT@_la-ctf-subr.lo `test -f 'ctf-subr.c' || echo '$(srcdir)/'`ctf-subr.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-subr.Tpo $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-subr.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-subr.c' object='libctf@CTF_SOVER_EXT@_la-ctf-subr.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_la-ctf-subr.lo `test -f 'ctf-subr.c' || echo '$(srcdir)/'`ctf-subr.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf@CTF_SOVER_EXT@_la-ctf-subr.lo `test -f 'ctf-subr.c' || echo '$(srcdir)/'`ctf-subr.c
+ 
+-libctf_la-ctf-types.lo: ctf-types.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_la-ctf-types.lo -MD -MP -MF $(DEPDIR)/libctf_la-ctf-types.Tpo -c -o libctf_la-ctf-types.lo `test -f 'ctf-types.c' || echo '$(srcdir)/'`ctf-types.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_la-ctf-types.Tpo $(DEPDIR)/libctf_la-ctf-types.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-types.c' object='libctf_la-ctf-types.lo' libtool=yes @AMDEPBACKSLASH@
++libctf@CTF_SOVER_EXT@_la-ctf-types.lo: ctf-types.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf@CTF_SOVER_EXT@_la-ctf-types.lo -MD -MP -MF $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-types.Tpo -c -o libctf@CTF_SOVER_EXT@_la-ctf-types.lo `test -f 'ctf-types.c' || echo '$(srcdir)/'`ctf-types.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-types.Tpo $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-types.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-types.c' object='libctf@CTF_SOVER_EXT@_la-ctf-types.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_la-ctf-types.lo `test -f 'ctf-types.c' || echo '$(srcdir)/'`ctf-types.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf@CTF_SOVER_EXT@_la-ctf-types.lo `test -f 'ctf-types.c' || echo '$(srcdir)/'`ctf-types.c
+ 
+-libctf_la-ctf-util.lo: ctf-util.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_la-ctf-util.lo -MD -MP -MF $(DEPDIR)/libctf_la-ctf-util.Tpo -c -o libctf_la-ctf-util.lo `test -f 'ctf-util.c' || echo '$(srcdir)/'`ctf-util.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_la-ctf-util.Tpo $(DEPDIR)/libctf_la-ctf-util.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-util.c' object='libctf_la-ctf-util.lo' libtool=yes @AMDEPBACKSLASH@
++libctf@CTF_SOVER_EXT@_la-ctf-util.lo: ctf-util.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf@CTF_SOVER_EXT@_la-ctf-util.lo -MD -MP -MF $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-util.Tpo -c -o libctf@CTF_SOVER_EXT@_la-ctf-util.lo `test -f 'ctf-util.c' || echo '$(srcdir)/'`ctf-util.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-util.Tpo $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-util.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-util.c' object='libctf@CTF_SOVER_EXT@_la-ctf-util.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_la-ctf-util.lo `test -f 'ctf-util.c' || echo '$(srcdir)/'`ctf-util.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf@CTF_SOVER_EXT@_la-ctf-util.lo `test -f 'ctf-util.c' || echo '$(srcdir)/'`ctf-util.c
+ 
+-libctf_la-ctf-qsort_r.lo: ctf-qsort_r.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_la-ctf-qsort_r.lo -MD -MP -MF $(DEPDIR)/libctf_la-ctf-qsort_r.Tpo -c -o libctf_la-ctf-qsort_r.lo `test -f 'ctf-qsort_r.c' || echo '$(srcdir)/'`ctf-qsort_r.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_la-ctf-qsort_r.Tpo $(DEPDIR)/libctf_la-ctf-qsort_r.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-qsort_r.c' object='libctf_la-ctf-qsort_r.lo' libtool=yes @AMDEPBACKSLASH@
++libctf@CTF_SOVER_EXT@_la-ctf-qsort_r.lo: ctf-qsort_r.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf@CTF_SOVER_EXT@_la-ctf-qsort_r.lo -MD -MP -MF $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-qsort_r.Tpo -c -o libctf@CTF_SOVER_EXT@_la-ctf-qsort_r.lo `test -f 'ctf-qsort_r.c' || echo '$(srcdir)/'`ctf-qsort_r.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-qsort_r.Tpo $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-qsort_r.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-qsort_r.c' object='libctf@CTF_SOVER_EXT@_la-ctf-qsort_r.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_la-ctf-qsort_r.lo `test -f 'ctf-qsort_r.c' || echo '$(srcdir)/'`ctf-qsort_r.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf@CTF_SOVER_EXT@_la-ctf-qsort_r.lo `test -f 'ctf-qsort_r.c' || echo '$(srcdir)/'`ctf-qsort_r.c
+ 
+-libctf_la-ctf-open-bfd.lo: ctf-open-bfd.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf_la-ctf-open-bfd.lo -MD -MP -MF $(DEPDIR)/libctf_la-ctf-open-bfd.Tpo -c -o libctf_la-ctf-open-bfd.lo `test -f 'ctf-open-bfd.c' || echo '$(srcdir)/'`ctf-open-bfd.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf_la-ctf-open-bfd.Tpo $(DEPDIR)/libctf_la-ctf-open-bfd.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-open-bfd.c' object='libctf_la-ctf-open-bfd.lo' libtool=yes @AMDEPBACKSLASH@
++libctf@CTF_SOVER_EXT@_la-ctf-open-bfd.lo: ctf-open-bfd.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libctf@CTF_SOVER_EXT@_la-ctf-open-bfd.lo -MD -MP -MF $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-open-bfd.Tpo -c -o libctf@CTF_SOVER_EXT@_la-ctf-open-bfd.lo `test -f 'ctf-open-bfd.c' || echo '$(srcdir)/'`ctf-open-bfd.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-open-bfd.Tpo $(DEPDIR)/libctf@CTF_SOVER_EXT@_la-ctf-open-bfd.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ctf-open-bfd.c' object='libctf@CTF_SOVER_EXT@_la-ctf-open-bfd.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf_la-ctf-open-bfd.lo `test -f 'ctf-open-bfd.c' || echo '$(srcdir)/'`ctf-open-bfd.c
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libctf@CTF_SOVER_EXT@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libctf@CTF_SOVER_EXT@_la-ctf-open-bfd.lo `test -f 'ctf-open-bfd.c' || echo '$(srcdir)/'`ctf-open-bfd.c
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
diff --git a/patches/mips-hack.diff b/patches/mips-hack.diff
new file mode 100644
index 000000000..795a4e709
--- /dev/null
+++ b/patches/mips-hack.diff
@@ -0,0 +1,12 @@
+--- a/gas/config/tc-mips.c
++++ b/gas/config/tc-mips.c
+@@ -16734,6 +16734,9 @@ parse_code_option (char * name)
+   else
+     return OPTION_TYPE_BAD;
+ 
++  if (mips_opts.isa == ISA_MIPS1 && mips_opts.fp == 0)
++    mips_opts.isa = ISA_MIPS2;
++
+   return isa_set ? OPTION_TYPE_ISA : OPTION_TYPE_NORMAL;
+ }
+ 
diff --git a/patches/mips64-default-n64.diff b/patches/mips64-default-n64.diff
new file mode 100644
index 000000000..00581279f
--- /dev/null
+++ b/patches/mips64-default-n64.diff
@@ -0,0 +1,82 @@
+--- a/bfd/config.bfd
++++ b/bfd/config.bfd
+@@ -927,11 +927,21 @@ case "${targ}" in
+     targ_defvec=mips_elf32_be_vec
+     targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec"
+     ;;
+-  mips64*el-*-linux*)
++  mips*64*el-*-linux*-gnuabi64)
++    targ_defvec=mips_elf64_trad_le_vec
++    targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_be_vec"
++    want64=true
++    ;;
++  mips*64*-*-linux*-gnuabi64)
++    targ_defvec=mips_elf64_trad_be_vec
++    targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_le_vec"
++    want64=true
++    ;;
++  mips*64*el-*-linux*)
+     targ_defvec=mips_elf32_ntrad_le_vec
+     targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_trad_le_vec mips_elf32_trad_be_vec mips_elf64_trad_le_vec mips_elf64_trad_be_vec"
+     ;;
+-  mips64*-*-linux*)
++  mips*64*-*-linux*)
+     targ_defvec=mips_elf32_ntrad_be_vec
+     targ_selvecs="mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec"
+     ;;
+--- a/binutils/testsuite/binutils-all/mips/mips-note-2-n32.d
++++ b/binutils/testsuite/binutils-all/mips/mips-note-2-n32.d
+@@ -1,4 +1,5 @@
+ #PROG: objcopy
++#as: -n32
+ #readelf: --notes --wide
+ #objcopy: --merge-notes
+ #name: MIPS merge notes section (n32)
+--- a/gas/configure
++++ b/gas/configure
+@@ -12167,6 +12167,9 @@ _ACEOF
+ 	esac
+ 	# Decide which ABI to target by default.
+ 	case ${target} in
++	  mips*64*-linux-gnuabi64)
++	    mips_default_abi=N64_ABI
++	    ;;
+ 	  mips64*-linux* | mips-sgi-irix6* | mips64*-freebsd* \
+ 	  | mips64*-kfreebsd*-gnu | mips64*-ps2-elf*)
+ 	    mips_default_abi=N32_ABI
+--- a/gas/configure.ac
++++ b/gas/configure.ac
+@@ -384,6 +384,9 @@ changequote([,])dnl
+ 	esac
+ 	# Decide which ABI to target by default.
+ 	case ${target} in
++	  mips*64*-linux-gnuabi64)
++	    mips_default_abi=N64_ABI
++	    ;;
+ 	  mips64*-linux* | mips-sgi-irix6* | mips64*-freebsd* \
+ 	  | mips64*-kfreebsd*-gnu | mips64*-ps2-elf*)
+ 	    mips_default_abi=N32_ABI
+--- a/ld/configure.tgt
++++ b/ld/configure.tgt
+@@ -543,11 +543,19 @@ mips*-*-vxworks*)	targ_emul=elf32ebmipvx
+ 			;;
+ mips*-*-windiss)	targ_emul=elf32mipswindiss
+ 			;;
+-mips64*el-*-linux-*)	targ_emul=elf32ltsmipn32
++mips*64*el-*-linux-gnuabi64)	targ_emul=elf64ltsmip
++			targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32ltsmip elf32btsmip elf64btsmip"
++			targ_extra_libpath=$targ_extra_emuls
++			;;
++mips*64*el-*-linux-*)	targ_emul=elf32ltsmipn32
+ 			targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip"
+ 			targ_extra_libpath=$targ_extra_emuls
+ 			;;
+-mips64*-*-linux-*)	targ_emul=elf32btsmipn32
++mips*64*-*-linux-gnuabi64)	targ_emul=elf64btsmip
++			targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip"
++			targ_extra_libpath=$targ_extra_emuls
++			;;
++mips*64*-*-linux-*)	targ_emul=elf32btsmipn32
+ 			targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip"
+ 			targ_extra_libpath=$targ_extra_emuls
+ 			;;
diff --git a/patches/pr-ld-16428.diff b/patches/pr-ld-16428.diff
new file mode 100644
index 000000000..85f21dd79
--- /dev/null
+++ b/patches/pr-ld-16428.diff
@@ -0,0 +1,158 @@
+# DP: Proposed patch for PR ld/16428, disallow -shared/-pie, -shared/-static, -pie/-static.
+
+2014-01-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/16428
+	* ld.texinfo: Updated for -static/-non_shared change.
+	* ldlex.h (option_values): Add OPTION_STATIC.
+	* lexsup.c (ld_options): Use OPTION_STATIC for -static/-non_shared.
+	(parse_args): Handle OPTION_STATIC.  Disallow -shared and -pie,
+	-shared and -static, -pie and -static.
+
+2014-01-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/16428
+	* ld-elf/pr16428a.d: New file.
+	* ld-elf/pr16428b.d: Likewise.
+	* ld-elf/pr16428c.d: Likewise.
+	* ld-elf/pr16428d.d: Likewise.
+
+diff --git a/ld/ld.texinfo b/ld/ld.texinfo
+index ae3d568..bddfdfe 100644
+--- a/ld/ld.texinfo
++++ b/ld/ld.texinfo
+@@ -1204,11 +1204,11 @@ platforms for which shared libraries are supported.  The different
+ variants of this option are for compatibility with various systems.  You
+ may use this option multiple times on the command line: it affects
+ library searching for @option{-l} options which follow it.  This
+-option also implies @option{--unresolved-symbols=report-all}.  This
+-option can be used with @option{-shared}.  Doing so means that a
+-shared library is being created but that all of the library's external
+-references must be resolved by pulling in entries from static
+-libraries.
++option also implies @option{--unresolved-symbols=report-all}.
++@option{-Bstatic} and @option{-dn} can be used with @option{-shared}.
++Doing so means that a shared library is being created but that all of
++the library's external references must be resolved by pulling in entries
++from static libraries.
+ 
+ @kindex -Bsymbolic
+ @item -Bsymbolic
+diff --git a/ld/ldlex.h b/ld/ldlex.h
+index 99f4282..6f237dc 100644
+--- a/ld/ldlex.h
++++ b/ld/ldlex.h
+@@ -49,6 +49,7 @@ enum option_values
+   OPTION_NO_WARN_SEARCH_MISMATCH,
+   OPTION_NOINHIBIT_EXEC,
+   OPTION_NON_SHARED,
++  OPTION_STATIC,
+   OPTION_NO_WHOLE_ARCHIVE,
+   OPTION_OFORMAT,
+   OPTION_RELAX,
+diff --git a/ld/lexsup.c b/ld/lexsup.c
+index 2f71750..a366613 100644
+--- a/ld/lexsup.c
++++ b/ld/lexsup.c
+@@ -269,9 +269,9 @@ static const struct ld_option ld_options[] =
+     '\0', NULL, N_("Do not link against shared libraries"), ONE_DASH },
+   { {"dn", no_argument, NULL, OPTION_NON_SHARED},
+     '\0', NULL, NULL, ONE_DASH },
+-  { {"non_shared", no_argument, NULL, OPTION_NON_SHARED},
++  { {"non_shared", no_argument, NULL, OPTION_STATIC},
+     '\0', NULL, NULL, ONE_DASH },
+-  { {"static", no_argument, NULL, OPTION_NON_SHARED},
++  { {"static", no_argument, NULL, OPTION_STATIC},
+     '\0', NULL, NULL, ONE_DASH },
+   { {"Bsymbolic", no_argument, NULL, OPTION_SYMBOLIC},
+     '\0', NULL, N_("Bind global references locally"), ONE_DASH },
+@@ -523,6 +523,7 @@ parse_args (unsigned argc, char **argv)
+   struct option *really_longopts;
+   int last_optind;
+   enum report_method how_to_report_unresolved_symbols = RM_GENERATE_ERROR;
++  bfd_boolean seen_pie = FALSE, seen_shared = FALSE, seen_static = FALSE;
+ 
+   shortopts = (char *) xmalloc (OPTION_COUNT * 3 + 2);
+   longopts = (struct option *)
+@@ -707,6 +708,8 @@ parse_args (unsigned argc, char **argv)
+ 	case OPTION_CALL_SHARED:
+ 	  input_flags.dynamic = TRUE;
+ 	  break;
++	case OPTION_STATIC:
++	  seen_static = TRUE;
+ 	case OPTION_NON_SHARED:
+ 	  input_flags.dynamic = FALSE;
+ 	  break;
+@@ -1087,6 +1090,7 @@ parse_args (unsigned argc, char **argv)
+ 	case OPTION_SHARED:
+ 	  if (config.has_shared)
+ 	    {
++	      seen_shared = TRUE;
+ 	      link_info.shared = TRUE;
+ 	      /* When creating a shared library, the default
+ 		 behaviour is to ignore any unresolved references.  */
+@@ -1101,6 +1105,7 @@ parse_args (unsigned argc, char **argv)
+ 	case OPTION_PIE:
+ 	  if (config.has_shared)
+ 	    {
++	      seen_pie = TRUE;
+ 	      link_info.shared = TRUE;
+ 	      link_info.pie = TRUE;
+ 	    }
+@@ -1445,6 +1450,16 @@ parse_args (unsigned argc, char **argv)
+ 	}
+     }
+ 
++  if (seen_shared)
++    {
++      if (seen_pie)
++	einfo (_("%P%F: -shared and -pie are incompatible\n"));
++      if (seen_static)
++	einfo (_("%P%F: -shared and -static are incompatible\n"));
++    }
++  if (seen_pie && seen_static)
++    einfo (_("%P%F: -pie and -static are incompatible\n"));
++
+   while (ingroup)
+     {
+       lang_leave_group ();
+diff --git a/ld/testsuite/ld-elf/pr16428a.d b/ld/testsuite/ld-elf/pr16428a.d
+new file mode 100644
+index 0000000..8f5e833
+--- /dev/null
++++ b/ld/testsuite/ld-elf/pr16428a.d
+@@ -0,0 +1,4 @@
++#source: start.s
++#ld: -shared -static
++#target: *-*-linux* *-*-gnu* *-*-nacl*
++#error: -shared and -static are incompatible
+diff --git a/ld/testsuite/ld-elf/pr16428b.d b/ld/testsuite/ld-elf/pr16428b.d
+new file mode 100644
+index 0000000..f4ccba0
+--- /dev/null
++++ b/ld/testsuite/ld-elf/pr16428b.d
+@@ -0,0 +1,4 @@
++#source: start.s
++#ld: -shared -non_shared
++#target: *-*-linux* *-*-gnu* *-*-nacl*
++#error: -shared and -static are incompatible
+diff --git a/ld/testsuite/ld-elf/pr16428c.d b/ld/testsuite/ld-elf/pr16428c.d
+new file mode 100644
+index 0000000..747e8da
+--- /dev/null
++++ b/ld/testsuite/ld-elf/pr16428c.d
+@@ -0,0 +1,4 @@
++#source: start.s
++#ld: -shared -pie
++#target: *-*-linux* *-*-gnu* *-*-nacl*
++#error: -shared and -pie are incompatible
+diff --git a/ld/testsuite/ld-elf/pr16428d.d b/ld/testsuite/ld-elf/pr16428d.d
+new file mode 100644
+index 0000000..6e7a915
+--- /dev/null
++++ b/ld/testsuite/ld-elf/pr16428d.d
+@@ -0,0 +1,4 @@
++#source: start.s
++#ld: -pie -static
++#target: *-*-linux* *-*-gnu* *-*-nacl*
++#error: -pie and -static are incompatible
diff --git a/patches/pr28826.diff b/patches/pr28826.diff
new file mode 100644
index 000000000..e999ca602
--- /dev/null
+++ b/patches/pr28826.diff
@@ -0,0 +1,14 @@
+# DP: Fix PR ld/28826 x86_64 ld segfaults building xen, taken from the trunk
+
+diff --git a/bfd/coffgen.c b/bfd/coffgen.c
+index 293fce2baf3..bec1a424831 100644
+--- a/bfd/coffgen.c
++++ b/bfd/coffgen.c
+@@ -1092,6 +1092,7 @@ coff_write_alien_symbol (bfd *abfd,
+ 	memset (isym, 0, sizeof (*isym));
+       return true;
+     }
++  memset (dummy, 0, sizeof dummy);
+   native = dummy;
+   native->is_sym = true;
+   native[1].is_sym = false;
diff --git a/patches/pr28827-1.diff b/patches/pr28827-1.diff
new file mode 100644
index 000000000..21820dd7f
--- /dev/null
+++ b/patches/pr28827-1.diff
@@ -0,0 +1,205 @@
+# DP: Fix PR ld/28827, taken from the trunk (0441f94fba61998b4bd18487aacf70a672df099c)
+
+diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
+index 05d2d9f91d3..8a8b83b283d 100644
+--- a/bfd/elf64-ppc.c
++++ b/bfd/elf64-ppc.c
+@@ -3296,6 +3296,9 @@ struct ppc_link_hash_table
+   /* Set if inline plt calls should be converted to direct calls.  */
+   unsigned int can_convert_all_inline_plt:1;
+ 
++  /* Set if a stub_offset changed.  */
++  unsigned int stub_changed:1;
++
+   /* Set on error.  */
+   unsigned int stub_error:1;
+ 
+@@ -3313,6 +3316,13 @@ struct ppc_link_hash_table
+ 
+   /* Incremented every time we size stubs.  */
+   unsigned int stub_iteration;
++
++/* After 20 iterations of stub sizing we no longer allow stubs to
++   shrink.  This is to break out of a pathological case where adding
++   stubs or increasing their size on one iteration decreases section
++   gaps (perhaps due to alignment), which then results in smaller
++   stubs on the next iteration.  */
++#define STUB_SHRINK_ITER 20
+ };
+ 
+ /* Rename some of the generic section flags to better document how they
+@@ -12164,6 +12174,7 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+   asection *plt;
+   bfd_vma targ, off, r2off;
+   unsigned int size, extra, lr_used, delta, odd;
++  bfd_vma stub_offset;
+ 
+   /* Massage our args to the form they really have.  */
+   stub_entry = (struct ppc_stub_hash_entry *) gen_entry;
+@@ -12193,7 +12204,7 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+ 			    stub_entry->target_section);
+ 
+   /* Make a note of the offset within the stubs for this entry.  */
+-  stub_entry->stub_offset = stub_entry->group->stub_sec->size;
++  stub_offset = stub_entry->group->stub_sec->size;
+ 
+   if (stub_entry->h != NULL
+       && stub_entry->h->save_res
+@@ -12223,7 +12234,7 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+ 	      + stub_entry->target_section->output_offset
+ 	      + stub_entry->target_section->output_section->vma);
+       targ += PPC64_LOCAL_ENTRY_OFFSET (stub_entry->other);
+-      off = (stub_entry->stub_offset
++      off = (stub_offset
+ 	     + stub_entry->group->stub_sec->output_offset
+ 	     + stub_entry->group->stub_sec->output_section->vma);
+ 
+@@ -12322,7 +12333,7 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+     }
+   else if (stub_entry->type.main == ppc_stub_long_branch)
+     {
+-      off = (stub_entry->stub_offset
++      off = (stub_offset
+ 	     + stub_entry->group->stub_sec->output_offset
+ 	     + stub_entry->group->stub_sec->output_section->vma);
+       size = 0;
+@@ -12361,7 +12372,7 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+ 	{
+ 	  /* After the bcl, lr has been modified so we need to emit
+ 	     .eh_frame info saying the return address is in r12.  */
+-	  lr_used = stub_entry->stub_offset + 8;
++	  lr_used = stub_offset + 8;
+ 	  if (stub_entry->type.r2save)
+ 	    lr_used += 4;
+ 	  /* The eh_frame info will consist of a DW_CFA_advance_loc or
+@@ -12410,7 +12421,7 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+ 	    plt = htab->pltlocal;
+ 	}
+       targ += plt->output_offset + plt->output_section->vma;
+-      off = (stub_entry->stub_offset
++      off = (stub_offset
+ 	     + stub_entry->group->stub_sec->output_offset
+ 	     + stub_entry->group->stub_sec->output_section->vma
+ 	     + lr_used);
+@@ -12422,7 +12433,7 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+ 	  unsigned pad = plt_stub_pad (htab, stub_entry, off, odd);
+ 
+ 	  stub_entry->group->stub_sec->size += pad;
+-	  stub_entry->stub_offset = stub_entry->group->stub_sec->size;
++	  stub_offset = stub_entry->group->stub_sec->size;
+ 	  off -= pad;
+ 	  odd ^= pad & 4;
+ 	}
+@@ -12444,7 +12455,7 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+ 	{
+ 	  /* After the bcl, lr has been modified so we need to emit
+ 	     .eh_frame info saying the return address is in r12.  */
+-	  lr_used += stub_entry->stub_offset + 8;
++	  lr_used += stub_offset + 8;
+ 	  /* The eh_frame info will consist of a DW_CFA_advance_loc or
+ 	     variant, DW_CFA_register, 65, 12, DW_CFA_advance_loc+2,
+ 	     DW_CFA_restore_extended 65.  */
+@@ -12458,20 +12469,18 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+ 	{
+ 	  if (!htab->params->no_tls_get_addr_regsave)
+ 	    {
+-	      unsigned int cfa_updt = stub_entry->stub_offset + 18 * 4;
++	      unsigned int cfa_updt = stub_offset + 18 * 4;
+ 	      delta = cfa_updt - stub_entry->group->lr_restore;
+ 	      stub_entry->group->eh_size += eh_advance_size (delta);
+ 	      stub_entry->group->eh_size += htab->opd_abi ? 36 : 35;
+-	      stub_entry->group->lr_restore
+-		= stub_entry->stub_offset + size - 4;
++	      stub_entry->group->lr_restore = stub_offset + size - 4;
+ 	    }
+ 	  else if (stub_entry->type.r2save)
+ 	    {
+-	      lr_used = stub_entry->stub_offset + size - 20;
++	      lr_used = stub_offset + size - 20;
+ 	      delta = lr_used - stub_entry->group->lr_restore;
+ 	      stub_entry->group->eh_size += eh_advance_size (delta) + 6;
+-	      stub_entry->group->lr_restore
+-		= stub_entry->stub_offset + size - 4;
++	      stub_entry->group->lr_restore = stub_offset + size - 4;
+ 	    }
+ 	}
+     }
+@@ -12499,7 +12508,7 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+ 	  unsigned pad = plt_stub_pad (htab, stub_entry, off, 0);
+ 
+ 	  stub_entry->group->stub_sec->size += pad;
+-	  stub_entry->stub_offset = stub_entry->group->stub_sec->size;
++	  stub_offset = stub_entry->group->stub_sec->size;
+ 	}
+ 
+       if (info->emitrelocations)
+@@ -12523,21 +12532,21 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+ 	  if (!htab->params->no_tls_get_addr_regsave)
+ 	    {
+ 	      /* Adjustments to r1 need to be described.  */
+-	      unsigned int cfa_updt = stub_entry->stub_offset + 18 * 4;
++	      unsigned int cfa_updt = stub_offset + 18 * 4;
+ 	      delta = cfa_updt - stub_entry->group->lr_restore;
+ 	      stub_entry->group->eh_size += eh_advance_size (delta);
+ 	      stub_entry->group->eh_size += htab->opd_abi ? 36 : 35;
+ 	    }
+ 	  else
+ 	    {
+-	      lr_used = stub_entry->stub_offset + size - 20;
++	      lr_used = stub_offset + size - 20;
+ 	      /* The eh_frame info will consist of a DW_CFA_advance_loc
+ 		 or variant, DW_CFA_offset_externed_sf, 65, -stackoff,
+ 		 DW_CFA_advance_loc+4, DW_CFA_restore_extended, 65.  */
+ 	      delta = lr_used - stub_entry->group->lr_restore;
+ 	      stub_entry->group->eh_size += eh_advance_size (delta) + 6;
+ 	    }
+-	  stub_entry->group->lr_restore = stub_entry->stub_offset + size - 4;
++	  stub_entry->group->lr_restore = stub_offset + size - 4;
+ 	}
+     }
+   else
+@@ -12546,7 +12555,12 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+       return false;
+     }
+ 
+-  stub_entry->group->stub_sec->size += size;
++  if (stub_entry->stub_offset != stub_offset)
++    htab->stub_changed = true;
++  if (htab->stub_iteration <= STUB_SHRINK_ITER
++      || stub_entry->stub_offset < stub_offset)
++    stub_entry->stub_offset = stub_offset;
++  stub_entry->group->stub_sec->size = stub_entry->stub_offset + size;
+   return true;
+ }
+ 
+@@ -13644,12 +13658,8 @@ ppc64_elf_size_stubs (struct bfd_link_info *info)
+       _bfd_elf_link_hash_hide_symbol (info, &htab->tga_desc_fd->elf, true);
+     }
+ 
+-#define STUB_SHRINK_ITER 20
+   /* Loop until no stubs added.  After iteration 20 of this loop we may
+-     exit on a stub section shrinking.  This is to break out of a
+-     pathological case where adding stubs on one iteration decreases
+-     section gaps (perhaps due to alignment), which then requires
+-     fewer or smaller stubs on the next iteration.  */
++     exit on a stub section shrinking.  */
+ 
+   while (1)
+     {
+@@ -14119,6 +14129,7 @@ ppc64_elf_size_stubs (struct bfd_link_info *info)
+ 	  htab->elf.srelrdyn->size = 0;
+ 	}
+ 
++      htab->stub_changed = false;
+       bfd_hash_traverse (&htab->stub_hash_table, ppc_size_one_stub, info);
+ 
+       for (group = htab->group; group != NULL; group = group->next)
+@@ -14215,6 +14226,8 @@ ppc64_elf_size_stubs (struct bfd_link_info *info)
+ 	  break;
+ 
+       if (group == NULL
++	  && (!htab->stub_changed
++	      || htab->stub_iteration > STUB_SHRINK_ITER)
+ 	  && (htab->brlt->rawsize == htab->brlt->size
+ 	      || (htab->stub_iteration > STUB_SHRINK_ITER
+ 		  && htab->brlt->rawsize > htab->brlt->size))
diff --git a/patches/pr28827-2.diff b/patches/pr28827-2.diff
new file mode 100644
index 000000000..d606eafa1
--- /dev/null
+++ b/patches/pr28827-2.diff
@@ -0,0 +1,69 @@
+# DP: Fix PR ld/28827, taken from the trunk (2405fc4016feadea33cb747d5654514f62b74ff4)
+
+diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
+index 92f6d0a5d00..d53128debc6 100644
+--- a/bfd/elf64-ppc.c
++++ b/bfd/elf64-ppc.c
+@@ -11174,12 +11174,12 @@ plt_stub_size (struct ppc_link_hash_table *htab,
+ static inline unsigned int
+ plt_stub_pad (struct ppc_link_hash_table *htab,
+ 	      struct ppc_stub_hash_entry *stub_entry,
++	      bfd_vma stub_off,
+ 	      bfd_vma plt_off,
+ 	      unsigned int odd)
+ {
+   int stub_align;
+   unsigned stub_size;
+-  bfd_vma stub_off = stub_entry->group->stub_sec->size;
+ 
+   if (htab->params->plt_stub_align >= 0)
+     {
+@@ -12205,6 +12205,9 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+ 
+   /* Make a note of the offset within the stubs for this entry.  */
+   stub_offset = stub_entry->group->stub_sec->size;
++  if (htab->stub_iteration > STUB_SHRINK_ITER
++      && stub_entry->stub_offset > stub_offset)
++    stub_offset = stub_entry->stub_offset;
+ 
+   if (stub_entry->h != NULL
+       && stub_entry->h->save_res
+@@ -12430,10 +12433,9 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+ 
+       if (htab->params->plt_stub_align != 0)
+ 	{
+-	  unsigned pad = plt_stub_pad (htab, stub_entry, off, odd);
++	  unsigned pad = plt_stub_pad (htab, stub_entry, stub_offset, off, odd);
+ 
+-	  stub_entry->group->stub_sec->size += pad;
+-	  stub_offset = stub_entry->group->stub_sec->size;
++	  stub_offset += pad;
+ 	  off -= pad;
+ 	  odd ^= pad & 4;
+ 	}
+@@ -12505,10 +12507,9 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+ 
+       if (htab->params->plt_stub_align != 0)
+ 	{
+-	  unsigned pad = plt_stub_pad (htab, stub_entry, off, 0);
++	  unsigned pad = plt_stub_pad (htab, stub_entry, stub_offset, off, 0);
+ 
+-	  stub_entry->group->stub_sec->size += pad;
+-	  stub_offset = stub_entry->group->stub_sec->size;
++	  stub_offset += pad;
+ 	}
+ 
+       if (info->emitrelocations)
+@@ -12557,10 +12558,8 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+ 
+   if (stub_entry->stub_offset != stub_offset)
+     htab->stub_changed = true;
+-  if (htab->stub_iteration <= STUB_SHRINK_ITER
+-      || stub_entry->stub_offset < stub_offset)
+-    stub_entry->stub_offset = stub_offset;
+-  stub_entry->group->stub_sec->size = stub_entry->stub_offset + size;
++  stub_entry->stub_offset = stub_offset;
++  stub_entry->group->stub_sec->size = stub_offset + size;
+   return true;
+ }
+ 
diff --git a/patches/series b/patches/series
new file mode 100644
index 000000000..c40636f13
--- /dev/null
+++ b/patches/series
@@ -0,0 +1,39 @@
+#branch-updates.diff
+#branch-version.diff
+001_ld_makefile_patch.patch
+002_gprof_profile_arcs.patch
+003_gprof_see_also_monitor.patch
+006_better_file_error.patch
+013_bash_in_ld_testsuite.patch
+#014_hash_style-both.patch
+128_ppc64_powerpc_biarch.patch
+129_multiarch_libpath.patch
+130_gold_disable_testsuite_build.patch
+131_ld_bootstrap_testsuite.patch
+135_bfd_soversion.patch
+136_bfd_pic.patch
+157_ar_scripts_with_tilde.patch
+#158_ld_system_root.patch
+161_gold_dummy_zoption.diff
+
+# only applied for GFDL builds
+164_ld_doc_remove_xref.diff
+
+gprof-build.diff
+aarch64-libpath.diff
+#pr-ld-16428.diff
+mips64-default-n64.diff
+gold-mips.diff
+gold-no-keep-files-mapped.diff
+
+# trunk backports
+pr28827-1.diff
+pr28827-2.diff
+7c4643efe7b.diff
+pr28826.diff
+
+# experimental ...
+#infinity-notes.diff
+libctf-soname.diff
+
+mips-hack.diff
diff --git a/rules b/rules
new file mode 100755
index 000000000..63f8c9265
--- /dev/null
+++ b/rules
@@ -0,0 +1,1973 @@
+#!/usr/bin/make -f
+# debian/rules file - for binutils (2.29)
+# Based on sample debian/rules file - for GNU Hello (1.3).
+# Copyright 1994,1995 by Ian Jackson.
+# Copyright 1998-2007 James Troup.
+# Portions Copyright 2008-2019 Canonical Ltd.
+# Portions Copyright 2008-2019 Matthias Klose.
+# I hereby give you perpetual unlimited permission to copy,
+# modify and relicense this file, provided that you do not remove
+# my name from the file itself.  (I assert my moral right of
+# paternity under the Copyright, Designs and Patents Act 1988.)
+# This file may have to be extensively modified
+
+###############################################################################
+
+include /usr/share/dpkg/pkg-info.mk
+
+vafilt = $(subst $(2)=,,$(filter $(2)=%,$(1)))
+DPKG_VARS := $(shell dpkg-architecture)
+DEB_BUILD_GNU_TYPE	?= $(call vafilt,$(DPKG_VARS),DEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH		?= $(call vafilt,$(DPKG_VARS),DEB_HOST_ARCH)
+DEB_HOST_GNU_CPU	?= $(call vafilt,$(DPKG_VARS),DEB_HOST_GNU_CPU)
+DEB_HOST_GNU_TYPE	?= $(call vafilt,$(DPKG_VARS),DEB_HOST_GNU_TYPE)
+DEB_HOST_MULTIARCH	?= $(call vafilt,$(DPKG_VARS),DEB_HOST_MULTIARCH)
+
+ifeq (,$(filter no, $(DEB_RULES_REQUIRES_ROOT)))
+  require_root = yes
+endif
+ifeq ($(require_root),yes)
+  CHOWN = chown
+  DPKG_DEB = dpkg-deb
+else
+  CHOWN = : chown
+  DPKG_DEB = dpkg-deb --root-owner-group
+endif
+
+ifeq (,$(filter $(distrelease),lenny etch squeeze wheezy jessie))
+  ifeq ($(DEB_HOST_GNU_TYPE),i586-linux-gnu)
+    DEB_BUILD_GNU_TYPE	= i686-linux-gnu
+    DEB_HOST_GNU_CPU	= i686
+    DEB_HOST_GNU_TYPE	= i686-linux-gnu
+    TRIPLET_SYMLINK	= i586-linux-gnu
+  else ifeq ($(DEB_HOST_GNU_TYPE),i586-kfreebsd-gnu)
+    DEB_BUILD_GNU_TYPE	= i686-kfreebsd-gnu
+    DEB_HOST_GNU_CPU	= i686
+    DEB_HOST_GNU_TYPE	= i686-kfreebsd-gnu
+    TRIPLET_SYMLINK	= i586-kfreebsd-gnu
+  else ifeq ($(DEB_HOST_GNU_TYPE),i586-gnu)
+    DEB_BUILD_GNU_TYPE	= i686-gnu
+    DEB_HOST_GNU_CPU	= i686
+    DEB_HOST_GNU_TYPE	= i686-gnu
+    TRIPLET_SYMLINK	= i586-gnu
+  endif
+endif
+
+p_bin = binutils
+p_com = $(p_bin)-common
+p_lib = lib$(p_bin)
+p_nat = $(p_bin)-$(subst _,-,$(DEB_HOST_GNU_TYPE))
+p_dev = $(p_bin)-dev
+p_mul = $(p_bin)-multiarch
+p_mdev = $(p_mul)-dev
+p_doc = $(p_bin)-doc
+p_hppa64 = $(p_bin)-hppa64-linux-gnu
+p_src = $(p_bin)-source
+
+p_ctf = libctf0
+p_ctfn = libctf-nobfd0
+
+p_hst = $(p_bin)-for-host
+p_bld = $(p_bin)-for-build
+
+p_cross = $(p_bin)-$(subst _,-,$(DEB_TARGET_GNU_TYPE))
+
+# version used for p_bld/p_hst dependencies
+min_ver = 2.30-2
+
+distribution := $(shell lsb_release -is)
+distrelease  := $(shell lsb_release -cs)
+ifeq ($(distrelease),n/a)
+  distrelease     := sid
+endif
+
+# BACKPORT is used for cross builds for a -source package not conflicting
+# with the source package of the native package.
+ifeq ($(BACKPORT),true)
+  p_src = $(p_bin)-$(VERSION)-source
+else
+  p_src = $(p_bin)-source
+endif
+
+pwd   := $(shell pwd)
+d     = debian/tmp
+d_bin = $(d)
+d_com = debian/$(p_com)
+d_lib = debian/$(p_lib)
+d_nat = debian/$(p_nat)
+d_dev = debian/$(p_dev)
+d_mul = debian/$(p_mul)
+d_mdev = debian/$(p_mdev)
+d_doc = debian/$(p_doc)
+d_hppa64 = debian/$(p_hppa64)
+d_src = debian/$(p_src)
+
+d_ctf = debian/$(p_ctf)
+d_ctfn = debian/$(p_ctfn)
+
+d_hst = debian/$(p_hst)
+d_bld = debian/$(p_bld)
+
+d_cross = debian/$(p_cross)
+
+install_dir    = install -d -m 755
+install_file   = install -m 644
+install_script = install -m 755
+install_binary = install -m 755 -s --strip-program="$(STRIP)"
+
+NATIVE_ARCHS ?= amd64 i386 arm64 armhf armel ppc64el s390x
+NATIVE_ARCHS += alpha hppa ia64 m68k powerpc ppc64 \
+	riscv64 sh4 sparc64 x32
+NATIVE_ARCHS += hurd-i386 kfreebsd-amd64 kfreebsd-i386
+#NATIVE_ARCHS += nios2 or1k s390 sparc
+
+# don't generate the control file entries for native packages which are never
+# built. Only valid for Ubuntu. The autopkg testers get confused otherwise
+ifneq ($(distribution)-$(CROSS_ARCHS),Ubuntu-)
+  NATIVE_ARCHS += mips mipsel mips64 mips64el
+  NATIVE_ARCHS += mipsn32 mipsn32el
+  NATIVE_ARCHS += mipsn32r6 mipsn32r6el mipsr6 mipsr6el mips64r6 mips64r6el
+endif
+
+with_cross = yes
+ifeq ($(DEB_SOURCE),binutils)
+  with_native	= yes
+  same_source	= yes
+  ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 x32))
+    # DEB_HOST_ARCH is filtered-out later anyway, do not test here.
+    CROSS_ARCHS ?= amd64 i386 x32 \
+                   s390x ppc64el arm64 armhf armel \
+                   alpha hppa m68k \
+                   powerpc ppc64 sh4 sparc64 \
+                   ia64 riscv64 \
+                   kfreebsd-amd64 kfreebsd-i386 hurd-i386
+  else ifeq ($(DEB_HOST_ARCH),arm64)
+    CROSS_ARCHS ?= amd64 armel armhf i386 ppc64el riscv64 s390x x32
+  else ifeq ($(DEB_HOST_ARCH),ppc64)
+    CROSS_ARCHS ?= ppc64el
+  else ifeq ($(DEB_HOST_ARCH),ppc64el)
+    CROSS_ARCHS ?= powerpc ppc64 amd64 i386 x32 arm64 armel armhf riscv64 s390x
+  endif
+else ifeq ($(DEB_SOURCE),binutils-ports)
+  CROSS_ARCHS ?= m68k sh4
+else ifeq ($(DEB_SOURCE),binutils-mipsen)
+  with_native	=
+  same_source	=
+  ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 x32 arm64 ppc64el))
+    CROSS_ARCHS ?= mips mipsel mips64el mips64 mipsn32 mipsn32el \
+                   mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
+  else ifneq (,$(filter $(DEB_HOST_ARCH), arm64 ppc64el))
+    CROSS_ARCHS ?= mipsel mips64el
+  endif
+else
+  $(error unexpected source package name: $(DEB_SOURCE))
+endif
+# c-t-b passes this one ...
+CROSS_ARCHS := $(filter-out $(DEB_HOST_ARCH),$(CROSS_ARCHS))
+
+ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 x32 hppa))
+  with_hppa64 = yes
+endif
+
+with_multiarch := yes
+
+# disabled: no build-needed restriction used in the autopkg test
+ifeq (0,1)
+# only build the basic package when running the autopkg tests
+ifneq (,$(ADT_TEST_TRIGGERS))
+  # c-t-b sets CROSS_ARCHS which has to be respected, can't unset it here
+  #CROSS_ARCHS :=
+  with_hppa64 :=
+  with_multiarch :=
+endif
+endif
+
+HOST_ARCHS_armhf = amd64 i386 x32 arm64 ppc64el
+HOST_ARCHS_armel = amd64 i386 x32 arm64 ppc64el
+HOST_ARCHS_arm64 = amd64 i386 x32 ppc64el
+HOST_ARCHS_powerpc = amd64 i386 x32 ppc64el
+HOST_ARCHS_ppc64el = amd64 i386 x32 ppc64 arm64
+HOST_ARCHS_s390x = amd64 i386 x32 arm64 ppc64el
+HOST_ARCHS_amd64 = arm64 i386 ppc64el x32
+HOST_ARCHS_i386 = amd64 arm64 ppc64el x32
+HOST_ARCHS_ia64 = amd64 i386 x32
+HOST_ARCHS_riscv64 = amd64 i386 x32 arm64 ppc64el
+
+HOST_ARCHS_alpha = amd64 i386 x32
+#HOST_ARCHS_arc = amd64 i386 x32
+HOST_ARCHS_hppa = amd64 i386 x32
+HOST_ARCHS_m68k = amd64 i386 x32
+HOST_ARCHS_ppc64 = amd64 i386 x32 ppc64el
+HOST_ARCHS_sh4 = amd64 i386 x32
+HOST_ARCHS_sparc64 = amd64 i386 x32
+HOST_ARCHS_x32 = amd64 arm64 i386 ppc64el
+
+HOST_ARCHS_mips = amd64 i386 x32
+HOST_ARCHS_mipsel = amd64 i386 x32 arm64 ppc64el
+HOST_ARCHS_mipsn32 = amd64 i386 x32
+HOST_ARCHS_mipsn32el = amd64 i386 x32
+HOST_ARCHS_mips64 = amd64 i386 x32
+HOST_ARCHS_mips64el = amd64 i386 x32 arm64 ppc64el
+
+HOST_ARCHS_mipsr6 = amd64 i386 x32
+HOST_ARCHS_mipsr6el = amd64 i386 x32
+HOST_ARCHS_mipsn32r6 = amd64 i386 x32
+HOST_ARCHS_mipsn32r6el = amd64 i386 x32
+HOST_ARCHS_mips64r6 = amd64 i386 x32
+HOST_ARCHS_mips64r6el = amd64 i386 x32
+
+HOST_ARCHS_kfreebsd-amd64 = amd64 i386 x32
+HOST_ARCHS_kfreebsd-i386 = amd64 i386 x32
+HOST_ARCHS_hurd-i386 = amd64 i386 x32
+
+# Map a Debian architecture alias to a GNU type or a multiarch path component.
+run_dpkg_arch = $(or $(dpkg_arch_$1),$(eval \
+  dpkg_arch_$1 := $(shell dpkg-architecture -f -a$1))$(dpkg_arch_$1))
+_gnu_type  = $(call vafilt,$(run_dpkg_arch),DEB_HOST_GNU_TYPE)
+_multiarch = $(call vafilt,$(run_dpkg_arch),DEB_HOST_MULTIARCH)
+
+# Convenient shortcuts for {configure,build,install,binary}.%: generic recipes.
+CROSS_ARCH	= $(subst .,,$(suffix $@))
+CROSS_GNU_TYPE	= $(subst i586,i686,$(call _gnu_type,$(CROSS_ARCH)))
+P_CROSS		= binutils-$(subst _,-,$(CROSS_GNU_TYPE))
+D_CROSS		= debian/$(P_CROSS)
+
+# If $(TARGET) is not set, try reading debian/target
+ifeq (,$(TARGET))
+  ifneq (,$(wildcard debian/target))
+    TARGET := $(shell cat debian/target 2>/dev/null)
+  endif
+endif
+
+ifneq (,$(TARGET))
+  with_native	=
+  with_cross	= disabled by TARGET
+  same_source	=
+  # Support TARGET both as Debian architecture specification (e.g. arm),
+  # and as the target name (e.g. arm-linux-gnu).
+  DEB_TARGET_ARCH := $(or $(shell dpkg-architecture -f -t$(TARGET) -qDEB_HOST_ARCH 2>/dev/null),\
+                          $(TARGET))
+  DEB_TARGET_GNU_TYPE  = $(call _gnu_type,$(DEB_TARGET_ARCH))
+  DEB_TARGET_MULTIARCH = $(call _multiarch,$(DEB_TARGET_ARCH))
+  for_target           = $(call run_dpkg_arch,$(DEB_TARGET_ARCH))
+else
+  for_target           =
+endif
+
+ifneq (,$(TARGET))
+  APPEND_TOOLLIBDIR=yes
+  export APPEND_TOOLLIBDIR
+endif
+
+ifeq (,$(DEB_HOST_MULTIARCH))
+  ifeq ($(DEB_HOST_ARCH),i386)
+    DEB_HOST_MULTIARCH = i386-linux-gnu
+  else
+    DEB_HOST_MULTIARCH = $(DEB_HOST_GNU_TYPE)
+  endif
+endif
+
+SHELL  = /bin/bash
+
+gold_targets = \
+	amd64 arm64 armel armhf i386 \
+	mips mipsel mipsn32 mipsn32el mips64 mips64el \
+	mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el \
+	powerpc ppc64 ppc64el sparc sparc64 s390x \
+	x32 kfreebsd-amd64 kfreebsd-i386 hurd-i386
+
+ifneq (,$(filter $(DEB_HOST_ARCH), $(gold_targets)))
+  with_gold = yes
+  gold_provides = -Vgold:Provides=binutils-gold
+endif
+
+CFLAGS = -g -O2
+CXXFLAGS = -g -O2
+LDFLAGS =
+CROSS := $(DEB_HOST_GNU_TYPE)-
+CC     = $(CROSS)gcc
+CXX    = $(CROSS)g++
+STRIP  = $(CROSS)strip -R .comment -R .note
+STRIP_LTO = $(CROSS)strip -R .gnu.lto_* -R .gnu.debuglto_* -N __gnu_lto_slim -N __gnu_lto_v1
+
+ifeq (,$(findstring nopgo,$(DEB_BUILD_OPTIONS)))
+  ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+    ifeq (,$(filter $(DEB_HOST_ARCH), mipsel))
+      CONF_PGO = --enable-pgo-build=lto
+    endif
+  endif
+endif
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+  CFLAGS = -g -O0
+  CONF_PGO =
+endif
+
+# this outputs 0 or 1 depending on whether a macro appears in the *default* cpp
+# -dM -P output; this is used to test the toolchain *default* configuration
+check_cpp = $(shell $(CROSS)cpp -dM -P /dev/null | grep -q '^\#define $(1)' && echo 1 || echo 0)
+
+# testsuite doesn't expect to be built with -mthumb
+# TODO if the testsuite is only broken with Thumb-2 (and not with "Thumb-1"),
+# we should test for __thumb2__ instead
+ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf))
+  ifeq ($(call check_cpp,__thumb__),1)
+    CFLAGS += -marm
+  endif
+endif
+
+SPACE = $(EMPTY) $(EMPTY)
+COMMA = ,
+
+DEB_SVERSION	:= $(shell echo $(DEB_VERSION) | sed 's/+b[0-9][0-9]*$$//')
+
+VERSION		:= $(shell sed -n 's/^ *VERSION=\(.*\)/\1/p' bfd/configure | head -1 | tr -d \')
+DATE		:= $(shell sed -n 's/.* \([0-9]*\)$$/\1/p' bfd/version.h)
+ifneq (,$(DATE))
+  DATE_EXT	:= .$(DATE)
+endif
+BUILD_DATE := $(shell dpkg-parsechangelog | sed -n -e 's/^Date: //p')
+BUILD_DAY  := $(shell date -Idate -u -d "$(BUILD_DATE)")
+
+is_rc = yes
+is_rc =
+
+ifneq ($(DEB_VERSION_UPSTREAM),$(VERSION)$(DATE_EXT))
+  $(error upstream ($(VERSION)$(DATE_EXT)) and debian ($(DEB_VERSION_UPSTREAM)) version mismatch)
+endif
+
+SINGLE_VERSION= -system
+MULTI_VERSION = -multiarch
+HPPA64_VERSION= -hppa64
+
+ifeq (,$(filter $(distrelease),squeeze wheezy precise trusty))
+  DPKG_DEV = dpkg-dev (>= 1.17.11),
+endif
+ifeq (,$(filter $(distrelease),squeeze wheezy stretch precise trusty xenial zesty artful))
+  DPKG_DEV = dpkg-dev (>= 1.19.0.5),
+endif
+
+NJOBS =
+# Support parallel=<n> in DEB_BUILD_OPTIONS (see #209008)
+ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
+  NJOBS := -j $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
+endif
+ifneq (,$(findstring nogold,$(DEB_BUILD_OPTIONS)))
+  with_gold = disabled in DEB_BUILD_OPTIONS
+endif
+ifneq (,$(findstring nomult,$(DEB_BUILD_OPTIONS)))
+  with_multiarch = disabled in DEB_BUILD_OPTIONS
+endif
+ifneq (,$(findstring nocross,$(DEB_BUILD_OPTIONS)))
+  with_cross = disabled in DEB_BUILD_OPTIONS
+endif
+ifneq (,$(findstring nohppa,$(DEB_BUILD_OPTIONS)))
+  with_hppa64 = disabled in DEB_BUILD_OPTIONS
+endif
+
+# PF is the installation prefix for the package without the leading slash.
+# It's "usr" for gcc releases, so use this if not explicitly set
+ifeq ($(PF),)
+  PF = usr
+endif
+
+# Don't include docs with GFDL invariant sections
+GFDL_INVARIANT_FREE := yes
+ifeq ($(distribution),Ubuntu)
+  GFDL_INVARIANT_FREE := no
+endif
+
+gfdl_toplevel_texinfo_files = \
+	bfd/doc/bfd.texi \
+	bfd/doc/bfdint.texi \
+	ld/ldint.texi
+
+gfdl_generated_files = \
+	bfd/doc/bfd.info
+
+programs = addr2line ar as c++filt elfedit gprof ld ld.bfd
+programs += nm objcopy objdump ranlib readelf size strings strip
+ifeq ($(with_gold),yes)
+programs += gold ld.gold dwp
+endif
+
+########################################
+
+CONFARGS = \
+	--disable-silent-rules \
+	--enable-obsolete \
+	--enable-shared \
+	--enable-plugins \
+	--enable-threads \
+	--with-system-zlib \
+	--prefix=/$(PF) \
+	--enable-deterministic-archives \
+	--disable-compressed-debug-sections \
+	--enable-new-dtags \
+	--disable-x86-used-note \
+	--with-gold-ldflags=-static-libstdc++ \
+	--build=$(DEB_BUILD_GNU_TYPE) \
+	--host=$(DEB_HOST_GNU_TYPE) \
+	--with-pkgversion="GNU Binutils for $(distribution)"
+
+# not yet ready for GCC 4.9
+CONFARGS += --disable-werror
+
+DEB_TARGET_MULTIARCH32_amd64		= i386-linux-gnu
+DEB_TARGET_MULTIARCHX32_amd64		= x86_64-linux-gnux32
+
+DEB_TARGET_MULTIARCH32_x32		= i386-linux-gnu
+DEB_TARGET_MULTIARCH64_x32		= x86_64-linux-gnu
+
+DEB_TARGET_MULTIARCH32_powerpc		= powerpc-linux-gnu
+
+DEB_TARGET_MULTIARCH32_s390x		= s390-linux-gnu
+
+DEB_TARGET_MULTIARCH32_sparc64		= sparc-linux-gnu
+
+DEB_TARGET_MULTIARCH32_kfreebsd-amd64	= i386-kfreebsd-gnu
+
+DEB_TARGET_MULTIARCH64_i386		= x86_64-linux-gnu
+DEB_TARGET_MULTIARCHX32_i386		= x86_64-linux-gnux32
+
+DEB_TARGET_MULTIARCH64_powerpc		= powerpc64-linux-gnu
+
+DEB_TARGET_MULTIARCH64_sparc		= sparc64-linux-gnu
+
+DEB_TARGET_MULTIARCH64_s390		= s390x-linux-gnu
+
+DEB_TARGET_MULTIARCH64_kfreebsd-i386	= x86_64-kfreebsd-gnu
+
+DEB_TARGET_MULTIARCH64_mips		= mips64-linux-gnuabi64
+DEB_TARGET_MULTIARCHN32_mips		= mips64-linux-gnuabin32
+
+DEB_TARGET_MULTIARCH64_mipsel		= mips64el-linux-gnuabi64
+DEB_TARGET_MULTIARCHN32_mipsel		= mips64el-linux-gnuabin32
+
+DEB_TARGET_MULTIARCH64_mipsn32		= mips64-linux-gnuabi64
+DEB_TARGET_MULTIARCH32_mipsn32		= mips-linux-gnu
+
+DEB_TARGET_MULTIARCH64_mipsn32el 	= mips64el-linux-gnuabi64
+DEB_TARGET_MULTIARCH32_mipsn32el 	= mipsel-linux-gnu
+
+DEB_TARGET_MULTIARCH32_mips64		= mips-linux-gnu
+DEB_TARGET_MULTIARCHN32_mips64		= mips64-linux-gnuabin32
+
+DEB_TARGET_MULTIARCH32_mips64el		= mipsel-linux-gnu
+DEB_TARGET_MULTIARCHN32_mips64el	= mips64el-linux-gnuabin32
+
+DEB_TARGET_MULTIARCH64_mipsr6		= mipsisa64r6-linux-gnuabi64
+DEB_TARGET_MULTIARCHN32_mipsr6	= mipsisa64r6-linux-gnuabin32
+
+DEB_TARGET_MULTIARCH64_mipsr6el	= mipsisa64r6el-linux-gnuabi64
+DEB_TARGET_MULTIARCHN32_mipsr6el	= mipsisa64r6el-linux-gnuabin32
+
+DEB_TARGET_MULTIARCH64_mipsn32r6	= mipsisa64r6-linux-gnuabi64
+DEB_TARGET_MULTIARCH32_mipsn32r6	= mipsisa32r6-linux-gnu
+
+DEB_TARGET_MULTIARCH64_mipsn32r6el 	= mipsisa64r6el-linux-gnuabi64
+DEB_TARGET_MULTIARCH32_mipsn32r6el 	= mipsisa32r6el-linux-gnu
+
+DEB_TARGET_MULTIARCH32_mips64r6		= mipsisa32r6-linux-gnu
+DEB_TARGET_MULTIARCHN32_mips64r6	= mipsisa64r6-linux-gnuabin32
+
+DEB_TARGET_MULTIARCH32_mips64r6el	= mipsisa32r6el-linux-gnu
+DEB_TARGET_MULTIARCHN32_mips64r6el	= mipsisa64r6el-linux-gnuabin32
+
+DEB_TARGET_MULTIARCH32_arm64		= aarch64_ilp32-linux-gnu
+
+SET_MULTIARCH_ENV = \
+	DEB_TARGET_MULTIARCH=$(call _multiarch,$1) \
+	$(if $(DEB_TARGET_MULTIARCH32_$1) ,DEB_TARGET_MULTIARCH32=$(DEB_TARGET_MULTIARCH32_$1)) \
+	$(if $(DEB_TARGET_MULTIARCH64_$1) ,DEB_TARGET_MULTIARCH64=$(DEB_TARGET_MULTIARCH64_$1)) \
+	$(if $(DEB_TARGET_MULTIARCHX32_$1),DEB_TARGET_MULTIARCHX32=$(DEB_TARGET_MULTIARCHX32_$1)) \
+	$(if $(DEB_TARGET_MULTIARCHN32_$1),DEB_TARGET_MULTIARCHN32=$(DEB_TARGET_MULTIARCHN32_$1))
+
+CONFARGS_TARGET_sparc		= --enable-targets=sparc64-linux-gnu
+CONFLICTS_TARGET_sparc		= -VextraConflicts="libc6-dev-sparc64 (<< 2.2.5-7)"
+
+CONFARGS_TARGET_sparc64		= --enable-targets=sparc-linux-gnu
+CONFLICTS_TARGET_sparc64	= -VextraConflicts="libc6-dev-sparc64 (<< 2.2.5-7)"
+
+CONFARGS_TARGET_powerpc		= --enable-targets=powerpc64-linux-gnu
+
+CONFARGS_TARGET_ppc64		= --enable-targets=powerpc-linux-gnu
+
+CONFARGS_TARGET_ppc64el		= --enable-targets=powerpc-linux-gnu
+
+CONFARGS_TARGET_s390		= --enable-targets=s390x-linux-gnu
+
+CONFARGS_TARGET_s390x		= --enable-targets=s390-linux-gnu
+
+CONFARGS_TARGET_amd64		= --enable-targets=x86_64-linux-gnux32,x86_64-pep
+
+CONFARGS_TARGET_i386		= --enable-targets=x86_64-linux-gnu,x86_64-linux-gnux32,x86_64-pep
+
+CONFARGS_TARGET_x32		= --enable-targets=x86_64-linux-gnu,x86_64-pep
+
+CONFLICTS_TARGET_amd64		= -VextraConflicts="binutils-mingw-w64-i686 (<< 2.23.52.20130612-1+3), binutils-mingw-w64-x86-64 (<< 2.23.52.20130612-1+3)"
+CONFLICTS_TARGET_i386 = $(CONFLICTS_TARGET_amd64)
+CONFLICTS_TARGET_x32  = $(CONFLICTS_TARGET_amd64)
+
+CONFARGS_TARGET_riscv64		= --with-isa-spec=2.2
+
+CONFARGS_TARGET_kfreebsd-i386	= --enable-targets=x86_64-kfreebsd-gnu
+
+CONFARGS_TARGET_mips		= --enable-targets=mips64-linux-gnuabi64,mips64-linux-gnuabin32
+
+CONFARGS_TARGET_mipsel		= --enable-targets=mips64el-linux-gnuabi64,mips64el-linux-gnuabin32 --enable-mips-fix-loongson3-llsc=yes
+
+CONFARGS_TARGET_mipsn32		= --enable-targets=mips64-linux-gnuabi64,mips-linux-gnu
+
+CONFARGS_TARGET_mipsn32el	= --enable-targets=mips64el-linux-gnuabi64,mipsel-linux-gnu --enable-mips-fix-loongson3-llsc=yes
+
+CONFARGS_TARGET_mips64		= --enable-targets=mips64-linux-gnuabin32,mips-linux-gnu
+
+CONFARGS_TARGET_mips64el	= --enable-targets=mips64el-linux-gnuabin32,mipsel-linux-gnu --enable-mips-fix-loongson3-llsc=yes
+
+CONFARGS_TARGET_mipsr6	= --enable-targets=mipsisa64r6-linux-gnuabi64,mipsisa64r6-linux-gnuabin32
+
+CONFARGS_TARGET_mipsr6el	= --enable-targets=mipsisa64r6el-linux-gnuabi64,mipsisa64r6el-linux-gnuabin32
+
+CONFARGS_TARGET_mipsn32r6	= --enable-targets=mipsisa64r6-linux-gnuabi64,mipsisa32r6-linux-gnu
+
+CONFARGS_TARGET_mipsn32r6el	= --enable-targets=mipsisa64r6el-linux-gnuabi64,mipsisa32r6el-linux-gnu
+
+CONFARGS_TARGET_mips64r6	= --enable-targets=mipsisa64r6-linux-gnuabin32,mipsisa32r6-linux-gnu
+
+CONFARGS_TARGET_mips64r6el	= --enable-targets=mipsisa64r6el-linux-gnuabin32,mipsisa32r6el-linux-gnu
+
+CONFARGS_TARGET_aarch64		= --enable-targets=aarch64_be-linux-gnu
+
+CONFARGS_TARGET_arc		= --with-cpu=hs38_linux
+
+with_check := yes
+ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+  # override buildd admins to run the testsuite anyway ...
+  ifeq (,$(filter $(DEB_HOST_ARCH), m68k powerpc sh4 sparc64))
+    with_check := disabled through DEB_BUILD_OPTIONS
+  endif
+endif
+#with_check := disabled for this upload
+
+regression_archs = mipsel riscv64 sparc64
+ifneq (,$(filter $(DEB_HOST_ARCH), $(regression_archs)))
+  ignore_regressions := regressions ignored on architecture $(DEB_HOST_ARCH)
+endif
+#ignore_regressions := regressions ignored on architecture $(DEB_HOST_ARCH)
+
+with_strip := yes
+ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	with_strip := disabled through DEB_BUILD_OPTIONS
+endif
+
+source_files = $(addprefix $(shell basename $(pwd))/, \
+		 $(filter-out stamps .pc CVS debian builddir-% test-summary%, $(wildcard *)))
+
+###############################################################################
+
+update-patches: export QUILT_PATCHES := debian/patches
+update-patches:
+	while quilt push; do \
+	  quilt refresh --no-timestamps --no-index -pab --sort; \
+	done
+
+###############################################################################
+
+################
+# clean target #
+################
+
+clean:
+	$(checkdir)
+	rm -rf stamps
+	rm -rf builddir-*
+	rm -rf stamps
+	find . -name \*.gmo -o -name \*~ -o -name \*.info ! -name sysroff.info | xargs -r rm -f
+	rm -f test-summary*
+	rm -rf $(d_bin) $(d_com) $(d_lib) $(d_lib)-dbg $(d_nat) $(d_nat)-dbg \
+	  $(d_hst) $(d_dev) $(d_mul) $(d_mul)-dbg $(d_mdev) $(d_doc) \
+	  $(d_hppa64) $(d_hppa64)-dbg $(d_src) $(d_bld) \
+	  $(d_ctf) $(d_ctf)-dbg $(d_ctfn) $(d_ctfn)-dbg
+	rm -rf $(foreach ca,$(CROSS_ARCHS),debian/binutils-$(subst _,-,$(subst i586,i686,$(call _gnu_type,$(ca)))){,-dbg})
+	rm -rf debian/tmp debian/files* debian/substvars
+	rm -f debian/*.orig debian/*.rej
+	rm -f debian/files debian/substvars
+ifneq (,$(TARGET))
+	rm -rf $(d_cross)
+endif
+	for i in debian/*.in; do \
+	    case "$$i" in debian/control*.in) continue; esac; \
+	    rm -f $${i%*.in}; \
+	done
+
+	rm -f *-stamp
+
+###############################################################################
+
+stamps/control: debian/control.in debian/control.cross.in
+ifneq (,$(TARGET))
+	sed -n -e 's/@dpkg_dev@/$(DPKG_DEV)/;/^Package: binutils-for-build$$/q;p' \
+		< debian/control.in > debian/control
+	sed -e "s/@target@/$(subst _,-,$(DEB_TARGET_GNU_TYPE))/g" \
+		-e "s/@host_archs@/any/" \
+		-e 's/@binutils_alt_triplet@//' \
+		< debian/control.cross.in >> debian/control
+else
+	sed -e 's/@dpkg_dev@/$(DPKG_DEV)/' \
+		debian/control.in > debian/control
+	$(foreach ca,$(NATIVE_ARCHS), \
+	  sed \
+	    -e 's/@host_archs@/$(ca)$(if $(and $(filter yes,$(with_cross)),$(filter $(ca),$(DEB_HOST_ARCH) $(CROSS_ARCHS))), $(HOST_ARCHS_$(ca)))/g' \
+	    -e 's/@target@/$(subst _,-,$(subst i586,i686,$(call _gnu_type,$(ca))))/g' \
+	    -e 's/@binutils_alt_triplet@/$(if $(findstring i386,$(ca)),binutils-$(subst i686,i586,$(call _gnu_type,$(ca))))/g' \
+	    -e '$(if $(filter yes,$(same_source)),/^Built-Using/d)' \
+	    debian/control.cross.in >> debian/control; \
+	)
+endif
+	@mkdir -p stamps
+	touch $@
+
+#######################
+# single-arch targets #
+#######################
+
+SINGLE_CONFARGS = $(CONFARGS) $(CONFARGS_TARGET_$(DEB_HOST_ARCH))
+ifeq ($(with_gold),yes)
+	SINGLE_CONFARGS += --enable-ld=default --enable-gold
+endif
+SINGLE_CONFARGS += $(CONF_PGO)
+
+stamps/configure-single:
+	$(checkdir)
+	env
+	@echo BEGIN $@
+ifeq ($(with_check),yes)
+	@if echo "spawn true" | /usr/bin/expect -f - >/dev/null; then \
+	  : ; \
+	else \
+	  echo "expect is failing on your system with the above error, which means the"; \
+	  echo "testsuite will fail.  Please resolve the above issues and retry the build."; \
+	  echo "-----------------------------------------------------------------------------"; \
+	  exit 1; \
+	fi
+endif
+
+	: # force regeneration, not needed for releases
+	rm -f ld/ldgram.c ld/ldgram.h ld/ldlex.c
+
+	find -name '*.[1-8]' -size 0 | xargs -r rm -f
+
+	rm -rf stamps/configure-single builddir-single
+	mkdir builddir-single
+	cd builddir-single && env CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" \
+		$(call SET_MULTIARCH_ENV,$(DEB_HOST_ARCH)) \
+		../configure --with-sysroot=/ \
+			--libdir=/$(PF)/lib/$(DEB_HOST_MULTIARCH) \
+			$(SINGLE_CONFARGS)
+	@mkdir -p stamps
+	touch $@
+
+stamps/build-single: stamps/configure-single
+	$(checkdir)
+	@echo BEGIN $@
+	env BFD_SOVER_EXT="$(SINGLE_VERSION)" CTF_SOVER_EXT="" \
+	  $(call SET_MULTIARCH_ENV,$(DEB_HOST_ARCH)) \
+	    $(MAKE) $(NJOBS) -C builddir-single \
+		LDFLAGS="-Wl,-z,relro"
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+ifeq ($(with_check),yes)
+	-env MAKE="$(MAKE) VERSION=$(SINGLE_VERSION)" \
+	  $(call SET_MULTIARCH_ENV,$(DEB_HOST_ARCH)) \
+	    $(MAKE) -C builddir-single -k check
+	cat builddir-single/binutils/binutils.sum \
+	    builddir-single/gas/testsuite/gas.sum \
+	    builddir-single/ld/ld.sum >> $(pwd)/test-summary
+	set -e; \
+	tsi=test-summary-installed; \
+	rm -f $$tsi; \
+	if [ -f /usr/share/doc/binutils/test-summary-$(DEB_HOST_ARCH).gz ]; then \
+	  zcat /usr/share/doc/binutils/test-summary-$(DEB_HOST_ARCH).gz > $$tsi; \
+	elif [ -f /usr/share/doc/binutils/test-summary.gz ]; then \
+	  zcat /usr/share/doc/binutils/test-summary.gz > $$tsi; \
+	elif [ -f /usr/share/doc/binutils/test-summary ]; then \
+	  cat /usr/share/doc/binutils/test-summary > $$tsi; \
+	fi; \
+	if [ ! -f $$tsi ]; then \
+	  echo "No test results available for the installed binutils version"; \
+	elif [ -x /usr/bin/python3 ]; then \
+	  echo "Test results, compared with installed binutils:"; \
+	  if python3 debian/test-suite-compare.py $$tsi test-summary; then \
+	    : ; \
+	  elif [ -n "$(ignore_regressions)" ]; then \
+	    echo "$(ignore_regressions)"; \
+	  else \
+	    false; \
+	  fi; \
+	else \
+	  echo "python3 not installed, not comparing test results."; \
+	fi
+endif
+endif
+	touch $@
+
+
+###############################################################################
+
+#####################
+# multiarch targets #
+#####################
+
+multiarch_targets = \
+	aarch64-linux-gnu \
+	aarch64_be-linux-gnu \
+	alpha-linux-gnu \
+	arm-linux-gnueabi \
+	hppa-linux-gnu \
+	i686-linux-gnu \
+	ia64-linux-gnu \
+	m32r-linux-gnu \
+	m68k-linux-gnu \
+	m68k-rtems \
+	mips-linux-gnu \
+	mipsel-linux-gnu \
+	mips64-linux-gnuabin32 \
+	mips64el-linux-gnuabin32 \
+	mips64-linux-gnu \
+	mips64el-linux-gnu \
+	mipsisa32r6-linux-gnu \
+	mipsisa32r6el-linux-gnu \
+	mipsisa64r6-linux-gnuabin32 \
+	mipsisa64r6el-linux-gnuabin32 \
+	mipsisa64r6-linux-gnuabi64 \
+	mipsisa64r6el-linux-gnuabi64 \
+	powerpc-linux-gnu \
+	powerpc64-linux-gnu \
+	powerpc64le-linux-gnu \
+	riscv64-linux-gnu \
+	s390-linux-gnu \
+	s390x-linux-gnu \
+	sh-linux-gnu \
+	sparc-linux-gnu \
+	sparc64-linux-gnu \
+	x86_64-linux-gnu \
+	x86_64-linux-gnux32 \
+	m32r-linux-gnu \
+	x86_64-pep
+
+# try to work around #758830
+ifeq ($(DEB_HOST_ARCH),sh4)
+  multiarch_targets := $(filter-out hppa-linux-gnu, $(multiarch_targets))
+endif
+
+stamps/configure-multi:
+	$(checkdir)
+	@echo BEGIN $@
+	rm -rf stamps/configure-multi \
+		builddir-multi
+	mkdir builddir-multi
+	cd builddir-multi \
+	    && env CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" \
+	        $(call SET_MULTIARCH_ENV,$(DEB_HOST_ARCH)) \
+		../configure $(CONFARGS) $(CONF_PGO) \
+		  $(filter-out --enable-targets=%, $(CONFARGS_TARGET_$(DEB_HOST_ARCH))) \
+		  --with-sysroot=/ \
+		  --libdir=/$(PF)/lib/$(DEB_HOST_MULTIARCH) \
+		  --enable-targets=$(subst $(SPACE),$(COMMA),$(multiarch_targets))
+	@mkdir -p stamps
+	touch $@
+
+stamps/build-multi: stamps/configure-multi
+	$(checkdir)
+	@echo BEGIN $@
+	env BFD_SOVER_EXT="$(MULTI_VERSION)" CTF_SOVER_EXT="$(MULTI_VERSION)" \
+	  $(call SET_MULTIARCH_ENV,$(DEB_HOST_ARCH)) \
+	  $(MAKE) $(NJOBS) -C builddir-multi \
+		LDFLAGS="-Wl,-z,relro"
+	touch $@
+
+###############################################################################
+
+#################
+# cross targets #
+#################
+
+CROSS_CONFARGS = $(CONFARGS) --enable-initfini-array
+ifeq ($(with_gold),yes)
+	CROSS_CONFARGS += --enable-ld=default --enable-gold
+endif
+
+stamps/configure.%:
+	$(checkdir)
+	@echo BEGIN $@
+	rm -rf $@ builddir-$*
+	mkdir builddir-$*
+	cd builddir-$* \
+	    && env CC="$(CC)" CXX="$(CXX)" \
+	       $(call SET_MULTIARCH_ENV,$*) \
+		../configure \
+		  $(CROSS_CONFARGS) \
+		  $(CONFARGS_TARGET_$(*)) \
+		  --with-sysroot=/ \
+		  --libdir=/$(PF)/lib/$(call _multiarch,$*) \
+		  $(if $(filter $*, $(gold_targets)),--enable-ld=default --enable-gold,--disable-gold) \
+		  --target=$(CROSS_GNU_TYPE)
+	@mkdir -p stamps
+	touch $@
+
+stamps/build.%: stamps/configure.%
+	$(checkdir)
+	@echo BEGIN $@
+	env BFD_SOVER_EXT="-$*" CTF_SOVER_EXT="-$*" \
+	  $(call SET_MULTIARCH_ENV,$*) \
+	  $(MAKE) -C builddir-$* $(NJOBS) \
+		CFLAGS="$(CFLAGS)" \
+		CXXFLAGS="$(CXXFLAGS)" \
+		LDFLAGS="$(LDFLAGS) -Wl,-z,relro"
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+ifeq ($(with_check),yes)
+	-env MAKE="$(MAKE) VERSION=$(VERSION)-$*" \
+	  $(call SET_MULTIARCH_ENV,$*) \
+	    $(MAKE) -C builddir-$* -k check
+	cat builddir-$*/binutils/binutils.sum \
+	    builddir-$*/gas/testsuite/gas.sum \
+	    builddir-$*/ld/ld.sum >> test-summary-$*
+	set -e; \
+	tsi=test-summary-$*-installed; \
+	rm -f $$tsi; \
+	if [ -f /usr/share/doc/$(P_CROSS)/test-summary.gz ]; then \
+	  zcat /usr/share/doc/$(P_CROSS)/test-summary.gz > $$tsi; \
+	elif [ -f /usr/share/doc/binutils/test-summary-$*.gz ]; then \
+	  zcat /usr/share/doc/binutils/test-summary-$*.gz > $$tsi; \
+	fi; \
+	if [ ! -f $$tsi ]; then \
+	  echo "No test results available for the installed $(P_CROSS) version"; \
+	elif [ -x /usr/bin/python3 ]; then \
+	  echo "Test results, compared with installed binutils:"; \
+	  if python3 debian/test-suite-compare.py $$tsi test-summary-$*; then \
+	    : ; \
+	  elif echo $(regression_archs) | grep --word-regexp --silent "$*"; then \
+	    echo "regressions ignore for target $*"; \
+	  else \
+	    false; \
+	  fi; \
+	else \
+	  echo "python3 not installed, not comparing test results."; \
+	fi
+endif
+endif
+	touch $@
+
+stamps/install.%: stamps/build.%
+	$(checkdir)
+	@echo BEGIN $@
+	rm -rf $(D_CROSS)
+	env MAKE="$(MAKE) VERSION=$(VERSION)-$*" \
+	  $(MAKE) -C builddir-$* DESTDIR=$(CURDIR)/$(D_CROSS) install
+
+	rm -rf \
+		$(D_CROSS)/$(PF)/share/info \
+		$(D_CROSS)/$(PF)/share/locale
+
+	mkdir -p $(D_CROSS)/$(PF)/lib/$(DEB_HOST_MULTIARCH)
+	set -e; \
+	d_src=$(D_CROSS)/$(PF)/$(DEB_HOST_GNU_TYPE)/$(CROSS_GNU_TYPE)/lib; \
+	d_dst=$(D_CROSS)/$(PF)/lib/$(DEB_HOST_MULTIARCH); \
+	for lib in libbfd libopcodes; do \
+	  so=$$(basename $$(echo $$d_src/$$lib*$**.so)); \
+	  mv $$d_src/$$so $$d_dst/.; \
+	  ln -sf ../../../lib/$(DEB_HOST_MULTIARCH)/$$so $$d_src/$$lib.so; \
+	  mv $$d_src/$$lib.a $$d_dst/$${lib}-$(VERSION)-$*.a; \
+	  ln -sf ../../../lib/$(DEB_HOST_MULTIARCH)/$$lib-$(VERSION)-$*.a $$d_src/$$lib.a; \
+	done
+	mv $(D_CROSS)/$(PF)/lib/$(call _multiarch,$*)/libctf*.so* \
+	  $(D_CROSS)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/.
+
+	: # replace hard links with soft links
+	for i in $(D_CROSS)/usr/$(CROSS_GNU_TYPE)/bin/*; do \
+	  ln -sf ../../bin/$(CROSS_GNU_TYPE)-$$(basename $$i) $$i; \
+	done
+	ln -sf $(CROSS_GNU_TYPE)-ld.bfd $(D_CROSS)/usr/bin/$(CROSS_GNU_TYPE)-ld
+
+	$(call strip_package, $(P_CROSS),$(D_CROSS),.)
+	chmod ugo-x $(D_CROSS)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/*.so
+	chmod ugo-x $(D_CROSS)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/*.so.*
+
+	: # Get rid of .la files since libtool obviously has no idea about transient paths
+	rm -f $(D_CROSS)/$(PF)/$(DEB_HOST_GNU_TYPE)/$(CROSS_GNU_TYPE)/lib/*.la
+
+	for i in $(D_CROSS)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/*.a; do \
+	  echo "lto-stripping $(basename $$i) ..."; \
+	  $(STRIP_LTO) $$i; \
+	  if which strip-nondeterminism >/dev/null 2>&1; then \
+	    echo "strip-nondeterminism $(basename $$i) ..."; \
+	    strip-nondeterminism $$i; \
+	  fi; \
+	done
+
+	: # no spu toolchain
+	rm -f $(D_CROSS)/$(PF)/bin/*embedspu
+
+	: # Remove windows related manpages
+	rm -f $(D_CROSS)/$(PF)/share/man/man1/$(CROSS_GNU_TYPE)-{dlltool,nlmconv,windmc,windres}.1
+
+	: # symlink man pages
+	mv $(D_CROSS)/$(PF)/share/man/man1/$(CROSS_GNU_TYPE)-ld.1 \
+	  $(D_CROSS)/$(PF)/share/man/man1/$(CROSS_GNU_TYPE)-ld.bfd.1
+	gzip -9n $(D_CROSS)/$(PF)/share/man/man1/*
+	for i in $(D_CROSS)/$(PF)/share/man/man1/*; do \
+	  b=$$(basename $$i | sed 's/$(CROSS_GNU_TYPE)-//'); \
+	  ln -sf $$b $$i; \
+	done
+	ln -sf $(CROSS_GNU_TYPE)-ld.bfd.1.gz \
+	  $(D_CROSS)/$(PF)/share/man/man1/$(CROSS_GNU_TYPE)-ld.1.gz
+
+	: # gold man pages
+	$(if $(filter $*, $(gold_targets)), \
+	  ln -sf ld.gold.1.gz $(D_CROSS)/$(PF)/share/man/man1/$(CROSS_GNU_TYPE)-ld.gold.1.gz; \
+	  ln -sf dwp.1.gz $(D_CROSS)/$(PF)/share/man/man1/$(CROSS_GNU_TYPE)-dwp.1.gz; \
+	)
+
+	: # Don't want /usr/<arch>-linux to exist in any package, don't ship development files
+	rm -rf $(D_CROSS)/$(PF)/$(DEB_HOST_GNU_TYPE)
+
+	rm -f $(D_CROSS)/$(PF)/lib/*.a $(D_CROSS)/$(PF)/lib/*/*.a
+	rm -f $(D_CROSS)/$(PF)/lib/*.la $(D_CROSS)/$(PF)/lib/*/*.la
+	rm -f $(D_CROSS)/$(PF)/$(DEB_HOST_GNU_TYPE)/$(CROSS_GNU_TYPE)/lib/*.a
+	rm -f $(D_CROSS)/$(PF)/$(DEB_HOST_GNU_TYPE)/$(CROSS_GNU_TYPE)/lib/libctf*
+	rm -f $(D_CROSS)/$(PF)/lib/$(CROSS_GNU_TYPE)/libctf*
+	rm -f $(D_CROSS)/$(PF)/include/ctf*.h
+
+	: # remove RPATH
+	chrpath -k -d $$(file $(D_CROSS)/usr/bin/*|awk -F: '/ ELF/ {print $$1}')
+
+ifneq (,$(filter $(distrelease),lenny etch squeeze wheezy jessie stretch))
+	: # temporary i586-* symlinks for stretch
+	compat=$$(echo $(CROSS_GNU_TYPE) | sed 's/i686/i586/'); \
+	case "$(CROSS_GNU_TYPE)" in i686-*) \
+	  for i in $(programs); do \
+	    ln -sf $(CROSS_GNU_TYPE)-$$i $(D_CROSS)/$(PF)/bin/$$compat-$$i; \
+	    ln -sf $(CROSS_GNU_TYPE)-$$i.1.gz $(D_CROSS)/$(PF)/share/man/man1/$$compat-$$i.1.gz; \
+	  done; \
+	esac
+endif
+	touch $@
+
+###############################################################################
+
+#################
+# hppa64 target #
+#################
+
+stamps/configure-hppa64:
+	$(checkdir)
+	@echo BEGIN $@
+	rm -rf stamps/configure-hppa64 \
+		builddir-hppa64
+	mkdir builddir-hppa64
+	cd builddir-hppa64 \
+	    && env CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ../configure \
+		$(filter-out --enable-targets=%, $(CONFARGS)) \
+		--libdir=/$(PF)/lib/hppa64-linux-gnu \
+		--target=hppa64-linux-gnu
+	@mkdir -p stamps
+	touch $@
+
+stamps/build-hppa64: stamps/configure-hppa64
+	$(checkdir)
+	@echo BEGIN $@
+	env BFD_SOVER_EXT="$(HPPA64_VERSION)" CTF_SOVER_EXT="$(HPPA64_VERSION)" \
+	  $(MAKE) $(NJOBS) -C builddir-hppa64 \
+	    LDFLAGS="-Wl,-z,relro"
+	touch $@
+
+###############################################################################
+
+pre-build:
+#ifneq (,$(filter $(DEB_HOST_ARCH), armel powerpc))
+#	@echo Build it ...
+#else
+#	@echo Explicitely fail the build for architecture $(DEB_HOST_ARCH)
+#	false
+#endif
+
+build_stamps = stamps/build-single
+ifeq ($(with_multiarch),yes)
+       build_stamps += stamps/build-multi
+endif
+ifeq ($(with_hppa64),yes)
+       build_stamps += stamps/build-hppa64
+endif
+ifeq ($(with_cross),yes)
+       build_stamps += $(addprefix stamps/build.,$(CROSS_ARCHS))
+endif
+ifneq (,$(TARGET))
+   ifeq ($(DEB_TARGET_GNU_TYPE),hppa64-linux-gnu)
+     build_stamps = stamps/build-hppa64
+   else
+     build_stamps = stamps/build.$(DEB_TARGET_ARCH)
+  endif
+endif
+ifeq ($(BACKPORT),true)
+    build_stamps :=
+    with_check := no
+endif
+
+build: pre-build stamps/build
+build-arch: pre-build stamps/build
+build-indep: pre-build stamps/build
+stamps/build: $(build_stamps)
+	touch $@
+
+###############################################################################
+
+##################
+# install target #
+##################
+
+install_stamps =
+ifeq ($(with_hppa64),yes)
+       install_stamps += stamps/install-hppa64
+endif
+ifeq ($(with_cross),yes)
+       install_stamps += $(addprefix stamps/install.,$(CROSS_ARCHS))
+endif
+
+ifneq (,$(TARGET))
+    ifeq ($(DEB_TARGET_GNU_TYPE),hppa64-linux-gnu)
+      install_stamp = stamps/install-hppa64
+    else
+      install_stamp = stamps/install.$(DEB_TARGET_ARCH)
+  endif
+else
+        install_stamp = stamps/install
+endif
+ifeq ($(BACKPORT),true)
+    install_stamps :=
+endif
+install: $(install_stamp)
+stamps/install: checkroot stamps/build $(install_stamps)
+	$(checkdir)
+
+	rm -fr $(d_bin) $(d_com) $(d_lib) $(d_nat) $(d_dev) $(d_mul) $(d_mdev) $(d_doc) $(d_src) $(d_bld) $(d_ctf) $(d_ctfn)
+	$(install_dir) $(d_bin) $(d_com) $(d_lib) $(d_nat) $(d_dev) $(d_mul) $(d_mdev) $(d_doc) $(d_src) $(d_bld)
+
+	: # install binutils and -dev stuff
+	env MAKE="$(MAKE) VERSION=$(SINGLE_VERSION)" \
+	  $(MAKE) -C builddir-single \
+		CFLAGS="$(CFLAGS)" \
+		CXXFLAGS="$(CXXFLAGS)" \
+		LDFLAGS="$(LDFLAGS)" \
+		DESTDIR=$(CURDIR)/$(d_bin) install
+
+	$(install_dir) $(d_com)/$(PF)/share
+	mv $(d_bin)/$(PF)/share/locale $(d_com)/$(PF)/share/locale
+
+	$(install_dir) $(d_doc)/$(PF)/share
+	mv $(d_bin)/$(PF)/share/info $(d_doc)/$(PF)/share/info
+
+	$(install_dir) $(d_nat)/$(PF)/lib/$(DEB_HOST_MULTIARCH)
+	mv $(d_bin)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/bfd-plugins \
+		$(d_nat)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/.
+	mv $(d_bin)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/ldscripts \
+		$(d_nat)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/.
+
+	$(install_dir) $(d_com)/$(PF)/share/man
+	mv $(d_bin)/$(PF)/share/man/man1 $(d_com)/$(PF)/share/man/.
+	for f in $(d_com)/$(PF)/share/man/man1/*.1; do \
+	  sed -i -e '/^\.TH /s/[0-9]*-[0-9]*-[0-9]*/$(BUILD_DAY)/' $$f; \
+	done
+
+ifeq ($(with_multiarch),yes)
+	: # now install binutils-multiarch stuff
+	env MAKE="$(MAKE) VERSION=$(MULTI_VERSION)" \
+	  $(MAKE) -C builddir-multi \
+		CFLAGS="$(CFLAGS)" \
+		CXXFLAGS="$(CXXFLAGS)" \
+		LDFLAGS="$(LDFLAGS)" \
+		DESTDIR=$(CURDIR)/$(d_mul) install
+endif
+
+	: # fix bfd.h, removing the safety inclusion guard
+	awk '/PR 14072/,/^#endif/ {next} {print}' $(d_bin)/$(PF)/include/bfd.h \
+	  > $(d_bin)/$(PF)/include/bfd.h.new
+	mv $(d_bin)/$(PF)/include/bfd.h.new $(d_bin)/$(PF)/include/bfd.h
+
+	: # fix multilib conflicts of generated values by __WORDSIZE-based expressions
+	sed -i -e '/^#include "ansidecl.h"/{p;s~^.*$$~#include <bits/wordsize.h>~;}' \
+	    -e 's/^#define BFD_DEFAULT_TARGET_SIZE \(32\|64\) *$$/#define BFD_DEFAULT_TARGET_SIZE __WORDSIZE/' \
+	    -e 's/^#define BFD_HOST_64BIT_LONG [01] *$$/#define BFD_HOST_64BIT_LONG (__WORDSIZE == 64)/' \
+	    -e 's/^#define BFD_HOST_64_BIT \(long \)\?long *$$/#if __WORDSIZE == 32\
+#define BFD_HOST_64_BIT long long\
+#else\
+#define BFD_HOST_64_BIT long\
+#endif/' \
+	    -e 's/^#define BFD_HOST_U_64_BIT unsigned \(long \)\?long *$$/#define BFD_HOST_U_64_BIT unsigned BFD_HOST_64_BIT/' \
+	    $(d_bin)/$(PF)/include/bfd.h
+
+	: # copy plugin-api.h ...
+	cp -f include/plugin-api.h $(d_bin)/$(PF)/include
+
+	: # We don't need to distribute everything in binutils and -dev
+	rm -rf $(d_bin)/$(PF)/include/obstack.h
+	rm -f $(d_doc)/$(PF)/share/info/configure.* $(d_doc)/$(PF)/share/info/standards.*
+
+ifneq (,$(filter $(DEB_HOST_ARCH),powerpc ppc64 ppc64el))
+	rm -f $(d_bin)/$(PF)/bin/embedspu
+endif
+
+ifeq ($(with_multiarch),yes)
+	: # Now get rid of just about everything in binutils-multiarch
+	rm -rf $(d_mul)/$(PF)/man $(d_mul)/$(PF)/info $(d_mul)/$(PF)/include
+	rm -rf $(d_mul)/$(PF)/share/man $(d_mul)/$(PF)/share/info $(d_mul)/$(PF)/share/locale
+
+	: # elfedit (even with its --input-mach option)
+	: # is the same for all targets.
+	rm -f $(d_mul)/$(PF)/bin/elfedit
+
+	: # c++filt does not link to libbfd for anything more than
+	: # the help message, and its behavior does not vary
+	: # between arches aside from the --version message.
+	rm -f $(d_mul)/$(PF)/bin/c++filt
+
+	: # As gas/README points out (search for --enable-targets),
+	: # multi-arch gas is not ready yet.
+	rm -f $(d_mul)/$(PF)/bin/as
+	rm -f $(d_mul)/$(PF)/bin/ld
+	rm -f $(d_mul)/$(PF)/bin/ld.bfd
+	rm -f $(d_mul)/$(PF)/bin/ld.gold
+
+  ifneq (,$(filter $(DEB_HOST_ARCH),powerpc ppc64 ppc64el))
+	rm -f $(d_mul)/$(PF)/bin/embedspu
+  endif
+	rm -rf $(d_mul)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/ldscripts
+	rm -rf $(d_mul)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/bfd-plugins
+endif
+
+#	rm -rf debian/binutils-*-*-*/$(PF)/lib/$(DEB_HOST_MULTIARCH)/ldscripts \
+#	  debian/binutils-*-gnu/$(PF)/lib/$(DEB_HOST_MULTIARCH)/ldscripts
+
+	$(install_dir) $(d_dev)/$(PF)/include
+	mv $(d_bin)/$(PF)/include/* $(d_dev)/$(PF)/include/
+
+	$(install_dir) $(d_ctf)/$(PF)/lib/$(DEB_HOST_MULTIARCH)
+	mv $(d_bin)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/libctf.so.* \
+		$(d_ctf)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/.
+	$(install_dir) $(d_ctfn)/$(PF)/lib/$(DEB_HOST_MULTIARCH)
+	mv $(d_bin)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/libctf-nobfd.so.* \
+		$(d_ctfn)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/.
+
+	$(install_dir) $(d_lib)/$(PF)/lib/$(DEB_HOST_MULTIARCH) $(d_dev)/$(PF)/lib/$(DEB_HOST_MULTIARCH)
+	mv $(d_bin)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/*.a \
+	   $(d_bin)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/libbfd.so \
+	   $(d_bin)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/libopcodes.so \
+	   $(d_bin)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/libctf*.so \
+		$(d_dev)/$(PF)/lib/$(DEB_HOST_MULTIARCH)
+	mv $(d_bin)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/*.so \
+	   $(d_lib)/$(PF)/lib/$(DEB_HOST_MULTIARCH)
+
+ifeq ($(with_multiarch),yes)
+	$(install_dir) $(d_mul)/$(PF)/lib/$(DEB_HOST_MULTIARCH) $(d_mdev)/$(PF)/lib/$(DEB_HOST_MULTIARCH)
+	mv $(d_mul)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/libbfd.so \
+	   $(d_mdev)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/libbfd-multiarch.so
+	mv $(d_mul)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/libopcodes.so \
+	   $(d_mdev)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/libopcodes-multiarch.so
+	mv $(d_mul)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/libctf-*.so \
+	   $(d_mdev)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/.
+	rm -f $(d_mul)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/*.la \
+	  $(d_mul)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/*.a
+	rm -f $(d_mul)/$(PF)/lib*/$(DEB_HOST_MULTIARCH)/libiberty*
+endif
+
+	: # Get rid of .la files since libtool obviously has no idea about transient paths
+	rm -f $(d_bin)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/*.la
+
+	chmod ugo-x $(d_lib)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/*.so
+	chmod ugo-x $(d_ctf)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/*.so.*
+	chmod ugo-x $(d_ctfn)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/*.so.*
+ifeq ($(with_native),yes)
+	$(call strip_package, $(p_lib), $(d_lib))
+	$(call strip_package, $(p_ctf), $(d_ctf))
+	$(call strip_package, $(p_ctfn), $(d_ctfn))
+endif
+ifeq ($(with_multiarch),yes)
+	chmod ugo-x $(d_mul)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/*.so
+	chmod ugo-x $(d_mul)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/*.so.*
+	$(call strip_package, $(p_mul), $(d_mul))
+endif
+
+	for i in $(d_dev)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/*.a; do \
+	  echo "lto-stripping $(basename $$i) ..."; \
+	  $(STRIP_LTO) $$i; \
+	  if which strip-nondeterminism >/dev/null 2>&1; then \
+	    echo "strip-nondeterminism $(basename $$i) ..."; \
+	    strip-nondeterminism $$i; \
+	  fi; \
+	done
+
+	: # Don't want /usr/<arch>-linux to exist in any package
+	rm -rf $(d_bin)/$(PF)/$(DEB_HOST_GNU_TYPE)
+
+	: # Remove windows related manpages
+	rm -f $(d_com)/$(PF)/share/man/man1/{dlltool,nlmconv,windmc,windres}.1
+
+ifeq ($(with_multiarch),yes)
+	rm -rf $(d_mul)/$(PF)/$(DEB_HOST_GNU_TYPE)
+	rm -f $(d_mul)/$(PF)/share/man/man1/{dlltool,nlmconv,windmc,windres}.1
+endif
+
+	rm -f $(d_bin)/$(PF)/bin/ld.bfd
+	mv $(d_bin)/$(PF)/bin/ld $(d_bin)/$(PF)/bin/ld.bfd
+	mv $(d_com)/$(PF)/share/man/man1/ld.1 \
+		$(d_com)/$(PF)/share/man/man1/ld.bfd.1
+	ln -sf $(DEB_HOST_GNU_TYPE)-ld.bfd $(d_bin)/$(PF)/bin/ld
+	$(install_dir) $(d_com)/$(PF)/share/man/man1
+	ln -sf ld.bfd.1.gz $(d_com)/$(PF)/share/man/man1/ld.1.gz
+ifeq ($(with_gold),yes)
+	ln -s ld.gold $(d_bin)/$(PF)/bin/gold
+  ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+	find debian -name '*gold' -o -name '*dwp'
+	if which help2man >/dev/null 2>&1; then \
+	  help2man -N -n 'The GNU ELF linker' \
+	    $(d_bin)/$(PF)/bin/ld.gold \
+	    | sed -e 's,debian/.*-ld.gold,ld.gold,g' \
+		-e 's/$(DEB_HOST_GNU_TYPE)-//g' \
+		> debian/ld.gold.1; \
+	  help2man -N -n 'The DWARF packaging utility' \
+	    $(d_bin)/$(PF)/bin/dwp \
+	    | sed -e 's,debian/.*-dwp,dwp,g' \
+		-e 's/$(DEB_HOST_GNU_TYPE)-//g' \
+		> debian/dwp.1; \
+	fi
+  endif
+	cp debian/dwp.1 $(d_com)/$(PF)/share/man/man1/
+	cp debian/ld.gold.1 $(d_com)/$(PF)/share/man/man1/
+	ln -s ld.gold.1.gz $(d_com)/$(PF)/share/man/man1/gold.1.gz
+
+	: # install a symlink for the gold linker
+	$(install_dir) $(d_bin)/$(PF)/lib/gold-ld
+	ln -s ../../bin/ld.gold $(d_bin)/$(PF)/lib/gold-ld/ld
+endif
+	: # install a symlink for the bfd linker
+	$(install_dir) $(d_bin)/$(PF)/lib/compat-ld
+	ln -s ../../bin/ld.bfd $(d_bin)/$(PF)/lib/compat-ld/ld
+
+	: # Remove empty directory
+	rmdir $(d_bin)/$(PF)/include/
+
+	: # Rename non-prefixed binaries to $(DEB_HOST_GNU_TYPE)- prefixed binaries
+	: # and provide symlinks to the prefixed binaries.
+	$(install_dir) $(d_nat)/$(PF)/bin $(d_nat)/$(PF)/share/man/man1
+	for i in $(programs); do \
+	  mv $(d_bin)/$(PF)/bin/$$i $(d_nat)/$(PF)/bin/$(DEB_HOST_GNU_TYPE)-$$i; \
+	  ln -sf $(DEB_HOST_GNU_TYPE)-$$i $(d_bin)/$(PF)/bin/$$i; \
+	done
+	ln -sf $(DEB_HOST_GNU_TYPE)-ld.gold $(d_nat)/usr/bin/$(DEB_HOST_GNU_TYPE)-gold
+	for i in $(programs); do \
+	  ln -sf $$i.1.gz $(d_nat)/$(PF)/share/man/man1/$(DEB_HOST_GNU_TYPE)-$$i.1.gz; \
+	done
+ifeq ($(with_native),yes)
+	$(call strip_package, $(p_nat), $(d_nat))
+endif
+ifeq ($(with_multiarch),yes)
+	for i in \
+	  addr2line ar gprof \
+	  nm objcopy objdump ranlib readelf size strings strip; \
+	do \
+	  mv $(d_mul)/$(PF)/bin/$$i $(d_mul)/$(PF)/bin/$(DEB_HOST_GNU_TYPE)-$$i; \
+	done
+	rm -f $(d_mul)/$(PF)/bin/embedspu
+endif
+
+ifneq (,$(filter $(DEB_HOST_ARCH),i386 kfreebsd-i386 hurd-i386))
+# temporary i586-* symlinks for stretch/sid
+  ifneq (,$(TRIPLET_SYMLINK))
+	for i in $(programs); do \
+	  ln -sf $(DEB_HOST_GNU_TYPE)-$$i $(d_nat)/$(PF)/bin/$(TRIPLET_SYMLINK)-$$i; \
+	  ln -sf $(DEB_HOST_GNU_TYPE)-$$i.1.gz $(d_nat)/$(PF)/share/man/man1/$(TRIPLET_SYMLINK)-$$i.1.gz; \
+	done
+  endif
+# temporary i486-* symlinks for jessie/sid
+  ifeq ($(DEB_HOST_GNU_CPU),i586)
+	gnutype=$(subst i586,i486,$(DEB_HOST_GNU_TYPE)); \
+	for i in $(programs); do \
+	  ln -sf $(DEB_HOST_GNU_TYPE)-$$i $(d_nat)/$(PF)/bin/$$gnutype-$$i; \
+	  ln -sf $(DEB_HOST_GNU_TYPE)-$$i.1.gz $(d_nat)/$(PF)/share/man/man1/$$gnutype-$$i.1.gz; \
+	done
+  endif
+# for backports to wheezy and squeeze
+  ifeq ($(DEB_HOST_GNU_CPU),i486)
+	gnutype=$(subst i486,i586,$(DEB_HOST_GNU_TYPE)); \
+	for i in $(programs); do \
+	  ln -sf $(DEB_HOST_GNU_TYPE)-$$i $(d_nat)/$(PF)/bin/$$gnutype-$$i; \
+	  ln -sf $(DEB_HOST_GNU_TYPE)-$$i.1.gz $(d_nat)/$(PF)/share/man/man1/$$gnutype-$$i.1.gz; \
+	done
+  endif
+endif
+	touch $@
+
+stamps/install-hppa64: checkroot stamps/build-hppa64
+	$(checkdir)
+
+	rm -fr $(d_hppa64)
+	$(install_dir) $(d_hppa64)
+	$(install_dir) $(d_hppa64)/$(PF)/lib/$(DEB_HOST_MULTIARCH)
+
+	: # install binutils-hppa64 stuff
+	env MAKE="$(MAKE) VERSION=$(HPPA64_VERSION)" \
+          $(MAKE) -C builddir-hppa64 \
+		CFLAGS="$(CFLAGS)" \
+		CXXFLAGS="$(CXXFLAGS)" \
+		LDFLAGS="$(LDFLAGS)" \
+		DESTDIR=$(CURDIR)/$(d_hppa64) install
+
+	: # move shared libs to the standard path
+	mv $(d_hppa64)/$(PF)/$(DEB_HOST_GNU_TYPE)/hppa64-linux-gnu/lib/lib*-*.so \
+		$(d_hppa64)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/.
+	mv $(d_hppa64)/$(PF)/lib/hppa64-linux-gnu/libctf*.so.* \
+		$(d_hppa64)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/.
+
+	: # Now get rid of just about everything in binutils-hppa64
+	rm -rf $(d_hppa64)/$(PF)/man
+	rm -rf $(d_hppa64)/$(PF)/info
+	rm -rf $(d_hppa64)/$(PF)/include
+	rm -rf $(d_hppa64)/$(PF)/share
+	rm -rf $(d_hppa64)/$(PF)/hppa-linux-gnu
+	rm -rf $(d_hppa64)/$(PF)/lib/libiberty.a
+	rm -rf $(d_hppa64)/$(PF)/lib/hppa64-linux-gnu/libctf*
+
+	: # replace hard links with soft links
+	for i in $(d_hppa64)/usr/hppa64-linux-gnu/bin/*; do \
+	  ln -sf ../../bin/hppa64-linux-gnu-$$(basename $$i) $$i; \
+	done
+	ln -sf hppa64-linux-gnu-ld.bfd $(d_hppa64)/usr/bin/hppa64-linux-gnu-ld
+
+	$(call strip_package, $(p_hppa64), $(d_hppa64))
+	chmod ugo-x $(d_hppa64)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/*.so
+	chmod ugo-x $(d_hppa64)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/*.so.*
+
+	: # remove RPATH
+	chrpath -k -d $$(file $(d_hppa64)/usr/bin/*|awk -F: '/ ELF/ {print $$1}')
+
+	: # Don't want /usr/<arch>-linux to exist in any package
+	rm -rf $(d_hppa64)/$(PF)/$(DEB_HOST_GNU_TYPE)
+
+	touch $@
+
+###############################################################################
+
+#######################
+# binary-indep target #
+#######################
+
+binary-indep: checkroot build install
+	$(checkdir)
+
+	rm -f debian/files debian/substvars
+
+# Cross builds do not have documentation packages
+ifeq (,$(TARGET))
+
+	$(install_dir) $(d_doc)/DEBIAN
+
+ifeq ($(GFDL_INVARIANT_FREE),yes)
+	rm -f $(d_doc)/$(PF)/share/info/bfd.info*
+	rm -f $(d_doc)/$(PF)/share/info/bfdint.info*
+	rm -f $(d_doc)/$(PF)/share/info/ldint.info*
+endif
+
+ifneq ($(BACKPORT),true)
+	$(install_dir) $(d_doc)/$(PF)/share/doc/$(p_doc)/
+	$(install_file)	debian/changelog $(d_doc)/$(PF)/share/doc/$(p_doc)/changelog.Debian
+	$(install_file)	debian/copyright $(d_doc)/$(PF)/share/doc/$(p_doc)/
+	for i in bfd gas gprof ld; do \
+	  ln -sf ../$(p_bin)/$$i $(d_doc)/$(PF)/share/doc/$(p_doc)/$$i; \
+	done
+	find $(d_doc)/$(PF)/share/doc/$(p_doc) -maxdepth 1 -type f ! -name copyright | xargs gzip -9n
+	gzip -9n $(d_doc)/$(PF)/share/info/*
+
+	dpkg-gencontrol -P$(d_doc) -p$(p_doc)
+	$(CHOWN) -R root:root $(d_doc)
+	chmod -R go=rX  $(d_doc)
+	find $(d_doc) -depth -newermt '$(BUILD_DATE)' -print0 | \
+		xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
+	$(DPKG_DEB) --build $(d_doc) ..
+
+	$(install_dir) $(d_src)/$(PF)/share/doc/$(p_src)/
+	$(install_file)	debian/changelog $(d_src)/$(PF)/share/doc/$(p_src)/changelog.Debian
+	$(install_file)	debian/copyright $(d_src)/$(PF)/share/doc/$(p_src)/
+	find $(d_src)/$(PF)/share/doc/$(p_src) -maxdepth 1 -type f ! -name copyright | xargs gzip -9n
+endif # ifndef BACKPORT
+
+	$(install_dir) $(d_src)/DEBIAN
+	$(install_dir) $(d_src)/$(PF)/src/binutils/patches
+	$(install_file) debian/patches/* $(d_src)/$(PF)/src/binutils/patches/
+	cd .. && find $(source_files) -depth -newermt '$(BUILD_DATE)' -print0 | \
+		xargs -0r touch --no-dereference --date='$(BUILD_DATE)' && \
+		find $(source_files) -type f -print0 | LC_ALL=C sort -z | \
+		tar --null -T - -c --xz --exclude=CVS --mode=go=rX,u+rw,a-s \
+		--xform='s=^[^/]*\/=binutils-$(VERSION)/=' \
+		-f $(pwd)/$(d_src)/$(PF)/src/binutils/binutils-$(VERSION).tar.xz \
+		$(source_files)
+
+	tar cf - $$(find './debian' -mindepth 1 \( \
+		-path './debian/binutils*' -type d -prune -o \
+		-path './debian/libbinutils' -type d -prune -o \
+		-path './debian/binutils*-dbg' -type d -prune -o \
+		-path './debian/libbinutils-dbg' -type d -prune -o \
+		-path './debian/patches' -prune -o \
+		-path './debian/libctf*' -type d -prune -o \
+		-path './debian/tmp*' -prune -o \
+		-path './debian/.bzr*' -prune -o \
+		-path './debian/files' -prune -o \
+		-print \) ) \
+	  | tar -x -C $(d_src)/$(PF)/src/binutils -f -
+	-chmod 755 $(d_src)/$(PF)/src/binutils/debian/*.{pre,post}{inst,rm}
+	chmod 755 $(d_src)/$(PF)/src/binutils/debian/test-suite-compare.py
+
+	dpkg-gencontrol -P$(d_src) -p$(p_src)
+	$(CHOWN) -R root:root $(d_src)
+	chmod -R go=rX  $(d_src)
+	find $(d_src) -depth -newermt '$(BUILD_DATE)' -print0 | \
+		xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
+	$(DPKG_DEB) --build $(d_src) ..
+
+
+	$(install_dir) $(d_bld)/DEBIAN $(d_bld)/$(PF)/share/doc/
+	ln -sf $(p_com) $(d_bld)/$(PF)/share/doc/$(p_bld)
+	dpkg-gencontrol -P$(d_bld) -p$(p_bld) -Vbinutils:minver=$(min_ver)
+	$(CHOWN) -R root:root $(d_bld)
+	chmod -R go=rX $(d_bld)
+	find $(d_bld) -depth -newermt '$(BUILD_DATE)' -print0 | \
+		xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
+	$(DPKG_DEB) --build $(d_bld) ..
+endif
+
+###############################################################################
+
+#######################
+# binary-arch target  #
+#######################
+
+binary.%: stamps/install.% install
+	rm -rf $(D_CROSS)/$(PF)/share/info
+
+	rm -rf $(D_CROSS)/DEBIAN $(D_CROSS)-dbg/DEBIAN
+
+	: # make lintian happy
+	$(install_dir) $(D_CROSS)/$(PF)/share/lintian/overrides
+	sed 's/@PKG@/$(P_CROSS)/' debian/binutils-cross.overrides \
+	  > $(D_CROSS)/$(PF)/share/lintian/overrides/$(P_CROSS)
+
+	: # install maintainer scrtips
+	$(install_dir) $(D_CROSS)/$(PF)/share/doc/$(P_CROSS)
+	$(install_file)	debian/changelog \
+	  $(D_CROSS)/$(PF)/share/doc/$(P_CROSS)/changelog.Debian
+	$(install_file)	debian/copyright debian/README.cross \
+	  $(D_CROSS)/$(PF)/share/doc/$(P_CROSS)/
+	gzip -9nf $(D_CROSS)/$(PF)/share/doc/$(P_CROSS)/changelog.Debian
+
+ifeq ($(with_check),yes)
+	: # remove user and date from test-summary for reproducible builds
+	sed -i -e '/Test run by/d' test-summary-$*
+	$(install_file) test-summary-$* \
+	  $(D_CROSS)/$(PF)/share/doc/$(P_CROSS)/test-summary
+	gzip -9nf $(D_CROSS)/$(PF)/share/doc/$(P_CROSS)/test-summary
+	$(install_dir) $(D_CROSS)/$(PF)/share/doc/$(p_bin)
+	ln -sf ../$(P_CROSS)/test-summary.gz \
+	  $(D_CROSS)/$(PF)/share/doc/$(p_bin)/test-summary-$*.gz
+endif
+
+	for pkg in bfd gas gprof ld; do \
+	  ln -sf ../binutils/$$pkg \
+	    $(D_CROSS)/$(PF)/share/doc/$(P_CROSS)/$$pkg; \
+	done
+
+	$(install_dir) $(D_CROSS)/DEBIAN $(D_CROSS)-dbg/DEBIAN
+	if [ "$(is_rc)" = yes ]; then \
+	  nver=$$(echo $(DEB_VERSION_UPSTREAM) | awk -F. '{ OFS="."; NF--; $$NF=$$NF+1; print }'); \
+	else \
+	  nver=$$(echo $(DEB_VERSION_UPSTREAM) | awk -F. '{ OFS="."; if (NF > 2) $$NF=$$NF+1; else $$++NF=1; print }'); \
+	fi; \
+	date_ext=$(DATE_EXT); \
+	[ "$(is_rc)" = yes ] && date_ext=; \
+	$(install_file) debian/binutils.triggers $(D_CROSS)/DEBIAN/triggers
+
+	rm -f debian/substvars
+	dpkg-shlibdeps $(D_CROSS)/$(PF)/bin/* -l$(d_lib)/$(PF)/lib/$(DEB_HOST_MULTIARCH)
+	dpkg-gencontrol -P$(D_CROSS) -p$(P_CROSS) \
+		-VBuilt-Using="$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W binutils-source)"
+	cd $(D_CROSS) && find -type f  ! -regex './DEBIAN/.*' -printf '%P\n' | LC_ALL=C sort | xargs md5sum > DEBIAN/md5sums
+	dpkg-gencontrol -P$(D_CROSS)-dbg -p$(P_CROSS)-dbg
+	cd $(D_CROSS)-dbg && find -type f  ! -regex './DEBIAN/.*' -printf '%P\n' | LC_ALL=C sort | xargs md5sum > DEBIAN/md5sums
+	$(CHOWN) -R root:root $(D_CROSS) $(D_CROSS)-dbg
+	chmod -R go=rX  $(D_CROSS) $(D_CROSS)-dbg
+	find $(D_CROSS) $(D_CROSS)-dbg -depth -newermt '$(BUILD_DATE)' -print0 | \
+		xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
+	$(DPKG_DEB) --build $(D_CROSS) ..
+	$(DPKG_DEB) --build $(D_CROSS)-dbg ..
+
+binary-for-host: checkroot
+	$(checkdir)
+
+	rm -fr $(d_hst)
+	$(install_dir) $(d_hst)/DEBIAN/ $(d_hst)/$(PF)/share/doc/
+	ln -sf $(p_com) $(d_hst)/$(PF)/share/doc/$(p_hst)
+
+	rm -f debian/substvars
+	$(for_target) dpkg-gencontrol -P$(d_hst) -p$(p_hst) \
+		-Vbinutils:native=$(if $(TARGET),$(p_cross),$(p_nat)) \
+		-Vbinutils:minver=$(min_ver)
+
+	$(CHOWN) -R root:root $(d_hst)
+	chmod -R go=rX $(d_hst)
+
+	find $(d_hst) -depth -newermt '$(BUILD_DATE)' -print0 | \
+		xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
+	$(DPKG_DEB) --build $(d_hst) ..
+
+binary-arch: checkroot binary-native binary-for-host \
+    $(if $(filter yes, $(with_cross)),$(addprefix binary.,$(CROSS_ARCHS)))
+	$(checkdir)
+
+binary-native: checkroot build install $(checkdir)
+
+ifneq ($(BACKPORT),true)
+# Process the following only if $(TARGET) is set
+ifneq (,$(TARGET))
+	rm -rf $(d_cross)/$(PF)/share/info $(d_cross)/$(PF)/share/man
+
+	$(install_dir) $(d_cross)/DEBIAN
+
+	$(install_dir) $(d_cross)/$(PF)/share/doc/$(p_cross)/
+	$(install_file)	debian/changelog $(d_cross)/$(PF)/share/doc/$(p_cross)/changelog.Debian
+	$(install_file)	debian/copyright debian/README.cross $(d_cross)/$(PF)/share/doc/$(p_cross)/
+	gzip -9nf $(d_cross)/$(PF)/share/doc/$(p_cross)/changelog.Debian
+
+	for pkg in bfd gas gprof ld; do \
+	  ln -sf ../binutils/$$pkg $(d_cross)/$(PF)/share/doc/$(p_cross)/$$pkg; \
+	done
+
+	rm -f debian/substvars
+	dpkg-shlibdeps $(d_cross)/$(PF)/bin/* \
+	  -ldebian/tmp/$(PF)/lib/$(DEB_TARGET_MULTIARCH) -l$(d_lib)/$(PF)/lib/$(DEB_TARGET_MULTIARCH)
+	dpkg-gencontrol -P$(d_cross) -p$(p_cross) \
+		-VBuilt-Using="$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W binutils-source)"
+	find $(d_cross) -depth -newermt '$(BUILD_DATE)' -print0 | \
+		xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
+	$(DPKG_DEB) --build $(d_cross) ..
+
+else
+	: # generate some control & helper files
+	if [ "$(is_rc)" = yes ]; then \
+	  nver=$$(echo $(DEB_VERSION_UPSTREAM) | awk -F. '{ OFS="."; NF--; $$NF=$$NF+1; print }'); \
+	else \
+	  nver=$$(echo $(DEB_VERSION_UPSTREAM) | awk -F. '{ OFS="."; if (NF > 2) $$NF=$$NF+1; else $$++NF=1; print }'); \
+	fi; \
+	for i in debian/*.in; do \
+	    case "$$i" in debian/control.in|debian/control.cross.in) continue; esac; \
+	    date_ext=$(DATE_EXT); \
+	    case "$$i" in debian/*.shlibs.in) [ "$(is_rc)" = yes ] && date_ext=; esac; \
+	    sed -e 's/@VER@/$(VERSION)/g' \
+		-e 's/@DEB_VER@/$(DEB_VERSION)/g' \
+		-e 's/@DEB_SVER@/$(DEB_SVERSION)/g' \
+		-e 's/@DEB_UVER@/$(DEB_VERSION_UPSTREAM)/g' \
+		-e "s/@DEB_NVER@/$$nver/g" \
+		-e "s/@DATE_EXT@/$$date_ext/g" \
+		-e 's/@DEB_ARCH@/$(DEB_HOST_ARCH)/g' \
+		-e 's/@DEB_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' \
+		-e 's/@DEB_TRIPLET@/$(DEB_HOST_GNU_TYPE)/g' \
+		-e "s/@dpkg_dev@/$(DPKG_DEV)/" \
+		$$i > $${i%*.in}; \
+	    case "$$i" in *.post*|*.pre*) chmod 755 $${i%*.in}; esac; \
+	done
+
+	: # install bug reporting information
+	$(install_file) -D debian/$(p_bin).presubj \
+		$(d_bin)/$(PF)/share/bug/$(p_bin)/presubj
+ifeq ($(with_multiarch),yes)
+	$(install_dir) $(d_mul)/$(PF)/share/bug
+	ln -sf $(p_bin) $(d_mul)/$(PF)/share/bug/$(p_mul)
+endif
+ifeq ($(with_hppa64),yes)
+	$(install_dir) $(d_hppa64)/$(PF)/share/bug
+	ln -sf $(p_bin) $(d_hppa64)/$(PF)/share/bug/$(p_hppa64)
+endif
+
+	: # make lintian happy
+	$(install_file) -D debian/$(p_com).overrides \
+		$(d_com)/$(PF)/share/lintian/overrides/$(p_com)
+	$(install_file) -D debian/$(p_lib).overrides \
+		$(d_lib)/$(PF)/share/lintian/overrides/$(p_lib)
+	$(install_file) -D debian/binutils.overrides \
+		$(d_bin)/$(PF)/share/lintian/overrides/$(p_bin)
+	$(install_dir) $(d_nat)/$(PF)/share/lintian/overrides
+	sed 's/@PKG@/$(p_nat)/' debian/binutils-triplet.overrides \
+	  > $(d_nat)/$(PF)/share/lintian/overrides/$(p_nat)
+ifeq ($(with_multiarch),yes)
+	$(install_file) -D debian/$(p_mul).overrides \
+		$(d_mul)/$(PF)/share/lintian/overrides/$(p_mul)
+	$(install_file) -D debian/$(p_mdev).overrides \
+		$(d_mdev)/$(PF)/share/lintian/overrides/$(p_mdev)
+endif
+ifeq ($(with_hppa64),yes)
+	$(install_file) -D debian/$(p_hppa64).overrides \
+		$(d_hppa64)/$(PF)/share/lintian/overrides/$(p_hppa64)
+endif
+
+	: # install maintainer scripts
+	$(install_dir) $(d_bin)/DEBIAN
+
+	$(install_dir) $(d_lib)/DEBIAN $(d_lib)-dbg/DEBIAN
+	$(install_file) debian/binutils.triggers $(d_lib)/DEBIAN/triggers
+	$(install_file) debian/libbinutils.shlibs $(d_lib)/DEBIAN/shlibs
+
+	$(install_dir) $(d_ctf)/DEBIAN $(d_ctf)-dbg/DEBIAN
+	$(install_file) debian/binutils.triggers $(d_ctf)/DEBIAN/triggers
+	$(install_file) debian/libctf0.symbols $(d_ctf)/DEBIAN/symbols
+
+	$(install_dir) $(d_ctfn)/DEBIAN $(d_ctfn)-dbg/DEBIAN
+	$(install_file) debian/binutils.triggers $(d_ctfn)/DEBIAN/triggers
+	$(install_file) debian/libctf-nobfd0.symbols $(d_ctfn)/DEBIAN/symbols
+
+	$(install_dir) $(d_com)/DEBIAN
+
+	$(install_dir) $(d_nat)/DEBIAN $(d_nat)-dbg/DEBIAN
+
+	$(install_dir) $(d_dev)/DEBIAN
+
+ifeq ($(with_multiarch),yes)
+	$(install_dir) $(d_mul)/DEBIAN $(d_mul)-dbg/DEBIAN
+	$(install_script) debian/binutils-multiarch.preinst $(d_mul)/DEBIAN/preinst
+	$(install_script) debian/binutils-multiarch.postinst $(d_mul)/DEBIAN/postinst
+	$(install_script) debian/binutils-multiarch.prerm $(d_mul)/DEBIAN/prerm
+	$(install_script) debian/binutils-multiarch.postrm $(d_mul)/DEBIAN/postrm
+	$(install_file) debian/binutils-multiarch.shlibs $(d_mul)/DEBIAN/shlibs
+	$(install_file) debian/binutils.triggers $(d_mul)/DEBIAN/triggers
+	$(install_dir) $(d_mdev)/DEBIAN
+endif
+
+ifeq ($(with_hppa64),yes)
+	$(install_dir) $(d_hppa64)/DEBIAN $(d_hppa64)-dbg/DEBIAN
+	$(install_file) debian/binutils.triggers $(d_hppa64)/DEBIAN/triggers
+endif
+
+	: # install docs
+	$(install_dir) $(d_bin)/$(PF)/share/doc/$(p_bin)/
+	$(install_file)	debian/changelog $(d_bin)/$(PF)/share/doc/$(p_bin)/changelog.Debian
+	$(install_file)	debian/copyright $(d_bin)/$(PF)/share/doc/$(p_bin)/
+
+	$(install_dir) $(d_com)/$(PF)/share/doc/$(p_com)/
+	$(install_file) debian/changelog $(d_com)/$(PF)/share/doc/$(p_com)/changelog.Debian
+	$(install_file) debian/copyright $(d_com)/$(PF)/share/doc/$(p_com)/
+
+	$(install_dir) $(d_lib)/$(PF)/share/doc/
+	ln -sf $(p_com) $(d_lib)/$(PF)/share/doc/$(p_lib)
+
+	$(install_dir) $(d_ctf)/$(PF)/share/doc/
+	ln -sf $(p_lib) $(d_ctf)/$(PF)/share/doc/$(p_ctf)
+
+	$(install_dir) $(d_ctfn)/$(PF)/share/doc/$(p_ctfn)
+	$(install_file)	debian/changelog $(d_ctfn)/$(PF)/share/doc/$(p_ctfn)/changelog.Debian
+	$(install_file)	debian/copyright $(d_ctfn)/$(PF)/share/doc/$(p_ctfn)/
+
+	$(install_dir) $(d_nat)/$(PF)/share/doc/
+	ln -sf $(p_lib) $(d_nat)/$(PF)/share/doc/$(p_nat)
+
+	$(install_dir) $(d_dev)/$(PF)/share/doc/
+	ln -sf $(p_bin) $(d_dev)/$(PF)/share/doc/$(p_dev)
+ifeq ($(with_multiarch),yes)
+	$(install_dir) $(d_mul)/$(PF)/share/doc/
+	ln -sf $(p_bin) $(d_mul)/$(PF)/share/doc/$(p_mul)
+	$(install_dir) $(d_mdev)/$(PF)/share/doc/
+	ln -sf $(p_mul) $(d_mdev)/$(PF)/share/doc/$(p_mdev)
+endif
+ifeq ($(with_hppa64),yes)
+	$(install_dir) $(d_hppa64)/$(PF)/share/doc/
+	ln -sf $(p_bin) $(d_hppa64)/$(PF)/share/doc/$(p_hppa64)
+endif
+
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+ifeq ($(with_check),yes)
+	: # remove user and date from test-summary for reproducible builds
+	sed -i -e '/Test run by/d' $(pwd)/test-summary
+	$(install_dir) $(d_nat)/$(PF)/share/doc/$(p_bin)
+	$(install_file) test-summary \
+	  $(d_nat)/$(PF)/share/doc/$(p_bin)/test-summary-$(DEB_HOST_ARCH)
+	gzip -9nf \
+	  $(d_nat)/$(PF)/share/doc/$(p_bin)/test-summary-$(DEB_HOST_ARCH)
+
+	: # save log and sum files in $(p_dev)
+	$(install_dir) $(d_dev)/$(PF)/share/doc/$(p_bin)/tests
+	for i in $$(find builddir-single -name '*.sum'); do \
+	  b=$$(basename $$i .sum); \
+	  $(install_file) $$i $(d_dev)/$(PF)/share/doc/$(p_bin)/tests/$$b.sum; \
+	  sed -i -e '/Test run by/d' $(d_dev)/$(PF)/share/doc/$(p_bin)/tests/$$b.sum; \
+	  xz -9v $(d_dev)/$(PF)/share/doc/$(p_bin)/tests/$$b.sum; \
+	  $(install_file) $${i%.sum}.log $(d_dev)/$(PF)/share/doc/$(p_bin)/tests/$$b.log; \
+	  xz -9v $(d_dev)/$(PF)/share/doc/$(p_bin)/tests/$$b.log; \
+	done
+endif
+endif
+	$(install_dir) $(d_com)/$(PF)/share/doc/$(p_bin)
+	$(install_file) binutils/NEWS debian/README.cross \
+                        $(d_com)/$(PF)/share/doc/$(p_bin)/
+
+	$(install_file) binutils/ChangeLog $(d_com)/$(PF)/share/doc/$(p_bin)/changelog
+
+	for pkg in bfd gas gprof ld; do \
+	  $(install_dir) $(d_com)/$(PF)/share/doc/$(p_bin)/$$pkg; \
+	done
+	$(install_file) bfd/ChangeLog bfd/PORTING bfd/TODO \
+			$(d_com)/$(PF)/share/doc/$(p_bin)/bfd/
+	$(install_file) gas/ChangeLog gas/NEWS $(d_com)/$(PF)/share/doc/$(p_bin)/gas/
+	$(install_file) gprof/ChangeLog gprof/TODO gprof/TEST \
+			$(d_com)/$(PF)/share/doc/$(p_bin)/gprof/
+	$(install_file) ld/ChangeLog ld/TODO ld/NEWS \
+			$(d_com)/$(PF)/share/doc/$(p_bin)/ld/
+
+	: # These only exist in H. J. Lu releases not GNU ones.
+	for dir in binutils bfd gas gprof ld; do \
+	  if [ -f $$dir/ChangeLog.linux ]; then \
+	    $(install_file) $$dir/ChangeLog.linux $(d_com)/$(PF)/share/doc/$(p_bin)/$$dir/; \
+	  fi; \
+	done
+
+	: # Copy bbconv.pl to the doc dir for use by interested people
+	$(install_file) gprof/bbconv.pl $(d_com)/$(PF)/share/doc/$(p_bin)/gprof/.
+
+	: # Compress stuff that needs it
+	gzip -9n $(d_ctfn)/$(PF)/share/doc/$(p_ctfn)/changelog.Debian
+
+	gzip -9n $(d_bin)/$(PF)/share/doc/$(p_bin)/changelog.Debian
+	find $(d_com)/$(PF)/share/doc/$(p_bin)/ -type f ! -name bbconv.pl | xargs gzip -9n
+	gzip -9n $(d_com)/$(PF)/share/doc/$(p_com)/changelog.Debian
+	gzip -9n $(d_com)/$(PF)/share/man/man1/*.1
+
+	: # Finish it all up
+	dpkg-gencontrol -P$(d_bin) -p$(p_bin) \
+		$(CONFLICTS_TARGET_$(DEB_HOST_ARCH)) $(gold_provides) \
+		-Vbinutils:native=$(p_nat)
+	cd $(d_bin) && find -type f  ! -regex './DEBIAN/.*' -printf '%P\n' | LC_ALL=C sort | xargs md5sum > DEBIAN/md5sums
+
+	rm -f debian/substvars
+	find $(d_lib) -type f | xargs file | grep ELF | cut -d: -f 1 | xargs dpkg-shlibdeps
+	dpkg-gencontrol -P$(d_lib) -p$(p_lib)
+	cd $(d_lib) && find -type f  ! -regex './DEBIAN/.*' -printf '%P\n' | LC_ALL=C sort | xargs md5sum > DEBIAN/md5sums
+	dpkg-gencontrol -P$(d_lib)-dbg -p$(p_lib)-dbg
+	cd $(d_lib)-dbg && find -type f  ! -regex './DEBIAN/.*' -printf '%P\n' | LC_ALL=C sort | xargs md5sum > DEBIAN/md5sums
+
+	dpkg-gensymbols -P$(d_ctf) -p$(p_ctf) -l$(d_lib)
+	dpkg-gensymbols -P$(d_ctfn) -p$(p_ctfn)
+
+	rm -f debian/substvars
+	find $(d_ctf) -type f | xargs file | grep ELF | cut -d: -f 1 | xargs dpkg-shlibdeps
+	dpkg-gencontrol -P$(d_ctf) -p$(p_ctf)
+	cd $(d_ctf) && find -type f  ! -regex './DEBIAN/.*' -printf '%P\n' | LC_ALL=C sort | xargs md5sum > DEBIAN/md5sums
+	dpkg-gencontrol -P$(d_ctf)-dbg -p$(p_ctf)-dbg
+	cd $(d_ctf)-dbg && find -type f  ! -regex './DEBIAN/.*' -printf '%P\n' | LC_ALL=C sort | xargs md5sum > DEBIAN/md5sums
+
+	rm -f debian/substvars
+	find $(d_ctfn) -type f | xargs file | grep ELF | cut -d: -f 1 | xargs dpkg-shlibdeps
+	dpkg-gencontrol -P$(d_ctfn) -p$(p_ctfn)
+	cd $(d_ctfn) && find -type f  ! -regex './DEBIAN/.*' -printf '%P\n' | LC_ALL=C sort | xargs md5sum > DEBIAN/md5sums
+	dpkg-gencontrol -P$(d_ctfn)-dbg -p$(p_ctfn)-dbg
+	cd $(d_ctfn)-dbg && find -type f  ! -regex './DEBIAN/.*' -printf '%P\n' | LC_ALL=C sort | xargs md5sum > DEBIAN/md5sums
+
+	rm -f debian/substvars
+	dpkg-gencontrol -P$(d_com) -p$(p_com)
+	cd $(d_com) && find -type f ! -regex './DEBIAN/.*' -printf '%P\n' | LC_ALL=C sort | xargs md5sum > DEBIAN/md5sums
+
+	rm -f debian/substvars
+	find $(d_nat) -type f | xargs file | grep ELF | cut -d: -f 1 | xargs dpkg-shlibdeps -l$(d_lib)/$(PF)/lib/$(DEB_HOST_MULTIARCH)
+	dpkg-gencontrol -P$(d_nat) -p$(p_nat) -VextraDepends='libbinutils (= $${binary:Version})'
+	cd $(d_nat) && find -type f  ! -regex './DEBIAN/.*' -printf '%P\n' | LC_ALL=C sort | xargs md5sum > DEBIAN/md5sums
+	dpkg-gencontrol -P$(d_nat)-dbg -p$(p_nat)-dbg -VextraDepends='libbinutils (= $${binary:Version})'
+	cd $(d_nat)-dbg && find -type f  ! -regex './DEBIAN/.*' -printf '%P\n' | LC_ALL=C sort | xargs md5sum > DEBIAN/md5sums
+
+	rm -f debian/substvars
+	dpkg-gencontrol -P$(d_dev) -p$(p_dev)
+	cd $(d_dev) && find -type f  ! -regex './DEBIAN/.*' -printf '%P\n' | LC_ALL=C sort | xargs md5sum > DEBIAN/md5sums
+
+ifeq ($(with_multiarch),yes)
+	rm -f debian/substvars
+	find $(d_mul) -type f | xargs file | grep ELF | cut -d: -f 1 | xargs dpkg-shlibdeps
+	dpkg-gencontrol -P$(d_mul) -p$(p_mul)
+	cd $(d_mul) && find -type f  ! -regex './DEBIAN/.*' -printf '%P\n' | LC_ALL=C sort | xargs md5sum > DEBIAN/md5sums
+	dpkg-gencontrol -P$(d_mul)-dbg -p$(p_mul)-dbg
+	cd $(d_mul)-dbg && find -type f  ! -regex './DEBIAN/.*' -printf '%P\n' | LC_ALL=C sort | xargs md5sum > DEBIAN/md5sums
+
+	rm -f debian/substvars
+	mkdir -p $(d_mdev)/DEBIAN
+	dpkg-gencontrol -P$(d_mdev) -p$(p_mdev)
+	cd $(d_mdev) && find -type f  ! -regex './DEBIAN/.*' -printf '%P\n' | LC_ALL=C sort | xargs -r md5sum > DEBIAN/md5sums
+endif
+
+ifeq ($(with_hppa64),yes)
+	rm -f debian/substvars
+	find $(d_hppa64) -type f | xargs file | grep ELF | cut -d: -f 1 | xargs dpkg-shlibdeps
+	dpkg-gencontrol -P$(d_hppa64) -p$(p_hppa64)
+	cd $(d_hppa64) && find -type f  ! -regex './DEBIAN/.*' -printf '%P\n' | LC_ALL=C sort | xargs md5sum > DEBIAN/md5sums
+	dpkg-gencontrol -P$(d_hppa64)-dbg -p$(p_hppa64)-dbg
+	cd $(d_hppa64)-dbg && find -type f  ! -regex './DEBIAN/.*' -printf '%P\n' | LC_ALL=C sort | xargs md5sum > DEBIAN/md5sums
+endif
+
+	$(CHOWN) -R root:root $(d_bin) $(d_com) $(d_lib) $(d_lib)-dbg $(d_ctf) $(d_ctf)-dbg $(d_ctfn) $(d_ctfn)-dbg $(d_nat) $(d_nat)-dbg $(d_dev)
+	chmod -R go=rX  $(d_bin) $(d_com) $(d_lib) $(d_lib)-dbg $(d_ctf) $(d_ctf)-dbg $(d_ctfn) $(d_ctfn)-dbg $(d_nat) $(d_nat)-dbg $(d_dev)
+	find $(d_bin) -depth -newermt '$(BUILD_DATE)' -print0 | \
+		xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
+	$(DPKG_DEB) --build $(d_bin) ..
+	find $(d_com) -depth -newermt '$(BUILD_DATE)' -print0 | \
+		xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
+	$(DPKG_DEB) --build $(d_com) ..
+	find $(d_ctf) -depth -newermt '$(BUILD_DATE)' -print0 | \
+		xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
+	$(DPKG_DEB) --build $(d_ctf) ..
+	find $(d_ctf)-dbg -depth -newermt '$(BUILD_DATE)' -print0 | \
+		xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
+	$(DPKG_DEB) --build $(d_ctf)-dbg ..
+	find $(d_ctfn) -depth -newermt '$(BUILD_DATE)' -print0 | \
+		xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
+	$(DPKG_DEB) --build $(d_ctfn) ..
+	find $(d_ctfn)-dbg -depth -newermt '$(BUILD_DATE)' -print0 | \
+		xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
+	$(DPKG_DEB) --build $(d_ctfn)-dbg ..
+	find $(d_lib) -depth -newermt '$(BUILD_DATE)' -print0 | \
+		xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
+	$(DPKG_DEB) --build $(d_lib) ..
+	find $(d_lib)-dbg -depth -newermt '$(BUILD_DATE)' -print0 | \
+		xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
+	$(DPKG_DEB) --build $(d_lib)-dbg ..
+	find $(d_nat) -depth -newermt '$(BUILD_DATE)' -print0 | \
+		xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
+	$(DPKG_DEB) --build $(d_nat) ..
+	find $(d_nat)-dbg -depth -newermt '$(BUILD_DATE)' -print0 | \
+		xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
+	$(DPKG_DEB) --build $(d_nat)-dbg ..
+	find $(d_dev) -depth -newermt '$(BUILD_DATE)' -print0 | \
+		xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
+	$(DPKG_DEB) --build $(d_dev) ..
+ifeq ($(with_multiarch),yes)
+	$(CHOWN) -R root:root $(d_mul) $(d_mul)-dbg
+	chmod -R go=rX $(d_mul) $(d_mul)-dbg
+	find $(d_mul) -depth -newermt '$(BUILD_DATE)' -print0 | \
+		xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
+	$(DPKG_DEB) --build $(d_mul) ..
+	find $(d_mul)-dbg -depth -newermt '$(BUILD_DATE)' -print0 | \
+		xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
+	$(DPKG_DEB) --build $(d_mul)-dbg ..
+
+	$(CHOWN) -R root:root $(d_mdev)
+	chmod -R go=rX  $(d_mdev)
+	find $(d_mdev) -depth -newermt '$(BUILD_DATE)' -print0 | \
+		xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
+	$(DPKG_DEB) --build $(d_mdev) ..
+endif
+ifeq ($(with_hppa64),yes)
+	$(CHOWN) -R root:root $(d_hppa64)-dbg
+	chmod -R go=rX  $(d_hppa64) $(d_hppa64)-dbg
+	find $(d_hppa64) -depth -newermt '$(BUILD_DATE)' -print0 | \
+		xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
+	$(DPKG_DEB) --build $(d_hppa64) ..
+	find $(d_hppa64)-dbg -depth -newermt '$(BUILD_DATE)' -print0 | \
+		xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
+	$(DPKG_DEB) --build $(d_hppa64)-dbg ..
+endif
+	@echo '==================== Build finished ===================='
+	ps aux
+
+endif # Process the following only if $(TARGET) is set
+endif # ifndef BACKPORT
+
+###############################################################################
+
+define checkdir
+        test -f bfd/elf32.c -a -f debian/rules
+endef
+
+#	if which pkg_create_dbgsym >/dev/null 2>&1; then \
+#	  pkg_create_dbgsym $1 $2; \
+#	fi
+
+ifeq ($(with_strip),yes)
+# strip_package: <pkgname> <install-dir> <???>
+define strip_package
+	$(install_dir) $(strip $2)-dbg/usr/share/doc/
+	ln -sf $(strip $1) $(strip $2)-dbg/usr/share/doc/$(strip $1)-dbg
+	: # Strip shared libraries and binaries
+	set -e; \
+	nfiles=0; \
+	for i in \
+	  $(strip $2)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/libbfd-*so \
+	  $(strip $2)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/libopcodes-*so \
+	  $(strip $2)/$(PF)/lib/$(DEB_HOST_MULTIARCH)/libctf*.so.0.0.0 \
+	  $$(file $(strip $2)/$(PF)/bin/* |awk -F: '$$0 !~ /script/ {print $$1}'); \
+	do \
+	  test ! -h $$i || continue; test -f $$i || continue; \
+	  files="$$files $$i"; \
+	  nfiles=$$(expr $$nfiles + 1); \
+	done; \
+	for i in $$files; do \
+	  id=$$(debugedit --build-id --build-id-seed='$(strip $1)-$(DEB_VERSION)' $$i); \
+	done; \
+	mkdir -p $(strip $2)-dbg/usr/lib/debug/.dwz/$(DEB_HOST_MULTIARCH); \
+	dwz=usr/lib/debug/.dwz/$(DEB_HOST_MULTIARCH)/$(strip $1).debug; \
+	if [ $$nfiles -gt 1 ]; then \
+	  dwz -m $(strip $2)-dbg/$$dwz -M /$$dwz $$files; \
+	  $(CROSS)objcopy --compress-debug-sections $(strip $2)-dbg/$$dwz; \
+	else \
+	  dwz $$files; \
+	fi; \
+	for i in $$files; do \
+	  b_id=$$(LC_ALL=C $(CROSS)readelf -n $$i | sed -n 's/ *Build ID: *\([0-9a-f][0-9a-f]*\)/\1/p'); \
+	  if [ -z "$$b_id" ]; then \
+	    id=$$(echo $$i | sed -r 's,debian/[^/]+,$2-dbg/usr/lib/debug,'); \
+	    echo strip $$i; \
+	    mkdir -p $$(dirname $$id); \
+	    $(CROSS)objcopy --only-keep-debug $$i $$id; \
+	    chmod 644 $$id; \
+	    $(STRIP) $$i; \
+	    $(CROSS)objcopy --add-gnu-debuglink $$id $$i; \
+	  else \
+	    echo "ID: $${b_id} -> $$(echo $$i | sed 's,$(strip $2),,')"; \
+	    d=usr/lib/debug/.build-id/$${b_id:0:2}; \
+	    f=$${b_id:2}.debug; \
+	    mkdir -p $(strip $2)-dbg/$$d; \
+	    $(CROSS)objcopy --only-keep-debug --compress-debug-sections $$i $(strip $2)-dbg/$$d/$$f; \
+	    chmod 644 $(strip $2)-dbg/$$d/$$f; \
+	    $(STRIP) $$i; \
+	  fi; \
+	done
+endef
+else
+define strip_package
+	$(install_dir) $(strip $2)-dbg/usr/share/doc/
+	ln -sf $(strip $1) $(strip $2)-dbg/usr/share/doc/$(strip $1)-dbg
+endef
+endif
+
+remove-gfdl-files:
+	rm -rf .git* .cvs* gdb* libdecnumber readline sim
+ifeq ($(GFDL_INVARIANT_FREE),yes)
+	for i in $(gfdl_toplevel_texinfo_files); do \
+	  if [ -f $$i ]; then \
+	    sed "s/@name@/$$(basename $$i)/g" debian/gfdl.texi > $$i; \
+	  fi; \
+	done
+	rm -f $(gfdl_generated_files)
+	rm -f zlib/contrib/dotzlib/DotZLib.chm
+endif
+
+# Below here is fairly generic really
+
+binary:         binary-indep binary-arch
+
+checkroot:
+	$(checkdir)
+ifeq ($(require_root),yes)
+	test root = "`whoami`"
+endif
+
+.PHONY: binary binary-arch binary-indep clean checkroot
+
+.PRECIOUS: stamps/configure.% stamps/build.% stamps/install.%
diff --git a/source.lintian-overrides b/source.lintian-overrides
new file mode 100644
index 000000000..5662f6631
--- /dev/null
+++ b/source.lintian-overrides
@@ -0,0 +1,12 @@
+# handled via diversions
+binutils source: binaries-have-file-conflict
+
+# wrong positive
+binutils source: license-problem-gfdl-invariants
+
+# yes, we know what we are doing
+debian-rules-sets-dpkg-architecture-variable
+
+# test data
+binutils source: source-is-missing binutils/testsuite/binutils-all/nfp/test1_nfp6000.nffw
+binutils source: source-is-missing binutils/testsuite/binutils-all/nfp/test2_nfp6000.nffw
diff --git a/source/format b/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/test-suite-compare.py b/test-suite-compare.py
new file mode 100644
index 000000000..737303950
--- /dev/null
+++ b/test-suite-compare.py
@@ -0,0 +1,230 @@
+#!/usr/bin/python3
+
+# Quick'n'dirty regression check for dejagnu testsuites
+# Copyright (C) 2003, 2004, 2005, 2006, 2007  James Troup <james@nocrew.org>
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU;5B General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+################################################################################
+
+import optparse
+import os
+import sys
+
+################################################################################
+
+def fubar(msg, exit_code=1):
+    sys.stderr.write("E: %s\n" % (msg))
+    sys.exit(exit_code)
+
+def warn(msg):
+    sys.stderr.write("W: %s\n" % (msg))
+
+def info(msg):
+    sys.stderr.write("I: %s\n" % (msg))
+
+################################################################################
+
+def read_testsummary(filename):
+    results = {}
+    file = open(filename)
+    for line in file.readlines():
+        if not line:
+            continue
+        if line.startswith("Running"):
+            s = line.split()
+            if "/" in s[1]:
+                x = s[1]
+                if x.find("/testsuite/") == -1:
+                    fubar("Can't find /testsuite/ in '%s'." % (x))
+                # 'Running /home/james/debian/packages/binutils/binutils-2.14.90.0.7/gas/testsuite/gas/hppa/unsorted/unsorted.exp ...' -> 'gas/hppa/unsorted/unsorted.exp'
+                # ... since using basename() isn't dupe safe.
+                section = x[x.find("/testsuite/"):].replace("/testsuite/","").split()[0]
+
+                # Tests can be duplicated, e.g. hppa/basic/basic.exp
+                # is run twice, once for hppa-linux and once for
+                # hppa64-linux.  This is of course a horrible bodge,
+                # but I can't think of anything trivial and better off
+                # hand.
+
+                if section in results:
+                    extra = 1
+                    too_many = 10
+                    while section in results and extra < too_many:
+                        section = "%s.%s" % (section, extra)
+                        extra += 1
+                        if extra >= too_many:
+                            fubar("gave up trying to unduplicate %s." % (section))
+
+                results[section] = {}
+                continue
+
+        got_state = 0
+        for state in [ "PASS", "XPASS", "FAIL", "XFAIL", "UNRESOLVED",
+                       "UNTESTED", "UNSUPPORTED" ]:
+            if line.startswith(state):
+                s = line.split(':')
+                state = s[0]
+                test = ':'.join(s[1:]).strip()
+                if test in results:
+                    warn("%s/%s is duplicated." % (section, test))
+                results[section][test] = state
+                got_state = 1
+                break
+
+        if got_state:
+            continue
+
+    return results
+
+################################################################################
+
+def compare_results(old, new):
+    total_num = 0
+    pass_count = 0
+    fail_count = 0
+    xfail_count = 0
+    untested_count = 0
+    regression_count = 0
+    progression_count = 0
+    change_count = 0
+
+    for section in list(new.keys()):
+        for test in list(new[section].keys()):
+            state = new[section][test]
+
+            # Stats pr0n
+            total_num += 1
+            if state == "PASS" or state == "XPASS":
+                pass_count += 1
+            elif state == "FAIL" or state == "UNRESOLVED":
+                fail_count += 1
+            elif state == "XFAIL":
+                xfail_count += 1
+            elif state == "UNTESTED":
+                untested_count += 1
+
+            # Compare to old
+            if section not in old:
+                continue
+            if test not in old[section]:
+                continue
+            old_state = old[section][test]
+            if state == "PASS":
+                if old_state != "PASS":
+                    progression_count += 1
+                    info("[%s] progression (%s -> %s): %s" % (section, old_state, state, test))
+            elif state == "XPASS":
+                if old_state != "XPASS" and old_state != "PASS":
+                    progression_count += 1
+                    warn("[%s] %s: %s" % (section, state, test))
+            elif state == "FAIL":
+                if old_state != "FAIL":
+                    regression_count += 1
+                    warn("[%s] REGRESSION (%s -> %s): %s" % (section, old_state, state, test))
+            elif state == "XFAIL":
+                if old_state != "XFAIL":
+                    change_count += 1
+                    info("[%s] change (%s -> %s): %s" % (section, old_state, state, test))
+            elif state == "UNRESOLVED":
+                if old_state != "UNRESOLVED" and old_state != "FAIL":
+                    regression_count += 1
+                    warn("[%s] REGRESSION (%s -> %s): %s" % (section, old_state, state, test))
+                if old_state == "FAIL":
+                    change_count += 1
+                    info("[%s] change (%s -> %s): %s" % (section, old_state, state, test))
+            elif state == "UNTESTED":
+                if old_state != "UNTESTED":
+                    change_count += 1
+                    warn("[%s] REGRESSION (%s -> %s): %s" % (section, old_state, state, test))
+
+    if regression_count:
+        print("%d REGRESSIONS (%.2f%%)." % (regression_count, (float(regression_count)/total_num)*100))
+    if progression_count:
+        print("%d progressions (%.2f%%)." % (progression_count, (float(progression_count)/total_num)*100))
+
+    if change_count:
+        print("%d changes (%.2f%%)." % (change_count, (float(change_count)/total_num)*100))
+
+    print("%d tests: %d pass (%.2f%%), %d fail (%.2f%%), %d xfail (%.2f%%) %d untested (%.2f%%)." \
+          % (total_num, pass_count, (float(pass_count)/total_num)*100,
+             fail_count, (float(fail_count)/total_num)*100,
+             xfail_count, (float(xfail_count)/total_num)*100,
+             untested_count, (float(untested_count)/total_num)*100))
+
+    if regression_count:
+        sys.exit(1)
+
+################################################################################
+
+def compare_multiple(directory, first_version, second_version):
+    architectures = [ "alpha", "arm", "hppa", "i386", "ia64", "mips",
+                      "m68k", "mipsel", "powerpc", "s390", "sparc" ]
+
+    for arch in architectures:
+        print("*********************************** %s ******************************" % (arch))
+        second_filename = "%s/%s_%s" % (directory, second_version, arch)
+        if not os.path.exists(second_filename):
+            print("   -- NOT AVAILABLE --")
+            continue
+
+        new = read_testsummary(second_filename)
+        first_filename = "%s/%s_%s" % (directory, first_version, arch)
+        old = read_testsummary(first_filename)
+        compare_results(old, new)
+
+################################################################################
+
+def init():
+    """Initalization, including parsing of options."""
+
+    usage = """usage: %prog [OPTIONS] <OLD> <NEW>
+compare (binutils) dejagnu testsuite results.
+
+Example usage:
+
+  test-suite-compare.py binutils-2.17/test-summary binutils-2.18/test-summary
+
+Or to compare across all architectures (with test results stored in a
+'test-summary' directory):
+
+  test-suite-compare.py -mtest-summary 2.17-3 2.18-1"""
+    parser = optparse.OptionParser(usage)
+    parser.add_option("-m", "--multiple", dest="multiple",
+                      nargs=1, type="string",
+                      help="compare multiple architectures")
+    (options, args) = parser.parse_args()
+
+    if len(args) > 2 or len(args) < 2:
+        parser.error("takes 2 arguments (old and new)")
+    (old_version, new_version) = args
+
+    return options, old_version, new_version
+            
+################################################################################
+
+def main():
+    (options, old_version, new_version) = init()
+    if options.multiple:
+        compare_multiple(options.multiple, old_version, new_version)
+    else:
+        old = read_testsummary(old_version)
+        new = read_testsummary(new_version)
+        compare_results(old, new)
+
+################################################################################
+
+if __name__ == '__main__':
+    main()
diff --git a/tests/build b/tests/build
new file mode 100644
index 000000000..0d78cf4fe
--- /dev/null
+++ b/tests/build
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+
+CPUS=$(getconf _NPROCESSORS_ONLN)
+case "$CPUS" in
+  [0-9]|[0-9][0-9]|[0-9][0-9][0-9]) ;;
+  *) CPUS=1
+esac
+
+if [ -n "${DEB_HOST_ARCH:-}" ]; then
+    CROSS="-a$DEB_HOST_ARCH"
+else
+    CROSS=
+fi
+
+echo "Memory on this machine:"
+egrep '^(Mem|Swap)' /proc/meminfo || true
+
+set -x
+DEB_BUILD_OPTIONS="parallel=$CPUS nohppa nomult nocross" dpkg-buildpackage -d -B --no-sign $CROSS
diff --git a/tests/control b/tests/control
new file mode 100644
index 000000000..0485471cb
--- /dev/null
+++ b/tests/control
@@ -0,0 +1,17 @@
+Tests: build
+# this doesn't work well, without building -hppa, -multiarch and -cross packages
+#Depends: build-essential
+#Restrictions: build-needed
+Depends: build-essential,
+  fakeroot,
+  autoconf (>= 2.64),
+  bison, flex, gettext, texinfo, dejagnu, quilt, chrpath, dwz, debugedit (>= 4.16),
+  python3:any, file, xz-utils, lsb-release, zlib1g-dev, procps, libstdc++-dev
+# build process emits warnings on stderr
+Restrictions: allow-stderr
+
+Tests: libc-link
+Depends: build-essential
+
+Tests: shlib-build
+Depends: build-essential
diff --git a/tests/libc-link b/tests/libc-link
new file mode 100644
index 000000000..09bfc8d81
--- /dev/null
+++ b/tests/libc-link
@@ -0,0 +1,29 @@
+#!/bin/sh
+# autopkgtest check: Build and run a simple program against libc, to verify
+# basic binutils compile-time and run-time linking functionality.
+#
+# (C) 2012 Canonical Ltd.
+# Author: Martin Pitt <martin.pitt@ubuntu.com>
+
+set -e
+
+WORKDIR=$(mktemp -d)
+trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM
+cd $WORKDIR
+cat <<EOF > libctest.c
+#include <string.h>
+#include <assert.h>
+
+int main()
+{
+    assert (1 > 0);
+    assert (strcmp ("hello", "hello") == 0);
+    return 0;
+}
+EOF
+
+gcc -o libctest libctest.c
+echo "build: OK"
+[ -x libctest ]
+./libctest
+echo "run: OK"
diff --git a/tests/shlib-build b/tests/shlib-build
new file mode 100644
index 000000000..a2145639c
--- /dev/null
+++ b/tests/shlib-build
@@ -0,0 +1,44 @@
+#!/bin/sh
+# autopkgtest check: Build and link against a simple shared library, to test
+# basic binutils compile-time and run-time linking functionality.
+#
+# (C) 2012 Canonical Ltd.
+# Author: Martin Pitt <martin.pitt@ubuntu.com>
+
+set -e
+
+WORKDIR=$(mktemp -d)
+trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM
+cd $WORKDIR
+cat <<EOF > testlib.c
+
+int ultimate_answer()
+{
+    return 42;
+}
+EOF
+
+gcc -Wall -Werror -shared -o libultimate.so testlib.c
+echo "library build: OK"
+
+# should export the symbol
+nm -D libultimate.so | grep -q 'T ultimate_answer'
+
+# link it against a program
+cat <<EOF > testprog.c
+#include <assert.h>
+
+int ultimate_answer();
+
+int main()
+{
+    assert (ultimate_answer() == 42);
+    return 0;
+}
+EOF
+
+gcc -Wall -Werror -L . -o testprog testprog.c -lultimate
+echo "program build: OK"
+[ -x testprog ]
+LD_LIBRARY_PATH=. ./testprog
+echo "run: OK"
diff --git a/watch b/watch
new file mode 100644
index 000000000..69cbc8aeb
--- /dev/null
+++ b/watch
@@ -0,0 +1,2 @@
+version=2
+http://ftp.gnu.org/gnu/binutils/binutils-([\d\.]*).tar.gz
-- 
2.30.2