210 files changed, 15802 insertions, 1526 deletions

diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index e698fde19c..1a6ff25d4d 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -237,7 +237,7 @@ class URI(object):
         # to RFC compliant URL format. E.g.:
         #   file://foo.diff -> file:foo.diff
         if urlp.scheme in self._netloc_forbidden:
-            uri = re.sub("(?<=:)//(?!/)", "", uri, 1)
+            uri = re.sub(r"(?<=:)//(?!/)", "", uri, count=1)
             reparse = 1
 
         if reparse:
diff --git a/bitbake/lib/bb/fetch2/gcp.py b/bitbake/lib/bb/fetch2/gcp.py
index eb3e0c6a6b..2ee9ed2194 100644
--- a/bitbake/lib/bb/fetch2/gcp.py
+++ b/bitbake/lib/bb/fetch2/gcp.py
@@ -23,7 +23,6 @@ import urllib.parse, urllib.error
 from bb.fetch2 import FetchMethod
 from bb.fetch2 import FetchError
 from bb.fetch2 import logger
-from bb.fetch2 import runfetchcmd
 
 class GCP(FetchMethod):
     """
@@ -48,7 +47,6 @@ class GCP(FetchMethod):
             ud.basename = os.path.basename(ud.path)
 
         ud.localfile = d.expand(urllib.parse.unquote(ud.basename))
-        ud.basecmd = "gsutil stat"
 
     def get_gcp_client(self):
         from google.cloud import storage
@@ -59,17 +57,20 @@ class GCP(FetchMethod):
         Fetch urls using the GCP API.
         Assumes localpath was called first.
         """
+        from google.api_core.exceptions import NotFound
         logger.debug2(f"Trying to download gs://{ud.host}{ud.path} to {ud.localpath}")
         if self.gcp_client is None:
             self.get_gcp_client()
 
-        bb.fetch2.check_network_access(d, ud.basecmd, f"gs://{ud.host}{ud.path}")
-        runfetchcmd("%s %s" % (ud.basecmd, f"gs://{ud.host}{ud.path}"), d)
+        bb.fetch2.check_network_access(d, "blob.download_to_filename", f"gs://{ud.host}{ud.path}")
 
         # Path sometimes has leading slash, so strip it
         path = ud.path.lstrip("/")
         blob = self.gcp_client.bucket(ud.host).blob(path)
-        blob.download_to_filename(ud.localpath)
+        try:
+            blob.download_to_filename(ud.localpath)
+        except NotFound:
+            raise FetchError("The GCP API threw a NotFound exception")
 
         # Additional sanity checks copied from the wget class (although there
         # are no known issues which mean these are required, treat the GCP API
@@ -91,8 +92,7 @@ class GCP(FetchMethod):
         if self.gcp_client is None:
             self.get_gcp_client()
 
-        bb.fetch2.check_network_access(d, ud.basecmd, f"gs://{ud.host}{ud.path}")
-        runfetchcmd("%s %s" % (ud.basecmd, f"gs://{ud.host}{ud.path}"), d)
+        bb.fetch2.check_network_access(d, "gcp_client.bucket(ud.host).blob(path).exists()", f"gs://{ud.host}{ud.path}")
 
         # Path sometimes has leading slash, so strip it
         path = ud.path.lstrip("/")
diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py
index 7581d003fd..327e45c8ac 100644
--- a/bitbake/lib/bb/parse/ast.py
+++ b/bitbake/lib/bb/parse/ast.py
@@ -391,6 +391,14 @@ def finalize(fn, d, variant = None):
         if d.getVar("_FAILPARSINGERRORHANDLED", False) == True:
             raise bb.BBHandledException()
 
+        while True:
+            inherits = d.getVar('__BBDEFINHERITS', False) or []
+            if not inherits:
+                break
+            inherit, filename, lineno = inherits.pop(0)
+            d.setVar('__BBDEFINHERITS', inherits)
+            bb.parse.BBHandler.inherit(inherit, filename, lineno, d, deferred=True)
+
         for var in d.getVar('__BBHANDLERS', False) or []:
             # try to add the handler
             handlerfn = d.getVarFlag(var, "filename", False)
@@ -444,14 +452,6 @@ def multi_finalize(fn, d):
         logger.debug("Appending .bbappend file %s to %s", append, fn)
         bb.parse.BBHandler.handle(append, d, True)
 
-    while True:
-        inherits = d.getVar('__BBDEFINHERITS', False) or []
-        if not inherits:
-            break
-        inherit, filename, lineno = inherits.pop(0)
-        d.setVar('__BBDEFINHERITS', inherits)
-        bb.parse.BBHandler.inherit(inherit, filename, lineno, d, deferred=True)
-
     onlyfinalise = d.getVar("__ONLYFINALISE", False)
 
     safe_d = d
@@ -487,7 +487,9 @@ def multi_finalize(fn, d):
                 d.setVar("BBEXTENDVARIANT", variantmap[name])
             else:
                 d.setVar("PN", "%s-%s" % (pn, name))
-            bb.parse.BBHandler.inherit(extendedmap[name], fn, 0, d)
+            inherits = d.getVar('__BBDEFINHERITS', False) or []
+            inherits.append((extendedmap[name], fn, 0))
+            d.setVar('__BBDEFINHERITS', inherits)
 
         safe_d.setVar("BBCLASSEXTEND", extended)
         _create_variants(datastores, extendedmap.keys(), extendfunc, onlyfinalise)
diff --git a/bitbake/lib/toaster/tests/builds/buildtest.py b/bitbake/lib/toaster/tests/builds/buildtest.py
index cacfccd4d3..e54d561334 100644
--- a/bitbake/lib/toaster/tests/builds/buildtest.py
+++ b/bitbake/lib/toaster/tests/builds/buildtest.py
@@ -128,7 +128,7 @@ class BuildTest(unittest.TestCase):
         if os.environ.get("TOASTER_TEST_USE_SSTATE_MIRROR"):
             ProjectVariable.objects.get_or_create(
                 name="SSTATE_MIRRORS",
-                value="file://.* http://cdn.jsdelivr.net/yocto/sstate/all/PATH;downloadfilename=PATH",
+                value="file://.* http://sstate.yoctoproject.org/all/PATH;downloadfilename=PATH",
                 project=project)
 
         ProjectTarget.objects.create(project=project,
diff --git a/documentation/README b/documentation/README
index d7428eb8ed..c394ab9288 100644
--- a/documentation/README
+++ b/documentation/README
@@ -429,5 +429,22 @@ both the Yocto Project and BitBake manuals:
 Submitting documentation changes
 ================================
 
-Please see the top level README file in this repository for details of where
-to send patches.
+Please refer to our contributor guide here: https://docs.yoctoproject.org/contributor-guide/
+for full details on how to submit changes.
+
+As a quick guide, patches should be sent to docs@lists.yoctoproject.org
+The git command to do that would be:
+
+     git send-email -M -1 --to docs@lists.yoctoproject.org
+
+The 'To' header can be set as default for this repository:
+
+     git config sendemail.to docs@lists.yoctoproject.org
+
+Now you can just do 'git send-email origin/master..' to send all local patches.
+
+Read the other sections in this document and documentation/standards.md for
+rules to follow when contributing to the documentation.
+
+Git repository: https://git.yoctoproject.org/yocto-docs
+Mailing list: docs@lists.yoctoproject.org
diff --git a/documentation/brief-yoctoprojectqs/index.rst b/documentation/brief-yoctoprojectqs/index.rst
index 2f6e4cf02e..b37142ef14 100644
--- a/documentation/brief-yoctoprojectqs/index.rst
+++ b/documentation/brief-yoctoprojectqs/index.rst
@@ -57,7 +57,7 @@ following requirements:
    :ref:`dev-manual/start:preparing the build host`
    section in the Yocto Project Development Tasks Manual.
 
--
+-  Ensure that the following utilities have these minimum version numbers:
 
    -  Git &MIN_GIT_VERSION; or greater
    -  tar &MIN_TAR_VERSION; or greater
@@ -65,7 +65,7 @@ following requirements:
    -  gcc &MIN_GCC_VERSION; or greater.
    -  GNU make &MIN_MAKE_VERSION; or greater
 
-If your build host does not meet any of these three listed version
+If your build host does not satisfy all of the above version
 requirements, you can take steps to prepare the system so that you
 can still use the Yocto Project. See the
 :ref:`ref-manual/system-requirements:required git, tar, python, make and gcc versions`
@@ -182,7 +182,7 @@ an entire Linux distribution, including the toolchain, from source.
       page of the Yocto Project Wiki.
 
 #. **Initialize the Build Environment:** From within the ``poky``
-   directory, run the :ref:`ref-manual/structure:\`\`oe-init-build-env\`\``
+   directory, run the :ref:`ref-manual/structure:``oe-init-build-env```
    environment
    setup script to define Yocto Project's build environment on your
    build host.
@@ -252,7 +252,7 @@ an entire Linux distribution, including the toolchain, from source.
       file in the :term:`Build Directory`::
 
          BB_HASHSERVE_UPSTREAM = "wss://hashserv.yoctoproject.org/ws"
-         SSTATE_MIRRORS ?= "file://.* http://cdn.jsdelivr.net/yocto/sstate/all/PATH;downloadfilename=PATH"
+         SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/all/PATH;downloadfilename=PATH"
          BB_HASHSERVE = "auto"
          BB_SIGNATURE_HANDLER = "OEEquivHash"
 
diff --git a/documentation/bsp-guide/bsp.rst b/documentation/bsp-guide/bsp.rst
index 3e484aa473..73e31670d6 100644
--- a/documentation/bsp-guide/bsp.rst
+++ b/documentation/bsp-guide/bsp.rst
@@ -81,7 +81,7 @@ directory of that Layer. This directory is what you add to the
 ``conf/bblayers.conf`` file found in your
 :term:`Build Directory`, which is
 established after you run the OpenEmbedded build environment setup
-script (i.e. :ref:`ref-manual/structure:\`\`oe-init-build-env\`\``).
+script (i.e. :ref:`ref-manual/structure:``oe-init-build-env```).
 Adding the root directory allows the :term:`OpenEmbedded Build System`
 to recognize the BSP
 layer and from it build an image. Here is an example::
@@ -229,7 +229,7 @@ section.
 
 #. *Initialize the Build Environment:* While in the root directory of
    the Source Directory (i.e. ``poky``), run the
-   :ref:`ref-manual/structure:\`\`oe-init-build-env\`\`` environment
+   :ref:`ref-manual/structure:``oe-init-build-env``` environment
    setup script to define the OpenEmbedded build environment on your
    build host. ::
 
@@ -674,21 +674,21 @@ to the kernel recipe by using a similarly named append file, which is
 located in the BSP Layer for your target device (e.g. the
 ``meta-bsp_root_name/recipes-kernel/linux`` directory).
 
-Suppose you are using the ``linux-yocto_4.4.bb`` recipe to build the
+Suppose you are using the ``linux-yocto_6.12.bb`` recipe to build the
 kernel. In other words, you have selected the kernel in your
 ``"bsp_root_name".conf`` file by adding
 :term:`PREFERRED_PROVIDER` and :term:`PREFERRED_VERSION`
 statements as follows::
 
    PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-   PREFERRED_VERSION_linux-yocto ?= "4.4%"
+   PREFERRED_VERSION_linux-yocto ?= "6.12%"
 
 .. note::
 
    When the preferred provider is assumed by default, the :term:`PREFERRED_PROVIDER`
    statement does not appear in the ``"bsp_root_name".conf`` file.
 
-You would use the ``linux-yocto_4.4.bbappend`` file to append specific
+You would use the ``linux-yocto_6.12.bbappend`` file to append specific
 BSP settings to the kernel, thus configuring the kernel for your
 particular BSP.
 
@@ -698,14 +698,19 @@ in the Yocto Project Linux Kernel Development Manual.
 
 An alternate scenario is when you create your own kernel recipe for the
 BSP. A good example of this is the Raspberry Pi BSP. If you examine the
-``recipes-kernel/linux`` directory you see the following::
+``recipes-kernel/linux`` directory in that layer you see the following
+Raspberry Pi-specific recipes and associated files::
 
+   files/
+   linux-raspberrypi_6.12.bb
+   linux-raspberrypi_6.1.bb
+   linux-raspberrypi_6.6.bb
    linux-raspberrypi-dev.bb
    linux-raspberrypi.inc
-   linux-raspberrypi_4.14.bb
-   linux-raspberrypi_4.9.bb
-
-The directory contains three kernel recipes and a common include file.
+   linux-raspberrypi-v7_6.12.bb
+   linux-raspberrypi-v7_6.1.bb
+   linux-raspberrypi-v7_6.6.bb
+   linux-raspberrypi-v7.inc
 
 Developing a Board Support Package (BSP)
 ========================================
@@ -1177,7 +1182,7 @@ Use these steps to create a BSP layer:
 
 -  *Create a Kernel Recipe:* Create a kernel recipe in
    ``recipes-kernel/linux`` by either using a kernel append file or a
-   new custom kernel recipe file (e.g. ``linux-yocto_4.12.bb``). The BSP
+   new custom kernel recipe file (e.g. ``linux-yocto_6.12.bb``). The BSP
    layers mentioned in the previous step also contain different kernel
    examples. See the ":ref:`kernel-dev/common:modifying an existing recipe`"
    section in the Yocto Project Linux Kernel Development Manual for
@@ -1242,7 +1247,7 @@ located in :yocto_git:`poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
 
    PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
 
-   MACHINE_EXTRA_RRECOMMENDS = "kernel-modules kernel-devicetree"
+   MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
 
    EXTRA_IMAGEDEPENDS += "virtual/bootloader"
 
@@ -1258,23 +1263,21 @@ located in :yocto_git:`poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
    SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0 115200;ttyAMA0"
 
    PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-   PREFERRED_VERSION_linux-yocto ?= "6.1%"
+   PREFERRED_VERSION_linux-yocto ?= "6.12%"
 
    KERNEL_IMAGETYPE = "zImage"
-   KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb"
-   KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
+   DTB_FILES = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb"
+   KERNEL_DEVICETREE = '${@' '.join('ti/omap/%s' % d for d in '${DTB_FILES}'.split())}'
 
    PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
 
    SPL_BINARY = "MLO"
    UBOOT_SUFFIX = "img"
    UBOOT_MACHINE = "am335x_evm_defconfig"
-   UBOOT_ENTRYPOINT = "0x80008000"
-   UBOOT_LOADADDRESS = "0x80008000"
 
    MACHINE_FEATURES = "usbgadget usbhost vfat alsa"
 
-   IMAGE_BOOT_FILES ?= "u-boot.${UBOOT_SUFFIX} ${SPL_BINARY} ${KERNEL_IMAGETYPE} ${KERNEL_DEVICETREE}"
+   IMAGE_BOOT_FILES ?= "u-boot.${UBOOT_SUFFIX} ${SPL_BINARY} ${KERNEL_IMAGETYPE} ${DTB_FILES}"
 
    # support runqemu
    EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
@@ -1328,12 +1331,12 @@ Project Reference Manual.
    needed in the root filesystem. In this case, the U-Boot recipe must
    be built for the image.
 
-   At the end of the file, we also use this setings to implement
+   At the end of the file, we also use this setting to implement
    ``runqemu`` support on the host machine.
 
 -  :term:`DEFAULTTUNE`: Machines
    use tunings to optimize machine, CPU, and application performance.
-   These features, which are collectively known as "tuning features",
+   These features --- collectively known as "tuning features" ---
    are set in the :term:`OpenEmbedded-Core (OE-Core)` layer. In this
    example, the default tuning file is :oe_git:`tune-cortexa8
    </openembedded-core/tree/meta/conf/machine/include/arm/armv7a/tune-cortexa8.inc>`.
@@ -1363,8 +1366,7 @@ Project Reference Manual.
    to create the sysroot when building a Wic image.
 
 -  :term:`SERIAL_CONSOLES`:
-   Defines a serial console (TTY) to enable using getty. In this case,
-   the baud rate is "115200" and the device name is "ttyO0".
+   Defines one or more serial consoles (TTYs) to enable using getty.
 
 -  :term:`PREFERRED_PROVIDER_virtual/kernel <PREFERRED_PROVIDER>`:
    Specifies the recipe that provides "virtual/kernel" when more than
@@ -1374,7 +1376,7 @@ Project Reference Manual.
 
 -  :term:`PREFERRED_VERSION_linux-yocto <PREFERRED_VERSION>`:
    Defines the version of the recipe used to build the kernel, which is
-   "6.1" in this case.
+   "6.12" in this case.
 
 -  :term:`KERNEL_IMAGETYPE`:
    The type of kernel to build for the device. In this case, the
@@ -1416,12 +1418,6 @@ Project Reference Manual.
       Specifies the value passed on the make command line when building
       a U-Boot image.
 
-   -  :term:`UBOOT_ENTRYPOINT`:
-      Specifies the entry point for the U-Boot image.
-
-   -  :term:`UBOOT_LOADADDRESS`:
-      Specifies the load address for the U-Boot image.
-
 -  :term:`MACHINE_FEATURES`:
    Specifies the list of hardware features the BeagleBone device is
    capable of supporting. In this case, the device supports "usbgadget
diff --git a/documentation/conf.py b/documentation/conf.py
index 2aceeb8e79..1eca8756ab 100644
--- a/documentation/conf.py
+++ b/documentation/conf.py
@@ -13,6 +13,7 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 import os
+import re
 import sys
 import datetime
 try:
@@ -173,6 +174,24 @@ latex_elements = {
     'preamble': '\\usepackage[UTF8]{ctex}\n\\setcounter{tocdepth}{2}',
 }
 
+
+from sphinx.search import SearchEnglish
+from sphinx.search import languages
+class DashFriendlySearchEnglish(SearchEnglish):
+
+    # Accept words that can include hyphens
+    _word_re = re.compile(r'[\w\-]+')
+
+    js_splitter_code = r"""
+function splitQuery(query) {
+    return query
+        .split(/[^\p{Letter}\p{Number}_\p{Emoji_Presentation}-]+/gu)
+        .filter(term => term.length > 0);
+}
+"""
+
+languages['en'] = DashFriendlySearchEnglish
+
 # Make the EPUB builder prefer PNG to SVG because of issues rendering Inkscape SVG
 from sphinx.builders.epub3 import Epub3Builder
 Epub3Builder.supported_image_types = ['image/png', 'image/gif', 'image/jpeg']
diff --git a/documentation/contributor-guide/submit-changes.rst b/documentation/contributor-guide/submit-changes.rst
index 0675aac984..6d5d69d7cf 100644
--- a/documentation/contributor-guide/submit-changes.rst
+++ b/documentation/contributor-guide/submit-changes.rst
@@ -776,6 +776,38 @@ argument to ``git format-patch`` with a version number::
 
    git format-patch -v2 <ref-branch>
 
+
+After generating updated patches (v2, v3, and so on) via ``git
+format-patch``, ideally developers will add a patch version changelog
+to each patch that describes what has changed between each revision of
+the patch. Add patch version changelogs after the ``---`` marker in the
+patch, indicating that this information is part of this patch, but is not
+suitable for inclusion in the commit message (i.e. the git history) itself.
+Providing a patch version changelog makes it easier for maintainers and
+reviewers to succinctly understand what changed in all versions of the
+patch, without having to consult alternate sources of information, such as
+searching through messages on a mailing list. For example::
+
+   <patch title>
+
+   <commit message>
+
+   <Signed-off-by/other trailers>
+   ---
+   changes in v4:
+   - provide a clearer commit message
+   - fix spelling mistakes
+
+   changes in v3:
+   - replace func() to use other_func() instead
+
+   changes in v2:
+   - this patch was added in v2
+   ---
+   <diffstat output>
+
+   <unified diff>
+
 Lastly please ensure that you also test your revised changes. In particular
 please don't just edit the patch file written out by ``git format-patch`` and
 resend it.
diff --git a/documentation/dev-manual/debugging.rst b/documentation/dev-manual/debugging.rst
index 92458a0c37..8552b26aea 100644
--- a/documentation/dev-manual/debugging.rst
+++ b/documentation/dev-manual/debugging.rst
@@ -36,7 +36,7 @@ section:
    use the BitBake ``-e`` option to examine variable values after a
    recipe has been parsed.
 
--  ":ref:`dev-manual/debugging:viewing package information with \`\`oe-pkgdata-util\`\``"
+-  ":ref:`dev-manual/debugging:viewing package information with ``oe-pkgdata-util```"
    describes how to use the ``oe-pkgdata-util`` utility to query
    :term:`PKGDATA_DIR` and
    display package-related information for built packages.
diff --git a/documentation/dev-manual/new-recipe.rst b/documentation/dev-manual/new-recipe.rst
index 944b9627f9..af88db937b 100644
--- a/documentation/dev-manual/new-recipe.rst
+++ b/documentation/dev-manual/new-recipe.rst
@@ -56,7 +56,7 @@ necessary when adding a recipe to build a new piece of software to be
 included in a build.
 
 You can find a complete description of the ``devtool add`` command in
-the ":ref:`sdk-manual/extensible:a closer look at \`\`devtool add\`\``" section
+the ":ref:`sdk-manual/extensible:a closer look at ``devtool add```" section
 in the Yocto Project Application Development and the Extensible Software
 Development Kit (eSDK) manual.
 
diff --git a/documentation/dev-manual/sbom.rst b/documentation/dev-manual/sbom.rst
index b72bad1554..7c4b5804fb 100644
--- a/documentation/dev-manual/sbom.rst
+++ b/documentation/dev-manual/sbom.rst
@@ -30,16 +30,9 @@ To make this happen, you must inherit the
 
    INHERIT += "create-spdx"
 
-Upon building an image, you will then get:
-
--  :term:`SPDX` output in JSON format as an ``IMAGE-MACHINE.spdx.json`` file in
-   ``tmp/deploy/images/MACHINE/`` inside the :term:`Build Directory`.
-
--  This toplevel file is accompanied by an ``IMAGE-MACHINE.spdx.index.json``
-   containing an index of JSON :term:`SPDX` files for individual recipes.
-
--  The compressed archive ``IMAGE-MACHINE.spdx.tar.zst`` contains the index
-   and the files for the single recipes.
+Upon building an image, you will then get the compressed archive
+``IMAGE-MACHINE.spdx.tar.zst`` contains the index and the files for the single
+recipes.
 
 The :ref:`ref-classes-create-spdx` class offers options to include
 more information in the output :term:`SPDX` data:
@@ -56,7 +49,7 @@ more information in the output :term:`SPDX` data:
 
 Though the toplevel :term:`SPDX` output is available in
 ``tmp/deploy/images/MACHINE/`` inside the :term:`Build Directory`, ancillary
-generated files are available in ``tmp/deploy/spdx/MACHINE`` too, such as:
+generated files are available in ``tmp/deploy/spdx`` too, such as:
 
 -  The individual :term:`SPDX` JSON files in the ``IMAGE-MACHINE.spdx.tar.zst``
    archive.
diff --git a/documentation/dev-manual/upgrading-recipes.rst b/documentation/dev-manual/upgrading-recipes.rst
index 4fac78bdfb..a38fd7837c 100644
--- a/documentation/dev-manual/upgrading-recipes.rst
+++ b/documentation/dev-manual/upgrading-recipes.rst
@@ -333,7 +333,7 @@ Manually Upgrading a Recipe
 
 If for some reason you choose not to upgrade recipes using
 :ref:`dev-manual/upgrading-recipes:Using the Auto Upgrade Helper (AUH)` or
-by :ref:`dev-manual/upgrading-recipes:Using \`\`devtool upgrade\`\``,
+by :ref:`dev-manual/upgrading-recipes:Using ``devtool upgrade```,
 you can manually edit the recipe files to upgrade the versions.
 
 .. note::
diff --git a/documentation/kernel-dev/common.rst b/documentation/kernel-dev/common.rst
index 28ef3b22c3..654c4e0a01 100644
--- a/documentation/kernel-dev/common.rst
+++ b/documentation/kernel-dev/common.rst
@@ -672,7 +672,7 @@ The steps in this procedure show you how you can patch the kernel using
 
    Before attempting this procedure, be sure you have performed the
    steps to get ready for updating the kernel as described in the
-   ":ref:`kernel-dev/common:getting ready to develop using \`\`devtool\`\``"
+   ":ref:`kernel-dev/common:getting ready to develop using ``devtool```"
    section.
 
 Patching the kernel involves changing or adding configurations to an
@@ -685,7 +685,7 @@ output at boot time through ``printk`` statements in the kernel's
 ``calibrate.c`` source code file. Applying the patch and booting the
 modified image causes the added messages to appear on the emulator's
 console. The example is a continuation of the setup procedure found in
-the ":ref:`kernel-dev/common:getting ready to develop using \`\`devtool\`\``" Section.
+the ":ref:`kernel-dev/common:getting ready to develop using ``devtool```" Section.
 
 #. *Check Out the Kernel Source Files:* First you must use ``devtool``
    to checkout the kernel source code in its workspace.
@@ -693,7 +693,7 @@ the ":ref:`kernel-dev/common:getting ready to develop using \`\`devtool\`\``" Se
    .. note::
 
       See this step in the
-      ":ref:`kernel-dev/common:getting ready to develop using \`\`devtool\`\``"
+      ":ref:`kernel-dev/common:getting ready to develop using ``devtool```"
       section for more information.
 
    Use the following ``devtool`` command to check out the code::
@@ -804,7 +804,7 @@ the ":ref:`kernel-dev/common:getting ready to develop using \`\`devtool\`\``" Se
    .. note::
 
       See Step 3 of the
-      ":ref:`kernel-dev/common:getting ready to develop using \`\`devtool\`\``"
+      ":ref:`kernel-dev/common:getting ready to develop using ``devtool```"
       section for information on setting up this layer.
 
    Once the command
@@ -1190,7 +1190,7 @@ appear in the ``.config`` file, which is in the :term:`Build Directory`.
 
    For more information about where the ``.config`` file is located, see the
    example in the
-   ":ref:`kernel-dev/common:using \`\`menuconfig\`\``"
+   ":ref:`kernel-dev/common:using ``menuconfig```"
    section.
 
 It is simple to create a configuration fragment. One method is to use
@@ -1286,7 +1286,7 @@ when you override a policy configuration in a hardware configuration
 fragment.
 
 In order to run this task, you must have an existing ``.config`` file.
-See the ":ref:`kernel-dev/common:using \`\`menuconfig\`\``" section for
+See the ":ref:`kernel-dev/common:using ``menuconfig```" section for
 information on how to create a configuration file.
 
 Here is sample output from the :ref:`ref-tasks-kernel_configcheck` task:
@@ -1359,7 +1359,7 @@ and
 tasks until they produce no warnings.
 
 For more information on how to use the ``menuconfig`` tool, see the
-:ref:`kernel-dev/common:using \`\`menuconfig\`\`` section.
+:ref:`kernel-dev/common:using ``menuconfig``` section.
 
 Fine-Tuning the Kernel Configuration File
 -----------------------------------------
diff --git a/documentation/kernel-dev/intro.rst b/documentation/kernel-dev/intro.rst
index a663733a1d..7df342f8d5 100644
--- a/documentation/kernel-dev/intro.rst
+++ b/documentation/kernel-dev/intro.rst
@@ -122,7 +122,7 @@ general information and references for further information.
    Using ``devtool`` requires that you have a clean build
    of the image. For
    more information, see the
-   ":ref:`kernel-dev/common:getting ready to develop using \`\`devtool\`\``"
+   ":ref:`kernel-dev/common:getting ready to develop using ``devtool```"
    section.
 
    Using traditional kernel development requires that you have the
diff --git a/documentation/migration-guides/release-4.0.rst b/documentation/migration-guides/release-4.0.rst
index e4e619d179..1053ec4c0b 100644
--- a/documentation/migration-guides/release-4.0.rst
+++ b/documentation/migration-guides/release-4.0.rst
@@ -32,3 +32,5 @@ Release 4.0 (kirkstone)
    release-notes-4.0.23
    release-notes-4.0.24
    release-notes-4.0.25
+   release-notes-4.0.26
+   release-notes-4.0.27
diff --git a/documentation/migration-guides/release-5.0.rst b/documentation/migration-guides/release-5.0.rst
index 528963ec2d..b3e7a67912 100644
--- a/documentation/migration-guides/release-5.0.rst
+++ b/documentation/migration-guides/release-5.0.rst
@@ -15,3 +15,5 @@ Release 5.0 (scarthgap)
    release-notes-5.0.6
    release-notes-5.0.7
    release-notes-5.0.8
+   release-notes-5.0.9
+   release-notes-5.0.10
diff --git a/documentation/migration-guides/release-notes-4.0.26.rst b/documentation/migration-guides/release-notes-4.0.26.rst
new file mode 100644
index 0000000000..42ff28c6a2
--- /dev/null
+++ b/documentation/migration-guides/release-notes-4.0.26.rst
@@ -0,0 +1,263 @@
+Release notes for Yocto-4.0.26 (Kirkstone)
+------------------------------------------
+
+Security Fixes in Yocto-4.0.26
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+-  bind: Fix :cve_nist:`2024-11187` and :cve_nist:`2024-12705`
+-  binutils: Fix :cve_nist:`2025-0840`
+-  elfutils: Fix :cve_nist:`2025-1352` and :cve_nist:`2025-1372`
+-  ffmpeg: Fix CVE-2024-28661, :cve_nist:`2024-35369`, :cve_nist:`2024-36613`, :cve_nist:`2024-36616`,
+   :cve_nist:`2024-36617`, :cve_nist:`2024-36618`, :cve_nist:`2025-0518` and :cve_nist:`2025-25473`
+-  ffmpeg: Ignore :cve_nist:`2023-46407`, :cve_nist:`2023-47470`, :cve_nist:`2024-7272`,
+   :cve_nist:`2024-22860`, :cve_nist:`2024-22861` and :cve_nist:`2024-22862`
+-  freetype: Fix :cve_nist:`2025-27363`
+-  gnutls: Fix :cve_nist:`2024-12243`
+-  grub: Fix :cve_nist:`2024-45774`, :cve_nist:`2024-45775`, :cve_nist:`2024-45776`,
+   :cve_nist:`2024-45777`, :cve_nist:`2024-45778`, :cve_nist:`2024-45779`, :cve_nist:`2024-45780`,
+   :cve_nist:`2024-45781`, :cve_nist:`2024-45782`, :cve_nist:`2024-45783`, :cve_nist:`2024-56737`,
+   :cve_nist:`2025-0622`, :cve_nist:`2025-0624`, :cve_nist:`2025-0677`, :cve_nist:`2025-0684`,
+   :cve_nist:`2025-0685`, :cve_nist:`2025-0686`, :cve_nist:`2025-0689`, :cve_nist:`2025-0678`,
+   :cve_nist:`2025-0690`, :cve_nist:`2025-1118` and :cve_nist:`2025-1125`
+-  gstreamer1.0-rtsp-server: fix :cve_nist:`2024-44331`
+-  libarchive: Fix :cve_nist:`2025-25724`
+-  libarchive: Ignore :cve_nist:`2025-1632`
+-  libcap: Fix :cve_nist:`2025-1390`
+-  linux-yocto/5.10: Fix :cve_nist:`2024-36476`, :cve_nist:`2024-43098`, :cve_nist:`2024-47143`,
+   :cve_nist:`2024-48881`, :cve_nist:`2024-50051`, :cve_nist:`2024-50074`, :cve_nist:`2024-50082`,
+   :cve_nist:`2024-50083`, :cve_nist:`2024-50099`, :cve_nist:`2024-50115`, :cve_nist:`2024-50116`,
+   :cve_nist:`2024-50117`, :cve_nist:`2024-50142`, :cve_nist:`2024-50148`, :cve_nist:`2024-50150`,
+   :cve_nist:`2024-50151`, :cve_nist:`2024-50167`, :cve_nist:`2024-50168`, :cve_nist:`2024-50171`,
+   :cve_nist:`2024-50185`, :cve_nist:`2024-50192`, :cve_nist:`2024-50193`, :cve_nist:`2024-50194`,
+   :cve_nist:`2024-50195`, :cve_nist:`2024-50198`, :cve_nist:`2024-50201`, :cve_nist:`2024-50202`,
+   :cve_nist:`2024-50205`, :cve_nist:`2024-50208`, :cve_nist:`2024-50209`, :cve_nist:`2024-50229`,
+   :cve_nist:`2024-50230`, :cve_nist:`2024-50233`, :cve_nist:`2024-50234`, :cve_nist:`2024-50236`,
+   :cve_nist:`2024-50237`, :cve_nist:`2024-50251`, :cve_nist:`2024-50262`, :cve_nist:`2024-50264`,
+   :cve_nist:`2024-50265`, :cve_nist:`2024-50267`, :cve_nist:`2024-50268`, :cve_nist:`2024-50269`,
+   :cve_nist:`2024-50273`, :cve_nist:`2024-50278`, :cve_nist:`2024-50279`, :cve_nist:`2024-50282`,
+   :cve_nist:`2024-50287`, :cve_nist:`2024-50292`, :cve_nist:`2024-50296`, :cve_nist:`2024-50299`,
+   :cve_nist:`2024-50301`, :cve_nist:`2024-50302`, :cve_nist:`2024-53042`, :cve_nist:`2024-53052`,
+   :cve_nist:`2024-53057`, :cve_nist:`2024-53059`, :cve_nist:`2024-53060`, :cve_nist:`2024-53061`,
+   :cve_nist:`2024-53063`, :cve_nist:`2024-53066`, :cve_nist:`2024-53096`, :cve_nist:`2024-53097`,
+   :cve_nist:`2024-53101`, :cve_nist:`2024-53103`, :cve_nist:`2024-53104`, :cve_nist:`2024-53145`,
+   :cve_nist:`2024-53146`, :cve_nist:`2024-53150`, :cve_nist:`2024-53155`, :cve_nist:`2024-53156`,
+   :cve_nist:`2024-53157`, :cve_nist:`2024-53161`, :cve_nist:`2024-53165`, :cve_nist:`2024-53171`,
+   :cve_nist:`2024-53173`, :cve_nist:`2024-53174`, :cve_nist:`2024-53194`, :cve_nist:`2024-53197`,
+   :cve_nist:`2024-53217`, :cve_nist:`2024-53226`, :cve_nist:`2024-53227`, :cve_nist:`2024-53237`,
+   :cve_nist:`2024-53239`, :cve_nist:`2024-55916`, :cve_nist:`2024-56548`, :cve_nist:`2024-56558`,
+   :cve_nist:`2024-56567`, :cve_nist:`2024-56568`, :cve_nist:`2024-56569`, :cve_nist:`2024-56572`,
+   :cve_nist:`2024-56574`, :cve_nist:`2024-56581`, :cve_nist:`2024-56587`, :cve_nist:`2024-56593`,
+   :cve_nist:`2024-56595`, :cve_nist:`2024-56596`, :cve_nist:`2024-56598`, :cve_nist:`2024-56600`,
+   :cve_nist:`2024-56601`, :cve_nist:`2024-56602`, :cve_nist:`2024-56603`, :cve_nist:`2024-56605`,
+   :cve_nist:`2024-56606`, :cve_nist:`2024-56615`, :cve_nist:`2024-56619`, :cve_nist:`2024-56623`,
+   :cve_nist:`2024-56629`, :cve_nist:`2024-56634`, :cve_nist:`2024-56642`, :cve_nist:`2024-56643`,
+   :cve_nist:`2024-56648`, :cve_nist:`2024-56650`, :cve_nist:`2024-56659`, :cve_nist:`2024-56662`,
+   :cve_nist:`2024-56670`, :cve_nist:`2024-56688`, :cve_nist:`2024-56698`, :cve_nist:`2024-56704`,
+   :cve_nist:`2024-56716`, :cve_nist:`2024-56720`, :cve_nist:`2024-56723`, :cve_nist:`2024-56724`,
+   :cve_nist:`2024-56728`, :cve_nist:`2024-56739`, :cve_nist:`2024-56746`, :cve_nist:`2024-56747`,
+   :cve_nist:`2024-56748`, :cve_nist:`2024-56754`, :cve_nist:`2024-56756`, :cve_nist:`2024-56770`,
+   :cve_nist:`2024-56779`, :cve_nist:`2024-56780`, :cve_nist:`2024-56781`, :cve_nist:`2024-56785`,
+   :cve_nist:`2024-57802`, :cve_nist:`2024-57807`, :cve_nist:`2024-57850`, :cve_nist:`2024-57874`,
+   :cve_nist:`2024-57890`, :cve_nist:`2024-57896`, :cve_nist:`2024-57900`, :cve_nist:`2024-57901`,
+   :cve_nist:`2024-57902`, :cve_nist:`2024-57910`, :cve_nist:`2024-57911`, :cve_nist:`2024-57913`,
+   :cve_nist:`2024-57922`, :cve_nist:`2024-57938`, :cve_nist:`2024-57939`, :cve_nist:`2024-57946`,
+   :cve_nist:`2024-57951`, :cve_nist:`2025-21638`, :cve_nist:`2025-21687`, :cve_nist:`2025-21689`,
+   :cve_nist:`2025-21692`, :cve_nist:`2025-21694`, :cve_nist:`2025-21697` and :cve_nist:`2025-21699`
+-  linux-yocto/5.15: Fix :cve_nist:`2024-57979`, :cve_nist:`2024-58034`, :cve_nist:`2024-58052`,
+   :cve_nist:`2024-58055`, :cve_nist:`2024-58058`, :cve_nist:`2024-58063`, :cve_nist:`2024-58069`,
+   :cve_nist:`2024-58071`, :cve_nist:`2024-58076`, :cve_nist:`2024-58083`, :cve_nist:`2025-21700`,
+   :cve_nist:`2025-21703`, :cve_nist:`2025-21715`, :cve_nist:`2025-21722`, :cve_nist:`2025-21727`,
+   :cve_nist:`2025-21731`, :cve_nist:`2025-21753`, :cve_nist:`2025-21756`, :cve_nist:`2025-21760`,
+   :cve_nist:`2025-21761`, :cve_nist:`2025-21762`, :cve_nist:`2025-21763`, :cve_nist:`2025-21764`,
+   :cve_nist:`2025-21796`, :cve_nist:`2025-21811`, :cve_nist:`2025-21887`, :cve_nist:`2025-21898`,
+   :cve_nist:`2025-21904`, :cve_nist:`2025-21905`, :cve_nist:`2025-21912`, :cve_nist:`2025-21917`,
+   :cve_nist:`2025-21919`, :cve_nist:`2025-21920`, :cve_nist:`2025-21922`, :cve_nist:`2025-21934`,
+   :cve_nist:`2025-21943`, :cve_nist:`2025-21948` and :cve_nist:`2025-21951`
+-  libpcre2: Ignore :cve_nist:`2022-1586`
+-  libtasn1: Fix :cve_nist:`2024-12133`
+-  libxml2: Fix :cve_nist:`2022-49043`, :cve_nist:`2024-56171`, :cve_nist:`2025-24928` and
+   :cve_nist:`2025-27113`
+-  libxslt: Fix :cve_nist:`2024-55549` and :cve_nist:`2025-24855`
+-  llvm: Fix :cve_nist:`2024-0151`
+-  mpg123: Fix :cve_nist:`2024-10573`
+-  openssh: Fix :cve_nist:`2025-26465`
+-  ovmf: Revert Fix for CVE-2023-45236 :cve_nist:`2023-45237`
+-  perl: Ignore :cve_nist:`2023-47038`
+-  puzzles: Ignore :cve_nist:`2024-13769`, :cve_nist:`2024-13770` and :cve_nist:`2025-0837`
+-  python3: Fix :cve_nist:`2025-0938`
+-  ruby: Fix :cve_nist:`2024-41946`, :cve_nist:`2025-27219` and :cve_nist:`2025-27220`
+-  subversion: Ignore :cve_nist:`2024-45720`
+-  systemd: Fix :cve_nist:`2022-3821`, :cve_nist:`2022-4415`, :cve_nist:`2022-45873` and
+   :cve_nist:`2023-7008`
+-  tiff: mark :cve_nist:`2023-30774` as patched with existing patch
+-  u-boot: Fix :cve_nist:`2022-2347`, :cve_nist:`2022-30767`, :cve_nist:`2022-30790`,
+   :cve_nist:`2024-57254`, :cve_nist:`2024-57255`, :cve_nist:`2024-57256`, :cve_nist:`2024-57257`,
+   :cve_nist:`2024-57258` and :cve_nist:`2024-57259`
+-  vim: Fix :cve_nist:`2025-1215`, :cve_nist:`2025-22134`, :cve_nist:`2025-24014`,
+   :cve_nist:`2025-26603`, :cve_nist:`2025-27423` and :cve_nist:`2025-29768`
+-  xserver-xorg: Fix :cve_nist:`2022-49737`, :cve_nist:`2025-26594`, :cve_nist:`2025-26595`,
+   :cve_nist:`2025-26596`, :cve_nist:`2025-26597`, :cve_nist:`2025-26598`, :cve_nist:`2025-26599`,
+   :cve_nist:`2025-26600` and :cve_nist:`2025-26601`
+-  xwayland: Fix :cve_nist:`2022-49737`, :cve_nist:`2024-9632`, :cve_nist:`2024-21885`,
+   :cve_nist:`2024-21886`, :cve_nist:`2024-31080`, :cve_nist:`2024-31081`, :cve_nist:`2024-31083`,
+   :cve_nist:`2025-26594`, :cve_nist:`2025-26595`, :cve_nist:`2025-26596`, :cve_nist:`2025-26597`,
+   :cve_nist:`2025-26598`, :cve_nist:`2025-26599`, :cve_nist:`2025-26600` and :cve_nist:`2025-26601`
+-  zlib: Fix :cve_nist:`2014-9485`
+
+
+
+Fixes in Yocto-4.0.26
+~~~~~~~~~~~~~~~~~~~~~
+
+-  bind: Upgrade to 9.18.33
+-  bitbake: cache: bump cache version
+-  bitbake: siggen.py: Improve taskhash reproducibility
+-  boost: fix do_fetch error
+-  build-appliance-image: Update to kirkstone head revision
+-  contributor-guide/submit-changes: add policy on AI generated code
+-  cve-update-nvd2-native: handle missing vulnStatus
+-  docs: Add favicon for the documentation html
+-  docs: Remove all mention of core-image-lsb
+-  libtasn1: upgrade to 4.20.0
+-  libxcrypt-compat: Remove libcrypt.so to fix conflict with libcrypt
+-  libxml2: fix compilation of explicit child axis in pattern
+-  linux-yocto/5.10: update to v5.10.234
+-  linux-yocto/5.15: update to v5.15.179
+-  mesa: Fix missing GLES3 headers in SDK sysroot
+-  mesa: Update :term:`SRC_URI`
+-  meta: Enable '-o pipefail' for the SDK installer
+-  migration-guides: add release notes for 4.0.25
+-  poky.conf: add ubuntu2404 to :term:`SANITY_TESTED_DISTROS`
+-  poky.conf: bump version for 4.0.26
+-  procps: replaced one use of fputs(3) with a write(2) call
+-  ref-manual: don't refer to poky-lsb
+-  scripts/install-buildtools: Update to 4.0.24
+-  scritps/runqemu: Ensure we only have two serial ports
+-  systemd: upgrade to 250.14
+-  tzcode-native: Fix compiler setting from 2023d version
+-  tzcode: Update :term:`SRC_URI`
+-  tzdata/tzcode-native: upgrade 2025a
+-  vim: Upgrade to 9.1.1198
+-  virglrenderer: fix do_fetch error
+-  vulnerabilities/classes: remove references to cve-check text format
+-  xz: Update :term:`SRC_URI`
+-  yocto-uninative: Update to 4.7 for glibc 2.41
+
+
+Known Issues in Yocto-4.0.26
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- N/A
+
+
+Contributors to Yocto-4.0.26
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Thanks to the following people who contributed to this release:
+
+-  Aleksandar Nikolic
+-  Alessio Cascone
+-  Antonin Godard
+-  Archana Polampalli
+-  Ashish Sharma
+-  Bruce Ashfield
+-  Carlos Dominguez
+-  Deepesh Varatharajan
+-  Divya Chellam
+-  Guocai He
+-  Hitendra Prajapati
+-  Hongxu Jia
+-  Jiaying Song
+-  Johannes Kauffmann
+-  Kai Kang
+-  Lee Chee Yang
+-  Libo Chen
+-  Marta Rybczynska
+-  Michael Halstead
+-  Mingli Yu
+-  Moritz Haase
+-  Narpat Mali
+-  Paulo Neves
+-  Peter Marko
+-  Priyal Doshi
+-  Richard Purdie
+-  Robert Yang
+-  Ross Burton
+-  Sakib Sajal
+-  Steve Sakoman
+-  Vijay Anusuri
+-  Yogita Urade
+-  Zhang Peng
+
+
+Repositories / Downloads for Yocto-4.0.26
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+poky
+
+-  Repository Location: :yocto_git:`/poky`
+-  Branch: :yocto_git:`kirkstone </poky/log/?h=kirkstone>`
+-  Tag:  :yocto_git:`yocto-4.0.26 </poky/log/?h=yocto-4.0.26>`
+-  Git Revision: :yocto_git:`d70d287a77d5026b698ac237ab865b2dafd36bb8 </poky/commit/?id=d70d287a77d5026b698ac237ab865b2dafd36bb8>`
+-  Release Artefact: poky-d70d287a77d5026b698ac237ab865b2dafd36bb8
+-  sha: 3ebfadb8bff4c1ca12b3cf3e4ef6e3ac2ce52b73570266daa98436c9959249f2
+-  Download Locations:
+   https://downloads.yoctoproject.org/releases/yocto/yocto-4.0.26/poky-d70d287a77d5026b698ac237ab865b2dafd36bb8.tar.bz2
+   https://mirrors.kernel.org/yocto/yocto/yocto-4.0.26/poky-d70d287a77d5026b698ac237ab865b2dafd36bb8.tar.bz2
+
+openembedded-core
+
+-  Repository Location: :oe_git:`/openembedded-core`
+-  Branch: :oe_git:`kirkstone </openembedded-core/log/?h=kirkstone>`
+-  Tag:  :oe_git:`yocto-4.0.26 </openembedded-core/log/?h=yocto-4.0.26>`
+-  Git Revision: :oe_git:`1efbe1004bc82e7c14c1e8bd4ce644f5015c3346 </openembedded-core/commit/?id=1efbe1004bc82e7c14c1e8bd4ce644f5015c3346>`
+-  Release Artefact: oecore-1efbe1004bc82e7c14c1e8bd4ce644f5015c3346
+-  sha: d3805e034dabd0865dbf55488b2c16d4ea0351d37aa826f0054a6bfdde5a8be9
+-  Download Locations:
+   https://downloads.yoctoproject.org/releases/yocto/yocto-4.0.26/oecore-1efbe1004bc82e7c14c1e8bd4ce644f5015c3346.tar.bz2
+   https://mirrors.kernel.org/yocto/yocto/yocto-4.0.26/oecore-1efbe1004bc82e7c14c1e8bd4ce644f5015c3346.tar.bz2
+
+meta-mingw
+
+-  Repository Location: :yocto_git:`/meta-mingw`
+-  Branch: :yocto_git:`kirkstone </meta-mingw/log/?h=kirkstone>`
+-  Tag:  :yocto_git:`yocto-4.0.26 </meta-mingw/log/?h=yocto-4.0.26>`
+-  Git Revision: :yocto_git:`87c22abb1f11be430caf4372e6b833dc7d77564e </meta-mingw/commit/?id=87c22abb1f11be430caf4372e6b833dc7d77564e>`
+-  Release Artefact: meta-mingw-87c22abb1f11be430caf4372e6b833dc7d77564e
+-  sha: f0bc4873e2e0319fb9d6d6ab9b98eb3f89664d4339a167d2db6a787dd12bc1a8
+-  Download Locations:
+   https://downloads.yoctoproject.org/releases/yocto/yocto-4.0.26/meta-mingw-87c22abb1f11be430caf4372e6b833dc7d77564e.tar.bz2
+   https://mirrors.kernel.org/yocto/yocto/yocto-4.0.26/meta-mingw-87c22abb1f11be430caf4372e6b833dc7d77564e.tar.bz2
+
+meta-gplv2
+
+-  Repository Location: :yocto_git:`/meta-gplv2`
+-  Branch: :yocto_git:`kirkstone </meta-gplv2/log/?h=kirkstone>`
+-  Tag:  :yocto_git:`yocto-4.0.26 </meta-gplv2/log/?h=yocto-4.0.26>`
+-  Git Revision: :yocto_git:`d2f8b5cdb285b72a4ed93450f6703ca27aa42e8a </meta-gplv2/commit/?id=d2f8b5cdb285b72a4ed93450f6703ca27aa42e8a>`
+-  Release Artefact: meta-gplv2-d2f8b5cdb285b72a4ed93450f6703ca27aa42e8a
+-  sha: c386f59f8a672747dc3d0be1d4234b6039273d0e57933eb87caa20f56b9cca6d
+-  Download Locations:
+   https://downloads.yoctoproject.org/releases/yocto/yocto-4.0.26/meta-gplv2-d2f8b5cdb285b72a4ed93450f6703ca27aa42e8a.tar.bz2
+   https://mirrors.kernel.org/yocto/yocto/yocto-4.0.26/meta-gplv2-d2f8b5cdb285b72a4ed93450f6703ca27aa42e8a.tar.bz2
+
+bitbake
+
+-  Repository Location: :oe_git:`/bitbake`
+-  Branch: :oe_git:`2.0 </bitbake/log/?h=2.0>`
+-  Tag:  :oe_git:`yocto-4.0.26 </bitbake/log/?h=yocto-4.0.26>`
+-  Git Revision: :oe_git:`046871d9fd76efdca7b72718b328d8f545523f7e </bitbake/commit/?id=046871d9fd76efdca7b72718b328d8f545523f7e>`
+-  Release Artefact: bitbake-046871d9fd76efdca7b72718b328d8f545523f7e
+-  sha: e9df0a9f5921b583b539188d66b23f120e1751000e7822e76c3391d5c76ee21a
+-  Download Locations:
+   https://downloads.yoctoproject.org/releases/yocto/yocto-4.0.26/bitbake-046871d9fd76efdca7b72718b328d8f545523f7e.tar.bz2
+   https://mirrors.kernel.org/yocto/yocto/yocto-4.0.26/bitbake-046871d9fd76efdca7b72718b328d8f545523f7e.tar.bz2
+
+yocto-docs
+
+-  Repository Location: :yocto_git:`/yocto-docs`
+-  Branch: :yocto_git:`kirkstone </yocto-docs/log/?h=kirkstone>`
+-  Tag: :yocto_git:`yocto-4.0.26 </yocto-docs/log/?h=yocto-4.0.26>`
+-  Git Revision: :yocto_git:`9b4c36f7b02dd4bedfec90206744a1e90e37733c </yocto-docs/commit/?id=9b4c36f7b02dd4bedfec90206744a1e90e37733c>`
+
diff --git a/documentation/migration-guides/release-notes-4.0.27.rst b/documentation/migration-guides/release-notes-4.0.27.rst
new file mode 100644
index 0000000000..e37e2f78b6
--- /dev/null
+++ b/documentation/migration-guides/release-notes-4.0.27.rst
@@ -0,0 +1,153 @@
+Release notes for Yocto-4.0.27 (Kirkstone)
+------------------------------------------
+
+Security Fixes in Yocto-4.0.27
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+-  binutils: Fix :cve_nist:`2025-1178`
+-  busybox: fix :cve_nist:`2023-39810`
+-  connman :fix :cve_nist:`2025-32743`
+-  curl: Ignore :cve_nist:`2025-0725`
+-  ghostscript: Fix :cve_nist:`2025-27830`, :cve_nist:`2025-27831`, :cve_nist:`2025-27832`,
+   :cve_nist:`2025-27834`, :cve_nist:`2025-27835` and :cve_nist:`2025-27836`
+-  ghostscript: Ignore :cve_nist:`2024-29507`, :cve_nist:`2025-27833` and :cve_nist:`2025-27837`
+-  glib-2.0: Fix :cve_nist:`2025-3360`
+-  go: Fix :cve_nist:`2025-22871`
+-  libarchive: Ignore :cve_nist:`2024-48615`
+-  libpam: Fix :cve_nist:`2024-10041`
+-  libsoup-2.4: Fix :cve_nist:`2024-52532`, :cve_nist:`2025-32906` and :cve_nist:`2025-32909`
+-  libsoup: Fix :cve_nist:`2024-52532`, :cve_nist:`2025-32906`, :cve_nist:`2025-32909`,
+   :cve_nist:`2025-32910`, :cve_nist:`2025-32911`, :cve_nist:`2025-32912`, :cve_nist:`2025-32913`
+   and :cve_nist:`2025-32914`
+-  libxml2: Fix :cve_nist:`2025-32414` and :cve_nist:`2025-32415`
+-  ofono: Fix :cve_nist:`2024-7537`
+-  perl: Fix :cve_nist:`2024-56406`
+-  ppp: Fix :cve_nist:`2024-58250`
+-  python3-setuptools: Fix :cve_nist:`2024-6345`
+-  qemu: Ignore :cve_nist:`2023-1386`
+-  ruby: Fix :cve_nist:`2024-43398`
+-  sqlite3: Fix :cve_nist:`2025-29088`
+-  systemd: Ignore :cve_nist:`2022-3821`, :cve_nist:`2022-4415` and :cve_nist:`2022-45873`
+
+
+Fixes in Yocto-4.0.27
+~~~~~~~~~~~~~~~~~~~~~
+
+-  Revert "cve-update-nvd2-native: Tweak to work better with NFS DL_DIR"
+-  build-appliance-image: Update to kirkstone head revision
+-  cve-update-nvd2-native: add workaround for json5 style list
+-  docs: Fix dead links that use the :term:`DISTRO` macro
+-  docs: manuals: remove repeated word
+-  docs: poky.yaml: introduce DISTRO_LATEST_TAG
+-  glibc: Add single-threaded fast path to rand()
+-  glibc: stable 2.35 branch updates
+-  module.bbclass: add KBUILD_EXTRA_SYMBOLS to install
+-  perl: enable _GNU_SOURCE define via d_gnulibc
+-  poky.conf: bump version for 4.0.27
+-  ref-manual/variables.rst: document autotools class related variables
+-  scripts/install-buildtools: Update to 4.0.26
+-  systemd: backport patch to fix journal issue
+-  systemd: systemd-journald fails to setup LogNamespace
+-  tzdata/tzcode-native: upgrade to 2025b
+
+
+Known Issues in Yocto-4.0.27
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- N/A
+
+
+Contributors to Yocto-4.0.27
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+-  Aleksandar Nikolic
+-  Alexander Kanavin
+-  Alon Bar-Lev
+-  Andrew Kreimer
+-  Antonin Godard
+-  Chen Qi
+-  Deepesh Varatharajan
+-  Divya Chellam
+-  Haitao Liu
+-  Haixiao Yan
+-  Hitendra Prajapati
+-  Peter Marko
+-  Praveen Kumar
+-  Priyal Doshi
+-  Shubham Kulkarni
+-  Soumya Sambu
+-  Steve Sakoman
+-  Vijay Anusuri
+-  Yogita Urade
+
+
+Repositories / Downloads for Yocto-4.0.27
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+poky
+
+-  Repository Location: :yocto_git:`/poky`
+-  Branch: :yocto_git:`kirkstone </poky/log/?h=kirkstone>`
+-  Tag:  :yocto_git:`yocto-4.0.27 </poky/log/?h=yocto-4.0.27>`
+-  Git Revision: :yocto_git:`ab9a994a8cd8e06b519a693db444030999d273b7 </poky/commit/?id=ab9a994a8cd8e06b519a693db444030999d273b7>`
+-  Release Artefact: poky-ab9a994a8cd8e06b519a693db444030999d273b7
+-  sha: 77a366c17cf29eef15c6ff3f44e73f81c07288c723fd4a6dbd8c7ee9b79933f3
+-  Download Locations:
+   https://downloads.yoctoproject.org/releases/yocto/yocto-4.0.27/poky-ab9a994a8cd8e06b519a693db444030999d273b7.tar.bz2
+   https://mirrors.kernel.org/yocto/yocto/yocto-4.0.27/poky-ab9a994a8cd8e06b519a693db444030999d273b7.tar.bz2
+
+openembedded-core
+
+-  Repository Location: :oe_git:`/openembedded-core`
+-  Branch: :oe_git:`kirkstone </openembedded-core/log/?h=kirkstone>`
+-  Tag:  :oe_git:`yocto-4.0.27 </openembedded-core/log/?h=yocto-4.0.27>`
+-  Git Revision: :oe_git:`e8be08a624b2d024715a5c8b0c37f2345a02336b </openembedded-core/commit/?id=e8be08a624b2d024715a5c8b0c37f2345a02336b>`
+-  Release Artefact: oecore-e8be08a624b2d024715a5c8b0c37f2345a02336b
+-  sha: cc5b0fadab021c6dc61f37fc4ff01a1cf657e7c219488ce264bede42f7f6212f
+-  Download Locations:
+   https://downloads.yoctoproject.org/releases/yocto/yocto-4.0.27/oecore-e8be08a624b2d024715a5c8b0c37f2345a02336b.tar.bz2
+   https://mirrors.kernel.org/yocto/yocto/yocto-4.0.27/oecore-e8be08a624b2d024715a5c8b0c37f2345a02336b.tar.bz2
+
+meta-mingw
+
+-  Repository Location: :yocto_git:`/meta-mingw`
+-  Branch: :yocto_git:`kirkstone </meta-mingw/log/?h=kirkstone>`
+-  Tag:  :yocto_git:`yocto-4.0.27 </meta-mingw/log/?h=yocto-4.0.27>`
+-  Git Revision: :yocto_git:`87c22abb1f11be430caf4372e6b833dc7d77564e </meta-mingw/commit/?id=87c22abb1f11be430caf4372e6b833dc7d77564e>`
+-  Release Artefact: meta-mingw-87c22abb1f11be430caf4372e6b833dc7d77564e
+-  sha: f0bc4873e2e0319fb9d6d6ab9b98eb3f89664d4339a167d2db6a787dd12bc1a8
+-  Download Locations:
+   https://downloads.yoctoproject.org/releases/yocto/yocto-4.0.27/meta-mingw-87c22abb1f11be430caf4372e6b833dc7d77564e.tar.bz2
+   https://mirrors.kernel.org/yocto/yocto/yocto-4.0.27/meta-mingw-87c22abb1f11be430caf4372e6b833dc7d77564e.tar.bz2
+
+meta-gplv2
+
+-  Repository Location: :yocto_git:`/meta-gplv2`
+-  Branch: :yocto_git:`kirkstone </meta-gplv2/log/?h=kirkstone>`
+-  Tag:  :yocto_git:`yocto-4.0.27 </meta-gplv2/log/?h=yocto-4.0.27>`
+-  Git Revision: :yocto_git:`d2f8b5cdb285b72a4ed93450f6703ca27aa42e8a </meta-gplv2/commit/?id=d2f8b5cdb285b72a4ed93450f6703ca27aa42e8a>`
+-  Release Artefact: meta-gplv2-d2f8b5cdb285b72a4ed93450f6703ca27aa42e8a
+-  sha: c386f59f8a672747dc3d0be1d4234b6039273d0e57933eb87caa20f56b9cca6d
+-  Download Locations:
+   https://downloads.yoctoproject.org/releases/yocto/yocto-4.0.27/meta-gplv2-d2f8b5cdb285b72a4ed93450f6703ca27aa42e8a.tar.bz2
+   https://mirrors.kernel.org/yocto/yocto/yocto-4.0.27/meta-gplv2-d2f8b5cdb285b72a4ed93450f6703ca27aa42e8a.tar.bz2
+
+bitbake
+
+-  Repository Location: :oe_git:`/bitbake`
+-  Branch: :oe_git:`2.0 </bitbake/log/?h=2.0>`
+-  Tag:  :oe_git:`yocto-4.0.27 </bitbake/log/?h=yocto-4.0.27>`
+-  Git Revision: :oe_git:`046871d9fd76efdca7b72718b328d8f545523f7e </bitbake/commit/?id=046871d9fd76efdca7b72718b328d8f545523f7e>`
+-  Release Artefact: bitbake-046871d9fd76efdca7b72718b328d8f545523f7e
+-  sha: e9df0a9f5921b583b539188d66b23f120e1751000e7822e76c3391d5c76ee21a
+-  Download Locations:
+   https://downloads.yoctoproject.org/releases/yocto/yocto-4.0.27/bitbake-046871d9fd76efdca7b72718b328d8f545523f7e.tar.bz2
+   https://mirrors.kernel.org/yocto/yocto/yocto-4.0.27/bitbake-046871d9fd76efdca7b72718b328d8f545523f7e.tar.bz2
+
+yocto-docs
+
+-  Repository Location: :yocto_git:`/yocto-docs`
+-  Branch: :yocto_git:`kirkstone </yocto-docs/log/?h=kirkstone>`
+-  Tag: :yocto_git:`yocto-4.0.27 </yocto-docs/log/?h=yocto-4.0.27>`
+-  Git Revision: :yocto_git:`0d51e553d5f83eea6634e03ddc9c7740bf72fcea </yocto-docs/commit/?id=0d51e553d5f83eea6634e03ddc9c7740bf72fcea>`
+
diff --git a/documentation/migration-guides/release-notes-4.3.rst b/documentation/migration-guides/release-notes-4.3.rst
index d1ab70447b..0103ac985e 100644
--- a/documentation/migration-guides/release-notes-4.3.rst
+++ b/documentation/migration-guides/release-notes-4.3.rst
@@ -295,7 +295,7 @@ New Features / Enhancements in 4.3
    -  Generation of :term:`SPDX` manifests is now enabled by default.
 
    -  Git based recipes in OE-Core which used the ``git``  protocol have been
-      changed to use `https`` where possible, as it is typically faster and
+      changed to use ``https`` where possible, as it is typically faster and
       more reliable.
 
    -  The ``os-release`` recipe added a ``CPE_NAME`` to the fields provided, with the
diff --git a/documentation/migration-guides/release-notes-5.0.10.rst b/documentation/migration-guides/release-notes-5.0.10.rst
new file mode 100644
index 0000000000..e9845aa315
--- /dev/null
+++ b/documentation/migration-guides/release-notes-5.0.10.rst
@@ -0,0 +1,208 @@
+.. SPDX-License-Identifier: CC-BY-SA-2.0-UK
+
+Release notes for Yocto-5.0.10 (Scarthgap)
+------------------------------------------
+
+Security Fixes in Yocto-5.0.10
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+-  binutils: Fix :cve_nist:`2025-1153`, :cve_nist:`2025-1179`, :cve_nist:`2025-1180` and
+   :cve_nist:`2025-1182`
+-  connman: Fix :cve_nist:`2025-32366` and :cve_nist:`2025-32743`
+-  curl: Fix :cve_nist:`2024-11053` and :cve_nist:`2025-0167`
+-  elfutils: Fix :cve_nist:`2025-1371`
+-  ffmpeg: Fix :cve_nist:`2024-7055`, :cve_nist:`2024-32230`, :cve_nist:`2024-35366`,
+   :cve_nist:`2024-36613`, :cve_nist:`2024-36616`, :cve_nist:`2024-36617` and :cve_nist:`2024-36619`
+-  git: Fix :cve_nist:`2024-50349` and :cve_nist:`2024-52006`
+-  glib-2.0: fix :cve_nist:`2025-3360` and :cve_nist:`2025-4373`
+-  iputils: Fix :cve_nist:`2025-47268`
+-  libpam: Fix :cve_nist:`2024-10041`
+-  libsoup-2.4: Fix :cve_nist:`2024-52530`, :cve_nist:`2024-52531`, :cve_nist:`2024-52532`,
+   :cve_nist:`2025-32906`, :cve_nist:`2025-32909`, :cve_nist:`2025-32910`, :cve_nist:`2025-32911`,
+   :cve_nist:`2025-32912`, :cve_nist:`2025-32913`, :cve_nist:`2025-32914` and :cve_nist:`2025-46420`
+-  libsoup: Fix :cve_nist:`2025-4476`, :cve_nist:`2025-32906`, :cve_nist:`2025-32909`,
+   :cve_nist:`2025-32910`, :cve_nist:`2025-32911`, :cve_nist:`2025-32912`, :cve_nist:`2025-32913`,
+   :cve_nist:`2025-32914` and :cve_nist:`2025-46420`
+-  libxml2: Fix :cve_nist:`2025-32414` and :cve_nist:`2025-32415`
+-  openssh: Fix :cve_nist:`2025-32728`
+-  perl: Fix :cve_nist:`2024-56406`
+-  ppp: Fix :cve_nist:`2024-58250`
+-  python3-jinja2: Fix :cve_nist:`2024-56201`, :cve_nist:`2024-56326` and :cve_nist:`2025-27516`
+-  ruby: Fix :cve_nist:`2025-27221`
+-  sqlite3: Fix :cve_nist:`2025-3277`, :cve_nist:`2025-29087` and :cve_nist:`2025-29088`
+
+
+Fixes in Yocto-5.0.10
+~~~~~~~~~~~~~~~~~~~~~
+
+-  binutils: stable 2.42 branch updates
+-  bluez5: add missing tools to noinst-tools package
+-  bluez5: backport a patch to fix btmgmt -i
+-  bluez5: make media control a :term:`PACKAGECONFIG` option
+-  build-appliance-image: Update to scarthgap head revision
+-  buildtools-tarball: Make buildtools respects host CA certificates
+-  buildtools-tarball: add envvars into :term:`BB_ENV_PASSTHROUGH_ADDITIONS`
+-  buildtools-tarball: move setting of envvars to respective envfile
+-  contributor-guide/submit-changes: encourage patch version changelogs
+-  cve-check.bbclass: Fix symlink handling also for text files
+-  cve-update-nvd2-native: Revert "cve-update-nvd2-native: Tweak to work better with NFS DL_DIR"
+-  dev-manual/sbom.rst: fix wrong build outputs
+-  docs: Fix dead links that use the :term:`DISTRO` macro
+-  docs: conf.py: tweak SearchEnglish to be hyphen-friendly
+-  docs:conf.py: define a manpage url
+-  ffmpeg: upgrade to 6.1.2
+-  git: upgrade to 2.44.3
+-  glibc-y2038-tests: remove glibc-y2038-tests_2.39.bb recipe
+-  glibc: Add single-threaded fast path to rand()
+-  glibc: stable 2.39 branch updates
+-  initscripts: add function log_success_msg/log_failure_msg/log_warning_msg
+-  libatomic-ops: Update :term:`GITHUB_BASE_URI`
+-  manuals: remove repeated word
+-  migration-guides: add release notes for 4.0.26, 5.0.8, 5.0.9
+-  module.bbclass: add KBUILD_EXTRA_SYMBOLS to install
+-  perl: upgrade to 5.38.4
+-  perlcross: upgrade to 1.6.2
+-  poky.conf: bump version for 5.0.10
+-  poky.yaml: introduce DISTRO_LATEST_TAG
+-  python3-jinja2: upgrade to 3.1.6
+-  ref-manual/release-process: update releases.svg
+-  ref-manual/variables.rst: HOST_CC_ARCH: fix wrong SDK reference
+-  ref-manual/variables.rst: WATCHDOG_TIMEOUT: fix recipe name
+-  ref-manual/variables.rst: add manpage links for toolchain variables
+-  ref-manual/variables.rst: add missing documentation for BUILD_* variables
+-  ref-manual/variables.rst: document HOST_*_ARCH variables
+-  ref-manual/variables.rst: document :term:`INHIBIT_DEFAULT_RUST_DEPS`
+-  ref-manual/variables.rst: document :term:`INHIBIT_UPDATERCD_BBCLASS`
+-  ref-manual/variables.rst: document :term:`SSTATE_SKIP_CREATION`
+-  ref-manual/variables.rst: document :term:`WIC_CREATE_EXTRA_ARGS`
+-  ref-manual/variables.rst: document autotools class related variables
+-  ref-manual/variables.rst: document missing SDK_*_ARCH variables
+-  ref-manual/variables.rst: document the :term:`IMAGE_ROOTFS_MAXSIZE` variable
+-  ref-manual/variables.rst: document the :term:`INITRAMFS_MAXSIZE` variable
+-  ref-manual/variables.rst: improve the :term:`PKGV` documentation
+-  ref-manual/variables.rst: update :term:`ROOT_HOME` documentation
+-  ref-manual: kernel-fitimage.bbclass does not use :term:`SPL_SIGN_KEYNAME`
+-  scripts/install-buildtools: Update to 5.0.9
+-  sphinx-lint: missing space after literal
+-  sphinx-lint: trailing whitespace
+-  sphinx-lint: unbalanced inline literal markup
+-  systemd: Password agents shouldn't be optional
+-  systemd: upgrade to 255.18
+-  test-manual/intro: remove Buildbot version used
+-  tzdata/tzcode-native: upgrade 2025a -> 2025b
+-  u-boot: ensure keys are generated before assembling U-Boot FIT image
+-  util-linux: Add fix to isolate test fstab entries using CUSTOM_FSTAB
+-  wic: bootimg-efi: Support + symbol in filenames
+
+
+Known Issues in Yocto-5.0.10
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+-  There is an issue where the target libsoup-2.4 build may fail if apachectl is present on the build
+   host. The issue only affects test binaries which aren't actually used. The issue can be fixed by
+   disabling the tests or updating to more recent changes on the scarthgap branch which fix this.
+
+
+Contributors to Yocto-5.0.10
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Thanks to the following people who contributed to this release:
+
+-  Adrian Freihofer
+-  Aleksandar Nikolic
+-  Alexander Kanavin
+-  Alon Bar-Lev
+-  Alper Ak
+-  Andrew Kreimer
+-  Antonin Godard
+-  Archana Polampalli
+-  Ashish Sharma
+-  Changqing Li
+-  Christos Gavros
+-  Deepesh Varatharajan
+-  Divya Chellam
+-  Divyanshu Rathore
+-  Enrico Jörns
+-  Etienne Cordonnier
+-  Guðni Már Gilbert
+-  Haixiao Yan
+-  Harish Sadineni
+-  Igor Opaniuk
+-  Jeroen Hofstee
+-  Lee Chee Yang
+-  Nguyen Dat Tho
+-  Niko Mauno
+-  Peter Marko
+-  Praveen Kumar
+-  Priyal Doshi
+-  Rogerio Guerra Borin
+-  Shubham Kulkarni
+-  Soumya Sambu
+-  Steve Sakoman
+-  Sunil Dora
+-  Trevor Woerner
+-  Vijay Anusuri
+-  Virendra Thakur
+-  Vyacheslav Yurkov
+-  Yi Zhao
+-  Yogita Urade
+-  rajmohan r
+
+Repositories / Downloads for Yocto-5.0.10
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+poky
+
+-  Repository Location: :yocto_git:`/poky`
+-  Branch: :yocto_git:`scarthgap </poky/log/?h=scarthgap>`
+-  Tag:  :yocto_git:`yocto-5.0.10 </poky/log/?h=yocto-5.0.10>`
+-  Git Revision: :yocto_git:`ac257900c33754957b2696529682029d997a8f28 </poky/commit/?id=ac257900c33754957b2696529682029d997a8f28>`
+-  Release Artefact: poky-ac257900c33754957b2696529682029d997a8f28
+-  sha: ddca7e54b331e78214bea65b346320d4fbcddf4b51103bfbbd9fc3960f32cdc7
+-  Download Locations:
+   https://downloads.yoctoproject.org/releases/yocto/yocto-5.0.10/poky-ac257900c33754957b2696529682029d997a8f28.tar.bz2
+   https://mirrors.kernel.org/yocto/yocto/yocto-5.0.10/poky-ac257900c33754957b2696529682029d997a8f28.tar.bz2
+
+openembedded-core
+
+-  Repository Location: :oe_git:`/openembedded-core`
+-  Branch: :oe_git:`scarthgap </openembedded-core/log/?h=scarthgap>`
+-  Tag:  :oe_git:`yocto-5.0.10 </openembedded-core/log/?h=yocto-5.0.10>`
+-  Git Revision: :oe_git:`d5342ffc570d47a723b18297d75bd2f63c2088db </openembedded-core/commit/?id=d5342ffc570d47a723b18297d75bd2f63c2088db>`
+-  Release Artefact: oecore-d5342ffc570d47a723b18297d75bd2f63c2088db
+-  sha: daa62094f2327f4b3fbcc485e8964d1b86a4722f58fb37e0d8e8e9885094a262
+-  Download Locations:
+   https://downloads.yoctoproject.org/releases/yocto/yocto-5.0.10/oecore-d5342ffc570d47a723b18297d75bd2f63c2088db.tar.bz2
+   https://mirrors.kernel.org/yocto/yocto/yocto-5.0.10/oecore-d5342ffc570d47a723b18297d75bd2f63c2088db.tar.bz2
+
+meta-mingw
+
+-  Repository Location: :yocto_git:`/meta-mingw`
+-  Branch: :yocto_git:`scarthgap </meta-mingw/log/?h=scarthgap>`
+-  Tag:  :yocto_git:`yocto-5.0.10 </meta-mingw/log/?h=yocto-5.0.10>`
+-  Git Revision: :yocto_git:`bd9fef71ec005be3c3a6d7f8b99d8116daf70c4f </meta-mingw/commit/?id=bd9fef71ec005be3c3a6d7f8b99d8116daf70c4f>`
+-  Release Artefact: meta-mingw-bd9fef71ec005be3c3a6d7f8b99d8116daf70c4f
+-  sha: ab073def6487f237ac125d239b3739bf02415270959546b6b287778664f0ae65
+-  Download Locations:
+   https://downloads.yoctoproject.org/releases/yocto/yocto-5.0.10/meta-mingw-bd9fef71ec005be3c3a6d7f8b99d8116daf70c4f.tar.bz2
+   https://mirrors.kernel.org/yocto/yocto/yocto-5.0.10/meta-mingw-bd9fef71ec005be3c3a6d7f8b99d8116daf70c4f.tar.bz2
+
+bitbake
+
+-  Repository Location: :oe_git:`/bitbake`
+-  Branch: :oe_git:`2.8 </bitbake/log/?h=2.8>`
+-  Tag:  :oe_git:`yocto-5.0.10 </bitbake/log/?h=yocto-5.0.10>`
+-  Git Revision: :oe_git:`696c2c1ef095f8b11c7d2eff36fae50f58c62e5e </bitbake/commit/?id=696c2c1ef095f8b11c7d2eff36fae50f58c62e5e>`
+-  Release Artefact: bitbake-696c2c1ef095f8b11c7d2eff36fae50f58c62e5e
+-  sha: fc83f879cd6dd14b9b7eba0161fec23ecc191fed0fb00556ba729dceef6c145f
+-  Download Locations:
+   https://downloads.yoctoproject.org/releases/yocto/yocto-5.0.10/bitbake-696c2c1ef095f8b11c7d2eff36fae50f58c62e5e.tar.bz2
+   https://mirrors.kernel.org/yocto/yocto/yocto-5.0.10/bitbake-696c2c1ef095f8b11c7d2eff36fae50f58c62e5e.tar.bz2
+
+yocto-docs
+
+-  Repository Location: :yocto_git:`/yocto-docs`
+-  Branch: :yocto_git:`scarthgap </yocto-docs/log/?h=scarthgap>`
+-  Tag: :yocto_git:`yocto-5.0.10 </yocto-docs/log/?h=yocto-5.0.10>`
+-  Git Revision: :yocto_git:`3996388e337377bedc113d072a51fe9d68dd40c6 </yocto-docs/commit/?id=3996388e337377bedc113d072a51fe9d68dd40c6>`
+
diff --git a/documentation/migration-guides/release-notes-5.0.9.rst b/documentation/migration-guides/release-notes-5.0.9.rst
new file mode 100644
index 0000000000..81b853cf31
--- /dev/null
+++ b/documentation/migration-guides/release-notes-5.0.9.rst
@@ -0,0 +1,206 @@
+.. SPDX-License-Identifier: CC-BY-SA-2.0-UK
+
+Release notes for Yocto-5.0.9 (Scarthgap)
+-----------------------------------------
+
+Security Fixes in Yocto-5.0.9
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+-  binutils: Fix :cve_nist:`2024-57360`, :cve_nist:`2025-1176`, :cve_nist:`2025-1178` and
+   :cve_nist:`2025-1181`
+-  expat: Fix :cve_nist:`2024-8176`
+-  freetype: Fix :cve_nist:`2025-27363`
+-  ghostscript: Fix :cve_nist:`2025-27830`, :cve_nist:`2025-27831`, :cve_nist:`2025-27832`,
+   :cve_nist:`2025-27833`, :cve_nist:`2025-27833`, :cve_nist:`2025-27834`, :cve_nist:`2025-27835`
+   and :cve_nist:`2025-27836`
+-  go: fix :cve_nist:`2025-22870` and :cve_nist:`2025-22871`
+-  grub: Fix :cve_nist:`2024-45781`, :cve_nist:`2024-45774`, :cve_nist:`2024-45775`,
+   :cve_nist:`2024-45776`, :cve_nist:`2024-45777`, :cve_nist:`2024-45778`, :cve_nist:`2024-45779`,
+   :cve_nist:`2024-45780`, :cve_nist:`2024-45782`, :cve_nist:`2024-45783`, :cve_nist:`2024-56737`,
+   :cve_nist:`2025-0622`, :cve_nist:`2025-0624`, :cve_nist:`2025-0677`, :cve_nist:`2025-0678`,
+   :cve_nist:`2025-0684`, :cve_nist:`2025-0685`, :cve_nist:`2025-0686`, :cve_nist:`2025-0689`,
+   :cve_nist:`2025-0690`, :cve_nist:`2025-1118` and :cve_nist:`2025-1125`
+-  libarchive: Fix :cve_nist:`2024-20696`, :cve_nist:`2024-48957`, :cve_nist:`2024-48958`,
+   :cve_nist:`2025-1632` and :cve_nist:`2025-25724`
+-  libxslt: Fix :cve_nist:`2024-24855` and :cve_nist:`2024-55549`
+-  linux-yocto/6.6: Fix :cve_nist:`2024-54458`, :cve_nist:`2024-57834`, :cve_nist:`2024-57973`,
+   :cve_nist:`2024-57978`, :cve_nist:`2024-57979`, :cve_nist:`2024-57980`, :cve_nist:`2024-57981`,
+   :cve_nist:`2024-57984`, :cve_nist:`2024-57996`, :cve_nist:`2024-57997`, :cve_nist:`2024-58002`,
+   :cve_nist:`2024-58005`, :cve_nist:`2024-58007`, :cve_nist:`2024-58010`, :cve_nist:`2024-58011`,
+   :cve_nist:`2024-58013`, :cve_nist:`2024-58017`, :cve_nist:`2024-58020`, :cve_nist:`2024-58034`,
+   :cve_nist:`2024-58052`, :cve_nist:`2024-58055`, :cve_nist:`2024-58058`, :cve_nist:`2024-58063`,
+   :cve_nist:`2024-58068`, :cve_nist:`2024-58069`, :cve_nist:`2024-58070`, :cve_nist:`2024-58071`,
+   :cve_nist:`2024-58076`, :cve_nist:`2024-58080`, :cve_nist:`2024-58083`, :cve_nist:`2024-58088`,
+   :cve_nist:`2025-21700`, :cve_nist:`2025-21703`, :cve_nist:`2025-21707`, :cve_nist:`2025-21711`,
+   :cve_nist:`2025-21715`, :cve_nist:`2025-21716`, :cve_nist:`2025-21718`, :cve_nist:`2025-21726`,
+   :cve_nist:`2025-21727`, :cve_nist:`2025-21731`, :cve_nist:`2025-21735`, :cve_nist:`2025-21736`,
+   :cve_nist:`2025-21741`, :cve_nist:`2025-21742`, :cve_nist:`2025-21743`, :cve_nist:`2025-21744`,
+   :cve_nist:`2025-21745`, :cve_nist:`2025-21748`, :cve_nist:`2025-21749`, :cve_nist:`2025-21753`,
+   :cve_nist:`2025-21756`, :cve_nist:`2025-21759`, :cve_nist:`2025-21760`, :cve_nist:`2025-21761`,
+   :cve_nist:`2025-21762`, :cve_nist:`2025-21763`, :cve_nist:`2025-21764`, :cve_nist:`2025-21773`,
+   :cve_nist:`2025-21775`, :cve_nist:`2025-21776`, :cve_nist:`2025-21779`, :cve_nist:`2025-21780`,
+   :cve_nist:`2025-21782`, :cve_nist:`2025-21783`, :cve_nist:`2025-21785`, :cve_nist:`2025-21787`,
+   :cve_nist:`2025-21789`, :cve_nist:`2025-21790`, :cve_nist:`2025-21791`, :cve_nist:`2025-21792`,
+   :cve_nist:`2025-21793`, :cve_nist:`2025-21796`, :cve_nist:`2025-21811`, :cve_nist:`2025-21812`,
+   :cve_nist:`2025-21814`, :cve_nist:`2025-21820`, :cve_nist:`2025-21844`, :cve_nist:`2025-21846`,
+   :cve_nist:`2025-21847`, :cve_nist:`2025-21848`, :cve_nist:`2025-21853`, :cve_nist:`2025-21854`,
+   :cve_nist:`2025-21855`, :cve_nist:`2025-21856`, :cve_nist:`2025-21857`, :cve_nist:`2025-21858`,
+   :cve_nist:`2025-21859`, :cve_nist:`2025-21862`, :cve_nist:`2025-21863`, :cve_nist:`2025-21864`,
+   :cve_nist:`2025-21865`, :cve_nist:`2025-21866`, :cve_nist:`2025-21867`, :cve_nist:`2025-21887`,
+   :cve_nist:`2025-21891`, :cve_nist:`2025-21898`, :cve_nist:`2025-21904`, :cve_nist:`2025-21905`,
+   :cve_nist:`2025-21908`, :cve_nist:`2025-21912`, :cve_nist:`2025-21915`, :cve_nist:`2025-21917`,
+   :cve_nist:`2025-21918`, :cve_nist:`2025-21919`, :cve_nist:`2025-21920`, :cve_nist:`2025-21922`,
+   :cve_nist:`2025-21928`, :cve_nist:`2025-21934`, :cve_nist:`2025-21936`, :cve_nist:`2025-21937`,
+   :cve_nist:`2025-21941`, :cve_nist:`2025-21943`, :cve_nist:`2025-21945`, :cve_nist:`2025-21947`,
+   :cve_nist:`2025-21948`, :cve_nist:`2025-21951`, :cve_nist:`2025-21957`, :cve_nist:`2025-21959`,
+   :cve_nist:`2025-21962`, :cve_nist:`2025-21963`, :cve_nist:`2025-21964`, :cve_nist:`2025-21966`,
+   :cve_nist:`2025-21967`, :cve_nist:`2025-21968`, :cve_nist:`2025-21969`, :cve_nist:`2025-21979`,
+   :cve_nist:`2025-21980`, :cve_nist:`2025-21981`, :cve_nist:`2025-21991` and :cve_nist:`2025-21993`
+-  mpg123: Fix :cve_nist:`2024-10573`
+-  ofono: Fix :cve_nist:`2024-7537`
+-  openssh: Fix :cve_nist:`2025-26465`
+-  puzzles: Ignore :cve_nist:`2024-13769`, :cve_nist:`2024-13770` and :cve_nist:`2025-0837`
+-  qemu: Ignore :cve_nist:`2023-1386`
+-  ruby: Fix :cve_nist:`2025-27219` and :cve_nist:`2025-27220`
+-  rust-cross-canadian: Ignore :cve_nist:`2024-43402`
+-  vim: Fix :cve_nist:`2025-1215`, :cve_nist:`2025-26603`, :cve_nist:`2025-27423` and
+   :cve_nist:`2025-29768`
+-  xserver-xorg: Fix :cve_nist:`2025-26594`, :cve_nist:`2025-26595`, :cve_nist:`2025-26596`,
+   :cve_nist:`2025-26597`, :cve_nist:`2025-26598`, :cve_nist:`2025-26599`, :cve_nist:`2025-26600`
+   and :cve_nist:`2025-26601`
+-  xz: Fix :cve_nist:`2025-31115`
+
+
+Fixes in Yocto-5.0.9
+~~~~~~~~~~~~~~~~~~~~
+
+-  babeltrace2: extend to nativesdk
+-  babeltrace: extend to nativesdk
+-  bitbake: event/utils: Avoid deadlock from lock_timeout() and recursive events
+-  bitbake: utils: Add signal blocking for lock_timeout
+-  bitbake: utils: Print information about lock issue before exiting
+-  bitbake: utils: Tweak lock_timeout logic
+-  build-appliance-image: Update to scarthgap head revision
+-  cve-check.bbclass: Mitigate symlink related error
+-  cve-update-nvd2-native: add workaround for json5 style list
+-  cve-update-nvd2-native: handle missing vulnStatus
+-  gcc: remove paths to sysroot from configargs.h and checksum-options for gcc-cross-canadian
+-  gcc: unify cleanup of include-fixed, apply to cross-canadian
+-  ghostscript: upgrade to 10.05.0
+-  grub: backport strlcpy function
+-  grub: drop obsolete CVE statuses
+-  icu: Adjust ICU_DATA_DIR path on big endian targets
+-  kernel-arch: add macro-prefix-map in KERNEL_CC
+-  libarchive: upgrade to 3.7.9
+-  libxslt: upgrade to 1.1.43
+-  linux-yocto/6.6: update to v6.6.84
+-  mc: set ac_cv_path_ZIP to avoid buildpaths QA issues
+-  mpg123: upgrade to 1.32.10
+-  nativesdk-libtool: sanitize the script, remove buildpaths
+-  openssl: rewrite ptest installation
+-  overview-manual/concepts: remove :term:`PR` from the build dir list
+-  patch.py: set commituser and commitemail for addNote
+-  poky.conf: bump version for 5.0.9
+-  vim: Upgrade to 9.1.1198
+-  xserver-xf86-config: add a configuration fragment to disable screen blanking
+-  xserver-xf86-config: remove obsolete configuration files
+-  xserver-xorg: upgrade to 21.1.16
+-  xz: upgrade to 5.4.7
+-  yocto-uninative: Update to 4.7 for glibc 2.41
+
+
+Known Issues in Yocto-5.0.9
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- N/A
+
+Contributors to Yocto-5.0.9
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Thanks to the following people who contributed to this release:
+
+-  Antonin Godard
+-  Archana Polampalli
+-  Ashish Sharma
+-  Bruce Ashfield
+-  Changqing Li
+-  Denys Dmytriyenko
+-  Divya Chellam
+-  Hitendra Prajapati
+-  Madhu Marri
+-  Makarios Christakis
+-  Martin Jansa
+-  Michael Halstead
+-  Niko Mauno
+-  Oleksandr Hnatiuk
+-  Peter Marko
+-  Richard Purdie
+-  Ross Burton
+-  Sana Kazi
+-  Stefan Mueller-Klieser
+-  Steve Sakoman
+-  Vijay Anusuri
+-  Virendra Thakur
+-  Vishwas Udupa
+-  Wang Mingyu
+-  Zhang Peng
+
+
+Repositories / Downloads for Yocto-5.0.9
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+poky
+
+-  Repository Location: :yocto_git:`/poky`
+-  Branch: :yocto_git:`scarthgap </poky/log/?h=scarthgap>`
+-  Tag:  :yocto_git:`yocto-5.0.9 </poky/log/?h=yocto-5.0.9>`
+-  Git Revision: :yocto_git:`bab0f9f62af9af580744948dd3240f648a99879a </poky/commit/?id=bab0f9f62af9af580744948dd3240f648a99879a>`
+-  Release Artefact: poky-bab0f9f62af9af580744948dd3240f648a99879a
+-  sha: ee6811d9fb6c4913e19d6e3569f1edc8ccd793779b237520596506446a6b4531
+-  Download Locations:
+   https://downloads.yoctoproject.org/releases/yocto/yocto-5.0.9/poky-bab0f9f62af9af580744948dd3240f648a99879a.tar.bz2
+   https://mirrors.kernel.org/yocto/yocto/yocto-5.0.9/poky-bab0f9f62af9af580744948dd3240f648a99879a.tar.bz2
+
+openembedded-core
+
+-  Repository Location: :oe_git:`/openembedded-core`
+-  Branch: :oe_git:`scarthgap </openembedded-core/log/?h=scarthgap>`
+-  Tag:  :oe_git:`yocto-5.0.9 </openembedded-core/log/?h=yocto-5.0.9>`
+-  Git Revision: :oe_git:`04038ecd1edd6592b826665a2b787387bb7074fa </openembedded-core/commit/?id=04038ecd1edd6592b826665a2b787387bb7074fa>`
+-  Release Artefact: oecore-04038ecd1edd6592b826665a2b787387bb7074fa
+-  sha: 6e201a4b486dfbdfcb7e96d83b962a205ec4764db6ad0e34bd623db18910eddb
+-  Download Locations:
+   https://downloads.yoctoproject.org/releases/yocto/yocto-5.0.9/oecore-04038ecd1edd6592b826665a2b787387bb7074fa.tar.bz2
+   https://mirrors.kernel.org/yocto/yocto/yocto-5.0.9/oecore-04038ecd1edd6592b826665a2b787387bb7074fa.tar.bz2
+
+meta-mingw
+
+-  Repository Location: :yocto_git:`/meta-mingw`
+-  Branch: :yocto_git:`scarthgap </meta-mingw/log/?h=scarthgap>`
+-  Tag:  :yocto_git:`yocto-5.0.9 </meta-mingw/log/?h=yocto-5.0.9>`
+-  Git Revision: :yocto_git:`bd9fef71ec005be3c3a6d7f8b99d8116daf70c4f </meta-mingw/commit/?id=bd9fef71ec005be3c3a6d7f8b99d8116daf70c4f>`
+-  Release Artefact: meta-mingw-bd9fef71ec005be3c3a6d7f8b99d8116daf70c4f
+-  sha: ab073def6487f237ac125d239b3739bf02415270959546b6b287778664f0ae65
+-  Download Locations:
+   https://downloads.yoctoproject.org/releases/yocto/yocto-5.0.9/meta-mingw-bd9fef71ec005be3c3a6d7f8b99d8116daf70c4f.tar.bz2
+   https://mirrors.kernel.org/yocto/yocto/yocto-5.0.9/meta-mingw-bd9fef71ec005be3c3a6d7f8b99d8116daf70c4f.tar.bz2
+
+bitbake
+
+-  Repository Location: :oe_git:`/bitbake`
+-  Branch: :oe_git:`2.8 </bitbake/log/?h=2.8>`
+-  Tag:  :oe_git:`yocto-5.0.9 </bitbake/log/?h=yocto-5.0.9>`
+-  Git Revision: :oe_git:`696c2c1ef095f8b11c7d2eff36fae50f58c62e5e </bitbake/commit/?id=696c2c1ef095f8b11c7d2eff36fae50f58c62e5e>`
+-  Release Artefact: bitbake-696c2c1ef095f8b11c7d2eff36fae50f58c62e5e
+-  sha: fc83f879cd6dd14b9b7eba0161fec23ecc191fed0fb00556ba729dceef6c145f
+-  Download Locations:
+   https://downloads.yoctoproject.org/releases/yocto/yocto-5.0.9/bitbake-696c2c1ef095f8b11c7d2eff36fae50f58c62e5e.tar.bz2
+   https://mirrors.kernel.org/yocto/yocto/yocto-5.0.9/bitbake-696c2c1ef095f8b11c7d2eff36fae50f58c62e5e.tar.bz2
+
+yocto-docs
+
+-  Repository Location: :yocto_git:`/yocto-docs`
+-  Branch: :yocto_git:`scarthgap </yocto-docs/log/?h=scarthgap>`
+-  Tag: :yocto_git:`yocto-5.0.9 </yocto-docs/log/?h=yocto-5.0.9>`
+-  Git Revision: :yocto_git:`56db4fd81f6235428bef9e46a61c11ca0ba89733 </yocto-docs/commit/?id=56db4fd81f6235428bef9e46a61c11ca0ba89733>`
+
diff --git a/documentation/overview-manual/concepts.rst b/documentation/overview-manual/concepts.rst
index 062ac4ab76..56dd3b3b55 100644
--- a/documentation/overview-manual/concepts.rst
+++ b/documentation/overview-manual/concepts.rst
@@ -98,7 +98,7 @@ files, and how to package the compiled output.
 
 The term "package" is sometimes used to refer to recipes. However, since
 the word "package" is used for the packaged output from the OpenEmbedded
-build system (i.e. ``.ipk`` or ``.deb`` files), this document avoids
+build system (i.e. ``.ipk``, ``.deb`` or ``.rpm`` files), this document avoids
 using the term "package" when referring to recipes.
 
 Classes
@@ -256,7 +256,7 @@ development environment.
 .. note::
 
    The
-   scripts/oe-setup-builddir
+   ``scripts/oe-setup-builddir``
    script uses the
    ``$TEMPLATECONF``
    variable to determine which sample configuration files to locate.
@@ -352,7 +352,7 @@ layers the build system uses to further control the build. These layers
 provide Metadata for the software, machine, and policies.
 
 In general, there are three types of layer input. You can see them below
-the "User Configuration" box in the `general workflow
+the "User Configuration" box in the :ref:`general workflow
 figure <overview-manual/concepts:openembedded build system concepts>`:
 
 -  *Metadata (.bb + Patches):* Software layers containing
@@ -420,14 +420,14 @@ build.
 Distro Layer
 ~~~~~~~~~~~~
 
-The distribution layer provides policy configurations for your
+A distribution layer provides policy configurations for your
 distribution. Best practices dictate that you isolate these types of
 configurations into their own layer. Settings you provide in
 ``conf/distro/distro.conf`` override similar settings that BitBake finds
 in your ``conf/local.conf`` file in the :term:`Build Directory`.
 
 The following list provides some explanation and references for what you
-typically find in the distribution layer:
+typically find in a distribution layer:
 
 -  *classes:* Class files (``.bbclass``) hold common functionality that
    can be shared among recipes in the distribution. When your recipes
@@ -454,7 +454,7 @@ typically find in the distribution layer:
 BSP Layer
 ~~~~~~~~~
 
-The BSP Layer provides machine configurations that target specific
+A BSP layer provides machine configurations that target specific
 hardware. Everything in this layer is specific to the machine for which
 you are building the image or the SDK. A common structure or form is
 defined for BSP layers. You can learn more about this structure in the
@@ -465,7 +465,7 @@ defined for BSP layers. You can learn more about this structure in the
    In order for a BSP layer to be considered compliant with the Yocto
    Project, it must meet some structural requirements.
 
-The BSP Layer's configuration directory contains configuration files for
+A BSP layer's configuration directory contains configuration files for
 the machine (``conf/machine/machine.conf``) and, of course, the layer
 (``conf/layer.conf``).
 
@@ -477,18 +477,18 @@ formfactors, graphics support systems, and so forth.
 .. note::
 
    While the figure shows several
-   recipes-\*
+   ``recipes-*``
    directories, not all these directories appear in all BSP layers.
 
 Software Layer
 ~~~~~~~~~~~~~~
 
-The software layer provides the Metadata for additional software
+A software layer provides the Metadata for additional software
 packages used during the build. This layer does not include Metadata
 that is specific to the distribution or the machine, which are found in
 their respective layers.
 
-This layer contains any recipes, append files, and patches, that your
+This layer contains any recipes, append files, and patches that your
 project needs.
 
 Sources
@@ -560,9 +560,8 @@ source tree used by the group).
 
 The canonical method through which to include a local project is to use the
 :ref:`ref-classes-externalsrc` class to include that local project. You use
-either the ``local.conf`` or a recipe's append file to override or set the
-recipe to point to the local directory on your disk to pull in the whole
-source tree.
+either ``local.conf`` or a recipe's append file to override or set the
+recipe to point to the local directory from which to fetch the source.
 
 Source Control Managers (Optional)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -953,7 +952,7 @@ package.
 
   For more information on the ``oe-pkgdata-util`` utility, see the section
   :ref:`dev-manual/debugging:Viewing Package Information with
-  \`\`oe-pkgdata-util\`\`` of the Yocto Project Development Tasks Manual.
+  ``oe-pkgdata-util``` of the Yocto Project Development Tasks Manual.
 
 To add a custom package variant of the ``${PN}`` recipe named
 ``${PN}-extra`` (name is arbitrary), one can add it to the
diff --git a/documentation/ref-manual/classes.rst b/documentation/ref-manual/classes.rst
index 45973befbe..1d76b36d45 100644
--- a/documentation/ref-manual/classes.rst
+++ b/documentation/ref-manual/classes.rst
@@ -1993,7 +1993,8 @@ a couple different ways:
       Not using this naming convention can lead to subtle problems
       caused by existing code that depends on that naming convention.
 
--  Create or modify a target recipe that contains the following::
+-  Or, create a :ref:`ref-classes-native` variant of any target recipe (e.g.
+   ``myrecipe.bb``) by adding the following to the recipe::
 
       BBCLASSEXTEND = "native"
 
@@ -2024,24 +2025,25 @@ couple different ways:
    inherit statement in the recipe after all other inherit statements so
    that the :ref:`ref-classes-nativesdk` class is inherited last.
 
--  Create a :ref:`ref-classes-nativesdk` variant of any recipe by adding the following::
+   .. note::
 
-       BBCLASSEXTEND = "nativesdk"
+      When creating a recipe, you must follow this naming convention::
 
-   Inside the
-   recipe, use ``:class-nativesdk`` and ``:class-target`` overrides to
-   specify any functionality specific to the respective SDK machine or
-   target case.
+              nativesdk-myrecipe.bb
 
-.. note::
 
-   When creating a recipe, you must follow this naming convention::
+      Not doing so can lead to subtle problems because there is code that
+      depends on the naming convention.
 
-           nativesdk-myrecipe.bb
+-  Or, create a :ref:`ref-classes-nativesdk` variant of any target recipe (e.g.
+   ``myrecipe.bb``) by adding the following to the recipe::
 
+       BBCLASSEXTEND = "nativesdk"
 
-   Not doing so can lead to subtle problems because there is code that
-   depends on the naming convention.
+   Inside the
+   recipe, use ``:class-nativesdk`` and ``:class-target`` overrides to
+   specify any functionality specific to the respective SDK machine or
+   target case.
 
 Although applied differently, the :ref:`ref-classes-nativesdk` class is used with both
 methods. The advantage of the second method is that you do not need to
diff --git a/documentation/ref-manual/devtool-reference.rst b/documentation/ref-manual/devtool-reference.rst
index a6ea00c210..2db2adde95 100644
--- a/documentation/ref-manual/devtool-reference.rst
+++ b/documentation/ref-manual/devtool-reference.rst
@@ -435,7 +435,7 @@ You can read more on the ``devtool upgrade`` workflow in the
 ":ref:`sdk-manual/extensible:use \`\`devtool upgrade\`\` to create a version of the recipe that supports a newer version of the software`"
 section in the Yocto Project Application Development and the Extensible
 Software Development Kit (eSDK) manual. You can also see an example of
-how to use ``devtool upgrade`` in the ":ref:`dev-manual/upgrading-recipes:using \`\`devtool upgrade\`\``"
+how to use ``devtool upgrade`` in the ":ref:`dev-manual/upgrading-recipes:using ``devtool upgrade```"
 section in the Yocto Project Development Tasks Manual.
 
 .. _devtool-resetting-a-recipe:
diff --git a/documentation/ref-manual/structure.rst b/documentation/ref-manual/structure.rst
index 616c3c4c9b..2190f5b90e 100644
--- a/documentation/ref-manual/structure.rst
+++ b/documentation/ref-manual/structure.rst
@@ -515,7 +515,7 @@ generated during the :ref:`ref-tasks-packagedata` task. The files stored in this
 directory contain information about each output package produced by the
 OpenEmbedded build system, and are used in different ways by the build system
 such as ":ref:`dev-manual/debugging:viewing package information with
-\`\`oe-pkgdata-util\`\``".
+``oe-pkgdata-util```".
 
 .. _structure-build-tmp-sstate-control:
 
diff --git a/documentation/ref-manual/svg/releases.svg b/documentation/ref-manual/svg/releases.svg
index aad50cf593..3a379078b8 100644
--- a/documentation/ref-manual/svg/releases.svg
+++ b/documentation/ref-manual/svg/releases.svg
@@ -2,11 +2,11 @@
 <svg
    version="1.1"
    id="svg2"
-   width="1523.001"
-   height="504.30499"
-   viewBox="0 0 1523.001 504.30497"
+   width="1992.7236"
+   height="613.35602"
+   viewBox="0 0 1992.7236 613.35599"
    sodipodi:docname="releases.svg"
-   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
+   inkscape:version="1.4.1 (93de688d07, 2025-03-30)"
    inkscape:export-filename="../../../../../../../../tmp/releases.png"
    inkscape:export-xdpi="96"
    inkscape:export-ydpi="96"
@@ -70,7 +70,7 @@
        scale_width="1"
        end_linecap_type="zerowidth"
        not_jump="false"
-       message="&lt;b&gt;Ctrl + click&lt;/b&gt; on existing node and move it" />
+       message="" />
     <marker
        style="overflow:visible"
        id="marker5783"
@@ -412,9 +412,9 @@
      inkscape:window-height="2069"
      id="namedview4"
      showgrid="true"
-     inkscape:zoom="2.1971372"
-     inkscape:cx="1068.2082"
-     inkscape:cy="287.87461"
+     inkscape:zoom="1.5536106"
+     inkscape:cx="1158.2696"
+     inkscape:cy="273.55632"
      inkscape:window-x="2256"
      inkscape:window-y="60"
      inkscape:window-maximized="1"
@@ -433,8 +433,8 @@
     <inkscape:grid
        type="xygrid"
        id="grid1257"
-       originx="-289.99936"
-       originy="369.99997"
+       originx="-289.06071"
+       originy="478.43017"
        spacingy="1"
        spacingx="1"
        units="px"
@@ -444,66 +444,90 @@
      inkscape:groupmode="layer"
      inkscape:label="Image"
      id="g10"
-     transform="translate(-289.99936,370.00003)">
+     transform="translate(-289.06072,478.43022)">
+    <rect
+       style="fill:#333333;fill-opacity:0;stroke:#000000;stroke-width:0.713896;stroke-linejoin:bevel;stroke-miterlimit:0;stroke-opacity:0"
+       id="rect1"
+       width="1992.0098"
+       height="612.64215"
+       x="289.41766"
+       y="-478.07327"
+       ry="24.97636" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.449183;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 563.40434,64.000628 v -415.635938 0 0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.50455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 563.40434,64.000628 v -524.414808 0 0"
        id="path207708" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.449183;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 683.40434,64.000628 v -415.635938 0 0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.50455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 683.40434,64.000628 v -524.414808 0 0"
        id="path207708-4" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.449183;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 803.40434,64.000628 v -415.635938 0 0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.50455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 803.40434,64.000628 v -524.414808 0 0"
        id="path207708-4-3" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.449183;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 923.40434,64.000588 v -415.635898 0 0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.50455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 923.40434,64.000577 v -524.414757 0 0"
        id="path207708-4-3-6" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.449183;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1043.4043,64.000588 v -415.635898 0 0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.50455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1043.4043,64.000577 v -524.414757 0 0"
        id="path207708-4-3-6-2" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.449183;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1163.4043,64.000588 v -415.635898 0 0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.50455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1163.4043,64.000577 v -524.414757 0 0"
        id="path207708-4-3-6-2-8" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.449183;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1283.4043,64.000588 v -415.635898 0 0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.50455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1283.4043,64.000577 v -524.414757 0 0"
        id="path207708-4-3-6-2-8-4" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.449183;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1403.4043,64.000588 v -415.635898 0 0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.50455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1403.4043,64.000577 v -524.414757 0 0"
        id="path207708-4-3-6-2-8-4-3" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.475347;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 1523.4043,64.000568 v -415.757648 0 0"
        id="path207708-4-3-6-2-8-4-3-8" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.449183;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1523.4043,64.000588 v -415.635898 0 0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.50455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1523.4043,64.000577 v -524.414757 0 0"
        id="path207708-4-3-6-2-8-4-3-8-0" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.449183;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1643.3583,64.000578 v -415.635868 0 0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.50455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1643.3583,64.000565 v -524.414715 0 0"
        id="path207708-4-3-6-2-8-4-3-8-4" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.449183;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1763.4043,64.000578 v -415.635868 0 0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.50455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1763.4043,64.000565 v -524.414715 0 0"
        id="path207708-4-3-6-2-8-4-3-8-4-0" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.449183;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 443.40434,64.000628 v -415.635938 0 0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.50455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1883.7877,64.878769 v -524.414709 0 0"
+       id="path207708-4-3-6-2-8-4-3-8-4-0-8" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.50455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 2002.9599,64.984489 v -524.414709 0 0"
+       id="path207708-4-3-6-2-8-4-3-8-4-0-8-8" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.50455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 2123.2232,62.984489 v -524.414709 0 0"
+       id="path207708-4-3-6-2-8-4-3-8-4-0-8-8-1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.50455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 2243.313,63.984489 v -524.414709 0 0"
+       id="path207708-4-3-6-2-8-4-3-8-4-0-8-8-1-9" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.50455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 443.40434,64.000628 v -524.414808 0 0"
        id="path207708-9" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 323.40434,64.000608 v -375.000008 0 0"
        id="path207708-9-6" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.449183;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 323.40434,64.000618 v -415.635908 0 0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.50455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 323.40434,64.000616 v -524.414766 0 0"
        id="path207708-9-6-2" />
     <text
        xml:space="preserve"
@@ -536,7 +560,7 @@
          x="-59.575905"
          y="580.05695" /></text>
     <rect
-       style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-opacity:1;opacity:0.5"
+       style="opacity:0.5;fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-opacity:1"
        id="rect917-0-0-4-4-9-4"
        width="160.00002"
        height="45.000004"
@@ -584,14 +608,6 @@
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none"
          id="tspan10317-2-9-1-4">4.2</tspan></text>
     <rect
-       style="opacity:0.75;fill:#251f32;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-opacity:1"
-       id="rect917-0-0-4-4-9-4-5-3-9-2-3"
-       width="140"
-       height="45.000004"
-       x="1043.132"
-       y="-328.2114"
-       ry="2.2558987" />
-    <rect
        style="opacity:1;fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-opacity:1"
        id="rect917-0-0-4-4-9-4-5-3-9-2-3-6"
        width="140"
@@ -615,22 +631,78 @@
          y="-238.332"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none"
          id="tspan10317-2-9-1-4-6-5-6">5.1</tspan></text>
+    <rect
+       style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-opacity:1"
+       id="rect917-0-0-4-4-9-4-5-3-9-2-3-6-2"
+       width="140"
+       height="45.000004"
+       x="1043.4697"
+       y="-328.48172"
+       ry="2.2558987" />
+    <text
+       xml:space="preserve"
+       style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#fffefe;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="1090.4542"
+       y="-309.61823"
+       id="text1185-3-55-4-0-0-0-1-1-6-4-7"><tspan
+         sodipodi:role="line"
+         x="1090.4542"
+         y="-309.61823"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none"
+         id="tspan957-2-8-6-3-9-7-4-2-0-0">Walnascar</tspan><tspan
+         sodipodi:role="line"
+         x="1090.4542"
+         y="-291.62155"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none"
+         id="tspan10317-2-9-1-4-6-5-6-9">5.2</tspan></text>
+    <rect
+       style="opacity:0.75;fill:#251f32;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-opacity:1"
+       id="rect917-0-0-4-4-9-4-5-3-9-2-3-67"
+       width="140"
+       height="45.000004"
+       x="1163.6425"
+       y="-382.27469"
+       ry="2.2558987" />
     <text
        xml:space="preserve"
        style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#fffefe;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="1094.2197"
-       y="-309.83084"
-       id="text1185-3-55-4-0-0-0-1-1-6-4-3"><tspan
+       x="1214.9716"
+       y="-363.89413"
+       id="text1185-3-55-4-0-0-0-1-1-6-4-3-53"><tspan
          sodipodi:role="line"
-         x="1094.2197"
-         y="-309.83084"
+         x="1214.9716"
+         y="-363.89413"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none"
-         id="tspan957-2-8-6-3-9-7-4-2-0-5">Walnascar</tspan><tspan
+         id="tspan957-2-8-6-3-9-7-4-2-0-5-5">Whinlatter</tspan><tspan
          sodipodi:role="line"
-         x="1094.2197"
-         y="-291.83417"
+         x="1214.9716"
+         y="-345.89746"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none"
-         id="tspan10317-2-9-1-4-6-5-6-6">5.2</tspan></text>
+         id="tspan10317-2-9-1-4-6-5-6-6-6">5.3</tspan></text>
+    <rect
+       style="opacity:0.75;fill:#251f32;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.29752;stroke-opacity:1"
+       id="rect917-0-0-4-4-9-4-5-3-9-2-3-67-6"
+       width="982.23163"
+       height="45.000004"
+       x="1283.7023"
+       y="-436.77539"
+       ry="2.2558987" />
+    <text
+       xml:space="preserve"
+       style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#fffefe;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="1335.1118"
+       y="-418.39484"
+       id="text1185-3-55-4-0-0-0-1-1-6-4-3-53-0"><tspan
+         sodipodi:role="line"
+         x="1335.1118"
+         y="-418.39484"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none"
+         id="tspan957-2-8-6-3-9-7-4-2-0-5-5-6">Wrynose</tspan><tspan
+         sodipodi:role="line"
+         x="1335.1118"
+         y="-400.39816"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#fffefe;fill-opacity:1;stroke:none"
+         id="tspan10317-2-9-1-4-6-5-6-6-6-2">6.0</tspan></text>
     <g
        id="g1591"
        transform="translate(-516.59566,64.000598)">
@@ -681,7 +753,7 @@
          id="tspan10317-2-9-0-1">5.0</tspan></text>
     <g
        id="g1125-0"
-       transform="matrix(0.42240595,0,0,0.41654472,330.77064,-441.11721)"
+       transform="matrix(0.42240595,0,0,0.41654472,330.77064,-497.11721)"
        style="stroke:none;stroke-width:2.38399">
       <rect
          style="opacity:1;fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.76797;stroke-opacity:1"
@@ -923,8 +995,8 @@
          y="345.7359" /></text>
     <path
        id="path29430"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.72671;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 307.54809,63.999718 H 1783.4043 Z" />
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.99503;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 307.54809,63.999718 H 2277.72 Z" />
     <path
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 323.40434,64.000618 v 9.99995 0"
@@ -1437,50 +1509,324 @@
        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 1763.4043,64.000578 v 9.99999 0"
        id="path29548-5-1-3-6-3-1-0-3-4-2-0-0" />
+    <text
+       xml:space="preserve"
+       style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="1885.6029"
+       y="94.285194"
+       id="text1185-9-7-1-1-8-1-0-4-2-8-2"><tspan
+         sodipodi:role="line"
+         x="1885.6029"
+         y="94.285194"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
+         id="tspan31345-4-0-4-81-5-2-8">Oct.</tspan><tspan
+         sodipodi:role="line"
+         x="1885.6029"
+         y="112.28188"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
+         id="tspan49906-7-3-8-2-8-9-9">2028</tspan></text>
+    <g
+       id="g1267-4-5-2-7"
+       transform="translate(563.45518,-155.9782)">
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1200,220.00002 v 9.99999 0"
+         id="path29548-5-1-3-6-3-1-0-3-4-1-3" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1220,219.99997 v 5.00004 0"
+         id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-0-5-0-0-5-6"
+         inkscape:transform-center-x="14.782001"
+         inkscape:transform-center-y="-0.085282837" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1240,219.99997 v 5.00004 0"
+         id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-9-7-5-3-5-9-1"
+         inkscape:transform-center-x="14.782001"
+         inkscape:transform-center-y="-0.085282837" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1260,219.99997 v 5.00004 0"
+         id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-9-1-5-2-0-9-9-2"
+         inkscape:transform-center-x="14.782001"
+         inkscape:transform-center-y="-0.085282837" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1280,219.99997 v 5.00004 0"
+         id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-9-1-4-8-9-9-4-1-9"
+         inkscape:transform-center-x="14.782001"
+         inkscape:transform-center-y="-0.085282837" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1299.7216,219.99997 v 5.00004 0"
+         id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-9-1-4-9-7-0-2-6-4-3"
+         inkscape:transform-center-x="-14.78205"
+         inkscape:transform-center-y="-0.085282837" />
+    </g>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1883.4551,64.021829 v 9.99999 0"
+       id="path29548-5-1-3-6-3-1-0-3-4-2-0-0-1" />
+    <text
+       xml:space="preserve"
+       style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="2005.5908"
+       y="94.339828"
+       id="text1185-9-7-1-1-8-1-0-4-2-8-2-4"><tspan
+         sodipodi:role="line"
+         x="2005.5908"
+         y="94.339828"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
+         id="tspan31345-4-0-4-81-5-2-8-7">Apr.</tspan><tspan
+         sodipodi:role="line"
+         x="2005.5908"
+         y="112.33651"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
+         id="tspan49906-7-3-8-2-8-9-9-8">2029</tspan></text>
+    <g
+       id="g1267-4-5-2-7-4"
+       transform="translate(683.44312,-155.92356)">
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1200,220.00002 v 9.99999 0"
+         id="path29548-5-1-3-6-3-1-0-3-4-1-3-5" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1220,219.99997 v 5.00004 0"
+         id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-0-5-0-0-5-6-0"
+         inkscape:transform-center-x="14.782001"
+         inkscape:transform-center-y="-0.085282837" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1240,219.99997 v 5.00004 0"
+         id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-9-7-5-3-5-9-1-3"
+         inkscape:transform-center-x="14.782001"
+         inkscape:transform-center-y="-0.085282837" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1260,219.99997 v 5.00004 0"
+         id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-9-1-5-2-0-9-9-2-6"
+         inkscape:transform-center-x="14.782001"
+         inkscape:transform-center-y="-0.085282837" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1280,219.99997 v 5.00004 0"
+         id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-9-1-4-8-9-9-4-1-9-1"
+         inkscape:transform-center-x="14.782001"
+         inkscape:transform-center-y="-0.085282837" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1299.7216,219.99997 v 5.00004 0"
+         id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-9-1-4-9-7-0-2-6-4-3-0"
+         inkscape:transform-center-x="-14.78205"
+         inkscape:transform-center-y="-0.085282837" />
+    </g>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 2003.443,64.076464 v 9.99999 0"
+       id="path29548-5-1-3-6-3-1-0-3-4-2-0-0-1-6" />
+    <text
+       xml:space="preserve"
+       style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="2125.6079"
+       y="94.692207"
+       id="text1185-9-7-1-1-8-1-0-4-2-8-2-4-2"><tspan
+         sodipodi:role="line"
+         x="2125.6079"
+         y="94.692207"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
+         id="tspan31345-4-0-4-81-5-2-8-7-0">Oct.</tspan><tspan
+         sodipodi:role="line"
+         x="2125.6079"
+         y="112.68889"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
+         id="tspan49906-7-3-8-2-8-9-9-8-6">2029</tspan></text>
+    <g
+       id="g1267-4-5-2-7-4-1"
+       transform="translate(803.46019,-155.57118)">
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1200,220.00002 v 9.99999 0"
+         id="path29548-5-1-3-6-3-1-0-3-4-1-3-5-5" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1220,219.99997 v 5.00004 0"
+         id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-0-5-0-0-5-6-0-5"
+         inkscape:transform-center-x="14.782001"
+         inkscape:transform-center-y="-0.085282837" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1240,219.99997 v 5.00004 0"
+         id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-9-7-5-3-5-9-1-3-4"
+         inkscape:transform-center-x="14.782001"
+         inkscape:transform-center-y="-0.085282837" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1260,219.99997 v 5.00004 0"
+         id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-9-1-5-2-0-9-9-2-6-7"
+         inkscape:transform-center-x="14.782001"
+         inkscape:transform-center-y="-0.085282837" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1280,219.99997 v 5.00004 0"
+         id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-9-1-4-8-9-9-4-1-9-1-6"
+         inkscape:transform-center-x="14.782001"
+         inkscape:transform-center-y="-0.085282837" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1299.7216,219.99997 v 5.00004 0"
+         id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-9-1-4-9-7-0-2-6-4-3-0-5"
+         inkscape:transform-center-x="-14.78205"
+         inkscape:transform-center-y="-0.085282837" />
+    </g>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 2123.4601,64.428843 v 9.99999 0"
+       id="path29548-5-1-3-6-3-1-0-3-4-2-0-0-1-6-6" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 2123.3825,64.223284 v 9.99999 0"
+       id="path29548-5-1-3-6-3-1-0-3-4-2-0-0-1-6-3" />
+    <text
+       xml:space="preserve"
+       style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="2245.5474"
+       y="94.839027"
+       id="text1185-9-7-1-1-8-1-0-4-2-8-2-4-2-7"><tspan
+         sodipodi:role="line"
+         x="2245.5474"
+         y="94.839027"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
+         id="tspan31345-4-0-4-81-5-2-8-7-0-4">Apr.</tspan><tspan
+         sodipodi:role="line"
+         x="2245.5474"
+         y="112.83571"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke:none"
+         id="tspan49906-7-3-8-2-8-9-9-8-6-5">2030</tspan></text>
+    <g
+       id="g1267-4-5-2-7-4-1-2"
+       transform="translate(923.39972,-155.42436)">
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1200,220.00002 v 9.99999 0"
+         id="path29548-5-1-3-6-3-1-0-3-4-1-3-5-5-5" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1220,219.99997 v 5.00004 0"
+         id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-0-5-0-0-5-6-0-5-4"
+         inkscape:transform-center-x="14.782001"
+         inkscape:transform-center-y="-0.085282837" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1240,219.99997 v 5.00004 0"
+         id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-9-7-5-3-5-9-1-3-4-7"
+         inkscape:transform-center-x="14.782001"
+         inkscape:transform-center-y="-0.085282837" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1260,219.99997 v 5.00004 0"
+         id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-9-1-5-2-0-9-9-2-6-7-4"
+         inkscape:transform-center-x="14.782001"
+         inkscape:transform-center-y="-0.085282837" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1280,219.99997 v 5.00004 0"
+         id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-9-1-4-8-9-9-4-1-9-1-6-4"
+         inkscape:transform-center-x="14.782001"
+         inkscape:transform-center-y="-0.085282837" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1299.7216,219.99997 v 5.00004 0"
+         id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-9-1-4-9-7-0-2-6-4-3-0-5-3"
+         inkscape:transform-center-x="-14.78205"
+         inkscape:transform-center-y="-0.085282837" />
+    </g>
+    <g
+       id="g1267-4-5-2-7-4-1-2-0"
+       transform="translate(1043.3579,-155.33829)">
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1200,220.00002 v 9.99999 0"
+         id="path29548-5-1-3-6-3-1-0-3-4-1-3-5-5-5-6" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1220,219.99997 v 5.00004 0"
+         id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-0-5-0-0-5-6-0-5-4-8"
+         inkscape:transform-center-x="14.782001"
+         inkscape:transform-center-y="-0.085282837" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1240,219.99997 v 5.00004 0"
+         id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-9-7-5-3-5-9-1-3-4-7-9"
+         inkscape:transform-center-x="14.782001"
+         inkscape:transform-center-y="-0.085282837" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1260,219.99997 v 5.00004 0"
+         id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-9-1-5-2-0-9-9-2-6-7-4-2"
+         inkscape:transform-center-x="14.782001"
+         inkscape:transform-center-y="-0.085282837" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1280,219.99997 v 5.00004 0"
+         id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-9-1-4-8-9-9-4-1-9-1-6-4-6"
+         inkscape:transform-center-x="14.782001"
+         inkscape:transform-center-y="-0.085282837" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1299.7216,219.99997 v 5.00004 0"
+         id="path29548-8-5-0-6-4-6-2-9-0-8-1-3-1-9-6-9-3-4-0-4-6-2-2-7-6-1-9-9-1-4-9-7-0-2-6-4-3-0-5-3-6"
+         inkscape:transform-center-x="-14.78205"
+         inkscape:transform-center-y="-0.085282837" />
+    </g>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 2243.3996,64.575663 v 9.99999 0"
+       id="path29548-5-1-3-6-3-1-0-3-4-2-0-0-1-6-6-0" />
     <rect
        style="opacity:0.75;fill:#241f31;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.751473;stroke-opacity:1"
        id="rect917-0-0-4-4-9-4-5-3-9-2-36"
        width="38.418175"
        height="23.151052"
-       x="1605.6135"
-       y="-41.172161"
+       x="2047.6135"
+       y="-45.172161"
        ry="1.1605872" />
     <rect
        style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.98878;stroke-dasharray:none;stroke-opacity:1"
        id="rect917-0-0-4-4-9-4-5-3-9-2-36-7"
        width="186.42949"
        height="110.40546"
-       x="1594.5294"
-       y="-73.753708"
+       x="2036.5294"
+       y="-77.753708"
        ry="5.5347452" />
     <rect
        style="opacity:0.75;fill:#241f31;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.50949;stroke-opacity:1"
        id="rect917-0-0-4-4-9-4-5-3-9-2-6"
        width="21.197233"
        height="19.28739"
-       x="1611.8163"
-       y="-41.883858"
+       x="2053.8164"
+       y="-45.883858"
        ry="0.96689767" />
     <text
        xml:space="preserve"
        style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#fffefe;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="1690.4917"
-       y="-53.687912"
+       x="2132.4917"
+       y="-57.687912"
        id="text1185-3-55-4-0-0-0-1-1-6-4-3-5"><tspan
          sodipodi:role="line"
-         x="1690.4917"
-         y="-53.687912"
+         x="2132.4917"
+         y="-57.687912"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
          id="tspan10317-2-9-1-4-6-5-6-6-5">Legend</tspan></text>
     <text
        xml:space="preserve"
        style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#fffefe;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="1656.0988"
-       y="-27.899874"
+       x="2098.0986"
+       y="-31.899874"
        id="text1185-3-55-4-0-0-0-1-1-6-4-3-5-2"><tspan
          sodipodi:role="line"
-         x="1656.0988"
-         y="-27.899874"
+         x="2098.0986"
+         y="-31.899874"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
          id="tspan10317-2-9-1-4-6-5-6-6-5-9">Future</tspan></text>
     <rect
@@ -1488,38 +1834,38 @@
        id="rect917-0-0-4-4-9-4-5-3-9-2-6-1"
        width="21.197233"
        height="19.28739"
-       x="1611.8671"
-       y="-17.756365"
+       x="2053.8672"
+       y="-21.756365"
        ry="0.96689767" />
     <text
        xml:space="preserve"
        style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#fffefe;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="1686.7159"
-       y="-3.6722763"
+       x="2128.7158"
+       y="-7.6722765"
        id="text1185-3-55-4-0-0-0-1-1-6-4-3-5-2-2"><tspan
          sodipodi:role="line"
-         x="1686.7159"
-         y="-3.6722763"
+         x="2128.7158"
+         y="-7.6722765"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
-         id="tspan10317-2-9-1-4-6-5-6-6-5-9-7">Current (Oct. 24)</tspan></text>
+         id="tspan10317-2-9-1-4-6-5-6-6-5-9-7">Current (Apr. 25)</tspan></text>
     <text
        xml:space="preserve"
        style="font-weight:bold;font-size:13.3333px;line-height:125%;font-family:'Nimbus Roman';-inkscape-font-specification:'Nimbus Roman, Bold';letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#fffefe;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="1667.363"
-       y="20.03771"
+       x="2109.363"
+       y="16.03771"
        id="text1185-3-55-4-0-0-0-1-1-6-4-3-5-2-2-9"><tspan
          sodipodi:role="line"
-         x="1667.363"
-         y="20.03771"
+         x="2109.363"
+         y="16.03771"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
          id="tspan10317-2-9-1-4-6-5-6-6-5-9-7-3">End-of-life</tspan></text>
     <rect
-       style="fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.50949;stroke-opacity:1;opacity:0.5"
+       style="opacity:0.5;fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.50949;stroke-opacity:1"
        id="rect917-0-0-4-4-9-4-5-3-9-2-6-1-0"
        width="21.197233"
        height="19.28739"
-       x="1612.0239"
-       y="5.9667883"
+       x="2054.0239"
+       y="1.9667883"
        ry="0.96689767" />
     <rect
        style="opacity:0.5;fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.85786;stroke-opacity:1"
diff --git a/documentation/ref-manual/tasks.rst b/documentation/ref-manual/tasks.rst
index 5cd23449fa..cf6b9876ca 100644
--- a/documentation/ref-manual/tasks.rst
+++ b/documentation/ref-manual/tasks.rst
@@ -727,7 +727,7 @@ tool, which you then use to modify the kernel configuration.
            $ bitbake linux-yocto -c menuconfig
 
 
-See the ":ref:`kernel-dev/common:using \`\`menuconfig\`\``"
+See the ":ref:`kernel-dev/common:using ``menuconfig```"
 section in the Yocto Project Linux Kernel Development Manual for more
 information on this configuration tool.
 
@@ -751,7 +751,7 @@ which can then be applied by subsequent tasks such as
 
 Runs ``make menuconfig`` for the kernel. For information on
 ``menuconfig``, see the
-":ref:`kernel-dev/common:using \`\`menuconfig\`\``"
+":ref:`kernel-dev/common:using ``menuconfig```"
 section in the Yocto Project Linux Kernel Development Manual.
 
 .. _ref-tasks-savedefconfig:
diff --git a/documentation/ref-manual/terms.rst b/documentation/ref-manual/terms.rst
index 9d765c89c8..9f61061415 100644
--- a/documentation/ref-manual/terms.rst
+++ b/documentation/ref-manual/terms.rst
@@ -63,7 +63,7 @@ universal, the list includes them just in case:
       This term refers to the area used by the OpenEmbedded build system for
       builds. The area is created when you ``source`` the setup environment
       script that is found in the Source Directory
-      (i.e. :ref:`ref-manual/structure:\`\`oe-init-build-env\`\``). The
+      (i.e. :ref:`ref-manual/structure:``oe-init-build-env```). The
       :term:`TOPDIR` variable points to the :term:`Build Directory`.
 
       You have a lot of flexibility when creating the :term:`Build Directory`.
diff --git a/documentation/ref-manual/variables.rst b/documentation/ref-manual/variables.rst
index 66e0bdee0d..9406f3548c 100644
--- a/documentation/ref-manual/variables.rst
+++ b/documentation/ref-manual/variables.rst
@@ -2199,7 +2199,7 @@ system and gives an overview of their function and contents.
       resides within the :term:`Build Directory` as ``${TMPDIR}/deploy``.
 
       For more information on the structure of the Build Directory, see
-      ":ref:`ref-manual/structure:the build directory --- \`\`build/\`\``" section.
+      ":ref:`ref-manual/structure:the build directory --- ``build/```" section.
       For more detail on the contents of the ``deploy`` directory, see the
       ":ref:`overview-manual/concepts:images`",
       ":ref:`overview-manual/concepts:package feeds`", and
@@ -2241,7 +2241,7 @@ system and gives an overview of their function and contents.
       contents of :term:`IMGDEPLOYDIR` by the :ref:`ref-classes-image` class.
 
       For more information on the structure of the :term:`Build Directory`, see
-      ":ref:`ref-manual/structure:the build directory --- \`\`build/\`\``" section.
+      ":ref:`ref-manual/structure:the build directory --- ``build/```" section.
       For more detail on the contents of the ``deploy`` directory, see the
       ":ref:`overview-manual/concepts:images`" and
       ":ref:`overview-manual/concepts:application development sdk`" sections both in
@@ -4154,9 +4154,33 @@ system and gives an overview of their function and contents.
          IMAGE_ROOTFS_EXTRA_SPACE = "41943040"
 
    :term:`IMAGE_ROOTFS_MAXSIZE`
-      Defines the maximum size in Kbytes for the generated image. If the
-      generated image size is above that, the build will fail. It's a good
-      idea to set this variable for images that need to fit on a limited
+      Defines the maximum allowed size of the generated image in kilobytes.
+      The build will fail if the generated image size exceeds this value.
+
+      The generated image size undergoes several calculation steps before being
+      compared to :term:`IMAGE_ROOTFS_MAXSIZE`.
+      In the first step, the size of the directory pointed to by :term:`IMAGE_ROOTFS`
+      is calculated.
+      In the second step, the result from the first step is multiplied
+      by :term:`IMAGE_OVERHEAD_FACTOR`.
+      In the third step, the result from the second step is compared with
+      :term:`IMAGE_ROOTFS_SIZE`. The larger value of these is added to
+      :term:`IMAGE_ROOTFS_EXTRA_SPACE`.
+      In the fourth step, the result from the third step is checked for
+      a decimal part. If it has one, it is rounded up to the next integer.
+      If it does not, it is simply converted into an integer.
+      In the fifth step, the :term:`IMAGE_ROOTFS_ALIGNMENT` is added to the result
+      from the fourth step and "1" is subtracted.
+      In the sixth step, the remainder of the division between the result
+      from the fifth step and :term:`IMAGE_ROOTFS_ALIGNMENT` is subtracted from the
+      result of the fifth step. In this way, the result from the fourth step is
+      rounded up to the nearest multiple of :term:`IMAGE_ROOTFS_ALIGNMENT`.
+
+      Thus, if the :term:`IMAGE_ROOTFS_MAXSIZE` is set, is compared with the result
+      of the above calculations and is independent of the final image type.
+      No default value is set for :term:`IMAGE_ROOTFS_MAXSIZE`.
+
+      It's a good idea to set this variable for images that need to fit on a limited
       space (e.g. SD card, a fixed-size partition, ...).
 
    :term:`IMAGE_ROOTFS_SIZE`
@@ -4340,6 +4364,23 @@ system and gives an overview of their function and contents.
       Set the variable to "1" to prevent the default dependencies from
       being added.
 
+   :term:`INHIBIT_DEFAULT_RUST_DEPS`
+      Prevents the :ref:`ref-classes-rust` class from automatically adding
+      its default build-time dependencies.
+
+      When a recipe inherits the :ref:`ref-classes-rust` class, several
+      tools such as ``rust-native`` and ``${RUSTLIB_DEP}`` (only added when cross-compiling) are added
+      to :term:`DEPENDS` to support the ``rust`` build process.
+
+      To prevent the build system from adding these dependencies automatically,
+      set the :term:`INHIBIT_DEFAULT_RUST_DEPS` variable as follows::
+
+         INHIBIT_DEFAULT_RUST_DEPS = "1"
+
+      By default, the value of :term:`INHIBIT_DEFAULT_RUST_DEPS` is empty. Setting
+      it to "0" does not disable inhibition. Only the empty string will disable
+      inhibition.
+
    :term:`INHIBIT_PACKAGE_DEBUG_SPLIT`
       Prevents the OpenEmbedded build system from splitting out debug
       information during packaging. By default, the build system splits out
@@ -4386,6 +4427,25 @@ system and gives an overview of their function and contents.
          even if the toolchain's binaries are strippable, there are other files
          needed for the build that are not strippable.
 
+   :term:`INHIBIT_UPDATERCD_BBCLASS`
+      Prevents the :ref:`ref-classes-update-rc.d` class from automatically
+      installing and registering SysV init scripts for packages.
+
+      When a recipe inherits the :ref:`ref-classes-update-rc.d` class, init
+      scripts are typically installed and registered for the packages listed in
+      :term:`INITSCRIPT_PACKAGES`. This ensures that the relevant
+      services are started and stopped at the appropriate runlevels using the
+      traditional SysV init system.
+
+      To prevent the build system from adding these scripts and configurations
+      automatically, set the :term:`INHIBIT_UPDATERCD_BBCLASS` variable as follows::
+
+         INHIBIT_UPDATERCD_BBCLASS = "1"
+
+      By default, the value of :term:`INHIBIT_UPDATERCD_BBCLASS` is empty. Setting
+      it to "0" does not disable inhibition. Only the empty string will disable
+      inhibition.
+
    :term:`INIT_MANAGER`
       Specifies the system init manager to use. Available options are:
 
@@ -4552,6 +4612,20 @@ system and gives an overview of their function and contents.
       See the :term:`MACHINE` variable for additional
       information.
 
+   :term:`INITRAMFS_MAXSIZE`
+      Defines the maximum allowed size of the :term:`Initramfs` image in Kbytes.
+      The build will fail if the :term:`Initramfs` image size exceeds this value.
+
+      The :term:`Initramfs` image size undergoes several calculation steps before
+      being compared to :term:`INITRAMFS_MAXSIZE`.
+      These steps are the same as those used for :term:`IMAGE_ROOTFS_MAXSIZE`
+      and are described in detail in that entry.
+
+      Thus, :term:`INITRAMFS_MAXSIZE` is compared with the result of the calculations
+      and is independent of the final image type (e.g. compressed).
+      A default value for :term:`INITRAMFS_MAXSIZE` is set in
+      :oe_git:`meta/conf/bitbake.conf </openembedded-core/tree/meta/conf/bitbake.conf>`.
+
    :term:`INITRAMFS_MULTICONFIG`
       Defines the multiconfig to create a multiconfig dependency to be used by
       the :ref:`ref-classes-kernel` class.
@@ -4734,15 +4808,8 @@ system and gives an overview of their function and contents.
       options not explicitly specified will be disabled in the kernel
       config.
 
-      In case :term:`KCONFIG_MODE` is not set the behaviour will depend on where
-      the ``defconfig`` file is coming from. An "in-tree" ``defconfig`` file
-      will be handled in ``alldefconfig`` mode, a ``defconfig`` file placed
-      in ``${WORKDIR}`` through a meta-layer will be handled in
-      ``allnoconfig`` mode.
-
-      An "in-tree" ``defconfig`` file can be selected via the
-      :term:`KBUILD_DEFCONFIG` variable. :term:`KCONFIG_MODE` does not need to
-      be explicitly set.
+      In case :term:`KCONFIG_MODE` is not set the ``defconfig`` file
+      will be handled in ``allnoconfig`` mode.
 
       A ``defconfig`` file compatible with ``allnoconfig`` mode can be
       generated by copying the ``.config`` file from a working Linux kernel
@@ -6730,7 +6797,7 @@ system and gives an overview of their function and contents.
       For examples of how this data is used, see the
       ":ref:`overview-manual/concepts:automatically added runtime dependencies`"
       section in the Yocto Project Overview and Concepts Manual and the
-      ":ref:`dev-manual/debugging:viewing package information with \`\`oe-pkgdata-util\`\``"
+      ":ref:`dev-manual/debugging:viewing package information with ``oe-pkgdata-util```"
       section in the Yocto Project Development Tasks Manual. For more
       information on the shared, global-state directory, see
       :term:`STAGING_DIR_HOST`.
@@ -6784,7 +6851,7 @@ system and gives an overview of their function and contents.
          the package is built, the version information can be retrieved with
          ``oe-pkgdata-util package-info <package name>``. See the
          :ref:`dev-manual/debugging:Viewing Package Information with
-         \`\`oe-pkgdata-util\`\`` section of the Yocto Project Development Tasks
+         ``oe-pkgdata-util``` section of the Yocto Project Development Tasks
          Manual for more information on ``oe-pkgdata-util``.
 
 
@@ -7385,17 +7452,12 @@ system and gives an overview of their function and contents.
          prefer to have a read-only root filesystem and prefer to keep
          writeable data in one place.
 
-      You can override the default by setting the variable in any layer or
-      in the ``local.conf`` file. Because the default is set using a "weak"
-      assignment (i.e. "??="), you can use either of the following forms to
-      define your override::
+      When setting ``INIT_MANAGER = systemd``, the default will be set to::
 
-         ROOT_HOME = "/root"
          ROOT_HOME ?= "/root"
 
-      These
-      override examples use ``/root``, which is probably the most commonly
-      used override.
+      You can also override the default by setting the variable in your distro
+      configuration or in the ``local.conf`` file.
 
    :term:`ROOTFS`
       Indicates a filesystem image to include as the root filesystem.
@@ -8388,7 +8450,7 @@ system and gives an overview of their function and contents.
       class.
 
    :term:`SPL_SIGN_KEYNAME`
-      The name of keys used by the :ref:`ref-classes-kernel-fitimage` class
+      The name of keys used by the :ref:`ref-classes-uboot-sign` class
       for signing U-Boot FIT image stored in the :term:`SPL_SIGN_KEYDIR`
       directory. If we have for example a ``dev.key`` key and a ``dev.crt``
       certificate stored in the :term:`SPL_SIGN_KEYDIR` directory, you will
@@ -8652,7 +8714,7 @@ system and gives an overview of their function and contents.
       The Yocto Project actually shares the cache data objects built by its
       autobuilder::
 
-         SSTATE_MIRRORS ?= "file://.* http://cdn.jsdelivr.net/yocto/sstate/all/PATH;downloadfilename=PATH"
+         SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/all/PATH;downloadfilename=PATH"
 
       As such binary artifacts are built for the generic QEMU machines
       supported by the various Poky releases, they are less likely to be
@@ -8676,6 +8738,26 @@ system and gives an overview of their function and contents.
 
       For details on the process, see the :ref:`ref-classes-staging` class.
 
+   :term:`SSTATE_SKIP_CREATION`
+      The :term:`SSTATE_SKIP_CREATION` variable can be used to skip the
+      creation of :ref:`shared state <overview-manual/concepts:shared state cache>`
+      tarball files. It makes sense e.g. for image creation tasks as tarring images
+      and keeping them in sstate would consume a lot of disk space.
+
+      In general it is not recommended to use this variable as missing sstate
+      artefacts adversely impact the build, particularly for entries in the
+      middle of dependency chains. The case it can make sense is where the
+      size and time costs of the artefact are similar to just running the
+      tasks. This generally only applies to end artefact output like images.
+
+      The syntax to disable it for one task is::
+
+         SSTATE_SKIP_CREATION:task-image-complete = "1"
+
+      The syntax to disable it for the whole recipe is::
+
+         SSTATE_SKIP_CREATION = "1"
+
    :term:`STAGING_BASE_LIBDIR_NATIVE`
       Specifies the path to the ``/lib`` subdirectory of the sysroot
       directory for the build host.
@@ -10374,6 +10456,20 @@ system and gives an overview of their function and contents.
       Specifies the timeout in seconds used by the ``watchdog-config`` recipe
       and also by ``systemd`` during reboot. The default is 60 seconds.
 
+   :term:`WIC_CREATE_EXTRA_ARGS`
+      If the :term:`IMAGE_FSTYPES` variable contains "wic", the build
+      will generate a
+      :ref:`Wic image <dev-manual/wic:creating partitioned images using wic>`
+      automatically when BitBake builds an image recipe. As part of
+      this process BitBake will invoke the "`wic create`" command. The
+      :term:`WIC_CREATE_EXTRA_ARGS` variable is placed at the end of this
+      command which allows the user to supply additional arguments.
+
+      One such useful purpose for this mechanism is to add the ``-D`` (or
+      ``--debug``) argument to the "`wic create`" command. This increases the
+      amount of debugging information written out to the Wic log during the
+      Wic creation process.
+
    :term:`WIRELESS_DAEMON`
       For ``connman`` and ``packagegroup-base``, specifies the wireless
       daemon to use. The default is "wpa-supplicant" (note that the value
diff --git a/documentation/sdk-manual/extensible.rst b/documentation/sdk-manual/extensible.rst
index d8d3858bfe..ab4956f466 100644
--- a/documentation/sdk-manual/extensible.rst
+++ b/documentation/sdk-manual/extensible.rst
@@ -669,7 +669,7 @@ SDK or eSDK:
    ``devtool build``.
    It also allows to benefit from the very good integration that IDEs like
    VSCode offer for tools like CMake or GDB.
-   
+
    However, supporting many programming languages and multiple
    IDEs is quite an elaborate and constantly evolving thing. Support for IDEs
    is therefore implemented as plugins. Plugins can also be provided by
@@ -802,7 +802,7 @@ the two modes:
 
       This instance of VSCode uses plugins that are useful for the development
       of the application. ``devtool ide-sdk`` generates the necessary
-      ``extensions.json``, ``settings.json``, ``tasks.json``and ``launch.json``
+      ``extensions.json``, ``settings.json``, ``tasks.json`` and ``launch.json``
       configuration files for all the involved plugins.
 
       When the source code folder present in the workspace folder is opened in
diff --git a/documentation/test-manual/intro.rst b/documentation/test-manual/intro.rst
index 5d451b6c28..caa0a8a792 100644
--- a/documentation/test-manual/intro.rst
+++ b/documentation/test-manual/intro.rst
@@ -51,13 +51,11 @@ fashion. Basically, during the development of a Yocto Project release,
 the Autobuilder tests if things work. The Autobuilder builds all test
 targets and runs all the tests.
 
-The Yocto Project uses now uses standard upstream
-Buildbot (`version 3.8 <https://docs.buildbot.net/3.8.0/>`__) to
-drive its integration and testing. Buildbot has a plug-in interface
-that the Yocto Project customizes using code from the
-``yocto-autobuilder2`` repository, adding its own console UI plugin. The
-resulting UI plug-in allows you to visualize builds in a way suited to
-the project's needs.
+The Yocto Project uses standard upstream Buildbot to drive its integration and
+testing. Buildbot has a plug-in interface that the Yocto Project customizes
+using code from the :yocto_git:`yocto-autobuilder2 </yocto-autobuilder2>`
+repository, adding its own console UI plugin. The resulting UI plug-in allows
+you to visualize builds in a way suited to the project's needs.
 
 A ``helper`` layer provides configuration and job management through
 scripts found in the ``yocto-autobuilder-helper`` repository. The
diff --git a/documentation/toaster-manual/reference.rst b/documentation/toaster-manual/reference.rst
index 755b895cee..3050b5d0f5 100644
--- a/documentation/toaster-manual/reference.rst
+++ b/documentation/toaster-manual/reference.rst
@@ -546,7 +546,7 @@ database.
 
 You need to run the ``buildslist`` command first to identify existing
 builds in the database before using the
-:ref:`toaster-manual/reference:\`\`builddelete\`\`` command. Here is an
+:ref:`toaster-manual/reference:``builddelete``` command. Here is an
 example that assumes default repository and :term:`Build Directory` names:
 
 .. code-block:: shell
@@ -555,7 +555,7 @@ example that assumes default repository and :term:`Build Directory` names:
    $ python ../bitbake/lib/toaster/manage.py buildslist
 
 If your Toaster database had only one build, the above
-:ref:`toaster-manual/reference:\`\`buildslist\`\``
+:ref:`toaster-manual/reference:``buildslist```
 command would return something like the following::
 
    1: qemux86 poky core-image-minimal
@@ -576,7 +576,7 @@ the database.
 
 Prior to running the ``builddelete`` command, you need to get the ID
 associated with builds by using the
-:ref:`toaster-manual/reference:\`\`buildslist\`\`` command.
+:ref:`toaster-manual/reference:``buildslist``` command.
 
 ``perf``
 --------
diff --git a/meta-poky/conf/distro/poky.conf b/meta-poky/conf/distro/poky.conf
index 4e2974e6d1..9eff80491b 100644
--- a/meta-poky/conf/distro/poky.conf
+++ b/meta-poky/conf/distro/poky.conf
@@ -1,6 +1,6 @@
 DISTRO = "poky"
 DISTRO_NAME = "Poky (Yocto Project Reference Distro)"
-DISTRO_VERSION = "5.0.9"
+DISTRO_VERSION = "5.0.10"
 DISTRO_CODENAME = "scarthgap"
 SDK_VENDOR = "-pokysdk"
 SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${METADATA_REVISION}', 'snapshot')}"
diff --git a/meta-poky/conf/templates/default/local.conf.sample b/meta-poky/conf/templates/default/local.conf.sample
index 72d3566294..b6071e2821 100644
--- a/meta-poky/conf/templates/default/local.conf.sample
+++ b/meta-poky/conf/templates/default/local.conf.sample
@@ -239,10 +239,7 @@ BB_DISKMON_DIRS ??= "\
 # Using the CDN rather than the yoctoproject.org address is suggested/preferred.
 #
 #BB_HASHSERVE_UPSTREAM = 'wss://hashserv.yoctoproject.org/ws'
-#SSTATE_MIRRORS ?= "file://.* http://cdn.jsdelivr.net/yocto/sstate/all/PATH;downloadfilename=PATH"
-#
-###SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/all/PATH;downloadfilename=PATH"
-
+#SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/all/PATH;downloadfilename=PATH"
 
 #
 # Qemu configuration
diff --git a/meta/classes-recipe/module.bbclass b/meta/classes-recipe/module.bbclass
index f2f0b25a2d..4948e995c5 100644
--- a/meta/classes-recipe/module.bbclass
+++ b/meta/classes-recipe/module.bbclass
@@ -65,6 +65,7 @@ module_do_install() {
                    CC="${KERNEL_CC}" LD="${KERNEL_LD}" OBJCOPY="${KERNEL_OBJCOPY}" \
                    STRIP="${KERNEL_STRIP}" \
                    O=${STAGING_KERNEL_BUILDDIR} \
+                   KBUILD_EXTRA_SYMBOLS="${KBUILD_EXTRA_SYMBOLS}" \
                    ${MODULES_INSTALL_TARGET}
 
         if [ ! -e "${B}/${MODULES_MODULE_SYMVERS_LOCATION}/Module.symvers" ] ; then
diff --git a/meta/classes-recipe/testimage.bbclass b/meta/classes-recipe/testimage.bbclass
index 954c213912..33b1c13f9d 100644
--- a/meta/classes-recipe/testimage.bbclass
+++ b/meta/classes-recipe/testimage.bbclass
@@ -25,7 +25,9 @@ TESTIMAGE_AUTO ??= "0"
 TESTIMAGE_FAILED_QA_ARTIFACTS = "\
     ${localstatedir}/log \
     ${sysconfdir}/version \
-    ${sysconfdir}/os-release"
+    ${sysconfdir}/os-release \
+    ${nonarch_libdir}/os-release \
+"
 
 # If some ptests are run and fail, retrieve corresponding directories
 TESTIMAGE_FAILED_QA_ARTIFACTS += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '${libdir}/${MCNAME}/ptest', '', d)}"
diff --git a/meta/classes-recipe/uboot-sign.bbclass b/meta/classes-recipe/uboot-sign.bbclass
index 5c579a9fb0..699db248e1 100644
--- a/meta/classes-recipe/uboot-sign.bbclass
+++ b/meta/classes-recipe/uboot-sign.bbclass
@@ -94,6 +94,8 @@ python() {
     sign = d.getVar('UBOOT_SIGN_ENABLE') == '1'
     if d.getVar('UBOOT_FITIMAGE_ENABLE') == '1' or sign:
         d.appendVar('DEPENDS', " u-boot-tools-native dtc-native")
+    if d.getVar('FIT_GENERATE_KEYS') == '1' and sign:
+        d.appendVarFlag('do_uboot_assemble_fitimage', 'depends', ' virtual/kernel:do_kernel_generate_rsa_keys')
 }
 
 concat_dtb() {
diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass
index badfee550c..6b8376bf17 100644
--- a/meta/classes/cve-check.bbclass
+++ b/meta/classes/cve-check.bbclass
@@ -270,13 +270,14 @@ python cve_check_write_rootfs_manifest () {
     d.setVar("PN", save_pn)
 
     if enable_text:
-        link_path = os.path.join(deploy_dir, "%s.cve" % link_name)
         manifest_name = d.getVar("CVE_CHECK_MANIFEST")
 
         with open(manifest_name, "w") as f:
             f.write(text_data)
 
-        update_symlinks(manifest_name, link_path)
+        if link_name:
+            link_path = os.path.join(deploy_dir, "%s.cve" % link_name)
+            update_symlinks(manifest_name, link_path)
         bb.plain("Image CVE report stored in: %s" % manifest_name)
 
     if enable_json:
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index baaf971a9a..3a51ad2139 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -190,7 +190,7 @@ RECIPE_MAINTAINER:pn-gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Khem Raj <r
 RECIPE_MAINTAINER:pn-gcc-crosssdk-${SDK_SYS} = "Khem Raj <raj.khem@gmail.com>"
 RECIPE_MAINTAINER:pn-gcc-runtime = "Khem Raj <raj.khem@gmail.com>"
 RECIPE_MAINTAINER:pn-gcc-sanitizers = "Khem Raj <raj.khem@gmail.com>"
-RECIPE_MAINTAINER:pn-gcc-source-13.3.0 = "Khem Raj <raj.khem@gmail.com>"
+RECIPE_MAINTAINER:pn-gcc-source-13.4.0 = "Khem Raj <raj.khem@gmail.com>"
 RECIPE_MAINTAINER:pn-gconf = "Ross Burton <ross.burton@arm.com>"
 RECIPE_MAINTAINER:pn-gcr = "Alexander Kanavin <alex.kanavin@gmail.com>"
 RECIPE_MAINTAINER:pn-gdb = "Khem Raj <raj.khem@gmail.com>"
@@ -210,7 +210,6 @@ RECIPE_MAINTAINER:pn-glibc = "Khem Raj <raj.khem@gmail.com>"
 RECIPE_MAINTAINER:pn-glibc-locale = "Khem Raj <raj.khem@gmail.com>"
 RECIPE_MAINTAINER:pn-glibc-mtrace = "Khem Raj <raj.khem@gmail.com>"
 RECIPE_MAINTAINER:pn-glibc-scripts = "Khem Raj <raj.khem@gmail.com>"
-RECIPE_MAINTAINER:pn-glibc-y2038-tests = "Lukasz Majewski <lukma@denx.de>"
 RECIPE_MAINTAINER:pn-glibc-testsuite = "Khem Raj <raj.khem@gmail.com>"
 RECIPE_MAINTAINER:pn-gmp = "Khem Raj <raj.khem@gmail.com>"
 RECIPE_MAINTAINER:pn-glslang = "Jose Quaresma <quaresma.jose@gmail.com>"
diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc
index 5975db25cc..9950e46776 100644
--- a/meta/conf/distro/include/ptest-packagelists.inc
+++ b/meta/conf/distro/include/ptest-packagelists.inc
@@ -81,8 +81,6 @@ PTESTS_FAST = "\
     zlib \
     libexif \
 "
-PTESTS_FAST:append:libc-glibc = " glibc-y2038-tests"
-PTESTS_PROBLEMS:remove:libc-glibc = "glibc-y2038-tests"
 PTESTS_FAST:remove:mips64 = "qemu"
 PTESTS_PROBLEMS:append:mips64 = " qemu"
 PTESTS_FAST:remove:riscv32 = "qemu"
@@ -104,6 +102,7 @@ PTESTS_SLOW = "\
     libevent \
     libgcrypt \
     libmodule-build-perl \
+    libpng \
     lttng-tools \
     openssh \
     openssl \
diff --git a/meta/conf/distro/include/time64.inc b/meta/conf/distro/include/time64.inc
index 2e85753e55..dd29105db4 100644
--- a/meta/conf/distro/include/time64.inc
+++ b/meta/conf/distro/include/time64.inc
@@ -19,7 +19,6 @@ TARGET_CC_ARCH:append:powerpc = "${@bb.utils.contains('TUNE_FEATURES', 'm32', '$
 TARGET_CC_ARCH:append:x86 = "${@bb.utils.contains('TUNE_FEATURES', 'm32', '${GLIBC_64BIT_TIME_FLAGS}', '', d)}"
 
 GLIBC_64BIT_TIME_FLAGS:pn-glibc = ""
-GLIBC_64BIT_TIME_FLAGS:pn-glibc-y2038-tests = ""
 GLIBC_64BIT_TIME_FLAGS:pn-glibc-testsuite = ""
 # pipewire-v4l2 explicitly sets _FILE_OFFSET_BITS=32 to get access to
 # both 32 and 64 bit file APIs.  But it does not handle the time side?
@@ -36,7 +35,6 @@ GLIBC_64BIT_TIME_FLAGS:pn-gcc-sanitizers = ""
 # Caused by the flags exceptions above
 INSANE_SKIP:append:pn-gcc-sanitizers = " 32bit-time"
 INSANE_SKIP:append:pn-glibc = " 32bit-time"
-INSANE_SKIP:append:pn-glibc-y2038-tests = " 32bit-time"
 INSANE_SKIP:append:pn-pulseaudio = " 32bit-time"
 
 # Strace has tests that call 32 bit API directly, which is fair enough, e.g.
diff --git a/meta/conf/machine/include/arm/armv8r/tune-cortexr52.inc b/meta/conf/machine/include/arm/armv8r/tune-cortexr52.inc
index 89f0e09450..e8667bc16b 100644
--- a/meta/conf/machine/include/arm/armv8r/tune-cortexr52.inc
+++ b/meta/conf/machine/include/arm/armv8r/tune-cortexr52.inc
@@ -10,11 +10,10 @@ require conf/machine/include/arm/arch-armv8r.inc
 
 AVAILTUNES                             += "cortexr52"
 ARMPKGARCH:tune-cortexr52               = "cortexr52"
-# We do not want -march since -mcpu is added above to cover for it
-TUNE_FEATURES:tune-cortexr52            = "aarch64 crc simd cortexr52"
+TUNE_FEATURES:tune-cortexr52            = "${TUNE_FEATURES:tune-armv8r-crc-simd} cortexr52"
 PACKAGE_EXTRA_ARCHS:tune-cortexr52      = "${PACKAGE_EXTRA_ARCHS:tune-armv8r-crc-simd} cortexr52"
 
 AVAILTUNES                             += "cortexr52hf"
-ARMPKGARCH:tune-cortexr52hf             = "cortexr52"
+ARMPKGARCH:tune-cortexr52hf             = "cortexr52hf"
 TUNE_FEATURES:tune-cortexr52hf          = "${TUNE_FEATURES:tune-cortexr52} callconvention-hard"
 PACKAGE_EXTRA_ARCHS:tune-cortexr52hf    = "cortexr52hf"
diff --git a/meta/lib/oeqa/selftest/cases/sstatetests.py b/meta/lib/oeqa/selftest/cases/sstatetests.py
index 86d6cd7464..4a2c425ac8 100644
--- a/meta/lib/oeqa/selftest/cases/sstatetests.py
+++ b/meta/lib/oeqa/selftest/cases/sstatetests.py
@@ -977,7 +977,7 @@ class SStateMirrors(SStateBase):
             self.append_config("""
 MACHINE = "{}"
 BB_HASHSERVE_UPSTREAM = "hashserv.yocto.io:8687"
-SSTATE_MIRRORS ?= "file://.* http://cdn.jsdelivr.net/yocto/sstate/all/PATH;downloadfilename=PATH"
+SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/all/PATH;downloadfilename=PATH"
 """.format(machine))
         else:
             self.append_config("""
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index 731bfa0e40..53d8644159 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -57,6 +57,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
            file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \
            file://0001-test-gatt-Fix-hung-issue.patch \
            file://0001-adapter-Fix-up-address-type-when-loading-keys.patch \
+           file://toolsbtmgmt-fix-index-option-for-non-interactive-mode.patch \
            "
 S = "${WORKDIR}/bluez-${PV}"
 
diff --git a/meta/recipes-connectivity/bluez5/bluez5/toolsbtmgmt-fix-index-option-for-non-interactive-mode.patch b/meta/recipes-connectivity/bluez5/bluez5/toolsbtmgmt-fix-index-option-for-non-interactive-mode.patch
new file mode 100644
index 0000000000..f4e14be146
--- /dev/null
+++ b/meta/recipes-connectivity/bluez5/bluez5/toolsbtmgmt-fix-index-option-for-non-interactive-mode.patch
@@ -0,0 +1,29 @@
+From f00d5546c9e989dd68ce0de0190cd0e043b0f1f5 Mon Sep 17 00:00:00 2001
+From: Arjan Opmeer <arjan.opmeer@gmail.com>
+Date: Tue, 9 Jul 2024 13:55:41 +0200
+Subject: [PATCH] tools/btmgmt: Fix --index option for non-interactive mode
+
+In non-interactive mode the --index option does not work because the
+call to mgmt_set_index() is made after bt_shell_attach().
+
+Fixes: https://github.com/bluez/bluez/issues/893
+
+Upstream-Status: Backport [https://github.com/bluez/bluez/commit/f00d5546c9e989dd68ce0de0190cd0e043b0f1f5]
+---
+ tools/btmgmt.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/btmgmt.c b/tools/btmgmt.c
+index 9b7f851bd8..436c2bb21f 100644
+--- a/tools/btmgmt.c
++++ b/tools/btmgmt.c
+@@ -51,8 +51,8 @@ int main(int argc, char *argv[])
+                return EXIT_FAILURE;
+        }
+ 
+-       bt_shell_attach(fileno(stdin));
+        mgmt_set_index(index_option);
++       bt_shell_attach(fileno(stdin));
+        status = bt_shell_run();
+ 
+        mgmt_remove_submenu();
diff --git a/meta/recipes-connectivity/connman/connman/CVE-2025-32366.patch b/meta/recipes-connectivity/connman/connman/CVE-2025-32366.patch
new file mode 100644
index 0000000000..0eb7360685
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman/CVE-2025-32366.patch
@@ -0,0 +1,41 @@
+From 8d3be0285f1d4667bfe85dba555c663eb3d704b4 Mon Sep 17 00:00:00 2001
+From: Yoonje Shin <ioerts@kookmin.ac.kr>
+Date: Mon, 12 May 2025 10:48:18 +0200
+Subject: [PATCH] dnsproxy: Address CVE-2025-32366 vulnerability
+
+In Connman parse_rr in dnsproxy.c has a memcpy length
+that depends on an RR RDLENGTH value (i.e., *rdlen=ntohs(rr->rdlen)
+and memcpy(response+offset,*end,*rdlen)). Here, rdlen may be larger
+than the amount of remaining packet data in the current state of
+parsing. As a result, values of stack memory locations may be sent
+over the network in a response.
+
+This patch adds a check to ensure that (*end + *rdlen) does not exceed
+the valid range. If the condition is violated, the function returns
+-EINVAL.
+
+CVE: CVE-2025-32366
+
+Upstream-Status: Backport [https://git.kernel.org/pub/scm/network/connman/connman.git/commit/?id=8d3be0285f1d4667bfe85dba555c663eb3d704b4]
+
+Signed-off-by: Praveen Kumar <praveen.kumar@windriver.com>
+---
+ src/dnsproxy.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/dnsproxy.c b/src/dnsproxy.c
+index 1a5a4f3..50b2d55 100644
+--- a/src/dnsproxy.c
++++ b/src/dnsproxy.c
+@@ -985,6 +985,9 @@ static int parse_rr(const unsigned char *buf, const unsigned char *start,
+        if ((offset + *rdlen) > *response_size)
+                return -ENOBUFS;
+
++       if ((*end + *rdlen) > max)
++               return -EINVAL;
++
+        memcpy(response + offset, *end, *rdlen);
+
+        *end += *rdlen;
+--
+2.40.0
diff --git a/meta/recipes-connectivity/connman/connman/CVE-2025-32743.patch b/meta/recipes-connectivity/connman/connman/CVE-2025-32743.patch
new file mode 100644
index 0000000000..b31c59aa70
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman/CVE-2025-32743.patch
@@ -0,0 +1,48 @@
+From d90b911f6760959bdf1393c39fe8d1118315490f Mon Sep 17 00:00:00 2001
+From: Praveen Kumar <praveen.kumar@windriver.com>
+Date: Thu, 24 Apr 2025 11:39:29 +0000
+Subject: [PATCH] dnsproxy: Fix NULL/empty lookup causing potential crash
+
+In ConnMan through 1.44, the lookup string in ns_resolv in dnsproxy.c
+can be NULL or an empty string when the TC (Truncated) bit is set in
+a DNS response. This allows attackers to cause a denial of service
+(application crash) or possibly execute arbitrary code, because those
+lookup values lead to incorrect length calculations and incorrect
+memcpy operations.
+
+This patch includes a check to make sure loookup value is valid before
+using it. This helps avoid unexpected value when the input is empty or
+incorrect.
+
+Fixes: CVE-2025-32743
+
+CVE: CVE-2025-32743
+
+Upstream-Status: Backport [https://git.kernel.org/pub/scm/network/connman/connman.git/commit/?id=d90b911f6760959bdf1393c39fe8d1118315490f]
+
+Signed-off-by: Praveen Kumar <praveen.kumar@windriver.com>
+---
+ src/dnsproxy.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/dnsproxy.c b/src/dnsproxy.c
+index 7ebffbc..1a5a4f3 100644
+--- a/src/dnsproxy.c
++++ b/src/dnsproxy.c
+@@ -1669,8 +1669,13 @@ static int ns_resolv(struct server_data *server, struct request_data *req,
+                                gpointer request, gpointer name)
+ {
+        int sk = -1;
++       int err;
+        const char *lookup = (const char *)name;
+-       int err = ns_try_resolv_from_cache(req, request, lookup);
++
++       if (!lookup || strlen(lookup) == 0)
++               return -EINVAL;
++
++       err = ns_try_resolv_from_cache(req, request, lookup);
+
+        if (err > 0)
+                /* cache hit */
+--
+2.40.0
diff --git a/meta/recipes-connectivity/connman/connman_1.42.bb b/meta/recipes-connectivity/connman/connman_1.42.bb
index 91ab9895ac..9b3abbe258 100644
--- a/meta/recipes-connectivity/connman/connman_1.42.bb
+++ b/meta/recipes-connectivity/connman/connman_1.42.bb
@@ -7,6 +7,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
            file://no-version-scripts.patch \
            file://0001-vpn-Adding-support-for-latest-pppd-2.5.0-release.patch \
            file://0001-src-log.c-Include-libgen.h-for-basename-API.patch \
+           file://CVE-2025-32743.patch \
+           file://CVE-2025-32366.patch \
            "
 
 SRC_URI:append:libc-musl = " file://0002-resolve-musl-does-not-implement-res_ninit.patch"
diff --git a/meta/recipes-connectivity/kea/kea_2.4.1.bb b/meta/recipes-connectivity/kea/kea_2.4.2.bb
index fcdb4889d9..6bb7cb9164 100644
--- a/meta/recipes-connectivity/kea/kea_2.4.1.bb
+++ b/meta/recipes-connectivity/kea/kea_2.4.2.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Kea is the next generation of DHCP software developed by ISC. It
 HOMEPAGE = "http://kea.isc.org"
 SECTION = "connectivity"
 LICENSE = "MPL-2.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ea061fa0188838072c4248c1318ec131"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ee16e7280a6cf2a1487717faf33190dc"
 
 DEPENDS = "boost log4cplus openssl"
 
@@ -18,7 +18,7 @@ SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \
            file://fix_pid_keactrl.patch \
            file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \
            "
-SRC_URI[sha256sum] = "815c61f5c271caa4a1db31dd656eb50a7f6ea973da3690f7c8581408e180131a"
+SRC_URI[sha256sum] = "6e82fb319d3b871c0d39bbd504f2cda0c66fa1262865872985fb4fb91b4eaafc"
 
 inherit autotools systemd update-rc.d upstream-version-is-even
 
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
index 0f5747cc6d..4d78312929 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
@@ -66,34 +66,14 @@ start_nfsd(){
         start-stop-daemon --start --exec "$NFS_NFSD" -- "$@"
         echo done
 }
-delay_nfsd(){
-        for delay in 0 1 2 3 4 5 6 7 8 9 
-        do
-                if pidof nfsd >/dev/null
-                then
-                        echo -n .
-                        sleep 1
-                else
-                        return 0
-                fi
-        done
-        return 1
-}
 stop_nfsd(){
-        # WARNING: this kills any process with the executable
-        # name 'nfsd'.
         echo -n 'stopping nfsd: '
-        start-stop-daemon --stop --quiet --signal 1 --name nfsd
-        if delay_nfsd || {
-                echo failed
-                echo ' using signal 9: '
-                start-stop-daemon --stop --quiet --signal 9 --name nfsd
-                delay_nfsd
-        }
+        $NFS_NFSD 0
+        if pidof nfsd
         then
-                echo done
-        else
                 echo failed
+        else
+                echo done
         fi
 }
 
diff --git a/meta/recipes-connectivity/openssh/openssh/CVE-2025-32728.patch b/meta/recipes-connectivity/openssh/openssh/CVE-2025-32728.patch
new file mode 100644
index 0000000000..72fc0073e8
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh/CVE-2025-32728.patch
@@ -0,0 +1,44 @@
+From fc86875e6acb36401dfc1dfb6b628a9d1460f367 Mon Sep 17 00:00:00 2001
+From: "djm@openbsd.org" <djm@openbsd.org>
+Date: Wed, 9 Apr 2025 07:00:03 +0000
+Subject: [PATCH] upstream: Fix logic error in DisableForwarding option. This
+ option
+
+was documented as disabling X11 and agent forwarding but it failed to do so.
+Spotted by Tim Rice.
+
+OpenBSD-Commit-ID: fffc89195968f7eedd2fc57f0b1f1ef3193f5ed1
+
+Upstream-Status: Backport [https://github.com/openssh/openssh-portable/commit/fc86875e6acb36401dfc1dfb6b628a9d1460f367]
+CVE: CVE-2025-32728
+Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
+---
+ session.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/session.c b/session.c
+index aa342e8..eb932b8 100644
+--- a/session.c
++++ b/session.c
+@@ -2191,7 +2191,8 @@ session_auth_agent_req(struct ssh *ssh, Session *s)
+        if ((r = sshpkt_get_end(ssh)) != 0)
+                sshpkt_fatal(ssh, r, "%s: parse packet", __func__);
+        if (!auth_opts->permit_agent_forwarding_flag ||
+-           !options.allow_agent_forwarding) {
++           !options.allow_agent_forwarding ||
++           options.disable_forwarding) {
+                debug_f("agent forwarding disabled");
+                return 0;
+        }
+@@ -2586,7 +2587,7 @@ session_setup_x11fwd(struct ssh *ssh, Session *s)
+                ssh_packet_send_debug(ssh, "X11 forwarding disabled by key options.");
+                return 0;
+        }
+-       if (!options.x11_forwarding) {
++       if (!options.x11_forwarding || options.disable_forwarding) {
+                debug("X11 forwarding disabled in server configuration file.");
+                return 0;
+        }
+-- 
+2.25.1
+
diff --git a/meta/recipes-connectivity/openssh/openssh_9.6p1.bb b/meta/recipes-connectivity/openssh/openssh_9.6p1.bb
index 6ae4c81a42..afcd50c7e6 100644
--- a/meta/recipes-connectivity/openssh/openssh_9.6p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_9.6p1.bb
@@ -31,6 +31,7 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar
            file://0001-Fix-missing-header-for-systemd-notification.patch \
            file://CVE-2025-26466.patch \
            file://CVE-2025-26465.patch \
+           file://CVE-2025-32728.patch \
            "
 SRC_URI[sha256sum] = "910211c07255a8c5ad654391b40ee59800710dd8119dd5362de09385aa7a777c"
 
diff --git a/meta/recipes-core/coreutils/coreutils/CVE-2025-5278.patch b/meta/recipes-core/coreutils/coreutils/CVE-2025-5278.patch
new file mode 100644
index 0000000000..41be1635b5
--- /dev/null
+++ b/meta/recipes-core/coreutils/coreutils/CVE-2025-5278.patch
@@ -0,0 +1,112 @@
+From 8763c305c29d0abb7e2be4695212b42917d054b2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
+Date: Tue, 20 May 2025 16:03:44 +0100
+Subject: [PATCH] sort: fix buffer under-read (CWE-127)
+
+* src/sort.c (begfield): Check pointer adjustment
+to avoid Out-of-range pointer offset (CWE-823).
+(limfield): Likewise.
+* tests/sort/sort-field-limit.sh: Add a new test,
+which triggers with ASAN or Valgrind.
+* tests/local.mk: Reference the new test.
+* NEWS: Mention bug fix introduced in v7.2 (2009).
+Fixes https://bugs.gnu.org/78507
+
+CVE: CVE-2025-5278
+
+Upstream-Status: Backport [https://cgit.git.savannah.gnu.org/cgit/coreutils.git/commit/?id=8c9602e3a145e9596dc1a63c6ed67865814b6633]
+
+Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
+---
+ src/sort.c                     | 12 ++++++++++--
+ tests/local.mk                 |  1 +
+ tests/sort/sort-field-limit.sh | 35 ++++++++++++++++++++++++++++++++++
+ 3 files changed, 46 insertions(+), 2 deletions(-)
+ create mode 100755 tests/sort/sort-field-limit.sh
+
+diff --git a/src/sort.c b/src/sort.c
+index b10183b6f..7af1a2512 100644
+--- a/src/sort.c
++++ b/src/sort.c
+@@ -1644,7 +1644,11 @@ begfield (struct line const *line, struct keyfield const *key)
+       ++ptr;
+ 
+   /* Advance PTR by SCHAR (if possible), but no further than LIM.  */
+-  ptr = MIN (lim, ptr + schar);
++  size_t remaining_bytes = lim - ptr;
++  if (schar < remaining_bytes)
++    ptr += schar;
++  else
++    ptr = lim;
+ 
+   return ptr;
+ }
+@@ -1746,7 +1750,11 @@ limfield (struct line const *line, struct keyfield const *key)
+           ++ptr;
+ 
+       /* Advance PTR by ECHAR (if possible), but no further than LIM.  */
+-      ptr = MIN (lim, ptr + echar);
++      size_t remaining_bytes = lim - ptr;
++      if (echar < remaining_bytes)
++        ptr += echar;
++      else
++        ptr = lim;
+     }
+ 
+   return ptr;
+diff --git a/tests/local.mk b/tests/local.mk
+index 4da6756ac..642d225fa 100644
+--- a/tests/local.mk
++++ b/tests/local.mk
+@@ -388,6 +388,7 @@ all_tests =                                 \
+   tests/sort/sort-debug-keys.sh                        \
+   tests/sort/sort-debug-warn.sh                        \
+   tests/sort/sort-discrim.sh                   \
++  tests/sort/sort-field-limit.sh               \
+   tests/sort/sort-files0-from.pl               \
+   tests/sort/sort-float.sh                     \
+   tests/sort/sort-h-thousands-sep.sh           \
+diff --git a/tests/sort/sort-field-limit.sh b/tests/sort/sort-field-limit.sh
+new file mode 100755
+index 000000000..52d8e1d17
+--- /dev/null
++++ b/tests/sort/sort-field-limit.sh
+@@ -0,0 +1,35 @@
++#!/bin/sh
++# From 7.2-9.7, this would trigger an out of bounds mem read
++
++# Copyright (C) 2025 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, see <https://www.gnu.org/licenses/>.
++
++. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
++print_ver_ sort
++getlimits_
++
++# This issue triggers with valgrind or ASAN
++valgrind --error-exitcode=1 sort --version 2>/dev/null &&
++  VALGRIND='valgrind --error-exitcode=1'
++
++{ printf '%s\n' aa bb; } > in || framework_failure_
++
++_POSIX2_VERSION=200809 $VALGRIND sort +0.${SIZE_MAX}R in > out || fail=1
++compare in out || fail=1
++
++_POSIX2_VERSION=200809 $VALGRIND sort +1 -1.${SIZE_MAX}R in > out || fail=1
++compare in out || fail=1
++
++Exit $fail
+-- 
+2.34.1
+
diff --git a/meta/recipes-core/coreutils/coreutils_9.4.bb b/meta/recipes-core/coreutils/coreutils_9.4.bb
index 62ecdea6ec..caed1f8c49 100644
--- a/meta/recipes-core/coreutils/coreutils_9.4.bb
+++ b/meta/recipes-core/coreutils/coreutils_9.4.bb
@@ -18,6 +18,7 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \
            file://0001-local.mk-fix-cross-compiling-problem.patch \
            file://0001-posixtm-pacify-clang-18.patch \
            file://CVE-2024-0684.patch \
+           file://CVE-2025-5278.patch \
            file://run-ptest \
            "
 SRC_URI[sha256sum] = "ea613a4cf44612326e917201bbbcdfbd301de21ffc3b59b6e5c07e040b275e52"
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/CVE-2025-4373-01.patch b/meta/recipes-core/glib-2.0/glib-2.0/CVE-2025-4373-01.patch
new file mode 100644
index 0000000000..f99c4de7e1
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0/CVE-2025-4373-01.patch
@@ -0,0 +1,120 @@
+From cc647f9e46d55509a93498af19659baf9c80f2e3 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@redhat.com>
+Date: Thu, 10 Apr 2025 10:57:20 -0500
+Subject: [PATCH 1/2] gstring: carefully handle gssize parameters
+
+Wherever we use gssize to allow passing -1, we need to ensure we don't
+overflow the value by assigning a gsize to it without checking if the
+size exceeds the maximum gssize. The safest way to do this is to just
+use normal gsize everywhere instead and use gssize only for the
+parameter.
+
+Our computers don't have enough RAM to write tests for this. I tried
+forcing string->len to high values for test purposes, but this isn't
+valid and will just cause out of bounds reads/writes due to
+string->allocated_len being unexpectedly small, so I don't think we can
+test this easily.
+
+CVE: CVE-2025-4373
+
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/cc647f9e46d55509a93498af19659baf9c80f2e3]
+
+Signed-off-by: Praveen Kumar <praveen.kumar@windriver.com>
+---
+ glib/gstring.c | 36 +++++++++++++++++++++++-------------
+ 1 file changed, 23 insertions(+), 13 deletions(-)
+
+diff --git a/glib/gstring.c b/glib/gstring.c
+index 9f04144..d016b65 100644
+--- a/glib/gstring.c
++++ b/glib/gstring.c
+@@ -490,8 +490,9 @@ g_string_insert_len (GString     *string,
+     return string;
+
+   if (len < 0)
+-    len = strlen (val);
+-  len_unsigned = len;
++    len_unsigned = strlen (val);
++  else
++    len_unsigned = len;
+
+   if (pos < 0)
+     pos_unsigned = string->len;
+@@ -788,10 +789,12 @@ g_string_insert_c (GString *string,
+   g_string_maybe_expand (string, 1);
+
+   if (pos < 0)
+-    pos = string->len;
++    pos_unsigned = string->len;
+   else
+-    g_return_val_if_fail ((gsize) pos <= string->len, string);
+-  pos_unsigned = pos;
++    {
++      pos_unsigned = pos;
++      g_return_val_if_fail (pos_unsigned <= string->len, string);
++    }
+
+   /* If not just an append, move the old stuff */
+   if (pos_unsigned < string->len)
+@@ -824,6 +827,7 @@ g_string_insert_unichar (GString  *string,
+                          gssize    pos,
+                          gunichar  wc)
+ {
++  gsize pos_unsigned;
+   gint charlen, first, i;
+   gchar *dest;
+
+@@ -865,15 +869,18 @@ g_string_insert_unichar (GString  *string,
+   g_string_maybe_expand (string, charlen);
+
+   if (pos < 0)
+-    pos = string->len;
++    pos_unsigned = string->len;
+   else
+-    g_return_val_if_fail ((gsize) pos <= string->len, string);
++    {
++      pos_unsigned = pos;
++      g_return_val_if_fail (pos_unsigned <= string->len, string);
++    }
+
+   /* If not just an append, move the old stuff */
+-  if ((gsize) pos < string->len)
+-    memmove (string->str + pos + charlen, string->str + pos, string->len - pos);
++  if (pos_unsigned < string->len)
++    memmove (string->str + pos_unsigned + charlen, string->str + pos_unsigned, string->len - pos_unsigned);
+
+-  dest = string->str + pos;
++  dest = string->str + pos_unsigned;
+   /* Code copied from g_unichar_to_utf() */
+   for (i = charlen - 1; i > 0; --i)
+     {
+@@ -931,6 +938,7 @@ g_string_overwrite_len (GString     *string,
+                         const gchar *val,
+                         gssize       len)
+ {
++  gssize len_unsigned;
+   gsize end;
+
+   g_return_val_if_fail (string != NULL, NULL);
+@@ -942,14 +950,16 @@ g_string_overwrite_len (GString     *string,
+   g_return_val_if_fail (pos <= string->len, string);
+
+   if (len < 0)
+-    len = strlen (val);
++    len_unsigned = strlen (val);
++  else
++    len_unsigned = len;
+
+-  end = pos + len;
++  end = pos + len_unsigned;
+
+   if (end > string->len)
+     g_string_maybe_expand (string, end - string->len);
+
+-  memcpy (string->str + pos, val, len);
++  memcpy (string->str + pos, val, len_unsigned);
+
+   if (end > string->len)
+     {
+--
+2.40.0
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/CVE-2025-4373-02.patch b/meta/recipes-core/glib-2.0/glib-2.0/CVE-2025-4373-02.patch
new file mode 100644
index 0000000000..ea586c90dc
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0/CVE-2025-4373-02.patch
@@ -0,0 +1,29 @@
+From 4d435bb4809793c445846db8fb87e3c9184c4703 Mon Sep 17 00:00:00 2001
+From: Peter Bloomfield <peterbloomfield@bellsouth.net>
+Date: Fri, 11 Apr 2025 05:52:33 +0000
+Subject: [PATCH 2/2] gstring: Make len_unsigned unsigned
+
+CVE: CVE-2025-4373
+
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/4d435bb4809793c445846db8fb87e3c9184c4703]
+
+Signed-off-by: Praveen Kumar <praveen.kumar@windriver.com>
+---
+ glib/gstring.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/glib/gstring.c b/glib/gstring.c
+index d016b65..d9ad0c3 100644
+--- a/glib/gstring.c
++++ b/glib/gstring.c
+@@ -938,7 +938,7 @@ g_string_overwrite_len (GString     *string,
+                         const gchar *val,
+                         gssize       len)
+ {
+-  gssize len_unsigned;
++  gsize len_unsigned;
+   gsize end;
+
+   g_return_val_if_fail (string != NULL, NULL);
+--
+2.40.0
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.78.6.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.78.6.bb
index 1a65f48399..e1a3b57270 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.78.6.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.78.6.bb
@@ -27,6 +27,8 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
            file://CVE-2025-3360-04.patch \
            file://CVE-2025-3360-05.patch \
            file://CVE-2025-3360-06.patch \
+           file://CVE-2025-4373-01.patch \
+           file://CVE-2025-4373-02.patch \
            "
 SRC_URI:append:class-native = " file://relocate-modules.patch \
                                 file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \
diff --git a/meta/recipes-core/glibc/glibc-version.inc b/meta/recipes-core/glibc/glibc-version.inc
index 040fc793b1..0130613936 100644
--- a/meta/recipes-core/glibc/glibc-version.inc
+++ b/meta/recipes-core/glibc/glibc-version.inc
@@ -1,6 +1,6 @@
 SRCBRANCH ?= "release/2.39/master"
 PV = "2.39+git"
-SRCREV_glibc ?= "3463100f2d47f2897a24ba8023a5c7aaf2d26550"
+SRCREV_glibc ?= "06a70769fd0b2e1f2a3085ad50ab620282bd77b3"
 SRCREV_localedef ?= "fab74f31b3811df543e24b6de47efdf45b538abc"
 
 GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git;protocol=https"
diff --git a/meta/recipes-core/glibc/glibc-y2038-tests_2.39.bb b/meta/recipes-core/glibc/glibc-y2038-tests_2.39.bb
deleted file mode 100644
index be49ca4cb7..0000000000
--- a/meta/recipes-core/glibc/glibc-y2038-tests_2.39.bb
+++ /dev/null
@@ -1,119 +0,0 @@
-require glibc_${PV}.bb
-require glibc-tests.inc
-
-inherit ptest features_check
-REQUIRED_DISTRO_FEATURES = "ptest"
-
-SRC_URI += "\
-        file://run-ptest \
-"
-
-SUMMARY = "glibc tests using time32/time64 interfaces to be run with ptest for the purpose of checking y2038 compatiblity"
-
-# Erase some variables already set by glibc_${PV}
-python __anonymous() {
-       # Remove packages provided by glibc build, we only need a subset of them
-       d.setVar("PACKAGES", "${PN} ${PN}-ptest")
-
-       d.setVar("PROVIDES", "${PN} ${PN}-ptest")
-
-       bbclassextend = d.getVar("BBCLASSEXTEND").replace("nativesdk", "").strip()
-       d.setVar("BBCLASSEXTEND", bbclassextend)
-       d.setVar("RRECOMMENDS", "")
-       d.setVar("SYSTEMD_SERVICE:nscd", "")
-       d.setVar("SYSTEMD_PACKAGES", "")
-}
-
-# Remove any leftovers from original glibc recipe
-RPROVIDES:${PN} = "${PN}"
-RRECOMMENDS:${PN} = ""
-RDEPENDS:${PN} = "glibc libgcc sed bash"
-RDEPENDS:${PN}-ptest = "${PN}"
-DEPENDS += "sed"
-
-export oe_srcdir="${exec_prefix}/src/debug/glibc/${PV}/"
-
-# Just build tests for target - do not run them
-do_check:append () {
-        oe_runmake -i check run-built-tests=no
-}
-addtask do_check after do_compile before do_install_ptest_base
-
-glibc_strip_build_directory () {
-        # Delete all non executable files from build directory
-        find ${B} ! -executable -type f -delete
-
-        # Remove build dynamic libraries and links to them as
-        # those are already installed in the target device
-        find ${B} -type f -name "*.so" -delete
-        find ${B} -type l -name "*.so*" -delete
-
-        # Remove headers (installed with glibc)
-        find ${B} -type f -name "*.h" -delete
-
-        find ${B} -type f -name "isomac" -delete
-        find ${B} -type f -name "annexc" -delete
-}
-
-do_install_ptest_base () {
-        glibc_strip_build_directory
-
-        ls -r ${B}/*/*-time64 > ${B}/tst_time64
-
-        # Remove '-time64' suffix - those tests are also time related
-        sed -e "s/-time64$//" ${B}/tst_time64 > ${B}/tst_time_tmp
-        tst_time=$(cat ${B}/tst_time_tmp ${B}/tst_time64)
-
-        rm ${B}/tst_time_tmp ${B}/tst_time64
-        echo "${tst_time}"
-
-        # Install build test programs to the image
-        install -d ${D}${PTEST_PATH}/tests/glibc-ptest/
-
-        for f in "${tst_time}"
-        do
-            cp -r ${f} ${D}${PTEST_PATH}/tests/glibc-ptest/
-        done
-
-        install -d ${D}${PTEST_PATH}
-        cp ${WORKDIR}/run-ptest ${D}${PTEST_PATH}/
-
-}
-
-# The datadir directory is required to allow core (and reused)
-# glibc cleanup function to finish correctly, as this directory
-# is not created for ptests
-stash_locale_package_cleanup:prepend () {
-        mkdir -p ${PKGD}${datadir}
-}
-
-stash_locale_sysroot_cleanup:prepend () {
-        mkdir -p ${SYSROOT_DESTDIR}${datadir}
-}
-
-# Prevent the do_package() task to set 'libc6' prefix
-# for glibc tests related packages
-python populate_packages:prepend () {
-    if d.getVar('DEBIAN_NAMES'):
-        d.setVar('DEBIAN_NAMES', '')
-}
-
-FILES:${PN} = "${PTEST_PATH}/* /usr/src/debug/${PN}/*"
-
-EXCLUDE_FROM_SHLIBS = "1"
-
-# Install debug data in .debug and sources in /usr/src/debug
-# It is more handy to have _all_ the sources and symbols in one
-# place (package) as this recipe will be used for validation and
-# debugging.
-PACKAGE_DEBUG_SPLIT_STYLE = ".debug"
-
-# glibc test cases violate by default some Yocto/OE checks (staticdev,
-# textrel)
-# 'debug-files' - add everything (including debug) into one package
-#                 (no need to install/build *-src package)
-INSANE_SKIP:${PN} += "staticdev textrel debug-files rpaths"
-
-deltask do_stash_locale
-do_install[noexec] = "1"
-do_populate_sysroot[noexec] = "1"
diff --git a/meta/recipes-core/glibc/glibc/0001-stdlib-Add-single-threaded-fast-path-to-rand.patch b/meta/recipes-core/glibc/glibc/0001-stdlib-Add-single-threaded-fast-path-to-rand.patch
new file mode 100644
index 0000000000..736fc51f38
--- /dev/null
+++ b/meta/recipes-core/glibc/glibc/0001-stdlib-Add-single-threaded-fast-path-to-rand.patch
@@ -0,0 +1,47 @@
+From 4f54b0dfc16dbe0df86afccb90e447df5f7f571e Mon Sep 17 00:00:00 2001
+From: Wilco Dijkstra <wilco.dijkstra@arm.com>
+Date: Mon, 18 Mar 2024 15:18:20 +0000
+Subject: [PATCH] stdlib: Add single-threaded fast path to rand()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Improve performance of rand() and __random() by adding a single-threaded
+fast path.  Bench-random-lock shows about 5x speedup on Neoverse V1.
+
+Upstream-Status: Backport [be0cfd848d9ad7378800d6302bc11467cf2b514f]
+
+Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+Signed-off-by: Haixiao Yan <haixiao.yan.cn@windriver.com>
+---
+ stdlib/random.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/stdlib/random.c b/stdlib/random.c
+index 17cc61ba8f55..5d482a857065 100644
+--- a/stdlib/random.c
++++ b/stdlib/random.c
+@@ -51,6 +51,7 @@
+    SUCH DAMAGE.*/
+ 
+ #include <libc-lock.h>
++#include <sys/single_threaded.h>
+ #include <limits.h>
+ #include <stddef.h>
+ #include <stdlib.h>
+@@ -288,6 +289,12 @@ __random (void)
+ {
+   int32_t retval;
+ 
++  if (SINGLE_THREAD_P)
++    {
++      (void) __random_r (&unsafe_state, &retval);
++      return retval;
++    }
++
+   __libc_lock_lock (lock);
+ 
+   (void) __random_r (&unsafe_state, &retval);
+-- 
+2.34.1
+
diff --git a/meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch b/meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch
index 9bdfa76318..411ca55d9f 100644
--- a/meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch
+++ b/meta/recipes-core/glibc/glibc/0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch
@@ -14,6 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  sysdeps/aarch64/bits/wordsize.h | 11 +++++++++--
  sysdeps/arm/bits/wordsize.h     | 22 +---------------------
  2 files changed, 10 insertions(+), 23 deletions(-)
+ mode change 100644 => 120000 sysdeps/arm/bits/wordsize.h
 
 diff --git a/sysdeps/aarch64/bits/wordsize.h b/sysdeps/aarch64/bits/wordsize.h
 index 118e59172d..ff86359fe8 100644
diff --git a/meta/recipes-core/glibc/glibc/0022-Avoid-hardcoded-build-time-paths-in-the-output-binar.patch b/meta/recipes-core/glibc/glibc/0022-Avoid-hardcoded-build-time-paths-in-the-output-binar.patch
index b527ddffc8..9e27a51e41 100644
--- a/meta/recipes-core/glibc/glibc/0022-Avoid-hardcoded-build-time-paths-in-the-output-binar.patch
+++ b/meta/recipes-core/glibc/glibc/0022-Avoid-hardcoded-build-time-paths-in-the-output-binar.patch
@@ -17,7 +17,7 @@ diff --git a/support/Makefile b/support/Makefile
 index 362a51f882..56d2b37058 100644
 --- a/support/Makefile
 +++ b/support/Makefile
-@@ -228,9 +228,9 @@ libsupport-inhibit-o += .o
+@@ -229,9 +229,9 @@ libsupport-inhibit-o += .o
  endif
  
  CFLAGS-support_paths.c = \
diff --git a/meta/recipes-core/glibc/glibc/0023-qemu-stale-process.patch b/meta/recipes-core/glibc/glibc/0023-qemu-stale-process.patch
index c0a467fcec..7c44acb013 100644
--- a/meta/recipes-core/glibc/glibc/0023-qemu-stale-process.patch
+++ b/meta/recipes-core/glibc/glibc/0023-qemu-stale-process.patch
@@ -22,16 +22,16 @@ diff --git a/sysdeps/unix/sysv/linux/Makefile  b/sysdeps/unix/sysv/linux/Makefil
    tst-sigtimedwait \
    tst-sync_file_range \
    tst-sysconf-iov_max \
-@@ -233,6 +232,8 @@
+@@ -234,6 +233,8 @@ tests += \
    tst-timerfd \
    tst-ttyname-direct \
    tst-ttyname-namespace \
 +  # Skip this test to avoid stale qemu process
 +  # tst-scm_rights \
    # tests
-
+ 
  # process_madvise requires CAP_SYS_ADMIN.
-@@ -270,9 +271,10 @@
+@@ -271,9 +272,10 @@ tests-time64 += \
    tst-ntp_gettimex-time64 \
    tst-ppoll-time64 \
    tst-prctl-time64 \
@@ -41,5 +41,5 @@ diff --git a/sysdeps/unix/sysv/linux/Makefile  b/sysdeps/unix/sysv/linux/Makefil
 +  # Skip this test to avoid stale qemu process
 +  # tst-scm_rights-time64 \
    # tests-time64
-
+ 
  tests-clone-internal = \
diff --git a/meta/recipes-core/glibc/glibc/run-ptest b/meta/recipes-core/glibc/glibc/run-ptest
deleted file mode 100755
index cb71c75682..0000000000
--- a/meta/recipes-core/glibc/glibc/run-ptest
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-# ptest script for glibc - to run time related tests to
-# facilitate Y2038 validation
-# Run with 'ptest-runner glibc-tests'
-
-output() {
-  retcode=$?
-  if [ $retcode -eq 0 ]
-    then echo "PASS: $i"
-  elif [ $retcode -eq 77 ]
-    then echo "SKIP: $i"
-  else echo "FAIL: $i"
-  fi
-}
-
-# Allow altering time on the target
-export GLIBC_TEST_ALLOW_TIME_SETTING="1"
-
-tst_time64=$(ls -r ${PWD}/tests/glibc-ptest/*-time64)
-
-# Remove '-time64' suffix - those tests are also time
-# related
-tst_time_tmp=$(sed -e "s/-time64$//" <<< ${tst_time64})
-
-# Do not run tests supporting only 32 bit time
-#for i in ${tst_time_tmp}
-#do
-#       $i >/dev/null 2>&1
-#       output
-#done
-
-# Run tests supporting only 64 bit time
-for i in ${tst_time64}
-do
-        $i >/dev/null 2>&1
-        output
-done
diff --git a/meta/recipes-core/glibc/glibc_2.39.bb b/meta/recipes-core/glibc/glibc_2.39.bb
index 8373db2c4f..c87eb76f41 100644
--- a/meta/recipes-core/glibc/glibc_2.39.bb
+++ b/meta/recipes-core/glibc/glibc_2.39.bb
@@ -17,7 +17,8 @@ Allows for ASLR bypass so can bypass some hardening, not an exploit in itself, m
 easier access for another. 'ASLR bypass itself is not a vulnerability.'"
 
 CVE_STATUS_GROUPS += "CVE_STATUS_STABLE_BACKPORTS"
-CVE_STATUS_STABLE_BACKPORTS = "CVE-2024-2961 CVE-2024-33599 CVE-2024-33600 CVE-2024-33601 CVE-2024-33602 CVE-2025-0395"
+CVE_STATUS_STABLE_BACKPORTS = "CVE-2024-2961 CVE-2024-33599 CVE-2024-33600 CVE-2024-33601 CVE-2024-33602 CVE-2025-0395 \
+    CVE-2025-4802 CVE-2025-5702"
 CVE_STATUS_STABLE_BACKPORTS[status] = "cpe-stable-backport: fix available in used git hash"
 
 DEPENDS += "gperf-native bison-native"
@@ -53,6 +54,7 @@ SRC_URI =  "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
            file://0021-fix-create-thread-failed-in-unprivileged-process-BZ-.patch \
            file://0022-Avoid-hardcoded-build-time-paths-in-the-output-binar.patch \
            file://0023-qemu-stale-process.patch \
+           file://0001-stdlib-Add-single-threaded-fast-path-to-rand.patch \
 "
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/meta/recipes-core/images/build-appliance-image_15.0.0.bb
index 39de22c188..fc942e3565 100644
--- a/meta/recipes-core/images/build-appliance-image_15.0.0.bb
+++ b/meta/recipes-core/images/build-appliance-image_15.0.0.bb
@@ -26,7 +26,7 @@ inherit core-image setuptools3 features_check
 
 REQUIRED_DISTRO_FEATURES += "xattr"
 
-SRCREV ?= "0ce88bc3474d29122e6f319cf474e5c5dce55419"
+SRCREV ?= "1c462cc39e557276861323b7adcef4fedbdf75e9"
 SRC_URI = "git://git.yoctoproject.org/poky;branch=scarthgap \
            file://Yocto_Build_Appliance.vmx \
            file://Yocto_Build_Appliance.vmxf \
diff --git a/meta/recipes-core/systemd/systemd-boot-native_255.18.bb b/meta/recipes-core/systemd/systemd-boot-native_255.21.bb
index 73db59b14e..73db59b14e 100644
--- a/meta/recipes-core/systemd/systemd-boot-native_255.18.bb
+++ b/meta/recipes-core/systemd/systemd-boot-native_255.21.bb
diff --git a/meta/recipes-core/systemd/systemd-boot_255.18.bb b/meta/recipes-core/systemd/systemd-boot_255.21.bb
index 397316fe9b..397316fe9b 100644
--- a/meta/recipes-core/systemd/systemd-boot_255.18.bb
+++ b/meta/recipes-core/systemd/systemd-boot_255.21.bb
diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc
index 8e134d8c86..28392b6b09 100644
--- a/meta/recipes-core/systemd/systemd.inc
+++ b/meta/recipes-core/systemd/systemd.inc
@@ -15,7 +15,7 @@ LICENSE:libsystemd = "LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
                     file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
 
-SRCREV = "20415d357fb0e253df7444019a47674fac4ed1d6"
+SRCREV = "70500d37992a01d3275b1c414c3ed161d6f91f9e"
 SRCBRANCH = "v255-stable"
 SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH}"
 
diff --git a/meta/recipes-core/systemd/systemd/0001-missing_type.h-add-comparison_fn_t.patch b/meta/recipes-core/systemd/systemd/0001-missing_type.h-add-comparison_fn_t.patch
index d2ffdd8de4..22f0468460 100644
--- a/meta/recipes-core/systemd/systemd/0001-missing_type.h-add-comparison_fn_t.patch
+++ b/meta/recipes-core/systemd/systemd/0001-missing_type.h-add-comparison_fn_t.patch
@@ -1,4 +1,4 @@
-From 7bbb54406dd77c358eab9df08b100ee85e176052 Mon Sep 17 00:00:00 2001
+From b270af4c086d254758fdcd1d294b15a555a4b3ea Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Mon, 25 Feb 2019 13:55:12 +0800
 Subject: [PATCH] missing_type.h: add comparison_fn_t
diff --git a/meta/recipes-core/systemd/systemd/0002-add-fallback-parse_printf_format-implementation.patch b/meta/recipes-core/systemd/systemd/0002-add-fallback-parse_printf_format-implementation.patch
index df9e978e55..6cce960299 100644
--- a/meta/recipes-core/systemd/systemd/0002-add-fallback-parse_printf_format-implementation.patch
+++ b/meta/recipes-core/systemd/systemd/0002-add-fallback-parse_printf_format-implementation.patch
@@ -1,4 +1,4 @@
-From d0b08484a6c3113b6209d8f8e1dc1186a6427b99 Mon Sep 17 00:00:00 2001
+From 0660aea3d7c8058d73c9f7b2971f4daf35dd7a32 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Sat, 22 May 2021 20:26:24 +0200
 Subject: [PATCH] add fallback parse_printf_format implementation
diff --git a/meta/recipes-core/systemd/systemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/meta/recipes-core/systemd/systemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch
index 784f0898c0..4472dda2e8 100644
--- a/meta/recipes-core/systemd/systemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch
+++ b/meta/recipes-core/systemd/systemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch
@@ -1,4 +1,4 @@
-From 7e4fae68909ce4932e073dd060e22581edc39ad2 Mon Sep 17 00:00:00 2001
+From edc39fe19419120f70341cd50d4d097a514ac9cb Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Thu, 21 Feb 2019 16:23:24 +0800
 Subject: [PATCH] binfmt: Don't install dependency links at install time for
diff --git a/meta/recipes-core/systemd/systemd/0003-src-basic-missing.h-check-for-missing-strndupa.patch b/meta/recipes-core/systemd/systemd/0003-src-basic-missing.h-check-for-missing-strndupa.patch
index e46b4386aa..715a0c7ec8 100644
--- a/meta/recipes-core/systemd/systemd/0003-src-basic-missing.h-check-for-missing-strndupa.patch
+++ b/meta/recipes-core/systemd/systemd/0003-src-basic-missing.h-check-for-missing-strndupa.patch
@@ -1,4 +1,4 @@
-From ca0b48676132744b78d99ee3ec2d33f11bb73c28 Mon Sep 17 00:00:00 2001
+From c728a728cd54c372162f5447aa94921efb0c35f0 Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Mon, 25 Feb 2019 14:18:21 +0800
 Subject: [PATCH] src/basic/missing.h: check for missing strndupa
@@ -280,7 +280,7 @@ index b3baf03afc..7404784a01 100644
  
  BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", CGroupTasksMax, cgroup_tasks_max_resolve);
 diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
-index 2d05ba7e1d..61a7de0037 100644
+index 71b07a6ec1..174a94e8a0 100644
 --- a/src/core/dbus-execute.c
 +++ b/src/core/dbus-execute.c
 @@ -42,6 +42,7 @@
@@ -352,7 +352,7 @@ index 7e0c98cb7d..978a7f5874 100644
  #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL)           /* 1 MiB */
  #define DEFAULT_MAX_USE_UPPER (uint64_t) (4ULL*1024ULL*1024ULL*1024ULL)   /* 4 GiB */
 diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
-index 016f3baa7f..b1def81313 100644
+index e7caf510ba..79b252cad7 100644
 --- a/src/fstab-generator/fstab-generator.c
 +++ b/src/fstab-generator/fstab-generator.c
 @@ -37,6 +37,7 @@
@@ -424,7 +424,7 @@ index 5ade8e99aa..7553cf319d 100644
  #define SNDBUF_SIZE (8*1024*1024)
  
 diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
-index 8befc97460..6ee4d4f595 100644
+index b32cd6c6a0..cc484454e0 100644
 --- a/src/libsystemd/sd-bus/sd-bus.c
 +++ b/src/libsystemd/sd-bus/sd-bus.c
 @@ -46,6 +46,7 @@
@@ -616,7 +616,7 @@ index 0a31be382f..92d629e7e0 100644
  /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */
  #define PRINT_LINE_THRESHOLD 3
 diff --git a/src/shared/pager.c b/src/shared/pager.c
-index 19deefab56..6b6d0af1a0 100644
+index 41dd7bffdc..9ca45d8b91 100644
 --- a/src/shared/pager.c
 +++ b/src/shared/pager.c
 @@ -25,6 +25,7 @@
diff --git a/meta/recipes-core/systemd/systemd/0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch b/meta/recipes-core/systemd/systemd/0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch
index 43ba526792..19eaf9170d 100644
--- a/meta/recipes-core/systemd/systemd/0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch
+++ b/meta/recipes-core/systemd/systemd/0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch
@@ -1,4 +1,4 @@
-From 3ea9cc03431c93c86cf0ca63ad04219af221a2d0 Mon Sep 17 00:00:00 2001
+From 674232187bf337c31a6528b4d241eafeb27ac85e Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Mon, 25 Feb 2019 14:56:21 +0800
 Subject: [PATCH] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not defined
diff --git a/meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch b/meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch
index c25ccde9e2..dbd94d473d 100644
--- a/meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch
+++ b/meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch
@@ -1,4 +1,4 @@
-From 885a6880ad1b687e3fbf1b9f35e218bee1fcc835 Mon Sep 17 00:00:00 2001
+From cdaafa37983753d309d2b37f8262e71f95798e52 Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Mon, 25 Feb 2019 15:00:06 +0800
 Subject: [PATCH] add missing FTW_ macros for musl
diff --git a/meta/recipes-core/systemd/systemd/0006-Use-uintmax_t-for-handling-rlim_t.patch b/meta/recipes-core/systemd/systemd/0006-Use-uintmax_t-for-handling-rlim_t.patch
index 13c155745a..09ffbcb70a 100644
--- a/meta/recipes-core/systemd/systemd/0006-Use-uintmax_t-for-handling-rlim_t.patch
+++ b/meta/recipes-core/systemd/systemd/0006-Use-uintmax_t-for-handling-rlim_t.patch
@@ -1,4 +1,4 @@
-From 646c3ced29922065eed64ac9b23af8276e989608 Mon Sep 17 00:00:00 2001
+From 8c33fe6338c448dca8533b9d3f9933e2794bda61 Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Mon, 25 Feb 2019 15:12:41 +0800
 Subject: [PATCH] Use uintmax_t for handling rlim_t
diff --git a/meta/recipes-core/systemd/systemd/0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch b/meta/recipes-core/systemd/systemd/0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
index 55405c5d0b..563f033b0d 100644
--- a/meta/recipes-core/systemd/systemd/0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
+++ b/meta/recipes-core/systemd/systemd/0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
@@ -1,4 +1,4 @@
-From f772369a2519b378c09bb89bd48c3743a62404e3 Mon Sep 17 00:00:00 2001
+From 68ab3364c0fe1073bba3adf02add7108de80a17c Mon Sep 17 00:00:00 2001
 From: Andre McCurdy <armccurdy@gmail.com>
 Date: Tue, 10 Oct 2017 14:33:30 -0700
 Subject: [PATCH] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat()
diff --git a/meta/recipes-core/systemd/systemd/0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch b/meta/recipes-core/systemd/systemd/0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch
index 6005b621ee..cc9f7771be 100644
--- a/meta/recipes-core/systemd/systemd/0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch
+++ b/meta/recipes-core/systemd/systemd/0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch
@@ -1,4 +1,4 @@
-From 45b1226ddbd981798e0448da41ddc4901e246b45 Mon Sep 17 00:00:00 2001
+From 6dd1aa50da27c07530a434218b5a7a384d0c6747 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sun, 27 May 2018 08:36:44 -0700
 Subject: [PATCH] Define glibc compatible basename() for non-glibc systems
diff --git a/meta/recipes-core/systemd/systemd/0008-implment-systemd-sysv-install-for-OE.patch b/meta/recipes-core/systemd/systemd/0008-implment-systemd-sysv-install-for-OE.patch
index d43eaeff7a..21faa10a95 100644
--- a/meta/recipes-core/systemd/systemd/0008-implment-systemd-sysv-install-for-OE.patch
+++ b/meta/recipes-core/systemd/systemd/0008-implment-systemd-sysv-install-for-OE.patch
@@ -1,4 +1,4 @@
-From abca5814cb0b5b98a1e7af829cc166e76c524f1a Mon Sep 17 00:00:00 2001
+From 8da2b10dcbf423f791db79b7dfcc6cfaf8e26f8b Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 5 Sep 2015 06:31:47 +0000
 Subject: [PATCH] implment systemd-sysv-install for OE
diff --git a/meta/recipes-core/systemd/systemd/0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch b/meta/recipes-core/systemd/systemd/0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch
index 3e557b764f..66aa8551ac 100644
--- a/meta/recipes-core/systemd/systemd/0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch
+++ b/meta/recipes-core/systemd/systemd/0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch
@@ -1,4 +1,4 @@
-From 8d61cecff3ba0687ad2c10aacb7d2aee7cb3fa79 Mon Sep 17 00:00:00 2001
+From ed33f139195794477ac854214022034db306f42d Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Wed, 4 Jul 2018 15:00:44 +0800
 Subject: [PATCH] Do not disable buffering when writing to oom_score_adj
diff --git a/meta/recipes-core/systemd/systemd/0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch b/meta/recipes-core/systemd/systemd/0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch
index d4b67d15f4..66fab46128 100644
--- a/meta/recipes-core/systemd/systemd/0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch
+++ b/meta/recipes-core/systemd/systemd/0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch
@@ -1,4 +1,4 @@
-From 2180b639665bd314905ef058dee9a5e4a534333e Mon Sep 17 00:00:00 2001
+From ef261a0122ff5a4340897c9afe1fae04d14eb0dd Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Tue, 10 Jul 2018 15:40:17 +0800
 Subject: [PATCH] distinguish XSI-compliant strerror_r from GNU-specifi
diff --git a/meta/recipes-core/systemd/systemd/0011-avoid-redefinition-of-prctl_mm_map-structure.patch b/meta/recipes-core/systemd/systemd/0011-avoid-redefinition-of-prctl_mm_map-structure.patch
index ad8888895f..1ad9a302ff 100644
--- a/meta/recipes-core/systemd/systemd/0011-avoid-redefinition-of-prctl_mm_map-structure.patch
+++ b/meta/recipes-core/systemd/systemd/0011-avoid-redefinition-of-prctl_mm_map-structure.patch
@@ -1,4 +1,4 @@
-From 3b1639c7052d9d574dd05d268364e7919b6f2580 Mon Sep 17 00:00:00 2001
+From 8b76e1f027d73e26cfc8e13bd49f43197dbb9004 Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Mon, 25 Feb 2019 15:44:54 +0800
 Subject: [PATCH] avoid redefinition of prctl_mm_map structure
diff --git a/meta/recipes-core/systemd/systemd/0012-do-not-disable-buffer-in-writing-files.patch b/meta/recipes-core/systemd/systemd/0012-do-not-disable-buffer-in-writing-files.patch
index f0eafd6fea..3ff247debb 100644
--- a/meta/recipes-core/systemd/systemd/0012-do-not-disable-buffer-in-writing-files.patch
+++ b/meta/recipes-core/systemd/systemd/0012-do-not-disable-buffer-in-writing-files.patch
@@ -1,4 +1,4 @@
-From c1a375d93edbfaf3f64bec88c75cfcf436d4ba05 Mon Sep 17 00:00:00 2001
+From 9686b8c52bd9e532ebe687dd31352d884873e0a4 Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Fri, 1 Mar 2019 15:22:15 +0800
 Subject: [PATCH] do not disable buffer in writing files
@@ -188,10 +188,10 @@ index d21f3f79ff..258607cc7e 100644
                          log_warning_errno(r, "Failed to flush binfmt_misc rules, ignoring: %m");
                  else
 diff --git a/src/core/cgroup.c b/src/core/cgroup.c
-index 61539afdbf..77e2b35daf 100644
+index d398655b0a..9558f38a72 100644
 --- a/src/core/cgroup.c
 +++ b/src/core/cgroup.c
-@@ -4581,7 +4581,7 @@ int unit_cgroup_freezer_action(Unit *u, FreezerAction action) {
+@@ -4589,7 +4589,7 @@ int unit_cgroup_freezer_action(Unit *u, FreezerAction action) {
                          u->freezer_state = FREEZER_THAWING;
          }
  
@@ -201,7 +201,7 @@ index 61539afdbf..77e2b35daf 100644
                  return r;
  
 diff --git a/src/core/main.c b/src/core/main.c
-index 8373a156cb..33e866942c 100644
+index 364dc895d1..d28ec42030 100644
 --- a/src/core/main.c
 +++ b/src/core/main.c
 @@ -1683,7 +1683,7 @@ static void initialize_core_pattern(bool skip_setup) {
diff --git a/meta/recipes-core/systemd/systemd/0013-Handle-__cpu_mask-usage.patch b/meta/recipes-core/systemd/systemd/0013-Handle-__cpu_mask-usage.patch
index 5427671553..a92d4db101 100644
--- a/meta/recipes-core/systemd/systemd/0013-Handle-__cpu_mask-usage.patch
+++ b/meta/recipes-core/systemd/systemd/0013-Handle-__cpu_mask-usage.patch
@@ -1,4 +1,4 @@
-From b10a273f5e26536068a90f961c2a7a6c6528083b Mon Sep 17 00:00:00 2001
+From 385fbcc3cec50b995299e25f913d9683ddf51174 Mon Sep 17 00:00:00 2001
 From: Scott Murray <scott.murray@konsulko.com>
 Date: Fri, 13 Sep 2019 19:26:27 -0400
 Subject: [PATCH] Handle __cpu_mask usage
diff --git a/meta/recipes-core/systemd/systemd/0014-Handle-missing-gshadow.patch b/meta/recipes-core/systemd/systemd/0014-Handle-missing-gshadow.patch
index 679b42ff95..f84f289c2f 100644
--- a/meta/recipes-core/systemd/systemd/0014-Handle-missing-gshadow.patch
+++ b/meta/recipes-core/systemd/systemd/0014-Handle-missing-gshadow.patch
@@ -1,4 +1,4 @@
-From c55dd0f9e1ea05749d0a54082daa69729ee946af Mon Sep 17 00:00:00 2001
+From bc62e5e507cc3f10fde7d35d16059a06a78757b6 Mon Sep 17 00:00:00 2001
 From: Alex Kiernan <alex.kiernan@gmail.com>
 Date: Tue, 10 Mar 2020 11:05:20 +0000
 Subject: [PATCH] Handle missing gshadow
diff --git a/meta/recipes-core/systemd/systemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch b/meta/recipes-core/systemd/systemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch
index 2bd683785d..c1297f27dd 100644
--- a/meta/recipes-core/systemd/systemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch
+++ b/meta/recipes-core/systemd/systemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch
@@ -1,4 +1,4 @@
-From 4733cb758285ec7f63e834894aa8f09d9bc77ad5 Mon Sep 17 00:00:00 2001
+From 79f2f3e90229f4812d93c6965cb67385642dfcc4 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 12 Apr 2021 23:44:53 -0700
 Subject: [PATCH] missing_syscall.h: Define MIPS ABI defines for musl
diff --git a/meta/recipes-core/systemd/systemd/0016-pass-correct-parameters-to-getdents64.patch b/meta/recipes-core/systemd/systemd/0016-pass-correct-parameters-to-getdents64.patch
index 3e359d976a..d932d7cc76 100644
--- a/meta/recipes-core/systemd/systemd/0016-pass-correct-parameters-to-getdents64.patch
+++ b/meta/recipes-core/systemd/systemd/0016-pass-correct-parameters-to-getdents64.patch
@@ -1,4 +1,4 @@
-From 1118d270cf2cd7c6cb99eb40ab42c3d07b20476c Mon Sep 17 00:00:00 2001
+From a8e07d87adfeb1c72c6eaf5402db465a78e08ee6 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 21 Jan 2022 15:15:11 -0800
 Subject: [PATCH] pass correct parameters to getdents64
diff --git a/meta/recipes-core/systemd/systemd/0017-Adjust-for-musl-headers.patch b/meta/recipes-core/systemd/systemd/0017-Adjust-for-musl-headers.patch
index 6ae6cdfe54..6a2dcc355d 100644
--- a/meta/recipes-core/systemd/systemd/0017-Adjust-for-musl-headers.patch
+++ b/meta/recipes-core/systemd/systemd/0017-Adjust-for-musl-headers.patch
@@ -1,4 +1,4 @@
-From ab78d7938e732125012f8276e357e8f6d4a51476 Mon Sep 17 00:00:00 2001
+From 5da745dc6f60f6fac65371a60eee7cecaf575eae Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 21 Jan 2022 22:19:37 -0800
 Subject: [PATCH] Adjust for musl headers
diff --git a/meta/recipes-core/systemd/systemd/0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch b/meta/recipes-core/systemd/systemd/0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch
index 5d74d08201..89ef33c156 100644
--- a/meta/recipes-core/systemd/systemd/0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch
+++ b/meta/recipes-core/systemd/systemd/0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch
@@ -1,4 +1,4 @@
-From 20cf3569dff21f5c4e46855c3956606fa0141710 Mon Sep 17 00:00:00 2001
+From 1c5c9714a2a9bc651687bf2c583019c52ed93ac4 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 8 Nov 2022 13:31:34 -0800
 Subject: [PATCH] test-bus-error: strerror() is assumed to be GNU specific
diff --git a/meta/recipes-core/systemd/systemd/0019-errno-util-Make-STRERROR-portable-for-musl.patch b/meta/recipes-core/systemd/systemd/0019-errno-util-Make-STRERROR-portable-for-musl.patch
index a20e21ee08..7911add5ea 100644
--- a/meta/recipes-core/systemd/systemd/0019-errno-util-Make-STRERROR-portable-for-musl.patch
+++ b/meta/recipes-core/systemd/systemd/0019-errno-util-Make-STRERROR-portable-for-musl.patch
@@ -1,4 +1,4 @@
-From 5e3e71f93adf5bdbfd470bcd93320dab314dc3ef Mon Sep 17 00:00:00 2001
+From 43f56ac05ff4b9c7774b6f580612f2a7896a4885 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 23 Jan 2023 23:39:46 -0800
 Subject: [PATCH] errno-util: Make STRERROR portable for musl
diff --git a/meta/recipes-core/systemd/systemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch b/meta/recipes-core/systemd/systemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch
index bdcff34f2c..be0a0da013 100644
--- a/meta/recipes-core/systemd/systemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch
+++ b/meta/recipes-core/systemd/systemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch
@@ -1,4 +1,4 @@
-From 18201d3350b443c79cc85274f3944bf64de33da0 Mon Sep 17 00:00:00 2001
+From cda1cc94bd81c8ff9135255895a414fb938e2c79 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 2 Aug 2023 12:06:27 -0700
 Subject: [PATCH] sd-event: Make malloc_trim() conditional on glibc
diff --git a/meta/recipes-core/systemd/systemd/0021-shared-Do-not-use-malloc_info-on-musl.patch b/meta/recipes-core/systemd/systemd/0021-shared-Do-not-use-malloc_info-on-musl.patch
index 451511be16..9aa08e59cd 100644
--- a/meta/recipes-core/systemd/systemd/0021-shared-Do-not-use-malloc_info-on-musl.patch
+++ b/meta/recipes-core/systemd/systemd/0021-shared-Do-not-use-malloc_info-on-musl.patch
@@ -1,4 +1,4 @@
-From 96c3d0d3a2359dd248685c2ede876d66c3faa3f9 Mon Sep 17 00:00:00 2001
+From 2913e608d6e91c8037d698534f72970b4c365d8f Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 2 Aug 2023 12:20:40 -0700
 Subject: [PATCH] shared: Do not use malloc_info on musl
diff --git a/meta/recipes-core/systemd/systemd/0022-avoid-missing-LOCK_EX-declaration.patch b/meta/recipes-core/systemd/systemd/0022-avoid-missing-LOCK_EX-declaration.patch
index cd22adf0e5..e0a342355f 100644
--- a/meta/recipes-core/systemd/systemd/0022-avoid-missing-LOCK_EX-declaration.patch
+++ b/meta/recipes-core/systemd/systemd/0022-avoid-missing-LOCK_EX-declaration.patch
@@ -1,4 +1,4 @@
-From f3bc7816d9cca9963a2737857763ee76e300a232 Mon Sep 17 00:00:00 2001
+From 9d151b5bb3105fb21d55a301def3d97b5a314580 Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Tue, 2 Jan 2024 11:03:27 +0800
 Subject: [PATCH] avoid missing LOCK_EX declaration
@@ -15,7 +15,7 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
  2 files changed, 2 insertions(+)
 
 diff --git a/src/core/exec-invoke.c b/src/core/exec-invoke.c
-index 22bc8d10c1..9bced8f420 100644
+index 9d27280ed0..569311422d 100644
 --- a/src/core/exec-invoke.c
 +++ b/src/core/exec-invoke.c
 @@ -5,6 +5,7 @@
diff --git a/meta/recipes-core/systemd/systemd_255.18.bb b/meta/recipes-core/systemd/systemd_255.21.bb
index f85ad61080..bb9dc3da33 100644
--- a/meta/recipes-core/systemd/systemd_255.18.bb
+++ b/meta/recipes-core/systemd/systemd_255.21.bb
@@ -592,26 +592,16 @@ FILES:${PN}-extra-utils = "\
                         ${bindir}/systemd-cgls \
                         ${bindir}/systemd-cgtop \
                         ${bindir}/systemd-stdio-bridge \
-                        ${base_bindir}/systemd-ask-password \
-                        ${base_bindir}/systemd-tty-ask-password-agent \
                         ${base_sbindir}/mount.ddi \
                         ${systemd_system_unitdir}/initrd.target.wants/systemd-pcrphase-initrd.path \
-                        ${systemd_system_unitdir}/systemd-ask-password-console.path \
-                        ${systemd_system_unitdir}/systemd-ask-password-console.service \
-                        ${systemd_system_unitdir}/systemd-ask-password-wall.path \
-                        ${systemd_system_unitdir}/systemd-ask-password-wall.service \
-                        ${systemd_system_unitdir}/sysinit.target.wants/systemd-ask-password-console.path \
-                        ${systemd_system_unitdir}/sysinit.target.wants/systemd-ask-password-wall.path \
                         ${systemd_system_unitdir}/sysinit.target.wants/systemd-pcrphase.path \
                         ${systemd_system_unitdir}/sysinit.target.wants/systemd-pcrphase-sysinit.path \
-                        ${systemd_system_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path \
                         ${rootlibexecdir}/systemd/systemd-resolve-host \
                         ${rootlibexecdir}/systemd/systemd-ac-power \
                         ${rootlibexecdir}/systemd/systemd-activate \
                         ${rootlibexecdir}/systemd/systemd-measure \
                         ${rootlibexecdir}/systemd/systemd-pcrphase \
                         ${rootlibexecdir}/systemd/systemd-socket-proxyd \
-                        ${rootlibexecdir}/systemd/systemd-reply-password \
                         ${rootlibexecdir}/systemd/systemd-sleep \
                         ${rootlibexecdir}/systemd/system-sleep \
                         ${systemd_system_unitdir}/systemd-hibernate.service \
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 48520ef951..1ecf5c7b39 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -42,6 +42,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin
            file://fcntl-lock.c \
            file://CVE-2024-28085-0001.patch \
            file://CVE-2024-28085-0002.patch \
+           file://fstab-isolation.patch \
            "
 
 SRC_URI[sha256sum] = "7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f"
diff --git a/meta/recipes-core/util-linux/util-linux/fstab-isolation.patch b/meta/recipes-core/util-linux/util-linux/fstab-isolation.patch
new file mode 100644
index 0000000000..51d209ec60
--- /dev/null
+++ b/meta/recipes-core/util-linux/util-linux/fstab-isolation.patch
@@ -0,0 +1,448 @@
+From 51f1e56cc8b6843bf65ceadc5eca1545258bf020 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
+Date: Sat, 22 Apr 2023 17:48:58 +0200
+Subject: [PATCH 1/3] tests: (functions.sh) create variable for test fstab
+ location
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
+(cherry picked from commit ed3d33faff17fb702a3acfca2f9f24e69f4920de)
+Upstream-Status: Backport [https://github.com/util-linux/util-linux/commit/ed3d33faff17fb702a3acfca2f9f24e69f4920de]
+Signed-off-by: Virendra Thakur <virendra.thakur@kpit.com>
+---
+ tests/functions.sh          | 13 +++++++------
+ tests/ts/mount/fstab-broken |  2 +-
+ 2 files changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/tests/functions.sh b/tests/functions.sh
+index 5a562a39a..c2e2f33ae 100644
+--- a/tests/functions.sh
++++ b/tests/functions.sh
+@@ -386,6 +386,7 @@ function ts_init_env {
+                TS_ENABLE_UBSAN="yes"
+        fi
+ 
++       TS_FSTAB="/etc/fstab"
+        BLKID_FILE="$TS_OUTDIR/${TS_TESTNAME}.blkidtab"
+ 
+        declare -a TS_SUID_PROGS
+@@ -824,12 +825,12 @@ function ts_is_mounted {
+ }
+ 
+ function ts_fstab_open {
+-       echo "# <!-- util-linux test entry" >> /etc/fstab
++       echo "# <!-- util-linux test entry" >> "$TS_FSTAB"
+ }
+ 
+ function ts_fstab_close {
+-       echo "# -->" >> /etc/fstab
+-       sync /etc/fstab 2>/dev/null
++       echo "# -->" >> "$TS_FSTAB"
++       sync "$TS_FSTAB" 2>/dev/null
+ }
+ 
+ function ts_fstab_addline {
+@@ -838,7 +839,7 @@ function ts_fstab_addline {
+        local FS=${3:-"auto"}
+        local OPT=${4:-"defaults"}
+ 
+-       echo "$SPEC   $MNT   $FS   $OPT   0   0" >> /etc/fstab
++       echo "$SPEC   $MNT   $FS   $OPT   0   0" >> "$TS_FSTAB"
+ }
+ 
+ function ts_fstab_lock {
+@@ -862,9 +863,9 @@ function ts_fstab_clean {
+   ba
+ }
+ s/# <!-- util-linux.*-->//;
+-/^$/d" /etc/fstab
++/^$/d" "$TS_FSTAB"
+ 
+-       sync /etc/fstab 2>/dev/null
++       sync "$TS_FSTAB" 2>/dev/null
+        ts_unlock "fstab"
+ }
+ 
+diff --git a/tests/ts/mount/fstab-broken b/tests/ts/mount/fstab-broken
+index 19edc5fe3..3b7a1ee9d 100755
+--- a/tests/ts/mount/fstab-broken
++++ b/tests/ts/mount/fstab-broken
+@@ -34,7 +34,7 @@ mkdir -p $MNT
+ 
+ ts_fstab_lock
+ ts_fstab_open
+-echo "tmpd $MNT tmpfs" >> /etc/fstab
++echo "tmpd $MNT tmpfs" >> "$TS_FSTAB"
+ ts_fstab_close
+ 
+ ts_init_subtest "mount"
+-- 
+2.34.1
+
+
+From 1e4a9141ca7d310030311e09123a81591f994f83 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
+Date: Sat, 22 Apr 2023 17:20:45 +0200
+Subject: [PATCH 2/3] tests: (functions.sh) use per-test fstab file
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
+(cherry picked from commit 6aa8d17b6b53b86a46c5da68c02a893113130496)
+Upstream-Status: Backport [https://github.com/util-linux/util-linux/commit/6aa8d17b6b53b86a46c5da68c02a893113130496]
+Signed-off-by: Virendra Thakur <virendra.thakur@kpit.com>
+---
+ tests/functions.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/functions.sh b/tests/functions.sh
+index c2e2f33ae..3089e8cda 100644
+--- a/tests/functions.sh
++++ b/tests/functions.sh
+@@ -386,7 +386,7 @@ function ts_init_env {
+                TS_ENABLE_UBSAN="yes"
+        fi
+ 
+-       TS_FSTAB="/etc/fstab"
++       TS_FSTAB="$TS_OUTDIR/${TS_TESTNAME}.fstab"
+        BLKID_FILE="$TS_OUTDIR/${TS_TESTNAME}.blkidtab"
+ 
+        declare -a TS_SUID_PROGS
+-- 
+2.34.1
+
+
+From 02c483f982e23a86d58cd7c6a4eb4b6e4d5def1a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
+Date: Sat, 22 Apr 2023 17:34:28 +0200
+Subject: [PATCH 3/3] mount: (tests) explicitly use test fstab location
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
+(cherry picked from commit b1580bd760519a2cf052f023057846e54de47484)
+Upstream-Status: Backport [https://github.com/util-linux/util-linux/commit/b1580bd760519a2cf052f023057846e54de47484]
+Signed-off-by: Virendra Thakur <virendra.thakur@kpit.com>
+---
+ tests/ts/mount/fslists             | 2 +-
+ tests/ts/mount/fstab-bind          | 2 +-
+ tests/ts/mount/fstab-broken        | 4 ++--
+ tests/ts/mount/fstab-btrfs         | 8 ++++----
+ tests/ts/mount/fstab-devname       | 4 ++--
+ tests/ts/mount/fstab-devname2label | 2 +-
+ tests/ts/mount/fstab-devname2uuid  | 2 +-
+ tests/ts/mount/fstab-label         | 6 +++---
+ tests/ts/mount/fstab-label2devname | 4 ++--
+ tests/ts/mount/fstab-label2uuid    | 4 ++--
+ tests/ts/mount/fstab-loop          | 4 ++--
+ tests/ts/mount/fstab-none          | 2 +-
+ tests/ts/mount/fstab-symlink       | 2 +-
+ tests/ts/mount/fstab-uuid          | 6 +++---
+ tests/ts/mount/fstab-uuid2devname  | 4 ++--
+ tests/ts/mount/fstab-uuid2label    | 4 ++--
+ 16 files changed, 30 insertions(+), 30 deletions(-)
+
+diff --git a/tests/ts/mount/fslists b/tests/ts/mount/fslists
+index 230186a1e..6ac72c3ce 100755
+--- a/tests/ts/mount/fslists
++++ b/tests/ts/mount/fslists
+@@ -61,7 +61,7 @@ ts_finalize_subtest
+ ts_init_subtest "more-types-fstab"
+ [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
+ ts_fstab_add $DEVICE $TS_MOUNTPOINT "foo,bar,ext2"
+-$TS_CMD_MOUNT $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
++$TS_CMD_MOUNT -T "$TS_FSTAB" $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+ ts_fstab_clean
+ ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts"
+ $TS_CMD_UMOUNT $TS_MOUNTPOINT
+diff --git a/tests/ts/mount/fstab-bind b/tests/ts/mount/fstab-bind
+index 2c799df78..cae016dd2 100755
+--- a/tests/ts/mount/fstab-bind
++++ b/tests/ts/mount/fstab-bind
+@@ -20,7 +20,7 @@ ts_fstab_add $MY_SOURCE "$TS_MOUNTPOINT" "none" "bind,default,noauto"
+ mkdir -p $MY_SOURCE
+ mkdir -p $TS_MOUNTPOINT
+ 
+-$TS_CMD_MOUNT $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
++$TS_CMD_MOUNT -T "$TS_FSTAB" $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+ [ "$?" = "0" ] || ts_log "error: mount $TS_MOUNTPOINT"
+ 
+ $TS_CMD_FINDMNT --mountpoint "$TS_MOUNTPOINT" &> /dev/null
+diff --git a/tests/ts/mount/fstab-broken b/tests/ts/mount/fstab-broken
+index 3b7a1ee9d..ec4c34241 100755
+--- a/tests/ts/mount/fstab-broken
++++ b/tests/ts/mount/fstab-broken
+@@ -38,7 +38,7 @@ echo "tmpd $MNT tmpfs" >> "$TS_FSTAB"
+ ts_fstab_close
+ 
+ ts_init_subtest "mount"
+-$TS_CMD_MOUNT $MNT &> /dev/null
++$TS_CMD_MOUNT -T "$TS_FSTAB" $MNT &> /dev/null
+ [ "$?" = "0" ] || ts_log "error: mount $MNT"
+ $TS_CMD_FINDMNT --kernel --mountpoint "$MNT" &> /dev/null
+ if [ "$?" != "0" ]; then
+@@ -57,7 +57,7 @@ ts_finalize_subtest
+ 
+ 
+ ts_init_subtest "mount-all"
+-$TS_CMD_MOUNT -a &> /dev/null
++$TS_CMD_MOUNT -T "$TS_FSTAB" -a &> /dev/null
+ [ "$?" = "0" ] || ts_log "error: mount -a"
+ $TS_CMD_FINDMNT --kernel --mountpoint "$MNT" &> /dev/null
+ if [ "$?" != "0" ]; then
+diff --git a/tests/ts/mount/fstab-btrfs b/tests/ts/mount/fstab-btrfs
+index a1003ab52..8e76dbba6 100755
+--- a/tests/ts/mount/fstab-btrfs
++++ b/tests/ts/mount/fstab-btrfs
+@@ -94,8 +94,8 @@ ts_fstab_addline "$DEVICE" "$TS_MOUNTPOINT_SUBVOLID" "btrfs" "subvolid=$NON_DEFA
+ ts_fstab_addline "$TS_MOUNTPOINT_SUBVOLID" "$TS_MOUNTPOINT_BIND" "auto" "bind"
+ ts_fstab_close
+ 
+-$TS_CMD_MOUNT -a >> $TS_OUTPUT 2>> $TS_ERRLOG
+-$TS_CMD_MOUNT -a >> $TS_OUTPUT 2>> $TS_ERRLOG
++$TS_CMD_MOUNT -T "$TS_FSTAB" -a >> $TS_OUTPUT 2>> $TS_ERRLOG
++$TS_CMD_MOUNT -T "$TS_FSTAB" -a >> $TS_OUTPUT 2>> $TS_ERRLOG
+ 
+ $TS_CMD_UMOUNT "$TS_MOUNTPOINT_BIND" >> $TS_OUTPUT 2>> $TS_ERRLOG
+ $TS_CMD_UMOUNT "$TS_MOUNTPOINT_DEFAULT" >> $TS_OUTPUT 2>> $TS_ERRLOG
+@@ -124,8 +124,8 @@ ts_fstab_addline "$DEVICE" "$TS_MOUNTPOINT_SUBVOLID" "auto" "subvolid=$NON_DEFAU
+ ts_fstab_addline "$TS_MOUNTPOINT_SUBVOL/bind-mnt" "$TS_MOUNTPOINT_BIND" "auto" "bind"
+ ts_fstab_close
+ 
+-$TS_CMD_MOUNT -a >> $TS_OUTPUT 2>> $TS_ERRLOG
+-$TS_CMD_MOUNT -a >> $TS_OUTPUT 2>> $TS_ERRLOG
++$TS_CMD_MOUNT -T "$TS_FSTAB" -a >> $TS_OUTPUT 2>> $TS_ERRLOG
++$TS_CMD_MOUNT -T "$TS_FSTAB" -a >> $TS_OUTPUT 2>> $TS_ERRLOG
+ 
+ $TS_CMD_UMOUNT "$TS_MOUNTPOINT_BIND" >> $TS_OUTPUT 2>> $TS_ERRLOG
+ $TS_CMD_UMOUNT "$TS_MOUNTPOINT_DEFAULT" >> $TS_OUTPUT 2>> $TS_ERRLOG
+diff --git a/tests/ts/mount/fstab-devname b/tests/ts/mount/fstab-devname
+index 5b64a32a6..6ac03b5a7 100755
+--- a/tests/ts/mount/fstab-devname
++++ b/tests/ts/mount/fstab-devname
+@@ -42,13 +42,13 @@ MOUNTPOINT=$TS_MOUNTPOINT
+ ts_fstab_add $DEVICE
+ 
+ ts_init_subtest "mountpoint"
+-$TS_CMD_MOUNT $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
++$TS_CMD_MOUNT -T "$TS_FSTAB" $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+ ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
+ $TS_CMD_UMOUNT $DEVICE || >> $TS_OUTPUT 2>> $TS_ERRLOG
+ ts_finalize_subtest
+ 
+ ts_init_subtest "device-name"
+-$TS_CMD_MOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
++$TS_CMD_MOUNT -T "$TS_FSTAB" $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+ ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
+ $TS_CMD_UMOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+ ts_finalize_subtest
+diff --git a/tests/ts/mount/fstab-devname2label b/tests/ts/mount/fstab-devname2label
+index 1d8562109..44066e153 100755
+--- a/tests/ts/mount/fstab-devname2label
++++ b/tests/ts/mount/fstab-devname2label
+@@ -41,7 +41,7 @@ ts_device_has "LABEL" $LABEL $DEVICE \
+ ts_fstab_add "LABEL=$LABEL"
+ ts_udevadm_settle "$DEVICE" "LABEL"
+ 
+-$TS_CMD_MOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
++$TS_CMD_MOUNT -T "$TS_FSTAB" $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+ ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts"
+ $TS_CMD_UMOUNT $DEVICE || ts_die "Cannot umount $DEVICE"
+ 
+diff --git a/tests/ts/mount/fstab-devname2uuid b/tests/ts/mount/fstab-devname2uuid
+index 8105fa028..503959103 100755
+--- a/tests/ts/mount/fstab-devname2uuid
++++ b/tests/ts/mount/fstab-devname2uuid
+@@ -39,7 +39,7 @@ UUID=$(ts_uuid_by_devname "$DEVICE") || ts_die "Cannot find UUID on $DEVICE"
+ ts_fstab_add "UUID=$UUID"
+ ts_udevadm_settle "$DEVICE" "UUID"
+ 
+-$TS_CMD_MOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
++$TS_CMD_MOUNT -T "$TS_FSTAB" $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+ ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts"
+ $TS_CMD_UMOUNT $DEVICE || ts_die "Cannot umount $DEVICE"
+ 
+diff --git a/tests/ts/mount/fstab-label b/tests/ts/mount/fstab-label
+index 4b23e7fee..a3cc06d52 100755
+--- a/tests/ts/mount/fstab-label
++++ b/tests/ts/mount/fstab-label
+@@ -42,19 +42,19 @@ ts_fstab_add "LABEL=$LABEL"
+ ts_udevadm_settle "$DEVICE" "LABEL"
+ 
+ ts_init_subtest "no-option"
+-$TS_CMD_MOUNT $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
++$TS_CMD_MOUNT -T "$TS_FSTAB" $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+ ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
+ $TS_CMD_UMOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+ ts_finalize_subtest
+ 
+ ts_init_subtest "L-option"
+-$TS_CMD_MOUNT -L $LABEL >> $TS_OUTPUT 2>> $TS_ERRLOG
++$TS_CMD_MOUNT -T "$TS_FSTAB" -L $LABEL >> $TS_OUTPUT 2>> $TS_ERRLOG
+ ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
+ $TS_CMD_UMOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG 
+ ts_finalize_subtest
+ 
+ ts_init_subtest "LABEL-option"
+-$TS_CMD_MOUNT LABEL=$LABEL >> $TS_OUTPUT 2>> $TS_ERRLOG
++$TS_CMD_MOUNT -T "$TS_FSTAB" LABEL=$LABEL >> $TS_OUTPUT 2>> $TS_ERRLOG
+ ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
+ $TS_CMD_UMOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+ ts_finalize_subtest
+diff --git a/tests/ts/mount/fstab-label2devname b/tests/ts/mount/fstab-label2devname
+index 75ca05e8c..fddbfa0ba 100755
+--- a/tests/ts/mount/fstab-label2devname
++++ b/tests/ts/mount/fstab-label2devname
+@@ -44,13 +44,13 @@ ts_udevadm_settle "$DEVICE" "LABEL"
+ [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
+ 
+ ts_init_subtest "L-option"
+-$TS_CMD_MOUNT -L $LABEL >> $TS_OUTPUT 2>> $TS_ERRLOG
++$TS_CMD_MOUNT -T "$TS_FSTAB" -L $LABEL >> $TS_OUTPUT 2>> $TS_ERRLOG
+ ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
+ $TS_CMD_UMOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+ ts_finalize_subtest
+ 
+ ts_init_subtest "LABEL-option"
+-$TS_CMD_MOUNT "LABEL=$LABEL" >> $TS_OUTPUT 2>> $TS_ERRLOG
++$TS_CMD_MOUNT -T "$TS_FSTAB" "LABEL=$LABEL" >> $TS_OUTPUT 2>> $TS_ERRLOG
+ ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
+ $TS_CMD_UMOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+ ts_finalize_subtest
+diff --git a/tests/ts/mount/fstab-label2uuid b/tests/ts/mount/fstab-label2uuid
+index 4bfcae4b9..927cde9aa 100755
+--- a/tests/ts/mount/fstab-label2uuid
++++ b/tests/ts/mount/fstab-label2uuid
+@@ -46,13 +46,13 @@ ts_udevadm_settle "$DEVICE" "LABEL" "UUID"
+ [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
+ 
+ ts_init_subtest "L-option"
+-$TS_CMD_MOUNT -L $LABEL >> $TS_OUTPUT 2>> $TS_ERRLOG
++$TS_CMD_MOUNT -T "$TS_FSTAB" -L $LABEL >> $TS_OUTPUT 2>> $TS_ERRLOG
+ ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
+ $TS_CMD_UMOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+ ts_finalize_subtest
+ 
+ ts_init_subtest "LABEL-option"
+-$TS_CMD_MOUNT "LABEL=$LABEL" >> $TS_OUTPUT 2>> $TS_ERRLOG
++$TS_CMD_MOUNT -T "$TS_FSTAB" "LABEL=$LABEL" >> $TS_OUTPUT 2>> $TS_ERRLOG
+ ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
+ $TS_CMD_UMOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+ ts_finalize_subtest
+diff --git a/tests/ts/mount/fstab-loop b/tests/ts/mount/fstab-loop
+index 7cc589fd2..0541e3a74 100755
+--- a/tests/ts/mount/fstab-loop
++++ b/tests/ts/mount/fstab-loop
+@@ -39,10 +39,10 @@ ts_fstab_lock
+ ts_fstab_open
+ 
+ ts_fstab_addline "$IMG" "$TS_MOUNTPOINT-1" "ext2" "loop"
+-$TS_CMD_MOUNT -a >> $TS_OUTPUT 2>> $TS_ERRLOG
++$TS_CMD_MOUNT -T "$TS_FSTAB" -a >> $TS_OUTPUT 2>> $TS_ERRLOG
+ 
+ ts_fstab_addline "$IMG" "$TS_MOUNTPOINT-2" "ext2" "loop"
+-$TS_CMD_MOUNT -a >> $TS_OUTPUT 2>> $TS_ERRLOG
++$TS_CMD_MOUNT -T "$TS_FSTAB" -a >> $TS_OUTPUT 2>> $TS_ERRLOG
+ 
+ ts_fstab_close
+ 
+diff --git a/tests/ts/mount/fstab-none b/tests/ts/mount/fstab-none
+index 6a4d05b62..95daa6cee 100755
+--- a/tests/ts/mount/fstab-none
++++ b/tests/ts/mount/fstab-none
+@@ -17,7 +17,7 @@ ts_fstab_add "none" "$TS_MOUNTPOINT" "tmpfs" "rw,nosuid,nodev,relatime"
+ 
+ mkdir -p $TS_MOUNTPOINT
+ 
+-$TS_CMD_MOUNT $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
++$TS_CMD_MOUNT -T "$TS_FSTAB" $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+ [ "$?" = "0" ] || ts_log "error: mount $TS_MOUNTPOINT"
+ 
+ $TS_CMD_FINDMNT --mountpoint "$TS_MOUNTPOINT" &> /dev/null
+diff --git a/tests/ts/mount/fstab-symlink b/tests/ts/mount/fstab-symlink
+index 4d3e37b19..6d419f9fe 100755
+--- a/tests/ts/mount/fstab-symlink
++++ b/tests/ts/mount/fstab-symlink
+@@ -46,7 +46,7 @@ ln -s $DEVICE $LINKNAME
+ ts_fstab_add $LINKNAME $TS_MOUNTPOINT "auto" "defaults,user"
+ 
+ # variant A) -- UID=0
+-$TS_CMD_MOUNT $LINKNAME >> $TS_OUTPUT 2>> $TS_ERRLOG
++$TS_CMD_MOUNT -T "$TS_FSTAB" $LINKNAME >> $TS_OUTPUT 2>> $TS_ERRLOG
+ ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts"
+ $TS_CMD_UMOUNT $LINKNAME || ts_die "A) Cannot umount $LINKNAME"
+ 
+diff --git a/tests/ts/mount/fstab-uuid b/tests/ts/mount/fstab-uuid
+index 03917b782..f51bb294e 100755
+--- a/tests/ts/mount/fstab-uuid
++++ b/tests/ts/mount/fstab-uuid
+@@ -42,19 +42,19 @@ ts_fstab_add "UUID=$UUID"
+ ts_udevadm_settle "$DEVICE" "UUID"
+ 
+ ts_init_subtest "no-option"
+-$TS_CMD_MOUNT $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
++$TS_CMD_MOUNT -T "$TS_FSTAB" $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
+ ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
+ $TS_CMD_UMOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+ ts_finalize_subtest
+ 
+ ts_init_subtest "U-option"
+-$TS_CMD_MOUNT -U $UUID >> $TS_OUTPUT 2>> $TS_ERRLOG
++$TS_CMD_MOUNT -T "$TS_FSTAB" -U $UUID >> $TS_OUTPUT 2>> $TS_ERRLOG
+ ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
+ $TS_CMD_UMOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+ ts_finalize_subtest
+ 
+ ts_init_subtest "UUID-option"
+-$TS_CMD_MOUNT UUID=$UUID >> $TS_OUTPUT 2>> $TS_ERRLOG
++$TS_CMD_MOUNT -T "$TS_FSTAB" UUID=$UUID >> $TS_OUTPUT 2>> $TS_ERRLOG
+ ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
+ $TS_CMD_UMOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+ ts_finalize_subtest
+diff --git a/tests/ts/mount/fstab-uuid2devname b/tests/ts/mount/fstab-uuid2devname
+index 9bf165e16..2b338acb1 100755
+--- a/tests/ts/mount/fstab-uuid2devname
++++ b/tests/ts/mount/fstab-uuid2devname
+@@ -42,13 +42,13 @@ ts_udevadm_settle "$DEVICE" "UUID"
+ [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
+ 
+ ts_init_subtest "U-option"
+-$TS_CMD_MOUNT -U $UUID >> $TS_OUTPUT 2>> $TS_ERRLOG
++$TS_CMD_MOUNT -T "$TS_FSTAB" -U $UUID >> $TS_OUTPUT 2>> $TS_ERRLOG
+ ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
+ $TS_CMD_UMOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+ ts_finalize_subtest
+ 
+ ts_init_subtest "UUID-option"
+-$TS_CMD_MOUNT "UUID=$UUID" >> $TS_OUTPUT 2>> $TS_ERRLOG
++$TS_CMD_MOUNT -T "$TS_FSTAB" "UUID=$UUID" >> $TS_OUTPUT 2>> $TS_ERRLOG
+ ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
+ $TS_CMD_UMOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+ ts_finalize_subtest
+diff --git a/tests/ts/mount/fstab-uuid2label b/tests/ts/mount/fstab-uuid2label
+index de10ff0b0..02eb6b985 100755
+--- a/tests/ts/mount/fstab-uuid2label
++++ b/tests/ts/mount/fstab-uuid2label
+@@ -45,13 +45,13 @@ ts_udevadm_settle "$DEVICE" "LABEL" "UUID"
+ [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
+ 
+ ts_init_subtest "U-option"
+-$TS_CMD_MOUNT -U $UUID >> $TS_OUTPUT 2>> $TS_ERRLOG
++$TS_CMD_MOUNT -T "$TS_FSTAB" -U $UUID >> $TS_OUTPUT 2>> $TS_ERRLOG
+ ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
+ $TS_CMD_UMOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
+ ts_finalize_subtest
+ 
+ ts_init_subtest "UUID-option"
+-$TS_CMD_MOUNT "UUID=$UUID" >> $TS_OUTPUT 2>> $TS_ERRLOG
++$TS_CMD_MOUNT -T "$TS_FSTAB" "UUID=$UUID" >> $TS_OUTPUT 2>> $TS_ERRLOG
+ ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
+ $TS_CMD_UMOUNT $DEVICE >> $TS_OUTPUT 2>>$TS_ERRLOG
+ ts_finalize_subtest
+-- 
+2.34.1
+
diff --git a/meta/recipes-devtools/binutils/binutils-2.42.inc b/meta/recipes-devtools/binutils/binutils-2.42.inc
index e103e712a4..ea018a48a3 100644
--- a/meta/recipes-devtools/binutils/binutils-2.42.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.42.inc
@@ -19,6 +19,7 @@ SRCBRANCH ?= "binutils-2_42-branch"
 UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)"
 
 CVE_STATUS[CVE-2023-25584] = "cpe-incorrect: Applies only for version 2.40 and earlier"
+CVE_STATUS[CVE-2025-1180] = "patched: fixed by patch for CVE-2025-1176" 
 
 SRCREV ?= "6558f9f5f0ccc107a083ae7fbf106ebcb5efa817"
 BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=https"
@@ -45,5 +46,12 @@ SRC_URI = "\
      file://CVE-2025-1181-pre.patch \
      file://CVE-2025-1181.patch \
      file://CVE-2025-1182.patch \
+     file://0019-CVE-2025-1153-1.patch \
+     file://0020-CVE-2025-1153-2.patch \
+     file://0021-CVE-2025-1153-3.patch \
+     file://CVE-2025-1179-pre.patch \
+     file://CVE-2025-1179.patch \
+     file://0022-CVE-2025-5245.patch \
+     file://0022-CVE-2025-5244.patch \
 "
 S  = "${WORKDIR}/git"
diff --git a/meta/recipes-devtools/binutils/binutils/0019-CVE-2025-1153-1.patch b/meta/recipes-devtools/binutils/binutils/0019-CVE-2025-1153-1.patch
new file mode 100644
index 0000000000..fa26961447
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0019-CVE-2025-1153-1.patch
@@ -0,0 +1,3207 @@
+From 0b7f992b78fe0984fc7d84cc748d0794e4a400e3 Mon Sep 17 00:00:00 2001
+From: Alan Modra <amodra@gmail.com>
+Date: Thu, 6 Feb 2025 21:46:22 +1030
+Subject: [PATCH] PR 32603, ld -w misbehaviorur
+
+ld -w currently causes segmentation faults and other misbehaviour
+since it changes einfo with %F in the format string (fatal error) to
+not exit.  This patch fixes that by introducing a new variant of einfo
+called "fatal" that always exits, and replaces all einfo calls using
+%F with a call to fatal without the %F.  I considered modifying einfo
+to inspect the first 2 or 4 chars in the format string, looking for
+%F, but decided that was probably a bad idea given that translators
+might have moved the %F.  It's also a little nicer to inform the
+compiler of a function that doesn't return.
+
+The patch also fixes some formatting nits, and makes use of %pA
+to print section names in a couple of places in aix.em.
+
+Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=0b7f992b78fe0984fc7d84cc748d0794e4a400e3]
+CVE: CVE-2025-1153
+
+Signed-off-by: Sunil Dora <sunilkumar.dora@windriver.com>
+---
+ ld/emulparams/call_nop.sh     |  6 +--
+ ld/emulparams/cet.sh          |  2 +-
+ ld/emulparams/elf32mcore.sh   |  2 +-
+ ld/emulparams/x86-64-lam.sh   |  6 +--
+ ld/emulparams/x86-64-level.sh |  2 +-
+ ld/emultempl/aarch64elf.em    |  6 +--
+ ld/emultempl/aix.em           | 41 ++++++++-------
+ ld/emultempl/armelf.em        | 10 ++--
+ ld/emultempl/avrelf.em        |  2 +-
+ ld/emultempl/beos.em          | 24 ++++-----
+ ld/emultempl/cr16elf.em       |  4 +-
+ ld/emultempl/cskyelf.em       |  4 +-
+ ld/emultempl/elf.em           | 18 +++----
+ ld/emultempl/hppaelf.em       |  4 +-
+ ld/emultempl/kvxelf.em        |  7 ++-
+ ld/emultempl/loongarchelf.em  |  4 +-
+ ld/emultempl/m68hc1xelf.em    |  2 +-
+ ld/emultempl/m68kelf.em       |  4 +-
+ ld/emultempl/metagelf.em      |  4 +-
+ ld/emultempl/mipself.em       |  2 +-
+ ld/emultempl/mmix-elfnmmo.em  |  5 +-
+ ld/emultempl/nds32elf.em      |  6 +--
+ ld/emultempl/nto.em           | 28 +++++------
+ ld/emultempl/pe.em            | 20 ++++----
+ ld/emultempl/pep.em           | 16 +++---
+ ld/emultempl/ppc32elf.em      |  4 +-
+ ld/emultempl/ppc64elf.em      | 10 ++--
+ ld/emultempl/riscvelf.em      |  2 +-
+ ld/emultempl/s390.em          |  2 +-
+ ld/emultempl/scoreelf.em      |  2 +-
+ ld/emultempl/spuelf.em        | 20 ++++----
+ ld/emultempl/tic6xdsbt.em     | 10 ++--
+ ld/emultempl/ticoff.em        |  4 +-
+ ld/emultempl/v850elf.em       |  2 +-
+ ld/emultempl/vms.em           |  2 +-
+ ld/emultempl/xtensaelf.em     | 12 ++---
+ ld/emultempl/z80.em           |  2 +-
+ ld/ldcref.c                   |  8 +--
+ ld/ldelf.c                    | 34 ++++++-------
+ ld/ldelfgen.c                 | 17 +++----
+ ld/ldemul.c                   |  2 +-
+ ld/ldexp.c                    | 42 ++++++++--------
+ ld/ldfile.c                   | 14 +++---
+ ld/ldgram.y                   |  6 +--
+ ld/ldlang.c                   | 95 +++++++++++++++++------------------
+ ld/ldlex.l                    | 14 ++----
+ ld/ldmain.c                   | 44 ++++++++--------
+ ld/ldmisc.c                   | 28 ++++++++---
+ ld/ldmisc.h                   |  1 +
+ ld/ldwrite.c                  | 20 ++++----
+ ld/lexsup.c                   | 72 +++++++++++++-------------
+ ld/mri.c                      |  2 +-
+ ld/pe-dll.c                   | 12 ++---
+ ld/plugin.c                   | 27 +++++-----
+ 54 files changed, 363 insertions(+), 376 deletions(-)
+
+diff --git a/ld/emulparams/call_nop.sh b/ld/emulparams/call_nop.sh
+index 2c3c305f..7dd6dfb1 100644
+--- a/ld/emulparams/call_nop.sh
++++ b/ld/emulparams/call_nop.sh
+@@ -20,7 +20,7 @@ PARSE_AND_LIST_ARGS_CASE_Z_CALL_NOP='
+              char *end;
+              params.call_nop_byte = strtoul (optarg + 16 , &end, 0);
+              if (*end)
+-               einfo (_("%F%P: invalid number for -z call-nop=prefix-: %s\n"),
++               fatal (_("%P: invalid number for -z call-nop=prefix-: %s\n"),
+                       optarg + 16);
+              params.call_nop_as_suffix = false;
+            }
+@@ -29,12 +29,12 @@ PARSE_AND_LIST_ARGS_CASE_Z_CALL_NOP='
+              char *end;
+              params.call_nop_byte = strtoul (optarg + 16, &end, 0);
+              if (*end)
+-               einfo (_("%F%P: invalid number for -z call-nop=suffix-: %s\n"),
++               fatal (_("%P: invalid number for -z call-nop=suffix-: %s\n"),
+                       optarg + 16);
+              params.call_nop_as_suffix = true;
+            }
+          else
+-           einfo (_("%F%P: unsupported option: -z %s\n"), optarg);
++           fatal (_("%P: unsupported option: -z %s\n"), optarg);
+        }
+ '
+ 
+diff --git a/ld/emulparams/cet.sh b/ld/emulparams/cet.sh
+index 2c627994..e463441d 100644
+--- a/ld/emulparams/cet.sh
++++ b/ld/emulparams/cet.sh
+@@ -29,7 +29,7 @@ PARSE_AND_LIST_ARGS_CASE_Z_CET='
+                                 | prop_report_ibt
+                                 | prop_report_shstk);
+          else
+-           einfo (_("%F%P: invalid option for -z cet-report=: %s\n"),
++           fatal (_("%P: invalid option for -z cet-report=: %s\n"),
+                   optarg + 11);
+        }
+ '
+diff --git a/ld/emulparams/elf32mcore.sh b/ld/emulparams/elf32mcore.sh
+index 88a8cb6e..275a796f 100644
+--- a/ld/emulparams/elf32mcore.sh
++++ b/ld/emulparams/elf32mcore.sh
+@@ -46,6 +46,6 @@ PARSE_AND_LIST_ARGS_CASES='
+     case OPTION_BASE_FILE:
+       link_info.base_file = fopen (optarg, FOPEN_WB);
+       if (link_info.base_file == NULL)
+-       einfo (_("%F%P: cannot open base file %s\n"), optarg);
++       fatal (_("%P: cannot open base file %s\n"), optarg);
+       break;
+ '
+diff --git a/ld/emulparams/x86-64-lam.sh b/ld/emulparams/x86-64-lam.sh
+index fab42ff1..6e629ebb 100644
+--- a/ld/emulparams/x86-64-lam.sh
++++ b/ld/emulparams/x86-64-lam.sh
+@@ -25,7 +25,7 @@ PARSE_AND_LIST_ARGS_CASE_Z_LAM='
+          else if (strcmp (optarg + 15, "error") == 0)
+            params.lam_u48_report = prop_report_error;
+          else
+-           einfo (_("%F%P: invalid option for -z lam-u48-report=: %s\n"),
++           fatal (_("%P: invalid option for -z lam-u48-report=: %s\n"),
+                   optarg + 15);
+        }
+       else if (strcmp (optarg, "lam-u57") == 0)
+@@ -39,7 +39,7 @@ PARSE_AND_LIST_ARGS_CASE_Z_LAM='
+          else if (strcmp (optarg + 15, "error") == 0)
+            params.lam_u57_report = prop_report_error;
+          else
+-           einfo (_("%F%P: invalid option for -z lam-u57-report=: %s\n"),
++           fatal (_("%P: invalid option for -z lam-u57-report=: %s\n"),
+                   optarg + 15);
+        }
+       else if (strncmp (optarg, "lam-report=", 11) == 0)
+@@ -60,7 +60,7 @@ PARSE_AND_LIST_ARGS_CASE_Z_LAM='
+              params.lam_u57_report = prop_report_error;
+            }
+          else
+-           einfo (_("%F%P: invalid option for -z lam-report=: %s\n"),
++           fatal (_("%P: invalid option for -z lam-report=: %s\n"),
+                   optarg + 11);
+        }
+ '
+diff --git a/ld/emulparams/x86-64-level.sh b/ld/emulparams/x86-64-level.sh
+index c46aacf3..7e27cf1e 100644
+--- a/ld/emulparams/x86-64-level.sh
++++ b/ld/emulparams/x86-64-level.sh
+@@ -10,7 +10,7 @@ PARSE_AND_LIST_ARGS_CASE_Z_X86_64_LEVEL='
+          char *end;
+          unsigned int level = strtoul (optarg + 8 , &end, 10);
+          if (*end != '\0' || level < 2 || level > 4)
+-           einfo (_("%F%P: invalid x86-64 ISA level: %s\n"), optarg);
++           fatal (_("%P: invalid x86-64 ISA level: %s\n"), optarg);
+          params.isa_level = level;
+        }
+ '
+diff --git a/ld/emultempl/aarch64elf.em b/ld/emultempl/aarch64elf.em
+index b647909a..a6637718 100644
+--- a/ld/emultempl/aarch64elf.em
++++ b/ld/emultempl/aarch64elf.em
+@@ -316,7 +316,7 @@ aarch64_elf_create_output_section_statements (void)
+         These will only be created if the output format is an arm format,
+         hence we do not support linking and changing output formats at the
+         same time.  Use a link followed by objcopy to change output formats.  */
+-      einfo (_("%F%P: error: cannot change output format "
++      fatal (_("%P: error: cannot change output format "
+               "whilst linking %s binaries\n"), "AArch64");
+       return;
+     }
+@@ -342,7 +342,7 @@ aarch64_elf_create_output_section_statements (void)
+                              bfd_get_arch (link_info.output_bfd),
+                              bfd_get_mach (link_info.output_bfd)))
+     {
+-      einfo (_("%F%P: can not create BFD: %E\n"));
++      fatal (_("%P: can not create BFD: %E\n"));
+       return;
+     }
+ 
+@@ -468,7 +468,7 @@ PARSE_AND_LIST_ARGS_CASES='
+ 
+        group_size = bfd_scan_vma (optarg, &end, 0);
+        if (*end)
+-         einfo (_("%F%P: invalid number `%s'\''\n"), optarg);
++         fatal (_("%P: invalid number `%s'\''\n"), optarg);
+       }
+       break;
+ '
+diff --git a/ld/emultempl/aix.em b/ld/emultempl/aix.em
+index a445c329..29acdbc9 100644
+--- a/ld/emultempl/aix.em
++++ b/ld/emultempl/aix.em
+@@ -335,7 +335,7 @@ read_file_list (const char *filename)
+   f = fopen (filename, FOPEN_RT);
+   if (f == NULL)
+     {
+-      einfo (_("%F%P: cannot open %s\n"), filename);
++      fatal (_("%P: cannot open %s\n"), filename);
+       return;
+     }
+   if (fseek (f, 0L, SEEK_END) == -1)
+@@ -382,8 +382,8 @@ read_file_list (const char *filename)
+   return;
+ 
+  error:
+-  einfo (_("%F%P: cannot read %s\n"), optarg);
+   fclose (f);
++  fatal (_("%P: cannot read %s\n"), optarg);
+ }
+ 
+ static bool
+@@ -734,7 +734,7 @@ gld${EMULATION_NAME}_after_open (void)
+       size = (p->count + 2) * 4;
+       if (!bfd_xcoff_link_record_set (link_info.output_bfd, &link_info,
+                                      p->h, size))
+-       einfo (_("%F%P: bfd_xcoff_link_record_set failed: %E\n"));
++       fatal (_("%P: bfd_xcoff_link_record_set failed: %E\n"));
+     }
+ }
+ 
+@@ -764,9 +764,9 @@ gld${EMULATION_NAME}_before_allocation (void)
+ 
+       h = bfd_link_hash_lookup (link_info.hash, el->name, false, false, false);
+       if (h == NULL)
+-       einfo (_("%F%P: bfd_link_hash_lookup of export symbol failed: %E\n"));
++       fatal (_("%P: bfd_link_hash_lookup of export symbol failed: %E\n"));
+       if (!bfd_xcoff_export_symbol (link_info.output_bfd, &link_info, h))
+-       einfo (_("%F%P: bfd_xcoff_export_symbol failed: %E\n"));
++       fatal (_("%P: bfd_xcoff_export_symbol failed: %E\n"));
+     }
+ 
+   /* Track down all relocations called for by the linker script (these
+@@ -849,7 +849,7 @@ gld${EMULATION_NAME}_before_allocation (void)
+       (link_info.output_bfd, &link_info, libpath, entry_symbol.name,
+        file_align, maxstack, maxdata, gc && !unix_ld,
+        modtype, textro, flags, special_sections, rtld))
+-    einfo (_("%F%P: failed to set dynamic section sizes: %E\n"));
++    fatal (_("%P: failed to set dynamic section sizes: %E\n"));
+ 
+   /* Look through the special sections, and put them in the right
+      place in the link ordering.  This is especially magic.  */
+@@ -871,8 +871,8 @@ gld${EMULATION_NAME}_before_allocation (void)
+       is = NULL;
+       os = lang_output_section_get (sec->output_section);
+       if (os == NULL)
+-       einfo (_("%F%P: can't find output section %s\n"),
+-              sec->output_section->name);
++       fatal (_("%P: can't find output section %pA\n"),
++              sec->output_section);
+ 
+       for (pls = &os->children.head; *pls != NULL; pls = &(*pls)->header.next)
+        {
+@@ -908,8 +908,7 @@ gld${EMULATION_NAME}_before_allocation (void)
+ 
+       if (is == NULL)
+        {
+-         einfo (_("%F%P: can't find %s in output section\n"),
+-                bfd_section_name (sec));
++         fatal (_("%P: can't find %pA in output section\n"), sec);
+        }
+ 
+       /* Now figure out where the section should go.  */
+@@ -1162,7 +1161,7 @@ gld${EMULATION_NAME}_after_allocation (void)
+ 
+   /* Now that everything is in place, finalize the dynamic sections.  */
+   if (!bfd_xcoff_build_dynamic_sections (link_info.output_bfd, &link_info))
+-    einfo (_("%F%P: failed to layout dynamic sections: %E\n"));
++    fatal (_("%P: failed to layout dynamic sections: %E\n"));
+ 
+   if (!bfd_link_relocatable (&link_info))
+     {
+@@ -1313,7 +1312,7 @@ gld${EMULATION_NAME}_read_file (const char *filename, bool import)
+   if (f == NULL)
+     {
+       bfd_set_error (bfd_error_system_call);
+-      einfo ("%F%P: %s: %E\n", filename);
++      fatal ("%P: %s: %E\n", filename);
+       return;
+     }
+ 
+@@ -1375,7 +1374,7 @@ gld${EMULATION_NAME}_read_file (const char *filename, bool import)
+              obstack_free (o, obstack_base (o));
+            }
+          else if (*s == '(')
+-           einfo (_("%F%P:%s:%d: #! ([member]) is not supported "
++           fatal (_("%P:%s:%d: #! ([member]) is not supported "
+                     "in import files\n"),
+                   filename, lineno);
+          else
+@@ -1392,7 +1391,7 @@ gld${EMULATION_NAME}_read_file (const char *filename, bool import)
+              *s = '\0';
+              if (!bfd_xcoff_split_import_path (link_info.output_bfd,
+                                                start, &imppath, &impfile))
+-               einfo (_("%F%P: could not parse import path: %E\n"));
++               fatal (_("%P: could not parse import path: %E\n"));
+              while (ISSPACE (cs))
+                {
+                  ++s;
+@@ -1547,10 +1546,10 @@ gld${EMULATION_NAME}_find_relocs (lang_statement_union_type *s)
+ 
+       rs = &s->reloc_statement;
+       if (rs->name == NULL)
+-       einfo (_("%F%P: only relocations against symbols are permitted\n"));
++       fatal (_("%P: only relocations against symbols are permitted\n"));
+       if (!bfd_xcoff_link_count_reloc (link_info.output_bfd, &link_info,
+                                       rs->name))
+-       einfo (_("%F%P: bfd_xcoff_link_count_reloc failed: %E\n"));
++       fatal (_("%P: bfd_xcoff_link_count_reloc failed: %E\n"));
+     }
+ 
+   if (s->header.type == lang_assignment_statement_enum)
+@@ -1579,7 +1578,7 @@ gld${EMULATION_NAME}_find_exp_assignment (etree_type *exp)
+          if (!bfd_xcoff_record_link_assignment (link_info.output_bfd,
+                                                 &link_info,
+                                                 exp->assign.dst))
+-           einfo (_("%F%P: failed to record assignment to %s: %E\n"),
++           fatal (_("%P: failed to record assignment to %s: %E\n"),
+                   exp->assign.dst);
+        }
+       gld${EMULATION_NAME}_find_exp_assignment (exp->assign.src);
+@@ -1674,7 +1673,7 @@ gld${EMULATION_NAME}_create_output_section_statements (void)
+                             bfd_get_arch (link_info.output_bfd),
+                             bfd_get_mach (link_info.output_bfd)))
+     {
+-      einfo (_("%F%P: can not create stub BFD: %E\n"));
++      fatal (_("%P: can not create stub BFD: %E\n"));
+       return;
+     }
+ 
+@@ -1684,7 +1683,7 @@ gld${EMULATION_NAME}_create_output_section_statements (void)
+ 
+   /* Pass linker params to the back-end. */
+   if (!bfd_xcoff_link_init (&link_info, &params))
+-    einfo (_("%F%P: can not init BFD: %E\n"));
++    fatal (_("%P: can not init BFD: %E\n"));
+ 
+   /* __rtinit */
+   if (link_info.init_function != NULL
+@@ -1701,7 +1700,7 @@ gld${EMULATION_NAME}_create_output_section_statements (void)
+                                  bfd_get_arch (link_info.output_bfd),
+                                  bfd_get_mach (link_info.output_bfd)))
+        {
+-         einfo (_("%F%P: can not create BFD: %E\n"));
++         fatal (_("%P: can not create BFD: %E\n"));
+          return;
+        }
+ 
+@@ -1711,7 +1710,7 @@ gld${EMULATION_NAME}_create_output_section_statements (void)
+                                            link_info.fini_function,
+                                            rtld))
+        {
+-         einfo (_("%F%P: can not create BFD: %E\n"));
++         fatal (_("%P: can not create BFD: %E\n"));
+          return;
+        }
+ 
+diff --git a/ld/emultempl/armelf.em b/ld/emultempl/armelf.em
+index 7fb1826e..504fb0cd 100644
+--- a/ld/emultempl/armelf.em
++++ b/ld/emultempl/armelf.em
+@@ -521,7 +521,7 @@ arm_elf_create_output_section_statements (void)
+         These will only be created if the output format is an arm format,
+         hence we do not support linking and changing output formats at the
+         same time.  Use a link followed by objcopy to change output formats.  */
+-      einfo (_("%F%P: error: cannot change output format "
++      fatal (_("%P: error: cannot change output format "
+               "whilst linking %s binaries\n"), "ARM");
+       return;
+     }
+@@ -532,10 +532,10 @@ arm_elf_create_output_section_statements (void)
+                                        bfd_get_target (link_info.output_bfd));
+ 
+       if (params.in_implib_bfd == NULL)
+-       einfo (_("%F%P: %s: can't open: %E\n"), in_implib_filename);
++       fatal (_("%P: %s: can't open: %E\n"), in_implib_filename);
+ 
+       if (!bfd_check_format (params.in_implib_bfd, bfd_object))
+-       einfo (_("%F%P: %s: not a relocatable file: %E\n"), in_implib_filename);
++       fatal (_("%P: %s: not a relocatable file: %E\n"), in_implib_filename);
+     }
+ 
+   bfd_elf32_arm_set_target_params (link_info.output_bfd, &link_info, &params);
+@@ -549,7 +549,7 @@ arm_elf_create_output_section_statements (void)
+                              bfd_get_arch (link_info.output_bfd),
+                              bfd_get_mach (link_info.output_bfd)))
+     {
+-      einfo (_("%F%P: can not create BFD: %E\n"));
++      fatal (_("%P: can not create BFD: %E\n"));
+       return;
+     }
+ 
+@@ -734,7 +734,7 @@ PARSE_AND_LIST_ARGS_CASES='
+ 
+        group_size = bfd_scan_vma (optarg, &end, 0);
+        if (*end)
+-         einfo (_("%F%P: invalid number `%s'\''\n"), optarg);
++         fatal (_("%P: invalid number `%s'\''\n"), optarg);
+       }
+       break;
+ 
+diff --git a/ld/emultempl/avrelf.em b/ld/emultempl/avrelf.em
+index 3fe81004..dd5b57d1 100644
+--- a/ld/emultempl/avrelf.em
++++ b/ld/emultempl/avrelf.em
+@@ -116,7 +116,7 @@ avr_elf_create_output_section_statements (void)
+ 
+   if (bfd_get_flavour (link_info.output_bfd) != bfd_target_elf_flavour)
+     {
+-      einfo (_("%F%P: error: cannot change output format "
++      fatal (_("%P: error: cannot change output format "
+               "whilst linking %s binaries\n"), "AVR");
+       return;
+     }
+diff --git a/ld/emultempl/beos.em b/ld/emultempl/beos.em
+index 844d4986..81878b02 100644
+--- a/ld/emultempl/beos.em
++++ b/ld/emultempl/beos.em
+@@ -227,7 +227,7 @@ set_pe_subsystem (void)
+          return;
+        }
+     }
+-  einfo (_("%F%P: invalid subsystem type %s\n"), optarg);
++  fatal (_("%P: invalid subsystem type %s\n"), optarg);
+ }
+ 
+ 
+@@ -237,9 +237,7 @@ set_pe_value (char *name)
+   char *end;
+   set_pe_name (name,  strtoul (optarg, &end, 0));
+   if (end == optarg)
+-    {
+-      einfo (_("%F%P: invalid hex number for PE parameter '%s'\n"), optarg);
+-    }
++    fatal (_("%P: invalid hex number for PE parameter '%s'\n"), optarg);
+ 
+   optarg = end;
+ }
+@@ -254,9 +252,7 @@ set_pe_stack_heap (char *resname, char *comname)
+       set_pe_value (comname);
+     }
+   else if (*optarg)
+-    {
+-      einfo (_("%F%P: strange hex info for PE parameter '%s'\n"), optarg);
+-    }
++    fatal (_("%P: strange hex info for PE parameter '%s'\n"), optarg);
+ }
+ 
+ 
+@@ -271,7 +267,7 @@ gld${EMULATION_NAME}_handle_option (int optc)
+     case OPTION_BASE_FILE:
+       link_info.base_file = fopen (optarg, FOPEN_WB);
+       if (link_info.base_file == NULL)
+-       einfo (_("%F%P: cannot open base file %s\n"), optarg);
++       fatal (_("%P: cannot open base file %s\n"), optarg);
+       break;
+ 
+       /* PE options */
+@@ -380,9 +376,7 @@ gld${EMULATION_NAME}_after_open (void)
+      FIXME: This should be done via a function, rather than by
+      including an internal BFD header.  */
+   if (!obj_pe (link_info.output_bfd))
+-    {
+-      einfo (_("%F%P: PE operations on non PE file\n"));
+-    }
++    fatal (_("%P: PE operations on non PE file\n"));
+ 
+   pe_data(link_info.output_bfd)->pe_opthdr = pe;
+   pe_data(link_info.output_bfd)->dll = init[DLLOFF].value;
+@@ -431,12 +425,12 @@ sort_by_file_name (const void *a, const void *b)
+ 
+       if (!bfd_get_section_contents (sa->owner, sa, &a_sec, (file_ptr) 0,
+                                     (bfd_size_type) sizeof (a_sec)))
+-       einfo (_("%F%P: %pB: can't read contents of section .idata: %E\n"),
++       fatal (_("%P: %pB: can't read contents of section .idata: %E\n"),
+               sa->owner);
+ 
+       if (!bfd_get_section_contents (sb->owner, sb, &b_sec, (file_ptr) 0,
+                                     (bfd_size_type) sizeof (b_sec)))
+-       einfo (_("%F%P: %pB: can't read contents of section .idata: %E\n"),
++       fatal (_("%P: %pB: can't read contents of section .idata: %E\n"),
+               sb->owner);
+ 
+       i = a_sec < b_sec ? -1 : 0;
+@@ -668,7 +662,7 @@ gld${EMULATION_NAME}_place_orphan (asection *s,
+   /* Everything from the '\$' on gets deleted so don't allow '\$' as the
+      first character.  */
+   if (*secname == '\$')
+-    einfo (_("%F%P: section %s has '\$' as first character\n"), secname);
++    fatal (_("%P: section %s has '\$' as first character\n"), secname);
+   if (strchr (secname + 1, '\$') == NULL)
+     return NULL;
+ 
+@@ -698,7 +692,7 @@ gld${EMULATION_NAME}_place_orphan (asection *s,
+       }
+   ps[0] = 0;
+   if (l == NULL)
+-    einfo (_("%F%P: *(%s\$) missing from linker script\n"), output_secname);
++    fatal (_("%P: *(%s\$) missing from linker script\n"), output_secname);
+ 
+   /* Link the input section in and we're done for now.
+      The sections still have to be sorted, but that has to wait until
+diff --git a/ld/emultempl/cr16elf.em b/ld/emultempl/cr16elf.em
+index 7d4f9507..5464edf1 100644
+--- a/ld/emultempl/cr16elf.em
++++ b/ld/emultempl/cr16elf.em
+@@ -58,7 +58,7 @@ cr16_elf_after_open (void)
+             COFF and ELF.  */
+          if (bfd_get_flavour (abfd) != bfd_target_coff_flavour
+              && bfd_get_flavour (abfd) != bfd_target_elf_flavour)
+-           einfo (_("%F%P: %pB: all input objects must be COFF or ELF "
++           fatal (_("%P: %pB: all input objects must be COFF or ELF "
+                     "for --embedded-relocs\n"));
+ 
+          datasec = bfd_get_section_by_name (abfd, ".data.rel");
+@@ -82,7 +82,7 @@ cr16_elf_after_open (void)
+                                                      | SEC_IN_MEMORY))
+                  || !bfd_set_section_alignment (relsec, 2)
+                  || !bfd_set_section_size (relsec, datasec->reloc_count * 8))
+-               einfo (_("%F%P: %pB: can not create .emreloc section: %E\n"));
++               fatal (_("%P: %pB: can not create .emreloc section: %E\n"));
+            }
+ 
+          /* Double check that all other data sections are empty, as is
+diff --git a/ld/emultempl/cskyelf.em b/ld/emultempl/cskyelf.em
+index 82815e5e..9c91d7ac 100644
+--- a/ld/emultempl/cskyelf.em
++++ b/ld/emultempl/cskyelf.em
+@@ -151,7 +151,7 @@ csky_elf_create_output_section_statements (void)
+          bfd_get_arch (link_info.output_bfd),
+          bfd_get_mach (link_info.output_bfd)))
+     {
+-      einfo (_("%F%P: can not create BFD: %E\n"));
++      fatal (_("%P: can not create BFD: %E\n"));
+       return;
+     }
+ 
+@@ -324,7 +324,7 @@ PARSE_AND_LIST_ARGS_CASES='
+ 
+       group_size = bfd_scan_vma (optarg, &end, 0);
+       if (*end)
+-       einfo (_("%F%P: invalid number `%s'\''\n"), optarg);
++       fatal (_("%P: invalid number `%s'\''\n"), optarg);
+     }
+     break;
+ '
+diff --git a/ld/emultempl/elf.em b/ld/emultempl/elf.em
+index 71cec19f..5cc38194 100644
+--- a/ld/emultempl/elf.em
++++ b/ld/emultempl/elf.em
+@@ -667,13 +667,13 @@ gld${EMULATION_NAME}_handle_option (int optc)
+        {
+ #ifndef HAVE_ZSTD
+          if (config.compress_debug == COMPRESS_DEBUG_ZSTD)
+-           einfo (_ ("%F%P: --compress-debug-sections=zstd: ld is not built "
+-                 "with zstd support\n"));
++           fatal (_("%P: --compress-debug-sections=zstd: ld is not built "
++                    "with zstd support\n"));
+ #endif
+        }
+       if (config.compress_debug == COMPRESS_UNKNOWN)
+-       einfo (_("%F%P: invalid --compress-debug-sections option: \`%s'\n"),
+-              optarg);
++       fatal (_("%P: invalid --compress-debug-sections option: \`%s'\n"),
++               optarg);
+       break;
+ EOF
+ 
+@@ -727,7 +727,7 @@ fragment <<EOF
+          link_info.emit_gnu_hash = true;
+        }
+       else
+-       einfo (_("%F%P: invalid hash style \`%s'\n"), optarg);
++       fatal (_("%P: invalid hash style \`%s'\n"), optarg);
+       break;
+ 
+ EOF
+@@ -747,7 +747,7 @@ fragment <<EOF
+          link_info.maxpagesize = strtoul (optarg + 14, &end, 0);
+          if (*end
+              || (link_info.maxpagesize & (link_info.maxpagesize - 1)) != 0)
+-           einfo (_("%F%P: invalid maximum page size \`%s'\n"),
++           fatal (_("%P: invalid maximum page size \`%s'\n"),
+                   optarg + 14);
+          link_info.maxpagesize_is_set = true;
+        }
+@@ -757,7 +757,7 @@ fragment <<EOF
+          link_info.commonpagesize = strtoul (optarg + 17, &end, 0);
+          if (*end
+              || (link_info.commonpagesize & (link_info.commonpagesize - 1)) != 0)
+-           einfo (_("%F%P: invalid common page size \`%s'\n"),
++           fatal (_("%P: invalid common page size \`%s'\n"),
+                   optarg + 17);
+          link_info.commonpagesize_is_set = true;
+        }
+@@ -766,7 +766,7 @@ fragment <<EOF
+          char *end;
+          link_info.stacksize = strtoul (optarg + 11, &end, 0);
+          if (*end || link_info.stacksize < 0)
+-           einfo (_("%F%P: invalid stack size \`%s'\n"), optarg + 11);
++           fatal (_("%P: invalid stack size \`%s'\n"), optarg + 11);
+          if (!link_info.stacksize)
+            /* Use -1 for explicit no-stack, because zero means
+               'default'.   */
+@@ -805,7 +805,7 @@ fragment <<EOF
+          else if (strcmp (optarg, "start-stop-visibility=protected") == 0)
+            link_info.start_stop_visibility = STV_PROTECTED;
+          else
+-           einfo (_("%F%P: invalid visibility in \`-z %s'; "
++           fatal (_("%P: invalid visibility in \`-z %s'; "
+                     "must be default, internal, hidden, or protected"),
+                   optarg);
+        }
+diff --git a/ld/emultempl/hppaelf.em b/ld/emultempl/hppaelf.em
+index 09db0cb0..f0284ea3 100644
+--- a/ld/emultempl/hppaelf.em
++++ b/ld/emultempl/hppaelf.em
+@@ -82,7 +82,7 @@ hppaelf_create_output_section_statements (void)
+                              bfd_get_arch (link_info.output_bfd),
+                              bfd_get_mach (link_info.output_bfd)))
+     {
+-      einfo (_("%F%P: can not create BFD: %E\n"));
++      fatal (_("%P: can not create BFD: %E\n"));
+       return;
+     }
+ 
+@@ -351,7 +351,7 @@ PARSE_AND_LIST_ARGS_CASES='
+        const char *end;
+        group_size = bfd_scan_vma (optarg, &end, 0);
+        if (*end)
+-         einfo (_("%F%P: invalid number `%s'\''\n"), optarg);
++         fatal (_("%P: invalid number `%s'\''\n"), optarg);
+       }
+       break;
+ '
+diff --git a/ld/emultempl/kvxelf.em b/ld/emultempl/kvxelf.em
+index 2076c5b6..1ffbd1db 100644
+--- a/ld/emultempl/kvxelf.em
++++ b/ld/emultempl/kvxelf.em
+@@ -35,9 +35,8 @@ elf${ELFSIZE}_kvx_before_allocation (void)
+ EOF
+ if test x"${EMULATION_NAME}" != x"elf64kvx_linux"; then
+ fragment <<EOF
+-  if (bfd_link_pie (&link_info)) {
+-          einfo (_("%F:%P: -pie not supported\n"));
+-  }
++  if (bfd_link_pie (&link_info))
++    fatal (_(":%P: -pie not supported\n"));
+ EOF
+ fi
+ fragment <<EOF
+@@ -300,7 +299,7 @@ kvx_elf_create_output_section_statements (void)
+   ldlang_add_file (stub_file);
+ 
+   if (!kvx_elf${ELFSIZE}_init_stub_bfd (&link_info, stub_file->the_bfd))
+-    einfo ("%F%P: can not init BFD: %E\n");
++    einfo ("%P: can not init BFD: %E\n");
+ }
+ 
+ 
+diff --git a/ld/emultempl/loongarchelf.em b/ld/emultempl/loongarchelf.em
+index 3bb5ddf0..5a3d7b79 100644
+--- a/ld/emultempl/loongarchelf.em
++++ b/ld/emultempl/loongarchelf.em
+@@ -67,11 +67,11 @@ gld${EMULATION_NAME}_after_allocation (void)
+       && !bfd_link_relocatable (&link_info))
+     {
+       if (lang_phdr_list == NULL)
+-        elf_seg_map (link_info.output_bfd) = NULL;
++       elf_seg_map (link_info.output_bfd) = NULL;
+       if (!_bfd_elf_map_sections_to_segments (link_info.output_bfd,
+                                              &link_info,
+                                              NULL))
+-        einfo (_("%F%P: map sections to segments failed: %E\n"));
++       fatal (_("%P: map sections to segments failed: %E\n"));
+     }
+ 
+   /* Adjust program header size and .eh_frame_hdr size before
+diff --git a/ld/emultempl/m68hc1xelf.em b/ld/emultempl/m68hc1xelf.em
+index 5355b0fc..36f5f068 100644
+--- a/ld/emultempl/m68hc1xelf.em
++++ b/ld/emultempl/m68hc1xelf.em
+@@ -159,7 +159,7 @@ m68hc11elf_create_output_section_statements (void)
+                             bfd_get_arch (link_info.output_bfd),
+                             bfd_get_mach (link_info.output_bfd)))
+     {
+-      einfo (_("%F%P: can not create BFD: %E\n"));
++      fatal (_("%P: can not create BFD: %E\n"));
+       return;
+     }
+ 
+diff --git a/ld/emultempl/m68kelf.em b/ld/emultempl/m68kelf.em
+index 0477f1eb..f9a5bec2 100644
+--- a/ld/emultempl/m68kelf.em
++++ b/ld/emultempl/m68kelf.em
+@@ -82,7 +82,7 @@ m68k_elf_after_open (void)
+          asection *datasec;
+ 
+          if (bfd_get_flavour (abfd) != bfd_target_elf_flavour)
+-           einfo (_("%F%P: %pB: all input objects must be ELF "
++           fatal (_("%P: %pB: all input objects must be ELF "
+                     "for --embedded-relocs\n"));
+ 
+          datasec = bfd_get_section_by_name (abfd, ".data");
+@@ -106,7 +106,7 @@ m68k_elf_after_open (void)
+              if (relsec == NULL
+                  || !bfd_set_section_alignment (relsec, 2)
+                  || !bfd_set_section_size (relsec, datasec->reloc_count * 12))
+-               einfo (_("%F%P: %pB: can not create .emreloc section: %E\n"));
++               fatal (_("%P: %pB: can not create .emreloc section: %E\n"));
+            }
+ 
+          /* Double check that all other data sections are empty, as is
+diff --git a/ld/emultempl/metagelf.em b/ld/emultempl/metagelf.em
+index 81ab64c1..313d7ed5 100644
+--- a/ld/emultempl/metagelf.em
++++ b/ld/emultempl/metagelf.em
+@@ -59,7 +59,7 @@ metagelf_create_output_section_statements (void)
+                              bfd_get_arch (link_info.output_bfd),
+                              bfd_get_mach (link_info.output_bfd)))
+     {
+-      einfo (_("%F%P: can not create BFD: %E\n"));
++      fatal (_("%P: can not create BFD: %E\n"));
+       return;
+     }
+ 
+@@ -309,7 +309,7 @@ PARSE_AND_LIST_ARGS_CASES='
+        const char *end;
+        group_size = bfd_scan_vma (optarg, &end, 0);
+        if (*end)
+-         einfo (_("%F%P: invalid number `%s'\''\n"), optarg);
++         fatal (_("%P: invalid number `%s'\''\n"), optarg);
+       }
+       break;
+ '
+diff --git a/ld/emultempl/mipself.em b/ld/emultempl/mipself.em
+index f8fe4b97..2a22ba49 100644
+--- a/ld/emultempl/mipself.em
++++ b/ld/emultempl/mipself.em
+@@ -152,7 +152,7 @@ mips_add_stub_section (const char *stub_sec_name, asection *input_section,
+                                 bfd_get_arch (link_info.output_bfd),
+                                 bfd_get_mach (link_info.output_bfd)))
+        {
+-         einfo (_("%F%P: can not create BFD: %E\n"));
++         fatal (_("%P: can not create BFD: %E\n"));
+          return NULL;
+        }
+       stub_bfd->flags |= BFD_LINKER_CREATED;
+diff --git a/ld/emultempl/mmix-elfnmmo.em b/ld/emultempl/mmix-elfnmmo.em
+index f2ecbba3..03186363 100644
+--- a/ld/emultempl/mmix-elfnmmo.em
++++ b/ld/emultempl/mmix-elfnmmo.em
+@@ -113,10 +113,7 @@ mmix_after_allocation (void)
+     bfd_set_section_vma (sec, 0);
+ 
+   if (!_bfd_mmix_after_linker_allocation (link_info.output_bfd, &link_info))
+-    {
+-      /* This is a fatal error; make einfo call not return.  */
+-      einfo (_("%F%P: can't finalize linker-allocated global registers\n"));
+-    }
++    fatal (_("%P: can't finalize linker-allocated global registers\n"));
+ }
+ EOF
+ 
+diff --git a/ld/emultempl/nds32elf.em b/ld/emultempl/nds32elf.em
+index bde9e35d..36260573 100644
+--- a/ld/emultempl/nds32elf.em
++++ b/ld/emultempl/nds32elf.em
+@@ -44,7 +44,7 @@ nds32_elf_create_output_section_statements (void)
+   if (strstr (bfd_get_target (link_info.output_bfd), "nds32") == NULL)
+     {
+       /* Check the output target is nds32.  */
+-      einfo (_("%F%P: error: cannot change output format whilst "
++      fatal (_("%P: error: cannot change output format whilst "
+               "linking %s binaries\n"), "NDS32");
+       return;
+     }
+@@ -96,7 +96,7 @@ nds32_elf_after_open (void)
+               && abi_ver != (elf_elfheader (abfd)->e_flags & EF_NDS_ABI))
+        {
+          /* Incompatible objects.  */
+-         einfo (_("%F%P: %pB: ABI version of object files mismatched\n"),
++         fatal (_("%P: %pB: ABI version of object files mismatched\n"),
+                 abfd);
+        }
+     }
+@@ -195,7 +195,7 @@ PARSE_AND_LIST_ARGS_CASES='
+       {
+        sym_ld_script = fopen (optarg, FOPEN_WT);
+        if(sym_ld_script == NULL)
+-         einfo (_("%F%P: cannot open map file %s: %E\n"), optarg);
++         fatal (_("%P: cannot open map file %s: %E\n"), optarg);
+       }
+     break;
+   case OPTION_HYPER_RELAX:
+diff --git a/ld/emultempl/nto.em b/ld/emultempl/nto.em
+index de69e132..609d0217 100644
+--- a/ld/emultempl/nto.em
++++ b/ld/emultempl/nto.em
+@@ -51,7 +51,7 @@ nto_create_QNX_note_section(int type)
+      is called before this function, stub_file should already be defined.  */
+   if (!stub_file)
+     {
+-      einfo (_("%F%P: cannot create .note section in stub BFD.\n"));
++      fatal (_("%P: cannot create .note section in stub BFD.\n"));
+       return NULL;
+     }
+ 
+@@ -60,7 +60,7 @@ nto_create_QNX_note_section(int type)
+   note_sec = bfd_make_section_anyway_with_flags (stub_file->the_bfd, ".note", flags);
+   if (! note_sec)
+     {
+-      einfo (_("%F%P: failed to create .note section\n"));
++      fatal (_("%P: failed to create .note section\n"));
+       return NULL;
+     }
+ 
+@@ -101,7 +101,7 @@ nto_lookup_QNX_note_section(int type)
+       sec->contents = xmalloc(sec->size);
+       if (!bfd_get_section_contents (sec->owner, sec, sec->contents, (file_ptr) 0,
+                                     sec->size))
+-       einfo (_("%F%P: %pB: can't read contents of section .note: %E\n"),
++       fatal (_("%P: %pB: can't read contents of section .note: %E\n"),
+               sec->owner);
+ 
+       e_note = (Elf_External_Note *) sec->contents;
+@@ -144,7 +144,7 @@ nto_add_note_section (void) {
+ 
+   if (nto_lazy_stack && !link_info.stacksize)
+     {
+-      einfo (_("%F%P: error: --lazy-stack must follow -zstack-size=<size>\n"));
++      fatal (_("%P: error: --lazy-stack must follow -zstack-size=<size>\n"));
+       return;
+     }
+ 
+@@ -206,22 +206,22 @@ PARSE_AND_LIST_LONGOPTS=${PARSE_AND_LIST_LONGOPTS}'
+ PARSE_AND_LIST_OPTIONS=${PARSE_AND_LIST_OPTIONS}'
+   fprintf (file, _("\
+   --stack <size>              Set size of the initial stack\n\
+-  --lazy-stack               Set lazy allocation of stack\n\
++  --lazy-stack                Set lazy allocation of stack\n\
+ "));
+ '
+ 
+ PARSE_AND_LIST_ARGS_CASES=${PARSE_AND_LIST_ARGS_CASES}'
+     case OPTION_STACK:
+       {
+-        char *end;
+-        link_info.stacksize = strtoul (optarg, &end, 0);
+-        if (*end || link_info.stacksize < 0)
+-          einfo (_("%F%P: invalid stack size `%s'\''\n"), optarg + 11);
+-        if (!link_info.stacksize)
+-          /* Use -1 for explicit no-stack, because zero means
+-             'default'.   */
+-          link_info.stacksize = -1;
+-        break;
++       char *end;
++       link_info.stacksize = strtoul (optarg, &end, 0);
++       if (*end || link_info.stacksize < 0)
++         fatal (_("%P: invalid stack size `%s'\''\n"), optarg + 11);
++       if (!link_info.stacksize)
++         /* Use -1 for explicit no-stack, because zero means
++            'default'.   */
++         link_info.stacksize = -1;
++       break;
+       }
+     case OPTION_LAZY_STACK:
+       nto_lazy_stack = true;
+diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em
+index c6ed1110..4cb1488e 100644
+--- a/ld/emultempl/pe.em
++++ b/ld/emultempl/pe.em
+@@ -726,7 +726,7 @@ set_pe_subsystem (void)
+ 
+       if (v[i].name == NULL)
+        {
+-         einfo (_("%F%P: invalid subsystem type %s\n"), optarg);
++         fatal (_("%P: invalid subsystem type %s\n"), optarg);
+          return;
+        }
+ 
+@@ -747,7 +747,7 @@ set_pe_value (char *name)
+   set_pe_name (name,  strtoul (optarg, &end, 0));
+ 
+   if (end == optarg)
+-    einfo (_("%F%P: invalid hex number for PE parameter '%s'\n"), optarg);
++    fatal (_("%P: invalid hex number for PE parameter '%s'\n"), optarg);
+ 
+   optarg = end;
+ }
+@@ -764,7 +764,7 @@ set_pe_stack_heap (char *resname, char *comname)
+       set_pe_value (comname);
+     }
+   else if (*optarg)
+-    einfo (_("%F%P: strange hex info for PE parameter '%s'\n"), optarg);
++    fatal (_("%P: strange hex info for PE parameter '%s'\n"), optarg);
+ }
+ 
+ #define DEFAULT_BUILD_ID_STYLE "md5"
+@@ -780,7 +780,7 @@ gld${EMULATION_NAME}_handle_option (int optc)
+     case OPTION_BASE_FILE:
+       link_info.base_file = fopen (optarg, FOPEN_WB);
+       if (link_info.base_file == NULL)
+-       einfo (_("%F%P: cannot open base file %s\n"), optarg);
++       fatal (_("%P: cannot open base file %s\n"), optarg);
+       break;
+ 
+       /* PE options.  */
+@@ -1309,7 +1309,7 @@ make_runtime_ref (void)
+     = bfd_wrapped_link_hash_lookup (link_info.output_bfd, &link_info,
+                                    rr, true, false, true);
+   if (!h)
+-    einfo (_("%F%P: bfd_link_hash_lookup failed: %E\n"));
++    fatal (_("%P: bfd_link_hash_lookup failed: %E\n"));
+   else
+     {
+       if (h->type == bfd_link_hash_new)
+@@ -1607,7 +1607,7 @@ gld${EMULATION_NAME}_after_open (void)
+   if (bfd_get_flavour (link_info.output_bfd) != bfd_target_coff_flavour
+       || coff_data (link_info.output_bfd) == NULL
+       || !obj_pe (link_info.output_bfd))
+-    einfo (_("%F%P: cannot perform PE operations on non PE output file '%pB'\n"),
++    fatal (_("%P: cannot perform PE operations on non PE output file '%pB'\n"),
+           link_info.output_bfd);
+ 
+   pe_data (link_info.output_bfd)->pe_opthdr = pe;
+@@ -1680,7 +1680,7 @@ gld${EMULATION_NAME}_after_open (void)
+         These will only be created if the output format is an arm format,
+         hence we do not support linking and changing output formats at the
+         same time.  Use a link followed by objcopy to change output formats.  */
+-      einfo (_("%F%P: error: cannot change output format "
++      fatal (_("%P: error: cannot change output format "
+               "whilst linking %s binaries\n"), "ARM");
+       return;
+     }
+@@ -1740,7 +1740,7 @@ gld${EMULATION_NAME}_after_open (void)
+ 
+                    if (!bfd_generic_link_read_symbols (is->the_bfd))
+                      {
+-                       einfo (_("%F%P: %pB: could not read symbols: %E\n"),
++                       fatal (_("%P: %pB: could not read symbols: %E\n"),
+                               is->the_bfd);
+                        return;
+                      }
+@@ -1912,7 +1912,7 @@ gld${EMULATION_NAME}_after_open (void)
+ 
+                if (!bfd_generic_link_read_symbols (is->the_bfd))
+                  {
+-                   einfo (_("%F%P: %pB: could not read symbols: %E\n"),
++                   fatal (_("%P: %pB: could not read symbols: %E\n"),
+                           is->the_bfd);
+                    return;
+                  }
+@@ -2023,7 +2023,7 @@ gld${EMULATION_NAME}_unrecognized_file (lang_input_statement_type *entry ATTRIBU
+ 
+              h = bfd_link_hash_lookup (link_info.hash, buf, true, true, true);
+              if (h == (struct bfd_link_hash_entry *) NULL)
+-               einfo (_("%F%P: bfd_link_hash_lookup failed: %E\n"));
++               fatal (_("%P: bfd_link_hash_lookup failed: %E\n"));
+              if (h->type == bfd_link_hash_new)
+                {
+                  h->type = bfd_link_hash_undefined;
+diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em
+index bd2ee2ed..2d033dd3 100644
+--- a/ld/emultempl/pep.em
++++ b/ld/emultempl/pep.em
+@@ -698,7 +698,7 @@ set_pep_subsystem (void)
+ 
+       if (v[i].name == NULL)
+        {
+-         einfo (_("%F%P: invalid subsystem type %s\n"), optarg);
++         fatal (_("%P: invalid subsystem type %s\n"), optarg);
+          return;
+        }
+ 
+@@ -719,7 +719,7 @@ set_pep_value (char *name)
+   set_pep_name (name,  (bfd_vma) strtoull (optarg, &end, 0));
+ 
+   if (end == optarg)
+-    einfo (_("%F%P: invalid hex number for PE parameter '%s'\n"), optarg);
++    fatal (_("%P: invalid hex number for PE parameter '%s'\n"), optarg);
+ 
+   optarg = end;
+ }
+@@ -736,7 +736,7 @@ set_pep_stack_heap (char *resname, char *comname)
+       set_pep_value (comname);
+     }
+   else if (*optarg)
+-    einfo (_("%F%P: strange hex info for PE parameter '%s'\n"), optarg);
++    fatal (_("%P: strange hex info for PE parameter '%s'\n"), optarg);
+ }
+ 
+ #define DEFAULT_BUILD_ID_STYLE "md5"
+@@ -753,7 +753,7 @@ gld${EMULATION_NAME}_handle_option (int optc)
+     case OPTION_BASE_FILE:
+       link_info.base_file = fopen (optarg, FOPEN_WB);
+       if (link_info.base_file == NULL)
+-       einfo (_("%F%P: cannot open base file %s\n"), optarg);
++       fatal (_("%P: cannot open base file %s\n"), optarg);
+       break;
+ 
+       /* PE options.  */
+@@ -1306,7 +1306,7 @@ make_runtime_ref (void)
+     = bfd_wrapped_link_hash_lookup (link_info.output_bfd, &link_info,
+                                    rr, true, false, true);
+   if (!h)
+-    einfo (_("%F%P: bfd_link_hash_lookup failed: %E\n"));
++    fatal (_("%P: bfd_link_hash_lookup failed: %E\n"));
+   else
+     {
+       if (h->type == bfd_link_hash_new)
+@@ -1606,7 +1606,7 @@ gld${EMULATION_NAME}_after_open (void)
+   if (bfd_get_flavour (link_info.output_bfd) != bfd_target_coff_flavour
+       || coff_data (link_info.output_bfd) == NULL
+       || !obj_pe (link_info.output_bfd))
+-    einfo (_("%F%P: cannot perform PE operations on non PE output file '%pB'\n"),
++    fatal (_("%P: cannot perform PE operations on non PE output file '%pB'\n"),
+           link_info.output_bfd);
+ 
+   pe_data (link_info.output_bfd)->pe_opthdr = pep;
+@@ -1718,7 +1718,7 @@ gld${EMULATION_NAME}_after_open (void)
+ 
+                    if (!bfd_generic_link_read_symbols (is->the_bfd))
+                      {
+-                       einfo (_("%F%P: %pB: could not read symbols: %E\n"),
++                       fatal (_("%P: %pB: could not read symbols: %E\n"),
+                               is->the_bfd);
+                        return;
+                      }
+@@ -1907,7 +1907,7 @@ gld${EMULATION_NAME}_unrecognized_file (lang_input_statement_type *entry ATTRIBU
+ 
+              h = bfd_link_hash_lookup (link_info.hash, buf, true, true, true);
+              if (h == (struct bfd_link_hash_entry *) NULL)
+-               einfo (_("%F%P: bfd_link_hash_lookup failed: %E\n"));
++               fatal (_("%P: bfd_link_hash_lookup failed: %E\n"));
+              if (h->type == bfd_link_hash_new)
+                {
+                  h->type = bfd_link_hash_undefined;
+diff --git a/ld/emultempl/ppc32elf.em b/ld/emultempl/ppc32elf.em
+index 0730a05e..ffacadc6 100644
+--- a/ld/emultempl/ppc32elf.em
++++ b/ld/emultempl/ppc32elf.em
+@@ -386,7 +386,7 @@ PARSE_AND_LIST_ARGS_CASES=${PARSE_AND_LIST_ARGS_CASES}'
+          char *end;
+          unsigned long val = strtoul (optarg, &end, 0);
+          if (*end || val > 5)
+-           einfo (_("%F%P: invalid --plt-align `%s'\''\n"), optarg);
++           fatal (_("%P: invalid --plt-align `%s'\''\n"), optarg);
+          params.plt_stub_align = val;
+        }
+       else
+@@ -419,7 +419,7 @@ PARSE_AND_LIST_ARGS_CASES=${PARSE_AND_LIST_ARGS_CASES}'
+          if (*end
+              || (params.pagesize < 4096 && params.pagesize != 0)
+              || params.pagesize != (params.pagesize & -params.pagesize))
+-           einfo (_("%F%P: invalid pagesize `%s'\''\n"), optarg);
++           fatal (_("%P: invalid pagesize `%s'\''\n"), optarg);
+        }
+       break;
+ 
+diff --git a/ld/emultempl/ppc64elf.em b/ld/emultempl/ppc64elf.em
+index 533caed2..92bf4f58 100644
+--- a/ld/emultempl/ppc64elf.em
++++ b/ld/emultempl/ppc64elf.em
+@@ -91,7 +91,7 @@ ppc_create_output_section_statements (void)
+                             bfd_get_arch (link_info.output_bfd),
+                             bfd_get_mach (link_info.output_bfd)))
+     {
+-      einfo (_("%F%P: can not create BFD: %E\n"));
++      fatal (_("%P: can not create BFD: %E\n"));
+       return;
+     }
+ 
+@@ -101,7 +101,7 @@ ppc_create_output_section_statements (void)
+   if (params.save_restore_funcs < 0)
+     params.save_restore_funcs = !bfd_link_relocatable (&link_info);
+   if (!ppc64_elf_init_stub_bfd (&link_info, &params))
+-    einfo (_("%F%P: can not init BFD: %E\n"));
++    fatal (_("%P: can not init BFD: %E\n"));
+ }
+ 
+ /* Called after opening files but before mapping sections.  */
+@@ -860,7 +860,7 @@ PARSE_AND_LIST_ARGS_CASES=${PARSE_AND_LIST_ARGS_CASES}'
+        const char *end;
+        params.group_size = bfd_scan_vma (optarg, &end, 0);
+        if (*end)
+-         einfo (_("%F%P: invalid number `%s'\''\n"), optarg);
++         fatal (_("%P: invalid number `%s'\''\n"), optarg);
+       }
+       break;
+ 
+@@ -886,7 +886,7 @@ PARSE_AND_LIST_ARGS_CASES=${PARSE_AND_LIST_ARGS_CASES}'
+          char *end;
+          long val = strtol (optarg, &end, 0);
+          if (*end || (unsigned long) val + 8 > 16)
+-           einfo (_("%F%P: invalid --plt-align `%s'\''\n"), optarg);
++           fatal (_("%P: invalid --plt-align `%s'\''\n"), optarg);
+          params.plt_stub_align = val;
+        }
+       else
+@@ -915,7 +915,7 @@ PARSE_AND_LIST_ARGS_CASES=${PARSE_AND_LIST_ARGS_CASES}'
+          else if (strcasecmp (optarg, "no") == 0)
+            params.power10_stubs = 0;
+          else
+-           einfo (_("%F%P: invalid --power10-stubs argument `%s'\''\n"),
++           fatal (_("%P: invalid --power10-stubs argument `%s'\''\n"),
+                   optarg);
+        }
+       else
+diff --git a/ld/emultempl/riscvelf.em b/ld/emultempl/riscvelf.em
+index fe53b2a7..006e4edb 100644
+--- a/ld/emultempl/riscvelf.em
++++ b/ld/emultempl/riscvelf.em
+@@ -141,7 +141,7 @@ riscv_create_output_section_statements (void)
+         These will only be created if the output format is a RISC-V format,
+         hence we do not support linking and changing output formats at the
+         same time.  Use a link followed by objcopy to change output formats.  */
+-      einfo (_("%F%P: error: cannot change output format"
++      fatal (_("%P: error: cannot change output format"
+               " whilst linking %s binaries\n"), "RISC-V");
+       return;
+     }
+diff --git a/ld/emultempl/s390.em b/ld/emultempl/s390.em
+index 11e7f19b..0a93d76b 100644
+--- a/ld/emultempl/s390.em
++++ b/ld/emultempl/s390.em
+@@ -34,7 +34,7 @@ static void
+ s390_elf_create_output_section_statements (void)
+ {
+   if (!bfd_elf_s390_set_options (&link_info, &params))
+-    einfo (_("%F%P: can not init BFD: %E\n"));
++    fatal (_("%P: can not init BFD: %E\n"));
+ }
+ 
+ EOF
+diff --git a/ld/emultempl/scoreelf.em b/ld/emultempl/scoreelf.em
+index 6238b5e2..6413f330 100644
+--- a/ld/emultempl/scoreelf.em
++++ b/ld/emultempl/scoreelf.em
+@@ -62,7 +62,7 @@ score_elf_after_open (void)
+         These will only be created if the output format is an score format,
+         hence we do not support linking and changing output formats at the
+         same time.  Use a link followed by objcopy to change output formats.  */
+-      einfo (_("%F%P: error: cannot change output format "
++      fatal (_("%P: error: cannot change output format "
+               "whilst linking %s binaries\n"), "S+core");
+       return;
+     }
+diff --git a/ld/emultempl/spuelf.em b/ld/emultempl/spuelf.em
+index cc39435c..c694b828 100644
+--- a/ld/emultempl/spuelf.em
++++ b/ld/emultempl/spuelf.em
+@@ -202,7 +202,7 @@ spu_elf_load_ovl_mgr (void)
+       /* User supplied __ovly_load.  */
+     }
+   else if (mgr_stream->start == mgr_stream->end)
+-    einfo (_("%F%P: no built-in overlay manager\n"));
++    fatal (_("%P: no built-in overlay manager\n"));
+   else
+     {
+       lang_input_statement_type *ovl_is;
+@@ -379,7 +379,7 @@ spu_elf_open_overlay_script (void)
+   if (script == NULL)
+     {
+     file_err:
+-      einfo (_("%F%P: can not open script: %E\n"));
++      fatal (_("%P: can not open script: %E\n"));
+     }
+   return script;
+ }
+@@ -719,7 +719,7 @@ PARSE_AND_LIST_ARGS_CASES='
+            if (*end == 0)
+              break;
+          }
+-       einfo (_("%F%P: invalid --local-store address range `%s'\''\n"), optarg);
++       fatal (_("%P: invalid --local-store address range `%s'\''\n"), optarg);
+       }
+       break;
+ 
+@@ -755,12 +755,12 @@ PARSE_AND_LIST_ARGS_CASES='
+       if (!num_lines_set)
+        params.num_lines = 32;
+       else if ((params.num_lines & -params.num_lines) != params.num_lines)
+-       einfo (_("%F%P: invalid --num-lines/--num-regions `%u'\''\n"),
++       fatal (_("%P: invalid --num-lines/--num-regions `%u'\''\n"),
+               params.num_lines);
+       if (!line_size_set)
+        params.line_size = 1024;
+       else if ((params.line_size & -params.line_size) != params.line_size)
+-       einfo (_("%F%P: invalid --line-size/--region-size `%u'\''\n"),
++       fatal (_("%P: invalid --line-size/--region-size `%u'\''\n"),
+               params.line_size);
+       break;
+ 
+@@ -781,7 +781,7 @@ PARSE_AND_LIST_ARGS_CASES='
+            && (params.ovly_flavour != ovly_soft_icache
+                || (params.num_lines & -params.num_lines) == params.num_lines))
+          break;
+-       einfo (_("%F%P: invalid --num-lines/--num-regions `%s'\''\n"), optarg);
++       fatal (_("%P: invalid --num-lines/--num-regions `%s'\''\n"), optarg);
+       }
+       break;
+ 
+@@ -794,7 +794,7 @@ PARSE_AND_LIST_ARGS_CASES='
+            && (params.ovly_flavour != ovly_soft_icache
+                || (params.line_size & -params.line_size) == params.line_size))
+          break;
+-       einfo (_("%F%P: invalid --line-size/--region-size `%s'\''\n"), optarg);
++       fatal (_("%P: invalid --line-size/--region-size `%s'\''\n"), optarg);
+       }
+       break;
+ 
+@@ -803,7 +803,7 @@ PARSE_AND_LIST_ARGS_CASES='
+        char *end;
+        params.auto_overlay_fixed = strtoul (optarg, &end, 0);
+        if (*end != 0)
+-         einfo (_("%F%P: invalid --fixed-space value `%s'\''\n"), optarg);
++         fatal (_("%P: invalid --fixed-space value `%s'\''\n"), optarg);
+       }
+       break;
+ 
+@@ -812,7 +812,7 @@ PARSE_AND_LIST_ARGS_CASES='
+        char *end;
+        params.auto_overlay_reserved = strtoul (optarg, &end, 0);
+        if (*end != 0)
+-         einfo (_("%F%P: invalid --reserved-space value `%s'\''\n"), optarg);
++         fatal (_("%P: invalid --reserved-space value `%s'\''\n"), optarg);
+       }
+       break;
+ 
+@@ -821,7 +821,7 @@ PARSE_AND_LIST_ARGS_CASES='
+        char *end;
+        params.extra_stack_space = strtol (optarg, &end, 0);
+        if (*end != 0)
+-         einfo (_("%F%P: invalid --extra-stack-space value `%s'\''\n"), optarg);
++         fatal (_("%P: invalid --extra-stack-space value `%s'\''\n"), optarg);
+       }
+       break;
+ 
+diff --git a/ld/emultempl/tic6xdsbt.em b/ld/emultempl/tic6xdsbt.em
+index 524e3f73..a830be7e 100644
+--- a/ld/emultempl/tic6xdsbt.em
++++ b/ld/emultempl/tic6xdsbt.em
+@@ -59,10 +59,8 @@ tic6x_after_open (void)
+   if (is_tic6x_target ())
+     {
+       if (params.dsbt_index >= params.dsbt_size)
+-       {
+-         einfo (_("%F%P: invalid --dsbt-index %d, outside DSBT size\n"),
+-                params.dsbt_index);
+-       }
++       fatal (_("%P: invalid --dsbt-index %d, outside DSBT size\n"),
++              params.dsbt_index);
+       elf32_tic6x_setup (&link_info, &params);
+     }
+ 
+@@ -192,7 +190,7 @@ PARSE_AND_LIST_ARGS_CASES='
+        if (*end == 0
+            && params.dsbt_index >= 0 && params.dsbt_index < 0x7fff)
+          break;
+-       einfo (_("%F%P: invalid --dsbt-index %s\n"), optarg);
++       fatal (_("%P: invalid --dsbt-index %s\n"), optarg);
+       }
+       break;
+     case OPTION_DSBT_SIZE:
+@@ -202,7 +200,7 @@ PARSE_AND_LIST_ARGS_CASES='
+        if (*end == 0
+            && params.dsbt_size >= 0 && params.dsbt_size < 0x7fff)
+          break;
+-       einfo (_("%F%P: invalid --dsbt-size %s\n"), optarg);
++       fatal (_("%P: invalid --dsbt-size %s\n"), optarg);
+       }
+       break;
+    case OPTION_NO_MERGE_EXIDX_ENTRIES:
+diff --git a/ld/emultempl/ticoff.em b/ld/emultempl/ticoff.em
+index 4b048bef..bbf30f4a 100644
+--- a/ld/emultempl/ticoff.em
++++ b/ld/emultempl/ticoff.em
+@@ -88,9 +88,7 @@ gld${EMULATION_NAME}_handle_option (int optc)
+          lang_add_output_format (buf, NULL, NULL, 0);
+        }
+       else
+-       {
+-         einfo (_("%F%P: invalid COFF format version %s\n"), optarg);
+-       }
++       fatal (_("%P: invalid COFF format version %s\n"), optarg);
+       break;
+     }
+   return false;
+diff --git a/ld/emultempl/v850elf.em b/ld/emultempl/v850elf.em
+index 7bcd45f3..49ad2cc8 100644
+--- a/ld/emultempl/v850elf.em
++++ b/ld/emultempl/v850elf.em
+@@ -63,7 +63,7 @@ v850_create_output_section_statements (void)
+         These will only be created if the output format is an arm format,
+         hence we do not support linking and changing output formats at the
+         same time.  Use a link followed by objcopy to change output formats.  */
+-      einfo (_("%F%P: error: cannot change output format"
++      fatal (_("%P: error: cannot change output format"
+               " whilst linking %s binaries\n"), "V850");
+       return;
+     }
+diff --git a/ld/emultempl/vms.em b/ld/emultempl/vms.em
+index 67e9ea64..4ca2c942 100644
+--- a/ld/emultempl/vms.em
++++ b/ld/emultempl/vms.em
+@@ -201,7 +201,7 @@ gld${EMULATION_NAME}_before_allocation (void)
+       && bed->elf_backend_size_dynamic_sections
+       && ! (*bed->elf_backend_size_dynamic_sections) (link_info.output_bfd,
+                                                      &link_info))
+-    einfo (_("%F%P: failed to set dynamic section sizes: %E\n"));
++    fatal (_("%P: failed to set dynamic section sizes: %E\n"));
+ 
+   before_allocation_default ();
+ }
+diff --git a/ld/emultempl/xtensaelf.em b/ld/emultempl/xtensaelf.em
+index 51293539..208f730d 100644
+--- a/ld/emultempl/xtensaelf.em
++++ b/ld/emultempl/xtensaelf.em
+@@ -388,7 +388,7 @@ check_xtensa_info (bfd *abfd, asection *info_sec)
+ 
+   data = xmalloc (info_sec->size);
+   if (! bfd_get_section_contents (abfd, info_sec, data, 0, info_sec->size))
+-    einfo (_("%F%P: %pB: cannot read contents of section %pA\n"), abfd, info_sec);
++    fatal (_("%P: %pB: cannot read contents of section %pA\n"), abfd, info_sec);
+ 
+   if (info_sec->size > 24
+       && info_sec->size >= 24 + bfd_get_32 (abfd, data + 4)
+@@ -429,13 +429,13 @@ elf_xtensa_before_allocation (void)
+   if (is_big_endian
+       && link_info.output_bfd->xvec->byteorder == BFD_ENDIAN_LITTLE)
+     {
+-      einfo (_("%F%P: little endian output does not match "
++      fatal (_("%P: little endian output does not match "
+               "Xtensa configuration\n"));
+     }
+   if (!is_big_endian
+       && link_info.output_bfd->xvec->byteorder == BFD_ENDIAN_BIG)
+     {
+-      einfo (_("%F%P: big endian output does not match "
++      fatal (_("%P: big endian output does not match "
+               "Xtensa configuration\n"));
+     }
+ 
+@@ -454,7 +454,7 @@ elf_xtensa_before_allocation (void)
+         cannot go any further if there are any mismatches.  */
+       if ((is_big_endian && f->the_bfd->xvec->byteorder == BFD_ENDIAN_LITTLE)
+          || (!is_big_endian && f->the_bfd->xvec->byteorder == BFD_ENDIAN_BIG))
+-       einfo (_("%F%P: cross-endian linking for %pB not supported\n"),
++       fatal (_("%P: cross-endian linking for %pB not supported\n"),
+               f->the_bfd);
+ 
+       if (! first_bfd)
+@@ -485,7 +485,7 @@ elf_xtensa_before_allocation (void)
+       info_sec = bfd_make_section_with_flags (first_bfd, ".xtensa.info",
+                                              SEC_HAS_CONTENTS | SEC_READONLY);
+       if (! info_sec)
+-       einfo (_("%F%P: failed to create .xtensa.info section\n"));
++       fatal (_("%P: failed to create .xtensa.info section\n"));
+     }
+   if (info_sec)
+     {
+@@ -1224,7 +1224,7 @@ ld_build_required_section_dependence (lang_statement_union_type *s)
+       lang_statement_union_type *l = iter_stack_current (&stack);
+ 
+       if (l == NULL && link_info.non_contiguous_regions)
+-       einfo (_("%F%P: Relaxation not supported with "
++       fatal (_("%P: Relaxation not supported with "
+                 "--enable-non-contiguous-regions.\n"));
+ 
+       if (l->header.type == lang_input_section_enum)
+diff --git a/ld/emultempl/z80.em b/ld/emultempl/z80.em
+index ded04136..555f6024 100644
+--- a/ld/emultempl/z80.em
++++ b/ld/emultempl/z80.em
+@@ -48,7 +48,7 @@ z80_after_open (void)
+       const bfd_arch_info_type *info;
+       info = bfd_arch_get_compatible (link_info.output_bfd, abfd, false);
+       if (info == NULL)
+-       einfo (_("%F%P: %pB: Instruction sets of object files incompatible\n"),
++       fatal (_("%P: %pB: Instruction sets of object files incompatible\n"),
+               abfd);
+       else
+         bfd_set_arch_info (link_info.output_bfd, info);
+diff --git a/ld/ldcref.c b/ld/ldcref.c
+index 632506a4..572d4f4d 100644
+--- a/ld/ldcref.c
++++ b/ld/ldcref.c
+@@ -514,7 +514,7 @@ check_local_sym_xref (lang_input_statement_type *statement)
+     return;
+ 
+   if (!bfd_generic_link_read_symbols (abfd))
+-    einfo (_("%F%P: %pB: could not read symbols: %E\n"), abfd);
++    fatal (_("%P: %pB: could not read symbols: %E\n"), abfd);
+ 
+   for (syms = bfd_get_outsymbols (abfd); *syms; ++syms)
+     {
+@@ -625,7 +625,7 @@ check_refs (const char *name,
+      BFD might contain a prohibited cross reference.  */
+ 
+   if (!bfd_generic_link_read_symbols (abfd))
+-    einfo (_("%F%P: %pB: could not read symbols: %E\n"), abfd);
++    fatal (_("%P: %pB: could not read symbols: %E\n"), abfd);
+ 
+   info.sym_name = name;
+   info.global = global;
+@@ -687,14 +687,14 @@ check_reloc_refs (bfd *abfd, asection *sec, void *iarg)
+ 
+   relsize = bfd_get_reloc_upper_bound (abfd, sec);
+   if (relsize < 0)
+-    einfo (_("%F%P: %pB: could not read relocs: %E\n"), abfd);
++    fatal (_("%P: %pB: could not read relocs: %E\n"), abfd);
+   if (relsize == 0)
+     return;
+ 
+   relpp = (arelent **) xmalloc (relsize);
+   relcount = bfd_canonicalize_reloc (abfd, sec, relpp, info->asymbols);
+   if (relcount < 0)
+-    einfo (_("%F%P: %pB: could not read relocs: %E\n"), abfd);
++    fatal (_("%P: %pB: could not read relocs: %E\n"), abfd);
+ 
+   p = relpp;
+   pend = p + relcount;
+diff --git a/ld/ldelf.c b/ld/ldelf.c
+index d66e08dd..fb95b7a9 100644
+--- a/ld/ldelf.c
++++ b/ld/ldelf.c
+@@ -94,7 +94,7 @@ ldelf_after_parse (void)
+       else if (!link_info.maxpagesize_is_set)
+        link_info.maxpagesize = link_info.commonpagesize;
+       else
+-       einfo (_("%F%P: common page size (0x%v) > maximum page size (0x%v)\n"),
++       fatal (_("%P: common page size (0x%v) > maximum page size (0x%v)\n"),
+               link_info.commonpagesize, link_info.maxpagesize);
+     }
+ }
+@@ -120,7 +120,7 @@ ldelf_load_symbols (lang_input_statement_type *entry)
+ 
+   if (entry->flags.just_syms
+       && (bfd_get_file_flags (entry->the_bfd) & DYNAMIC) != 0)
+-    einfo (_("%F%P: %pB: --just-symbols may not be used on DSO\n"),
++    fatal (_("%P: %pB: --just-symbols may not be used on DSO\n"),
+           entry->the_bfd);
+ 
+   if (link_class == 0
+@@ -320,7 +320,7 @@ ldelf_try_needed (struct dt_needed *needed, int force, int is_linux)
+       struct bfd_link_needed_list *needs;
+ 
+       if (! bfd_elf_get_bfd_needed_list (abfd, &needs))
+-       einfo (_("%F%P: %pB: bfd_elf_get_bfd_needed_list failed: %E\n"), abfd);
++       fatal (_("%P: %pB: bfd_elf_get_bfd_needed_list failed: %E\n"), abfd);
+ 
+       if (needs != NULL)
+        {
+@@ -368,7 +368,7 @@ ldelf_try_needed (struct dt_needed *needed, int force, int is_linux)
+      can only check that using stat.  */
+ 
+   if (bfd_stat (abfd, &global_stat) != 0)
+-    einfo (_("%F%P: %pB: bfd_stat failed: %E\n"), abfd);
++    fatal (_("%P: %pB: bfd_stat failed: %E\n"), abfd);
+ 
+   /* First strip off everything before the last '/'.  */
+   soname = lbasename (bfd_get_filename (abfd));
+@@ -407,7 +407,7 @@ ldelf_try_needed (struct dt_needed *needed, int force, int is_linux)
+ 
+   /* Add this file into the symbol table.  */
+   if (! bfd_link_add_symbols (abfd, &link_info))
+-    einfo (_("%F%P: %pB: error adding symbols: %E\n"), abfd);
++    fatal (_("%P: %pB: error adding symbols: %E\n"), abfd);
+ 
+   return true;
+ }
+@@ -1205,7 +1205,7 @@ ldelf_handle_dt_needed (struct elf_link_hash_table *htab,
+          && elf_dt_name (abfd) != NULL)
+        {
+          if (bfd_elf_add_dt_needed_tag (abfd, &link_info) < 0)
+-           einfo (_("%F%P: failed to add DT_NEEDED dynamic tag\n"));
++           fatal (_("%P: failed to add DT_NEEDED dynamic tag\n"));
+        }
+ 
+   link_info.input_bfds_tail = save_input_bfd_tail;
+@@ -1256,10 +1256,8 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd,
+                     bfd_get_target (link_info.output_bfd));
+ 
+       if (link_info.out_implib_bfd == NULL)
+-       {
+-         einfo (_("%F%P: %s: can't open for writing: %E\n"),
+-                command_line.out_implib_filename);
+-       }
++       fatal (_("%P: %s: can't open for writing: %E\n"),
++              command_line.out_implib_filename);
+     }
+ 
+   if (ldelf_emit_note_gnu_build_id != NULL
+@@ -1313,7 +1311,7 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd,
+          && (elf_tdata (abfd)->elf_header->e_type == ET_EXEC
+              || (elf_tdata (abfd)->elf_header->e_type == ET_DYN
+                  && elf_tdata (abfd)->is_pie)))
+-       einfo (_("%F%P: cannot use executable file '%pB' as input to a link\n"),
++       fatal (_("%P: cannot use executable file '%pB' as input to a link\n"),
+               abfd);
+     }
+ 
+@@ -1367,7 +1365,7 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd,
+                }
+              else if (seen_type != type)
+                {
+-                 einfo (_("%F%P: compact frame descriptions incompatible with"
++                 fatal (_("%P: compact frame descriptions incompatible with"
+                           " DWARF2 .eh_frame from %pB\n"),
+                         type == DWARF2_EH_HDR ? abfd : elfbfd);
+                  break;
+@@ -1409,7 +1407,7 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd,
+ 
+   if (link_info.eh_frame_hdr_type == COMPACT_EH_HDR)
+     if (!bfd_elf_parse_eh_frame_entries (NULL, &link_info))
+-      einfo (_("%F%P: failed to parse EH frame entries\n"));
++      fatal (_("%P: failed to parse EH frame entries\n"));
+ 
+   ldelf_handle_dt_needed (htab, use_libpath, native, is_linux,
+                          is_freebsd, elfsize, prefix);
+@@ -1666,7 +1664,7 @@ ldelf_find_exp_assignment (etree_type *exp)
+                                               &link_info,
+                                               exp->assign.dst, provide,
+                                               exp->assign.hidden))
+-           einfo (_("%F%P: failed to record assignment to %s: %E\n"),
++           fatal (_("%P: failed to record assignment to %s: %E\n"),
+                   exp->assign.dst);
+        }
+       ldelf_find_exp_assignment (exp->assign.src);
+@@ -1846,7 +1844,7 @@ ldelf_before_allocation (char *audit, char *depaudit,
+          command_line.filter_shlib, audit, depaudit,
+          (const char * const *) command_line.auxiliary_filters,
+          &link_info, &sinterp)))
+-    einfo (_("%F%P: failed to set dynamic section sizes: %E\n"));
++    fatal (_("%P: failed to set dynamic section sizes: %E\n"));
+ 
+   if (sinterp != NULL)
+     {
+@@ -1883,8 +1881,8 @@ ldelf_before_allocation (char *audit, char *depaudit,
+        msg = (char *) xmalloc ((size_t) (sz + 1));
+        if (! bfd_get_section_contents (is->the_bfd, s, msg,
+                                        (file_ptr) 0, sz))
+-         einfo (_("%F%P: %pB: can't read contents of section .gnu.warning: %E\n"),
+-                is->the_bfd);
++         fatal (_("%P: %pB: can't read contents of section %pA: %E\n"),
++                is->the_bfd, s);
+        msg[sz] = '\0';
+        (*link_info.callbacks->warning) (&link_info, msg,
+                                         (const char *) NULL, is->the_bfd,
+@@ -1911,7 +1909,7 @@ ldelf_before_allocation (char *audit, char *depaudit,
+   before_allocation_default ();
+ 
+   if (!bfd_elf_size_dynsym_hash_dynstr (link_info.output_bfd, &link_info))
+-    einfo (_("%F%P: failed to set dynamic section sizes: %E\n"));
++    fatal (_("%P: failed to set dynamic section sizes: %E\n"));
+ 
+   if (ehdr_start != NULL)
+     {
+diff --git a/ld/ldelfgen.c b/ld/ldelfgen.c
+index d3448546..1b1e49ce 100644
+--- a/ld/ldelfgen.c
++++ b/ld/ldelfgen.c
+@@ -282,7 +282,7 @@ ldelf_map_segments (bool need_layout)
+                  if (os_info->ordered != os_info->count
+                      && bfd_link_relocatable (&link_info))
+                    {
+-                     einfo (_("%F%P: "
++                     fatal (_("%P: "
+                               "%pA has both ordered and unordered sections\n"),
+                             os->bfd_section);
+                      return;
+@@ -307,7 +307,7 @@ ldelf_map_segments (bool need_layout)
+          if (!_bfd_elf_map_sections_to_segments (link_info.output_bfd,
+                                                  &link_info,
+                                                  &need_layout))
+-           einfo (_("%F%P: map sections to segments failed: %E\n"));
++           fatal (_("%P: map sections to segments failed: %E\n"));
+ 
+          if (phdr_size != elf_program_header_size (link_info.output_bfd))
+            {
+@@ -327,7 +327,7 @@ ldelf_map_segments (bool need_layout)
+   while (need_layout && --tries);
+ 
+   if (tries == 0)
+-    einfo (_("%F%P: looping in map_segments\n"));
++    fatal (_("%P: looping in map_segments\n"));
+ 
+   if (bfd_get_flavour (link_info.output_bfd) == bfd_target_elf_flavour
+       && lang_phdr_list == NULL)
+@@ -337,9 +337,8 @@ ldelf_map_segments (bool need_layout)
+       const struct elf_backend_data *bed
+        = get_elf_backend_data (link_info.output_bfd);
+       if (bed->elf_backend_strip_zero_sized_dynamic_sections
+-         && !bed->elf_backend_strip_zero_sized_dynamic_sections
+-               (&link_info))
+-         einfo (_("%F%P: failed to strip zero-sized dynamic sections\n"));
++         && !bed->elf_backend_strip_zero_sized_dynamic_sections (&link_info))
++       fatal (_("%P: failed to strip zero-sized dynamic sections\n"));
+     }
+ }
+ 
+@@ -417,7 +416,7 @@ ldelf_acquire_strings_for_ctf
+     {
+       if (ctf_link_add_strtab (ctf_output, ldelf_ctf_strtab_iter_cb,
+                               &args) < 0)
+-       einfo (_("%F%P: warning: CTF strtab association failed; strings will "
++       fatal (_("%P: warning: CTF strtab association failed; strings will "
+                 "not be shared: %s\n"),
+               ctf_errmsg (ctf_errno (ctf_output)));
+     }
+@@ -444,7 +443,7 @@ ldelf_new_dynsym_for_ctf (struct ctf_dict *ctf_output, int symidx,
+       lsym.st_value = sym->st_value;
+       if (ctf_link_add_linker_symbol (ctf_output, &lsym) < 0)
+        {
+-         einfo (_("%F%P: warning: CTF symbol addition failed; CTF will "
++         fatal (_("%P: warning: CTF symbol addition failed; CTF will "
+                   "not be tied to symbols: %s\n"),
+                 ctf_errmsg (ctf_errno (ctf_output)));
+        }
+@@ -454,7 +453,7 @@ ldelf_new_dynsym_for_ctf (struct ctf_dict *ctf_output, int symidx,
+       /* Shuffle all the symbols.  */
+ 
+       if (ctf_link_shuffle_syms (ctf_output) < 0)
+-       einfo (_("%F%P: warning: CTF symbol shuffling failed; CTF will "
++       fatal (_("%P: warning: CTF symbol shuffling failed; CTF will "
+                 "not be tied to symbols: %s\n"),
+               ctf_errmsg (ctf_errno (ctf_output)));
+     }
+diff --git a/ld/ldemul.c b/ld/ldemul.c
+index 218abb84..b56b0492 100644
+--- a/ld/ldemul.c
++++ b/ld/ldemul.c
+@@ -343,7 +343,7 @@ ldemul_choose_mode (char *target)
+   einfo (_("%P: unrecognised emulation mode: %s\n"), target);
+   einfo (_("Supported emulations: "));
+   ldemul_list_emulations (stderr);
+-  einfo ("%F\n");
++  fatal ("\n");
+ }
+ 
+ void
+diff --git a/ld/ldexp.c b/ld/ldexp.c
+index 3c8ab2d3..45dffbc6 100644
+--- a/ld/ldexp.c
++++ b/ld/ldexp.c
+@@ -282,7 +282,7 @@ definedness_newfunc (struct bfd_hash_entry *entry,
+       bfd_hash_allocate (table, sizeof (struct definedness_hash_entry));
+ 
+   if (ret == NULL)
+-    einfo (_("%F%P: bfd_hash_allocate failed creating symbol %s\n"), name);
++    fatal (_("%P: bfd_hash_allocate failed creating symbol %s\n"), name);
+ 
+   ret->by_object = 0;
+   ret->iteration = 0;
+@@ -313,7 +313,7 @@ update_definedness (const char *name, struct bfd_link_hash_entry *h)
+     bfd_hash_lookup (&definedness_table, name, true, false);
+ 
+   if (defentry == NULL)
+-    einfo (_("%F%P: bfd_hash_lookup failed creating symbol %s\n"), name);
++    fatal (_("%P: bfd_hash_lookup failed creating symbol %s\n"), name);
+ 
+   /* If the symbol was already defined, and not by a script, then it
+      must be defined by an object file or by the linker target code.  */
+@@ -638,7 +638,7 @@ fold_binary (etree_type *tree)
+            expld.result.value = ((bfd_signed_vma) lhs.value
+                                  % (bfd_signed_vma) expld.result.value);
+          else if (expld.phase != lang_mark_phase_enum)
+-           einfo (_("%F%P:%pS %% by zero\n"), tree->binary.rhs);
++           fatal (_("%P:%pS %% by zero\n"), tree->binary.rhs);
+          arith_result_section (&lhs);
+          break;
+ 
+@@ -647,7 +647,7 @@ fold_binary (etree_type *tree)
+            expld.result.value = ((bfd_signed_vma) lhs.value
+                                  / (bfd_signed_vma) expld.result.value);
+          else if (expld.phase != lang_mark_phase_enum)
+-           einfo (_("%F%P:%pS / by zero\n"), tree->binary.rhs);
++           fatal (_("%P:%pS / by zero\n"), tree->binary.rhs);
+          arith_result_section (&lhs);
+          break;
+ 
+@@ -761,7 +761,7 @@ fold_name (etree_type *tree)
+          if (!h)
+            {
+              if (expld.phase != lang_first_phase_enum)
+-               einfo (_("%F%P: bfd_link_hash_lookup failed: %E\n"));
++               fatal (_("%P: bfd_link_hash_lookup failed: %E\n"));
+            }
+          else if (h->type == bfd_link_hash_defined
+                   || h->type == bfd_link_hash_defweak)
+@@ -789,7 +789,7 @@ fold_name (etree_type *tree)
+          else if (expld.phase == lang_final_phase_enum
+                   || (expld.phase != lang_mark_phase_enum
+                       && expld.assigning_to_dot))
+-           einfo (_("%F%P:%pS: undefined symbol `%s'"
++           fatal (_("%P:%pS: undefined symbol `%s'"
+                     " referenced in expression\n"),
+                   tree, tree->name.name);
+          else if (h->type == bfd_link_hash_new)
+@@ -827,7 +827,7 @@ fold_name (etree_type *tree)
+          if (os == NULL)
+            {
+              if (expld.phase == lang_final_phase_enum)
+-               einfo (_("%F%P:%pS: undefined section `%s'"
++               fatal (_("%P:%pS: undefined section `%s'"
+                         " referenced in expression\n"),
+                       tree, tree->name.name);
+            }
+@@ -845,7 +845,7 @@ fold_name (etree_type *tree)
+          if (os == NULL)
+            {
+              if (expld.phase == lang_final_phase_enum)
+-               einfo (_("%F%P:%pS: undefined section `%s'"
++               fatal (_("%P:%pS: undefined section `%s'"
+                         " referenced in expression\n"),
+                       tree, tree->name.name);
+            }
+@@ -873,7 +873,7 @@ fold_name (etree_type *tree)
+          if (os == NULL)
+            {
+              if (expld.phase == lang_final_phase_enum)
+-               einfo (_("%F%P:%pS: undefined section `%s'"
++               fatal (_("%P:%pS: undefined section `%s'"
+                         " referenced in expression\n"),
+                       tree, tree->name.name);
+              new_number (0);
+@@ -912,7 +912,7 @@ fold_name (etree_type *tree)
+        if (mem != NULL)
+          new_number (mem->length);
+        else
+-         einfo (_("%F%P:%pS: undefined MEMORY region `%s'"
++         fatal (_("%P:%pS: undefined MEMORY region `%s'"
+                   " referenced in expression\n"),
+                 tree, tree->name.name);
+       }
+@@ -926,7 +926,7 @@ fold_name (etree_type *tree)
+        if (mem != NULL)
+          new_rel_from_abs (mem->origin);
+        else
+-         einfo (_("%F%P:%pS: undefined MEMORY region `%s'"
++         fatal (_("%P:%pS: undefined MEMORY region `%s'"
+                   " referenced in expression\n"),
+                 tree, tree->name.name);
+       }
+@@ -938,7 +938,7 @@ fold_name (etree_type *tree)
+       else if (strcmp (tree->name.name, "COMMONPAGESIZE") == 0)
+        new_number (link_info.commonpagesize);
+       else
+-       einfo (_("%F%P:%pS: unknown constant `%s' referenced in expression\n"),
++       fatal (_("%P:%pS: unknown constant `%s' referenced in expression\n"),
+               tree, tree->name.name);
+       break;
+ 
+@@ -1086,7 +1086,7 @@ exp_fold_tree_1 (etree_type *tree)
+       if (tree->assign.dst[0] == '.' && tree->assign.dst[1] == 0)
+        {
+          if (tree->type.node_class != etree_assign)
+-           einfo (_("%F%P:%pS can not PROVIDE assignment to"
++           fatal (_("%P:%pS can not PROVIDE assignment to"
+                     " location counter\n"), tree);
+          if (expld.phase != lang_first_phase_enum)
+            {
+@@ -1119,11 +1119,11 @@ exp_fold_tree_1 (etree_type *tree)
+                  || expld.section == bfd_und_section_ptr)
+                {
+                  if (expld.phase != lang_mark_phase_enum)
+-                   einfo (_("%F%P:%pS invalid assignment to"
++                   fatal (_("%P:%pS invalid assignment to"
+                             " location counter\n"), tree);
+                }
+              else if (expld.dotp == NULL)
+-               einfo (_("%F%P:%pS assignment to location counter"
++               fatal (_("%P:%pS assignment to location counter"
+                         " invalid outside of SECTIONS\n"), tree);
+ 
+              /* After allocation, assignment to dot should not be
+@@ -1142,7 +1142,7 @@ exp_fold_tree_1 (etree_type *tree)
+                    nextdot += expld.section->vma;
+                  if (nextdot < expld.dot
+                      && expld.section != bfd_abs_section_ptr)
+-                   einfo (_("%F%P:%pS cannot move location counter backwards"
++                   fatal (_("%P:%pS cannot move location counter backwards"
+                             " (from %V to %V)\n"),
+                           tree, expld.dot, nextdot);
+                  else
+@@ -1202,7 +1202,7 @@ exp_fold_tree_1 (etree_type *tree)
+                  h = bfd_link_hash_lookup (link_info.hash, tree->assign.dst,
+                                            true, false, true);
+                  if (h == NULL)
+-                   einfo (_("%F%P:%s: hash creation failed\n"),
++                   fatal (_("%P:%s: hash creation failed\n"),
+                           tree->assign.dst);
+                }
+ 
+@@ -1578,7 +1578,7 @@ exp_get_vma (etree_type *tree, lang_output_section_statement_type *os,
+       if (expld.result.valid_p)
+        return expld.result.value;
+       else if (name != NULL && expld.phase != lang_mark_phase_enum)
+-       einfo (_("%F%P:%pS: nonconstant expression for %s\n"),
++       fatal (_("%P:%pS: nonconstant expression for %s\n"),
+               tree, name);
+     }
+   return def;
+@@ -1621,7 +1621,7 @@ exp_get_fill (etree_type *tree, fill_type *def, char *name)
+   if (!expld.result.valid_p)
+     {
+       if (name != NULL && expld.phase != lang_mark_phase_enum)
+-       einfo (_("%F%P:%pS: nonconstant expression for %s\n"),
++       fatal (_("%P:%pS: nonconstant expression for %s\n"),
+               tree, name);
+       return def;
+     }
+@@ -1681,7 +1681,7 @@ exp_get_abs_int (etree_type *tree, int def, char *name)
+        }
+       else if (name != NULL && expld.phase != lang_mark_phase_enum)
+        {
+-         einfo (_("%F%P:%pS: nonconstant expression for %s\n"),
++         fatal (_("%P:%pS: nonconstant expression for %s\n"),
+                 tree, name);
+        }
+     }
+@@ -1707,7 +1707,7 @@ ldexp_init (void)
+                              definedness_newfunc,
+                              sizeof (struct definedness_hash_entry),
+                              13))
+-    einfo (_("%F%P: can not create hash table: %E\n"));
++    fatal (_("%P: can not create hash table: %E\n"));
+ }
+ 
+ /* Convert absolute symbols defined by a script from "dot" (also
+diff --git a/ld/ldfile.c b/ld/ldfile.c
+index 49d899ee..ddab0d37 100644
+--- a/ld/ldfile.c
++++ b/ld/ldfile.c
+@@ -183,7 +183,7 @@ ldfile_add_remap_file (const char * file)
+ 
+       if (*p == '\0')
+        {
+-         einfo ("%F%P: malformed remap file entry: %s\n", line);
++         fatal ("%P: malformed remap file entry: %s\n", line);
+          continue;
+        }
+ 
+@@ -195,7 +195,7 @@ ldfile_add_remap_file (const char * file)
+ 
+       if (*p == '\0')
+        {
+-         einfo ("%F%P: malformed remap file entry: %s\n", line);
++         fatal ("%P: malformed remap file entry: %s\n", line);
+          continue;
+        }
+ 
+@@ -365,7 +365,7 @@ ldfile_try_open_bfd (const char *attempt,
+   if (entry->the_bfd == NULL)
+     {
+       if (bfd_get_error () == bfd_error_invalid_target)
+-       einfo (_("%F%P: invalid BFD target `%s'\n"), entry->target);
++       fatal (_("%P: invalid BFD target `%s'\n"), entry->target);
+       return false;
+     }
+ 
+@@ -508,7 +508,7 @@ ldfile_try_open_bfd (const char *attempt,
+ 
+          if (!entry->flags.dynamic && (entry->the_bfd->flags & DYNAMIC) != 0)
+            {
+-             einfo (_("%F%P: attempted static link of dynamic object `%s'\n"),
++             fatal (_("%P: attempted static link of dynamic object `%s'\n"),
+                     attempt);
+              bfd_close (entry->the_bfd);
+              entry->the_bfd = NULL;
+@@ -919,7 +919,7 @@ ldfile_open_command_file_1 (const char *name, enum script_open_style open_how)
+       if ((open_how != script_nonT || script->open_how != script_nonT)
+          && strcmp (name, script->name) == 0)
+        {
+-         einfo (_("%F%P: error: linker script file '%s'"
++         fatal (_("%P: error: linker script file '%s'"
+                   " appears multiple times\n"), name);
+          return;
+        }
+@@ -941,7 +941,7 @@ ldfile_open_command_file_1 (const char *name, enum script_open_style open_how)
+   if (ldlex_input_stack == NULL)
+     {
+       bfd_set_error (bfd_error_system_call);
+-      einfo (_("%F%P: cannot open linker script file %s: %E\n"), name);
++      fatal (_("%P: cannot open linker script file %s: %E\n"), name);
+       return;
+     }
+ 
+@@ -1012,5 +1012,5 @@ ldfile_set_output_arch (const char *string, enum bfd_architecture defarch)
+   else if (defarch != bfd_arch_unknown)
+     ldfile_output_architecture = defarch;
+   else
+-    einfo (_("%F%P: cannot represent machine `%s'\n"), string);
++    fatal (_("%P: cannot represent machine `%s'\n"), string);
+ }
+diff --git a/ld/ldgram.y b/ld/ldgram.y
+index 0d531fdd..c2f1e298 100644
+--- a/ld/ldgram.y
++++ b/ld/ldgram.y
+@@ -209,7 +209,7 @@ mri_script_command:
+                CHIP  exp
+        |       CHIP  exp ',' exp
+        |       NAME    {
+-                       einfo(_("%F%P: unrecognised keyword in MRI style script '%s'\n"),$1);
++                       fatal (_("%P: unrecognised keyword in MRI style script '%s'\n"), $1);
+                        }
+        |       LIST    {
+                        config.map_filename = "-";
+@@ -1547,7 +1547,7 @@ yyerror (const char *arg)
+     einfo (_("%P:%s: file format not recognized; treating as linker script\n"),
+           ldlex_filename ());
+   if (error_index > 0 && error_index < ERROR_NAME_MAX)
+-    einfo (_("%F%P:%pS: %s in %s\n"), NULL, arg, error_names[error_index - 1]);
++    fatal (_("%P:%pS: %s in %s\n"), NULL, arg, error_names[error_index - 1]);
+   else
+-    einfo ("%F%P:%pS: %s\n", NULL, arg);
++    fatal ("%P:%pS: %s\n", NULL, arg);
+ }
+diff --git a/ld/ldlang.c b/ld/ldlang.c
+index 229401c8..9bf5fcbe 100644
+--- a/ld/ldlang.c
++++ b/ld/ldlang.c
+@@ -1325,7 +1325,7 @@ output_section_statement_table_init (void)
+                              output_section_statement_newfunc,
+                              sizeof (struct out_section_hash_entry),
+                              61))
+-    einfo (_("%F%P: can not create hash table: %E\n"));
++    fatal (_("%P: can not create hash table: %E\n"));
+ }
+ 
+ static void
+@@ -1453,7 +1453,7 @@ lang_memory_region_alias (const char *alias, const char *region_name)
+      the default memory region.  */
+   if (strcmp (region_name, DEFAULT_MEMORY_REGION) == 0
+       || strcmp (alias, DEFAULT_MEMORY_REGION) == 0)
+-    einfo (_("%F%P:%pS: error: alias for default memory region\n"), NULL);
++    fatal (_("%P:%pS: error: alias for default memory region\n"), NULL);
+ 
+   /* Look for the target region and check if the alias is not already
+      in use.  */
+@@ -1464,14 +1464,14 @@ lang_memory_region_alias (const char *alias, const char *region_name)
+        if (region == NULL && strcmp (n->name, region_name) == 0)
+          region = r;
+        if (strcmp (n->name, alias) == 0)
+-         einfo (_("%F%P:%pS: error: redefinition of memory region "
++         fatal (_("%P:%pS: error: redefinition of memory region "
+                   "alias `%s'\n"),
+                 NULL, alias);
+       }
+ 
+   /* Check if the target region exists.  */
+   if (region == NULL)
+-    einfo (_("%F%P:%pS: error: memory region `%s' "
++    fatal (_("%P:%pS: error: memory region `%s' "
+             "for alias `%s' does not exist\n"),
+           NULL, region_name, alias);
+ 
+@@ -1532,7 +1532,7 @@ lang_output_section_statement_lookup (const char *name,
+   if (entry == NULL)
+     {
+       if (create)
+-       einfo (_("%F%P: failed creating section `%s': %E\n"), name);
++       fatal (_("%P: failed creating section `%s': %E\n"), name);
+       return NULL;
+     }
+ 
+@@ -1567,7 +1567,7 @@ lang_output_section_statement_lookup (const char *name,
+                                             name));
+       if (entry == NULL)
+        {
+-         einfo (_("%F%P: failed creating section `%s': %E\n"), name);
++         fatal (_("%P: failed creating section `%s': %E\n"), name);
+          return NULL;
+        }
+       entry->root = last_ent->root;
+@@ -2426,7 +2426,7 @@ static void
+ init_os (lang_output_section_statement_type *s, flagword flags)
+ {
+   if (strcmp (s->name, DISCARD_SECTION_NAME) == 0)
+-    einfo (_("%F%P: illegal use of `%s' section\n"), DISCARD_SECTION_NAME);
++    fatal (_("%P: illegal use of `%s' section\n"), DISCARD_SECTION_NAME);
+ 
+   if (!s->dup_output)
+     s->bfd_section = bfd_get_section_by_name (link_info.output_bfd, s->name);
+@@ -2435,7 +2435,7 @@ init_os (lang_output_section_statement_type *s, flagword flags)
+                                                         s->name, flags);
+   if (s->bfd_section == NULL)
+     {
+-      einfo (_("%F%P: output format %s cannot represent section"
++      fatal (_("%P: output format %s cannot represent section"
+               " called %s: %E\n"),
+             link_info.output_bfd->xvec->name, s->name);
+     }
+@@ -3023,11 +3023,11 @@ load_symbols (lang_input_statement_type *entry,
+          for (p = matching; *p != NULL; p++)
+            einfo (" %s", *p);
+          free (matching);
+-         einfo ("%F\n");
++         fatal ("\n");
+        }
+       else if (err != bfd_error_file_not_recognized
+               || place == NULL)
+-       einfo (_("%F%P: %pB: file not recognized: %E\n"), entry->the_bfd);
++       fatal (_("%P: %pB: file not recognized: %E\n"), entry->the_bfd);
+ 
+       bfd_close (entry->the_bfd);
+       entry->the_bfd = NULL;
+@@ -3100,7 +3100,7 @@ load_symbols (lang_input_statement_type *entry,
+ 
+              if (!bfd_check_format (member, bfd_object))
+                {
+-                 einfo (_("%F%P: %pB: member %pB in archive is not an object\n"),
++                 fatal (_("%P: %pB: member %pB in archive is not an object\n"),
+                         entry->the_bfd, member);
+                  loaded = false;
+                }
+@@ -3115,7 +3115,7 @@ load_symbols (lang_input_statement_type *entry,
+                 substitute BFD for us.  */
+              if (!bfd_link_add_symbols (subsbfd, &link_info))
+                {
+-                 einfo (_("%F%P: %pB: error adding symbols: %E\n"), member);
++                 fatal (_("%P: %pB: error adding symbols: %E\n"), member);
+                  loaded = false;
+                }
+            }
+@@ -3129,7 +3129,7 @@ load_symbols (lang_input_statement_type *entry,
+   if (bfd_link_add_symbols (entry->the_bfd, &link_info))
+     entry->flags.loaded = true;
+   else
+-    einfo (_("%F%P: %pB: error adding symbols: %E\n"), entry->the_bfd);
++    fatal (_("%P: %pB: error adding symbols: %E\n"), entry->the_bfd);
+ 
+   return entry->flags.loaded;
+ }
+@@ -3370,7 +3370,7 @@ open_output (const char *name)
+       {
+        char *in = lrealpath (f->local_sym_name);
+        if (filename_cmp (in, out) == 0)
+-         einfo (_("%F%P: input file '%s' is the same as output file\n"),
++         fatal (_("%P: input file '%s' is the same as output file\n"),
+                 f->filename);
+        free (in);
+       }
+@@ -3432,23 +3432,23 @@ open_output (const char *name)
+   if (link_info.output_bfd == NULL)
+     {
+       if (bfd_get_error () == bfd_error_invalid_target)
+-       einfo (_("%F%P: target %s not found\n"), output_target);
++       fatal (_("%P: target %s not found\n"), output_target);
+ 
+-      einfo (_("%F%P: cannot open output file %s: %E\n"), name);
++      fatal (_("%P: cannot open output file %s: %E\n"), name);
+     }
+ 
+   delete_output_file_on_failure = true;
+ 
+   if (!bfd_set_format (link_info.output_bfd, bfd_object))
+-    einfo (_("%F%P: %s: can not make object file: %E\n"), name);
++    fatal (_("%P: %s: can not make object file: %E\n"), name);
+   if (!bfd_set_arch_mach (link_info.output_bfd,
+-                          ldfile_output_architecture,
+-                          ldfile_output_machine))
+-    einfo (_("%F%P: %s: can not set architecture: %E\n"), name);
++                         ldfile_output_architecture,
++                         ldfile_output_machine))
++    fatal (_("%P: %s: can not set architecture: %E\n"), name);
+ 
+   link_info.hash = bfd_link_hash_table_create (link_info.output_bfd);
+   if (link_info.hash == NULL)
+-    einfo (_("%F%P: can not create hash table: %E\n"));
++    fatal (_("%P: can not create hash table: %E\n"));
+ 
+   bfd_set_gp_size (link_info.output_bfd, g_switch_value);
+ }
+@@ -3662,7 +3662,7 @@ open_input_bfds (lang_statement_union_type *s,
+ 
+   /* Exit if any of the files were missing.  */
+   if (input_flags.missing_file)
+-    einfo ("%F");
++    fatal ("");
+ }
+ 
+ #ifdef ENABLE_LIBCTF
+@@ -3973,7 +3973,7 @@ insert_undefined (const char *name)
+ 
+   h = bfd_link_hash_lookup (link_info.hash, name, true, false, true);
+   if (h == NULL)
+-    einfo (_("%F%P: bfd_link_hash_lookup failed: %E\n"));
++    fatal (_("%P: bfd_link_hash_lookup failed: %E\n"));
+   if (h->type == bfd_link_hash_new)
+     {
+       h->type = bfd_link_hash_undefined;
+@@ -4259,7 +4259,7 @@ map_input_to_output_sections
+                  else if (strcmp (name, "SHT_PREINIT_ARRAY") == 0)
+                    type = SHT_PREINIT_ARRAY;
+                  else
+-                   einfo (_ ("%F%P: invalid type for output section `%s'\n"),
++                   fatal (_ ("%P: invalid type for output section `%s'\n"),
+                           os->name);
+                }
+             else
+@@ -4268,7 +4268,7 @@ map_input_to_output_sections
+                 if (expld.result.valid_p)
+                   type = expld.result.value;
+                 else
+-                  einfo (_ ("%F%P: invalid type for output section `%s'\n"),
++                  fatal (_ ("%P: invalid type for output section `%s'\n"),
+                          os->name);
+               }
+              break;
+@@ -4417,7 +4417,7 @@ process_insert_statements (lang_statement_union_type **start)
+            }
+          if (where == NULL)
+            {
+-             einfo (_("%F%P: %s not found for insert\n"), i->where);
++             fatal (_("%P: %s not found for insert\n"), i->where);
+              return;
+            }
+ 
+@@ -5499,12 +5499,12 @@ size_input_section
+              if (dot + TO_ADDR (i->size) > end)
+                {
+                  if (i->flags & SEC_LINKER_CREATED)
+-                   einfo (_("%F%P: Output section `%pA' not large enough for "
++                   fatal (_("%P: Output section `%pA' not large enough for "
+                             "the linker-created stubs section `%pA'.\n"),
+                           i->output_section, i);
+ 
+                  if (i->rawsize && i->rawsize != i->size)
+-                   einfo (_("%F%P: Relaxation not supported with "
++                   fatal (_("%P: Relaxation not supported with "
+                             "--enable-non-contiguous-regions (section `%pA' "
+                             "would overflow `%pA' after it changed size).\n"),
+                           i, i->output_section);
+@@ -5860,7 +5860,7 @@ lang_size_sections_1
+                      dot += expld.result.section->vma;
+                  }
+                else if (expld.phase != lang_mark_phase_enum)
+-                 einfo (_("%F%P:%pS: non constant or forward reference"
++                 fatal (_("%P:%pS: non constant or forward reference"
+                           " address expression for section %s\n"),
+                         os->addr_tree, os->name);
+              }
+@@ -5943,7 +5943,7 @@ lang_size_sections_1
+                           overridden by the using the --no-check-sections
+                           switch.  */
+                        if (command_line.check_section_addresses)
+-                         einfo (_("%F%P: error: no memory region specified"
++                         fatal (_("%P: error: no memory region specified"
+                                   " for loadable section `%s'\n"),
+                                 bfd_section_name (os->bfd_section));
+                        else
+@@ -6250,7 +6250,7 @@ lang_size_sections_1
+                bool again;
+ 
+                if (!bfd_relax_section (i->owner, i, &link_info, &again))
+-                 einfo (_("%F%P: can't relax section: %E\n"));
++                 fatal (_("%P: can't relax section: %E\n"));
+                if (again)
+                  *relax = true;
+              }
+@@ -6659,7 +6659,7 @@ lang_do_assignments_1 (lang_statement_union_type *s,
+                s->data_statement.value += expld.result.section->vma;
+            }
+          else if (expld.phase == lang_final_phase_enum)
+-           einfo (_("%F%P: invalid data statement\n"));
++           fatal (_("%P: invalid data statement\n"));
+          {
+            unsigned int size;
+            switch (s->data_statement.type)
+@@ -6692,7 +6692,7 @@ lang_do_assignments_1 (lang_statement_union_type *s,
+          if (expld.result.valid_p)
+            s->reloc_statement.addend_value = expld.result.value;
+          else if (expld.phase == lang_final_phase_enum)
+-           einfo (_("%F%P: invalid reloc statement\n"));
++           fatal (_("%P: invalid reloc statement\n"));
+          dot += TO_ADDR (bfd_get_reloc_size (s->reloc_statement.howto));
+          break;
+ 
+@@ -7110,7 +7110,7 @@ lang_end (void)
+            break;
+        }
+       if (!sym)
+-       einfo (_("%F%P: --gc-sections requires a defined symbol root "
++       fatal (_("%P: --gc-sections requires a defined symbol root "
+                 "specified by -e or -u\n"));
+     }
+ 
+@@ -7135,7 +7135,7 @@ lang_end (void)
+             + bfd_section_vma (h->u.def.section->output_section)
+             + h->u.def.section->output_offset);
+       if (!bfd_set_start_address (link_info.output_bfd, val))
+-       einfo (_("%F%P: %s: can't set start address\n"), entry_symbol.name);
++       fatal (_("%P: %s: can't set start address\n"), entry_symbol.name);
+     }
+   else
+     {
+@@ -7148,7 +7148,7 @@ lang_end (void)
+       if (*send == '\0')
+        {
+          if (!bfd_set_start_address (link_info.output_bfd, val))
+-           einfo (_("%F%P: can't set start address\n"));
++           fatal (_("%P: can't set start address\n"));
+        }
+       /* BZ 2004952: Only use the start of the entry section for executables.  */
+       else if bfd_link_executable (&link_info)
+@@ -7167,7 +7167,7 @@ lang_end (void)
+                       bfd_section_vma (ts));
+              if (!bfd_set_start_address (link_info.output_bfd,
+                                          bfd_section_vma (ts)))
+-               einfo (_("%F%P: can't set start address\n"));
++               fatal (_("%P: can't set start address\n"));
+            }
+          else
+            {
+@@ -7236,11 +7236,10 @@ lang_check (void)
+                  != bfd_get_flavour (link_info.output_bfd)))
+          && (bfd_get_file_flags (input_bfd) & HAS_RELOC) != 0)
+        {
+-         einfo (_("%F%P: relocatable linking with relocations from"
++         fatal (_("%P: relocatable linking with relocations from"
+                   " format %s (%pB) to format %s (%pB) is not supported\n"),
+                 bfd_get_target (input_bfd), input_bfd,
+                 bfd_get_target (link_info.output_bfd), link_info.output_bfd);
+-         /* einfo with %F exits.  */
+        }
+ 
+       if (compatible == NULL)
+@@ -7341,7 +7340,7 @@ lang_one_common (struct bfd_link_hash_entry *h, void *info)
+ 
+   section = h->u.c.p->section;
+   if (!bfd_define_common_symbol (link_info.output_bfd, &link_info, h))
+-    einfo (_("%F%P: could not define common symbol `%pT': %E\n"),
++    fatal (_("%P: could not define common symbol `%pT': %E\n"),
+           h->root.string);
+ 
+   if (config.map_file != NULL)
+@@ -7519,7 +7518,7 @@ lang_set_flags (lang_memory_region_type *ptr, const char *flags, int invert)
+          break;
+ 
+        default:
+-         einfo (_("%F%P: invalid character %c (%d) in flags\n"),
++         fatal (_("%P: invalid character %c (%d) in flags\n"),
+                 *flags, *flags);
+          break;
+        }
+@@ -7631,7 +7630,7 @@ lang_enter_output_section_statement (const char *output_section_statement_name,
+ 
+   os->align_lma_with_input = align_with_input == ALIGN_WITH_INPUT;
+   if (os->align_lma_with_input && align != NULL)
+-    einfo (_("%F%P:%pS: error: align with input and explicit align specified\n"),
++    fatal (_("%P:%pS: error: align with input and explicit align specified\n"),
+           NULL);
+ 
+   os->subsection_alignment = subalign;
+@@ -8143,7 +8142,7 @@ lang_process (void)
+   lang_place_undefineds ();
+ 
+   if (!bfd_section_already_linked_table_init ())
+-    einfo (_("%F%P: can not create hash table: %E\n"));
++    fatal (_("%P: can not create hash table: %E\n"));
+ 
+   /* A first pass through the memory regions ensures that if any region
+      references a symbol for its origin or length then this symbol will be
+@@ -8181,7 +8180,7 @@ lang_process (void)
+       files = file_chain;
+       inputfiles = input_file_chain;
+       if (plugin_call_all_symbols_read ())
+-       einfo (_("%F%P: %s: plugin reported error after all symbols read\n"),
++       fatal (_("%P: %s: plugin reported error after all symbols read\n"),
+               plugin_error_plugin ());
+       link_info.lto_all_symbols_read = true;
+       /* Open any newly added files, updating the file chains.  */
+@@ -8758,9 +8757,7 @@ void
+ lang_startup (const char *name)
+ {
+   if (first_file->filename != NULL)
+-    {
+-      einfo (_("%F%P: multiple STARTUP files\n"));
+-    }
++    fatal (_("%P: multiple STARTUP files\n"));
+   first_file->filename = name;
+   first_file->local_sym_name = name;
+   first_file->flags.real = true;
+@@ -8984,7 +8981,7 @@ lang_record_phdrs (void)
+                        break;
+                      }
+                  if (last == NULL)
+-                   einfo (_("%F%P: no sections assigned to phdrs\n"));
++                   fatal (_("%P: no sections assigned to phdrs\n"));
+                }
+              pl = last;
+            }
+@@ -9022,7 +9019,7 @@ lang_record_phdrs (void)
+       if (!bfd_record_phdr (link_info.output_bfd, l->type,
+                            l->flags != NULL, flags, l->at != NULL,
+                            at, l->filehdr, l->phdrs, c, secs))
+-       einfo (_("%F%P: bfd_record_phdr failed: %E\n"));
++       fatal (_("%P: bfd_record_phdr failed: %E\n"));
+     }
+ 
+   free (secs);
+diff --git a/ld/ldlex.l b/ld/ldlex.l
+index e113c908..7cbade08 100644
+--- a/ld/ldlex.l
++++ b/ld/ldlex.l
+@@ -504,9 +504,7 @@ void
+ lex_push_file (FILE *file, const char *name, unsigned int sysrooted)
+ {
+   if (include_stack_ptr >= MAX_INCLUDE_DEPTH)
+-    {
+-      einfo (_("%F:includes nested too deeply\n"));
+-    }
++    fatal (_("%P: includes nested too deeply\n"));
+   file_name_stack[include_stack_ptr] = name;
+   lineno_stack[include_stack_ptr] = lineno;
+   sysrooted_stack[include_stack_ptr] = input_flags.sysrooted;
+@@ -568,9 +566,7 @@ lex_redirect (const char *string, const char *fake_filename, unsigned int count)
+ 
+   yy_init = 0;
+   if (include_stack_ptr >= MAX_INCLUDE_DEPTH)
+-    {
+-      einfo (_("%F: macros nested too deeply\n"));
+-    }
++    fatal (_("%P: macros nested too deeply\n"));
+   file_name_stack[include_stack_ptr] = fake_filename;
+   lineno_stack[include_stack_ptr] = lineno;
+   include_stack[include_stack_ptr] = YY_CURRENT_BUFFER;
+@@ -674,7 +670,7 @@ yy_input (char *buf, int max_size)
+        {
+          result = fread (buf, 1, max_size, yyin);
+          if (result < max_size && ferror (yyin))
+-           einfo (_("%F%P: read in flex scanner failed\n"));
++           fatal (_("%P: read in flex scanner failed\n"));
+        }
+     }
+   return result;
+@@ -711,7 +707,7 @@ comment (void)
+ 
+       if (c == 0)
+        {
+-         einfo (_("%F%P: EOF in comment\n"));
++         fatal (_("%P: EOF in comment\n"));
+          break;
+        }
+     }
+@@ -732,7 +728,7 @@ lex_warn_invalid (char *where, char *what)
+   if (ldfile_assumed_script)
+     {
+       bfd_set_error (bfd_error_file_not_recognized);
+-      einfo (_("%F%s: file not recognized: %E\n"), ldlex_filename ());
++      fatal (_("%s: file not recognized: %E\n"), ldlex_filename ());
+     }
+ 
+   if (! ISPRINT (*what))
+diff --git a/ld/ldmain.c b/ld/ldmain.c
+index 3cd5516c..878d9536 100644
+--- a/ld/ldmain.c
++++ b/ld/ldmain.c
+@@ -192,7 +192,7 @@ write_dependency_file (void)
+   out = fopen (config.dependency_file, FOPEN_WT);
+   if (out == NULL)
+     {
+-      einfo (_("%F%P: cannot open dependency file %s: %E\n"),
++      fatal (_("%P: cannot open dependency file %s: %E\n"),
+             config.dependency_file);
+     }
+ 
+@@ -265,7 +265,7 @@ main (int argc, char **argv)
+   expandargv (&argc, &argv);
+ 
+   if (bfd_init () != BFD_INIT_MAGIC)
+-    einfo (_("%F%P: fatal error: libbfd ABI mismatch\n"));
++    fatal (_("%P: fatal error: libbfd ABI mismatch\n"));
+ 
+   bfd_set_error_program_name (program_name);
+ 
+@@ -467,13 +467,13 @@ main (int argc, char **argv)
+     xexit (0);
+ 
+   if (link_info.inhibit_common_definition && !bfd_link_dll (&link_info))
+-    einfo (_("%F%P: --no-define-common may not be used without -shared\n"));
++    fatal (_("%P: --no-define-common may not be used without -shared\n"));
+ 
+   if (!lang_has_input_file)
+     {
+       if (version_printed || command_line.print_output_format)
+        xexit (0);
+-      einfo (_("%F%P: no input files\n"));
++      fatal (_("%P: no input files\n"));
+     }
+ 
+   if (verbose)
+@@ -493,7 +493,7 @@ main (int argc, char **argv)
+          if (config.map_file == (FILE *) NULL)
+            {
+              bfd_set_error (bfd_error_system_call);
+-             einfo (_("%F%P: cannot open map file %s: %E\n"),
++             einfo (_("%P: cannot open map file %s: %E\n"),
+                     config.map_filename);
+            }
+        }
+@@ -568,7 +568,7 @@ main (int argc, char **argv)
+       bfd *obfd = link_info.output_bfd;
+       link_info.output_bfd = NULL;
+       if (!bfd_close (obfd))
+-       einfo (_("%F%P: %s: final close failed: %E\n"), output_filename);
++       fatal (_("%P: %s: final close failed: %E\n"), output_filename);
+ 
+       /* If the --force-exe-suffix is enabled, and we're making an
+         executable file and it doesn't end in .exe, copy it to one
+@@ -595,10 +595,10 @@ main (int argc, char **argv)
+              dst = fopen (dst_name, FOPEN_WB);
+ 
+              if (!src)
+-               einfo (_("%F%P: unable to open for source of copy `%s'\n"),
++               fatal (_("%P: unable to open for source of copy `%s'\n"),
+                       output_filename);
+              if (!dst)
+-               einfo (_("%F%P: unable to open for destination of copy `%s'\n"),
++               fatal (_("%P: unable to open for destination of copy `%s'\n"),
+                       dst_name);
+              while ((l = fread (buf, 1, bsize, src)) > 0)
+                {
+@@ -709,7 +709,7 @@ get_emulation (int argc, char **argv)
+                  i++;
+                }
+              else
+-               einfo (_("%F%P: missing argument to -m\n"));
++               fatal (_("%P: missing argument to -m\n"));
+            }
+          else if (strcmp (argv[i], "-mips1") == 0
+                   || strcmp (argv[i], "-mips2") == 0
+@@ -763,11 +763,11 @@ add_ysym (const char *name)
+                                  bfd_hash_newfunc,
+                                  sizeof (struct bfd_hash_entry),
+                                  61))
+-       einfo (_("%F%P: bfd_hash_table_init failed: %E\n"));
++       fatal (_("%P: bfd_hash_table_init failed: %E\n"));
+     }
+ 
+   if (bfd_hash_lookup (link_info.notice_hash, name, true, true) == NULL)
+-    einfo (_("%F%P: bfd_hash_lookup failed: %E\n"));
++    fatal (_("%P: bfd_hash_lookup failed: %E\n"));
+ }
+ 
+ void
+@@ -780,11 +780,11 @@ add_ignoresym (struct bfd_link_info *info, const char *name)
+                                  bfd_hash_newfunc,
+                                  sizeof (struct bfd_hash_entry),
+                                  61))
+-       einfo (_("%F%P: bfd_hash_table_init failed: %E\n"));
++       fatal (_("%P: bfd_hash_table_init failed: %E\n"));
+     }
+ 
+   if (bfd_hash_lookup (info->ignore_hash, name, true, true) == NULL)
+-    einfo (_("%F%P: bfd_hash_lookup failed: %E\n"));
++    fatal (_("%P: bfd_hash_lookup failed: %E\n"));
+ }
+ 
+ /* Record a symbol to be wrapped, from the --wrap option.  */
+@@ -800,11 +800,11 @@ add_wrap (const char *name)
+                                  bfd_hash_newfunc,
+                                  sizeof (struct bfd_hash_entry),
+                                  61))
+-       einfo (_("%F%P: bfd_hash_table_init failed: %E\n"));
++       fatal (_("%P: bfd_hash_table_init failed: %E\n"));
+     }
+ 
+   if (bfd_hash_lookup (link_info.wrap_hash, name, true, true) == NULL)
+-    einfo (_("%F%P: bfd_hash_lookup failed: %E\n"));
++    fatal (_("%P: bfd_hash_lookup failed: %E\n"));
+ }
+ 
+ /* Handle the -retain-symbols-file option.  */
+@@ -832,7 +832,7 @@ add_keepsyms_file (const char *filename)
+       xmalloc (sizeof (struct bfd_hash_table));
+   if (!bfd_hash_table_init (link_info.keep_hash, bfd_hash_newfunc,
+                            sizeof (struct bfd_hash_entry)))
+-    einfo (_("%F%P: bfd_hash_table_init failed: %E\n"));
++    fatal (_("%P: bfd_hash_table_init failed: %E\n"));
+ 
+   bufsize = 100;
+   buf = (char *) xmalloc (bufsize);
+@@ -862,7 +862,7 @@ add_keepsyms_file (const char *filename)
+          buf[len] = '\0';
+ 
+          if (bfd_hash_lookup (link_info.keep_hash, buf, true, true) == NULL)
+-           einfo (_("%F%P: bfd_hash_lookup for insertion failed: %E\n"));
++           fatal (_("%P: bfd_hash_lookup for insertion failed: %E\n"));
+        }
+     }
+ 
+@@ -1269,7 +1269,7 @@ constructor_callback (struct bfd_link_info *info,
+   if (bfd_reloc_type_lookup (info->output_bfd, BFD_RELOC_CTOR) == NULL
+       && (bfd_link_relocatable (info)
+          || bfd_reloc_type_lookup (abfd, BFD_RELOC_CTOR) == NULL))
+-    einfo (_("%F%P: BFD backend error: BFD_RELOC_CTOR unsupported\n"));
++    fatal (_("%P: BFD backend error: BFD_RELOC_CTOR unsupported\n"));
+ 
+   s = set_name;
+   if (bfd_get_symbol_leading_char (abfd) != '\0')
+@@ -1281,7 +1281,7 @@ constructor_callback (struct bfd_link_info *info,
+ 
+   h = bfd_link_hash_lookup (info->hash, set_name, true, true, true);
+   if (h == (struct bfd_link_hash_entry *) NULL)
+-    einfo (_("%F%P: bfd_link_hash_lookup failed: %E\n"));
++    fatal (_("%P: bfd_link_hash_lookup failed: %E\n"));
+   if (h->type == bfd_link_hash_new)
+     {
+       h->type = bfd_link_hash_undefined;
+@@ -1314,7 +1314,7 @@ symbol_warning (const char *warning, const char *symbol, bfd *abfd)
+   struct warning_callback_info cinfo;
+ 
+   if (!bfd_generic_link_read_symbols (abfd))
+-    einfo (_("%F%P: %pB: could not read symbols: %E\n"), abfd);
++    fatal (_("%P: %pB: could not read symbols: %E\n"), abfd);
+ 
+   cinfo.found = false;
+   cinfo.warning = warning;
+@@ -1376,14 +1376,14 @@ warning_find_reloc (bfd *abfd, asection *sec, void *iarg)
+ 
+   relsize = bfd_get_reloc_upper_bound (abfd, sec);
+   if (relsize < 0)
+-    einfo (_("%F%P: %pB: could not read relocs: %E\n"), abfd);
++    fatal (_("%P: %pB: could not read relocs: %E\n"), abfd);
+   if (relsize == 0)
+     return;
+ 
+   relpp = (arelent **) xmalloc (relsize);
+   relcount = bfd_canonicalize_reloc (abfd, sec, relpp, info->asymbols);
+   if (relcount < 0)
+-    einfo (_("%F%P: %pB: could not read relocs: %E\n"), abfd);
++    fatal (_("%P: %pB: could not read relocs: %E\n"), abfd);
+ 
+   p = relpp;
+   pend = p + relcount;
+diff --git a/ld/ldmisc.c b/ld/ldmisc.c
+index 3c862ea4..d1257214 100644
+--- a/ld/ldmisc.c
++++ b/ld/ldmisc.c
+@@ -70,7 +70,7 @@
+ void
+ vfinfo (FILE *fp, const char *fmt, va_list ap, bool is_warning)
+ {
+-  bool fatal = false;
++  bool isfatal = false;
+   const char *scan;
+   int arg_type;
+   unsigned int arg_count = 0;
+@@ -282,7 +282,7 @@ vfinfo (FILE *fp, const char *fmt, va_list ap, bool is_warning)
+ 
+            case 'F':
+              /* Error is fatal.  */
+-             fatal = true;
++             isfatal = true;
+              break;
+ 
+            case 'P':
+@@ -324,7 +324,7 @@ vfinfo (FILE *fp, const char *fmt, va_list ap, bool is_warning)
+                if (abfd != NULL)
+                  {
+                    if (!bfd_generic_link_read_symbols (abfd))
+-                     einfo (_("%F%P: %pB: could not read symbols: %E\n"), abfd);
++                     fatal (_("%P: %pB: could not read symbols: %E\n"), abfd);
+ 
+                    asymbols = bfd_get_outsymbols (abfd);
+                  }
+@@ -587,7 +587,7 @@ vfinfo (FILE *fp, const char *fmt, va_list ap, bool is_warning)
+   if (is_warning && config.fatal_warnings)
+     config.make_executable = false;
+ 
+-  if (fatal)
++  if (isfatal)
+     xexit (1);
+ }
+ 
+@@ -620,10 +620,25 @@ einfo (const char *fmt, ...)
+   fflush (stderr);
+ }
+ 
++/* Fatal error.  */
++
++void
++fatal (const char *fmt, ...)
++{
++  va_list arg;
++
++  fflush (stdout);
++  va_start (arg, fmt);
++  vfinfo (stderr, fmt, arg, true);
++  va_end (arg);
++  fflush (stderr);
++  xexit (1);
++}
++
+ void
+ info_assert (const char *file, unsigned int line)
+ {
+-  einfo (_("%F%P: internal error %s %d\n"), file, line);
++  fatal (_("%P: internal error %s %d\n"), file, line);
+ }
+ 
+ /* ('m' for map) Format info message and print on map.  */
+@@ -692,6 +707,5 @@ ld_abort (const char *file, int line, const char *fn)
+   else
+     einfo (_("%P: internal error: aborting at %s:%d\n"),
+           file, line);
+-  einfo (_("%F%P: please report this bug\n"));
+-  xexit (1);
++  fatal (_("%P: please report this bug\n"));
+ }
+diff --git a/ld/ldmisc.h b/ld/ldmisc.h
+index e8b982fe..f763ab8f 100644
+--- a/ld/ldmisc.h
++++ b/ld/ldmisc.h
+@@ -23,6 +23,7 @@
+ 
+ extern void vfinfo (FILE *fp, const char *fmt, va_list arg, bool is_warning);
+ extern void einfo (const char *, ...);
++extern void fatal (const char *, ...) ATTRIBUTE_NORETURN;
+ extern void minfo (const char *, ...);
+ extern void info_msg (const char *, ...);
+ extern void lfinfo (FILE *, const char *, ...);
+diff --git a/ld/ldwrite.c b/ld/ldwrite.c
+index 46fb33c8..ace5e564 100644
+--- a/ld/ldwrite.c
++++ b/ld/ldwrite.c
+@@ -57,14 +57,14 @@ build_link_order (lang_statement_union_type *statement)
+ 
+        link_order = bfd_new_link_order (link_info.output_bfd, output_section);
+        if (link_order == NULL)
+-         einfo (_("%F%P: bfd_new_link_order failed: %E\n"));
++         fatal (_("%P: bfd_new_link_order failed: %E\n"));
+ 
+        link_order->type = bfd_data_link_order;
+        link_order->offset = statement->data_statement.output_offset;
+        link_order->u.data.contents = bfd_alloc (link_info.output_bfd,
+                                                 QUAD_SIZE);
+        if (link_order->u.data.contents == NULL)
+-         einfo (_("%F%P: bfd_new_link_order failed: %E\n"));
++         fatal (_("%P: bfd_new_link_order failed: %E\n"));
+ 
+        value = statement->data_statement.value;
+ 
+@@ -170,7 +170,7 @@ build_link_order (lang_statement_union_type *statement)
+ 
+        link_order = bfd_new_link_order (link_info.output_bfd, output_section);
+        if (link_order == NULL)
+-         einfo (_("%F%P: bfd_new_link_order failed: %E\n"));
++         fatal (_("%P: bfd_new_link_order failed: %E\n"));
+ 
+        link_order->offset = rs->output_offset;
+        link_order->size = bfd_get_reloc_size (rs->howto);
+@@ -178,7 +178,7 @@ build_link_order (lang_statement_union_type *statement)
+        link_order->u.reloc.p = (struct bfd_link_order_reloc *)
+          bfd_alloc (link_info.output_bfd, sizeof (struct bfd_link_order_reloc));
+        if (link_order->u.reloc.p == NULL)
+-         einfo (_("%F%P: bfd_new_link_order failed: %E\n"));
++         fatal (_("%P: bfd_new_link_order failed: %E\n"));
+ 
+        link_order->u.reloc.p->reloc = rs->reloc;
+        link_order->u.reloc.p->addend = rs->addend_value;
+@@ -224,7 +224,7 @@ build_link_order (lang_statement_union_type *statement)
+            link_order = bfd_new_link_order (link_info.output_bfd,
+                                             output_section);
+            if (link_order == NULL)
+-             einfo (_("%F%P: bfd_new_link_order failed: %E\n"));
++             fatal (_("%P: bfd_new_link_order failed: %E\n"));
+ 
+            if ((i->flags & SEC_NEVER_LOAD) != 0
+                && (i->flags & SEC_DEBUGGING) == 0)
+@@ -265,7 +265,7 @@ build_link_order (lang_statement_union_type *statement)
+        link_order = bfd_new_link_order (link_info.output_bfd,
+                                         output_section);
+        if (link_order == NULL)
+-         einfo (_("%F%P: bfd_new_link_order failed: %E\n"));
++         fatal (_("%P: bfd_new_link_order failed: %E\n"));
+        link_order->type = bfd_data_link_order;
+        link_order->size = statement->padding_statement.size;
+        link_order->offset = statement->padding_statement.output_offset;
+@@ -334,8 +334,7 @@ clone_section (bfd *abfd, asection *s, const char *name, int *count)
+       if (startswith (name, ".stab")
+          || strcmp (name, "$GDB_SYMBOLS$") == 0)
+        {
+-         einfo (_ ("%F%P: cannot create split section name for %s\n"), name);
+-         /* Silence gcc warnings.  einfo exits, so we never reach here.  */
++         fatal (_ ("%P: cannot create split section name for %s\n"), name);
+          return NULL;
+        }
+       tname[5] = 0;
+@@ -346,8 +345,7 @@ clone_section (bfd *abfd, asection *s, const char *name, int *count)
+       || (h = bfd_link_hash_lookup (link_info.hash,
+                                    sname, true, true, false)) == NULL)
+     {
+-      einfo (_("%F%P: clone section failed: %E\n"));
+-      /* Silence gcc warnings.  einfo exits, so we never reach here.  */
++      fatal (_("%P: clone section failed: %E\n"));
+       return NULL;
+     }
+   free (tname);
+@@ -554,7 +552,7 @@ ldwrite (void)
+         out.  */
+ 
+       if (bfd_get_error () != bfd_error_no_error)
+-       einfo (_("%F%P: final link failed: %E\n"));
++       fatal (_("%P: final link failed: %E\n"));
+       else
+        xexit (1);
+     }
+diff --git a/ld/lexsup.c b/ld/lexsup.c
+index e9939000..00346348 100644
+--- a/ld/lexsup.c
++++ b/ld/lexsup.c
+@@ -810,7 +810,8 @@ parse_args (unsigned argc, char **argv)
+               && optc != argv[last_optind][1])
+        {
+          if (optarg)
+-           einfo (_("%F%P: Error: unable to disambiguate: %s (did you mean -%s ?)\n"),
++           fatal (_("%P: Error: unable to disambiguate: "
++                    "%s (did you mean -%s ?)\n"),
+                   argv[last_optind], argv[last_optind]);
+          else
+            einfo (_("%P: Warning: grouped short command line options are deprecated: %s\n"), argv[last_optind]);
+@@ -850,7 +851,7 @@ parse_args (unsigned argc, char **argv)
+          /* Fall through.  */
+ 
+        default:
+-         einfo (_("%F%P: use the --help option for usage information\n"));
++         fatal (_("%P: use the --help option for usage information\n"));
+          break;
+ 
+        case 1:                 /* File name.  */
+@@ -869,7 +870,7 @@ parse_args (unsigned argc, char **argv)
+                   || strcmp (optarg, "default") == 0)
+            input_flags.dynamic = true;
+          else
+-           einfo (_("%F%P: unrecognized -a option `%s'\n"), optarg);
++           fatal (_("%P: unrecognized -a option `%s'\n"), optarg);
+          break;
+        case OPTION_ASSERT:
+          /* FIXME: We just ignore these, but we should handle them.  */
+@@ -882,7 +883,7 @@ parse_args (unsigned argc, char **argv)
+          else if (strcmp (optarg, "pure-text") == 0)
+            ;
+          else
+-           einfo (_("%F%P: unrecognized -assert option `%s'\n"), optarg);
++           fatal (_("%P: unrecognized -assert option `%s'\n"), optarg);
+          break;
+        case 'A':
+          ldfile_add_arch (optarg);
+@@ -926,8 +927,7 @@ parse_args (unsigned argc, char **argv)
+ 
+              style = cplus_demangle_name_to_style (optarg);
+              if (style == unknown_demangling)
+-               einfo (_("%F%P: unknown demangling style `%s'\n"),
+-                      optarg);
++               fatal (_("%P: unknown demangling style `%s'\n"), optarg);
+ 
+              cplus_demangle_set_style (style);
+            }
+@@ -1034,7 +1034,7 @@ parse_args (unsigned argc, char **argv)
+            char *end;
+            g_switch_value = strtoul (optarg, &end, 0);
+            if (*end)
+-             einfo (_("%F%P: invalid number `%s'\n"), optarg);
++             fatal (_("%P: invalid number `%s'\n"), optarg);
+          }
+          break;
+        case 'g':
+@@ -1130,7 +1130,7 @@ parse_args (unsigned argc, char **argv)
+              link_info.unresolved_syms_in_shared_libs = RM_IGNORE;
+            }
+          else
+-           einfo (_("%F%P: bad --unresolved-symbols option: %s\n"), optarg);
++           fatal (_("%P: bad --unresolved-symbols option: %s\n"), optarg);
+          break;
+        case OPTION_WARN_UNRESOLVED_SYMBOLS:
+          link_info.warn_unresolved_syms = true;
+@@ -1217,7 +1217,7 @@ parse_args (unsigned argc, char **argv)
+          break;
+        case OPTION_PLUGIN_OPT:
+          if (plugin_opt_plugin_arg (optarg))
+-           einfo (_("%F%P: bad -plugin-opt option\n"));
++           fatal (_("%P: bad -plugin-opt option\n"));
+          break;
+ #endif /* BFD_SUPPORTS_PLUGINS */
+        case 'q':
+@@ -1234,11 +1234,11 @@ parse_args (unsigned argc, char **argv)
+               an error message here.  We cannot just make this a warning,
+               increment optind, and continue because getopt is too confused
+               and will seg-fault the next time around.  */
+-           einfo(_("%F%P: unrecognised option: %s\n"), argv[optind]);
++           fatal(_("%P: unrecognised option: %s\n"), argv[optind]);
+ 
+          if (bfd_link_pic (&link_info))
+-           einfo (_("%F%P: -r and %s may not be used together\n"),
+-                    bfd_link_dll (&link_info) ? "-shared" : "-pie");
++           fatal (_("%P: -r and %s may not be used together\n"),
++                  bfd_link_dll (&link_info) ? "-shared" : "-pie");
+ 
+          link_info.type = type_relocatable;
+          config.build_constructors = false;
+@@ -1347,7 +1347,7 @@ parse_args (unsigned argc, char **argv)
+          if (config.has_shared)
+            {
+              if (bfd_link_relocatable (&link_info))
+-               einfo (_("%F%P: -r and %s may not be used together\n"),
++               fatal (_("%P: -r and %s may not be used together\n"),
+                       "-shared");
+ 
+              link_info.type = type_dll;
+@@ -1359,7 +1359,7 @@ parse_args (unsigned argc, char **argv)
+                link_info.unresolved_syms_in_shared_libs = RM_IGNORE;
+            }
+          else
+-           einfo (_("%F%P: -shared not supported\n"));
++           fatal (_("%P: -shared not supported\n"));
+          break;
+        case OPTION_NO_PIE:
+          link_info.type = type_pde;
+@@ -1368,12 +1368,12 @@ parse_args (unsigned argc, char **argv)
+          if (config.has_shared)
+            {
+              if (bfd_link_relocatable (&link_info))
+-               einfo (_("%F%P: -r and %s may not be used together\n"), "-pie");
++               fatal (_("%P: -r and %s may not be used together\n"), "-pie");
+ 
+              link_info.type = type_pie;
+            }
+          else
+-           einfo (_("%F%P: -pie not supported\n"));
++           fatal (_("%P: -pie not supported\n"));
+          break;
+        case 'h':               /* Used on Solaris.  */
+        case OPTION_SONAME:
+@@ -1390,7 +1390,7 @@ parse_args (unsigned argc, char **argv)
+          else if (strcmp (optarg, N_("ascending")) == 0)
+            config.sort_common = sort_ascending;
+          else
+-           einfo (_("%F%P: invalid common section sorting option: %s\n"),
++           fatal (_("%P: invalid common section sorting option: %s\n"),
+                   optarg);
+          break;
+        case OPTION_SORT_SECTION:
+@@ -1399,8 +1399,7 @@ parse_args (unsigned argc, char **argv)
+          else if (strcmp (optarg, N_("alignment")) == 0)
+            sort_section = by_alignment;
+          else
+-           einfo (_("%F%P: invalid section sorting option: %s\n"),
+-                  optarg);
++           fatal (_("%P: invalid section sorting option: %s\n"), optarg);
+          break;
+        case OPTION_STATS:
+          config.stats = true;
+@@ -1436,14 +1435,14 @@ parse_args (unsigned argc, char **argv)
+            /* Check for <something>=<somthing>...  */
+            optarg2 = strchr (optarg, '=');
+            if (optarg2 == NULL)
+-             einfo (_("%F%P: invalid argument to option"
++             fatal (_("%P: invalid argument to option"
+                       " \"--section-start\"\n"));
+ 
+            optarg2++;
+ 
+            /* So far so good.  Are all the args present?  */
+            if ((*optarg == '\0') || (*optarg2 == '\0'))
+-             einfo (_("%F%P: missing argument(s) to option"
++             fatal (_("%P: missing argument(s) to option"
+                       " \"--section-start\"\n"));
+ 
+            /* We must copy the section name as set_section_start
+@@ -1487,8 +1486,8 @@ parse_args (unsigned argc, char **argv)
+          /* Fall through.  */
+        case OPTION_UR:
+          if (bfd_link_pic (&link_info))
+-           einfo (_("%F%P: -r and %s may not be used together\n"),
+-                    bfd_link_dll (&link_info) ? "-shared" : "-pie");
++           fatal (_("%P: -r and %s may not be used together\n"),
++                  bfd_link_dll (&link_info) ? "-shared" : "-pie");
+ 
+          link_info.type = type_relocatable;
+          config.build_constructors = true;
+@@ -1518,7 +1517,7 @@ parse_args (unsigned argc, char **argv)
+              char *end;
+              int level ATTRIBUTE_UNUSED = strtoul (optarg, &end, 0);
+              if (*end)
+-               einfo (_("%F%P: invalid number `%s'\n"), optarg);
++               fatal (_("%P: invalid number `%s'\n"), optarg);
+ #if BFD_SUPPORTS_PLUGINS
+              report_plugin_symbols = level > 1;
+ #endif /* BFD_SUPPORTS_PLUGINS */
+@@ -1713,7 +1712,7 @@ parse_args (unsigned argc, char **argv)
+          break;
+        case ')':
+          if (! ingroup)
+-           einfo (_("%F%P: group ended before it began (--help for usage)\n"));
++           fatal (_("%P: group ended before it began (--help for usage)\n"));
+ 
+          lang_leave_group ();
+          ingroup--;
+@@ -1729,7 +1728,7 @@ parse_args (unsigned argc, char **argv)
+ 
+        case OPTION_REMAP_INPUTS_FILE:
+          if (! ldfile_add_remap_file (optarg))
+-           einfo (_("%F%P: failed to add remap file %s\n"), optarg);
++           fatal (_("%P: failed to add remap file %s\n"), optarg);
+          break;
+ 
+        case OPTION_REMAP_INPUTS:
+@@ -1738,7 +1737,7 @@ parse_args (unsigned argc, char **argv)
+            if (optarg2 == NULL)
+              /* FIXME: Should we allow --remap-inputs=@myfile as a synonym
+                 for --remap-inputs-file=myfile ?  */
+-             einfo (_("%F%P: invalid argument to option --remap-inputs\n"));
++             fatal (_("%P: invalid argument to option --remap-inputs\n"));
+            size_t len = optarg2 - optarg;
+            char * pattern = xmalloc (len + 1);
+            memcpy (pattern, optarg, len);
+@@ -1759,8 +1758,7 @@ parse_args (unsigned argc, char **argv)
+            char *end;
+            bfd_size_type cache_size = strtoul (optarg, &end, 0);
+            if (*end != '\0')
+-             einfo (_("%F%P: invalid cache memory size: %s\n"),
+-                    optarg);
++             fatal (_("%P: invalid cache memory size: %s\n"), optarg);
+            link_info.max_cache_size = cache_size;
+          }
+          break;
+@@ -1785,7 +1783,7 @@ parse_args (unsigned argc, char **argv)
+ 
+        case OPTION_POP_STATE:
+          if (input_flags.pushed == NULL)
+-           einfo (_("%F%P: no state pushed before popping\n"));
++           fatal (_("%P: no state pushed before popping\n"));
+          else
+            {
+              struct lang_input_statement_flags *oldp = input_flags.pushed;
+@@ -1808,7 +1806,7 @@ parse_args (unsigned argc, char **argv)
+          else if (strcasecmp (optarg, "discard") == 0)
+            config.orphan_handling = orphan_handling_discard;
+          else
+-           einfo (_("%F%P: invalid argument to option"
++           fatal (_("%P: invalid argument to option"
+                     " \"--orphan-handling\"\n"));
+          break;
+ 
+@@ -1853,7 +1851,7 @@ parse_args (unsigned argc, char **argv)
+          else if (strcmp (optarg, "share-duplicated") == 0)
+            config.ctf_share_duplicated = true;
+          else
+-           einfo (_("%F%P: bad --ctf-share-types option: %s\n"), optarg);
++           fatal (_("%P: bad --ctf-share-types option: %s\n"), optarg);
+          break;
+        }
+     }
+@@ -2048,7 +2046,7 @@ parse_args (unsigned argc, char **argv)
+   if (config.no_section_header)
+     {
+       if (bfd_link_relocatable (&link_info))
+-       einfo (_("%F%P: -r and -z nosectionheader may not be used together\n"));
++       fatal (_("%P: -r and -z nosectionheader may not be used together\n"));
+ 
+       link_info.strip = strip_all;
+     }
+@@ -2056,9 +2054,9 @@ parse_args (unsigned argc, char **argv)
+   if (!bfd_link_dll (&link_info))
+     {
+       if (command_line.filter_shlib)
+-       einfo (_("%F%P: -F may not be used without -shared\n"));
++       fatal (_("%P: -F may not be used without -shared\n"));
+       if (command_line.auxiliary_filters)
+-       einfo (_("%F%P: -f may not be used without -shared\n"));
++       fatal (_("%P: -f may not be used without -shared\n"));
+     }
+ 
+   /* Treat ld -r -s as ld -r -S -x (i.e., strip all local symbols).  I
+@@ -2099,7 +2097,7 @@ set_section_start (char *sect, char *valstr)
+   const char *end;
+   bfd_vma val = bfd_scan_vma (valstr, &end, 16);
+   if (*end)
+-    einfo (_("%F%P: invalid hex number `%s'\n"), valstr);
++    fatal (_("%P: invalid hex number `%s'\n"), valstr);
+   lang_section_start (sect, exp_intop (val), NULL);
+ }
+ 
+@@ -2112,7 +2110,7 @@ set_segment_start (const char *section, char *valstr)
+ 
+   bfd_vma val = bfd_scan_vma (valstr, &end, 16);
+   if (*end)
+-    einfo (_("%F%P: invalid hex number `%s'\n"), valstr);
++    fatal (_("%P: invalid hex number `%s'\n"), valstr);
+   /* If we already have an entry for this segment, update the existing
+      value.  */
+   name = section + 1;
+diff --git a/ld/mri.c b/ld/mri.c
+index 766f3174..7c8e59fa 100644
+--- a/ld/mri.c
++++ b/ld/mri.c
+@@ -288,7 +288,7 @@ mri_format (const char *name)
+     lang_add_output_format ("srec", NULL, NULL, 1);
+ 
+   else
+-    einfo (_("%F%P: unknown format type %s\n"), name);
++    fatal (_("%P: unknown format type %s\n"), name);
+ }
+ 
+ void
+diff --git a/ld/pe-dll.c b/ld/pe-dll.c
+index 95eef84f..800d00c8 100644
+--- a/ld/pe-dll.c
++++ b/ld/pe-dll.c
+@@ -756,7 +756,7 @@ process_def_file_and_drectve (bfd *abfd ATTRIBUTE_UNUSED, struct bfd_link_info *
+ 
+          if (!bfd_generic_link_read_symbols (b))
+            {
+-             einfo (_("%F%P: %pB: could not read symbols: %E\n"), b);
++             fatal (_("%P: %pB: could not read symbols: %E\n"), b);
+              return;
+            }
+ 
+@@ -1048,7 +1048,7 @@ build_filler_bfd (bool include_edata)
+                             bfd_get_arch (link_info.output_bfd),
+                             bfd_get_mach (link_info.output_bfd)))
+     {
+-      einfo (_("%F%P: can not create BFD: %E\n"));
++      fatal (_("%P: can not create BFD: %E\n"));
+       return;
+     }
+ 
+@@ -1326,7 +1326,7 @@ pe_walk_relocs (struct bfd_link_info *info,
+ 
+       if (!bfd_generic_link_read_symbols (b))
+        {
+-         einfo (_("%F%P: %pB: could not read symbols: %E\n"), b);
++         fatal (_("%P: %pB: could not read symbols: %E\n"), b);
+          return;
+        }
+ 
+@@ -1407,7 +1407,7 @@ pe_find_data_imports (const char *symhead,
+       if (!bfd_hash_table_init (import_hash,
+                                bfd_hash_newfunc,
+                                sizeof (struct bfd_hash_entry)))
+-       einfo (_("%F%P: bfd_hash_table_init failed: %E\n"));
++       fatal (_("%P: bfd_hash_table_init failed: %E\n"));
+     }
+   else
+     import_hash = NULL;
+@@ -1447,7 +1447,7 @@ pe_find_data_imports (const char *symhead,
+ 
+                if (!bfd_generic_link_read_symbols (b))
+                  {
+-                   einfo (_("%F%P: %pB: could not read symbols: %E\n"), b);
++                   fatal (_("%P: %pB: could not read symbols: %E\n"), b);
+                    return;
+                  }
+ 
+@@ -1549,7 +1549,7 @@ generate_reloc (bfd *abfd, struct bfd_link_info *info)
+ 
+       if (!bfd_generic_link_read_symbols (b))
+        {
+-         einfo (_("%F%P: %pB: could not read symbols: %E\n"), b);
++         fatal (_("%P: %pB: could not read symbols: %E\n"), b);
+          return;
+        }
+ 
+diff --git a/ld/plugin.c b/ld/plugin.c
+index e9828690..0a99d406 100644
+--- a/ld/plugin.c
++++ b/ld/plugin.c
+@@ -252,7 +252,7 @@ plugin_opt_plugin (const char *plugin)
+   newplug->name = plugin;
+   newplug->dlhandle = dlopen (plugin, RTLD_NOW);
+   if (!newplug->dlhandle)
+-    einfo (_("%F%P: %s: error loading plugin: %s\n"), plugin, dlerror ());
++    fatal (_("%P: %s: error loading plugin: %s\n"), plugin, dlerror ());
+ 
+   /* Check if plugin has been loaded already.  */
+   while (curplug)
+@@ -345,7 +345,7 @@ plugin_get_ir_dummy_bfd (const char *name, bfd *srctemplate)
+        }
+     }
+  report_error:
+-  einfo (_("%F%P: could not create dummy IR bfd: %E\n"));
++  fatal (_("%P: could not create dummy IR bfd: %E\n"));
+   return NULL;
+ }
+ 
+@@ -426,7 +426,7 @@ asymbol_from_plugin_symbol (bfd *abfd, asymbol *asym,
+       unsigned char visibility;
+ 
+       if (!elfsym)
+-       einfo (_("%F%P: %s: non-ELF symbol in ELF BFD!\n"), asym->name);
++       fatal (_("%P: %s: non-ELF symbol in ELF BFD!\n"), asym->name);
+ 
+       if (ldsym->def == LDPK_COMMON)
+        {
+@@ -437,7 +437,7 @@ asymbol_from_plugin_symbol (bfd *abfd, asymbol *asym,
+       switch (ldsym->visibility)
+        {
+        default:
+-         einfo (_("%F%P: unknown ELF symbol visibility: %d!\n"),
++         fatal (_("%P: unknown ELF symbol visibility: %d!\n"),
+                 ldsym->visibility);
+          return LDPS_ERR;
+ 
+@@ -555,7 +555,7 @@ get_view (const void *handle, const void **viewp)
+ 
+   /* FIXME: einfo should support %lld.  */
+   if ((off_t) size != input->filesize)
+-    einfo (_("%F%P: unsupported input file size: %s (%ld bytes)\n"),
++    fatal (_("%P: unsupported input file size: %s (%ld bytes)\n"),
+           input->name, (long) input->filesize);
+ 
+   /* Check the cached view buffer.  */
+@@ -826,7 +826,7 @@ get_symbols (const void *handle, int nsyms, struct ld_plugin_symbol *syms,
+          && blhe->type != bfd_link_hash_common)
+        {
+          /* We should not have a new, indirect or warning symbol here.  */
+-         einfo (_("%F%P: %s: plugin symbol table corrupt (sym type %d)\n"),
++         fatal (_("%P: %s: plugin symbol table corrupt (sym type %d)\n"),
+                 called_plugin->name, blhe->type);
+        }
+ 
+@@ -978,13 +978,14 @@ message (int level, const char *format, ...)
+     case LDPL_ERROR:
+     default:
+       {
+-       char *newfmt = concat (level == LDPL_FATAL ? "%F" : "%X",
+-                              _("%P: error: "), format, "\n",
++       char *newfmt = concat (_("%X%P: error: "), format, "\n",
+                               (const char *) NULL);
+        fflush (stdout);
+        vfinfo (stderr, newfmt, args, true);
+        fflush (stderr);
+        free (newfmt);
++       if (level == LDPL_FATAL)
++         fatal ("");
+       }
+       break;
+     }
+@@ -1127,14 +1128,14 @@ plugin_load_plugins (void)
+       if (!onloadfn)
+        onloadfn = (ld_plugin_onload) dlsym (curplug->dlhandle, "_onload");
+       if (!onloadfn)
+-       einfo (_("%F%P: %s: error loading plugin: %s\n"),
++       fatal (_("%P: %s: error loading plugin: %s\n"),
+               curplug->name, dlerror ());
+       set_tv_plugin_args (curplug, &my_tv[tv_header_size]);
+       called_plugin = curplug;
+       rv = (*onloadfn) (my_tv);
+       called_plugin = NULL;
+       if (rv != LDPS_OK)
+-       einfo (_("%F%P: %s: plugin error: %d\n"), curplug->name, rv);
++       fatal (_("%P: %s: plugin error: %d\n"), curplug->name, rv);
+       curplug = curplug->next;
+     }
+ 
+@@ -1193,7 +1194,7 @@ plugin_strdup (bfd *abfd, const char *str)
+   strlength = strlen (str) + 1;
+   copy = bfd_alloc (abfd, strlength);
+   if (copy == NULL)
+-    einfo (_("%F%P: plugin_strdup failed to allocate memory: %s\n"),
++    fatal (_("%P: plugin_strdup failed to allocate memory: %s\n"),
+           bfd_get_error ());
+   memcpy (copy, str, strlength);
+   return copy;
+@@ -1230,7 +1231,7 @@ plugin_object_p (bfd *ibfd, bool known_used)
+ 
+   input = bfd_alloc (abfd, sizeof (*input));
+   if (input == NULL)
+-    einfo (_("%F%P: plugin failed to allocate memory for input: %s\n"),
++    fatal (_("%P: plugin failed to allocate memory for input: %s\n"),
+           bfd_get_error ());
+ 
+   if (!bfd_plugin_open_input (ibfd, &file))
+@@ -1258,7 +1259,7 @@ plugin_object_p (bfd *ibfd, bool known_used)
+   claimed = 0;
+ 
+   if (plugin_call_claim_file (&file, &claimed, known_used))
+-    einfo (_("%F%P: %s: plugin reported error claiming file\n"),
++    fatal (_("%P: %s: plugin reported error claiming file\n"),
+           plugin_error_plugin ());
+ 
+   if (input->fd != -1
+-- 
+2.43.0
+
diff --git a/meta/recipes-devtools/binutils/binutils/0020-CVE-2025-1153-2.patch b/meta/recipes-devtools/binutils/binutils/0020-CVE-2025-1153-2.patch
new file mode 100644
index 0000000000..2b473914b7
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0020-CVE-2025-1153-2.patch
@@ -0,0 +1,840 @@
+From 31e9e2e8d1090da0c1da97a70005d8841fff8ddd Mon Sep 17 00:00:00 2001
+From: Alan Modra <amodra@gmail.com>
+Date: Sun, 16 Feb 2025 23:34:55 +1030
+Subject: [PATCH] PR 32603, more ld -w misbehaviour
+
+Commit 8d97c1a53f3d claimed to replace all einfo calls using %F with
+a call to fatal.  It did so only for the ld/ directory.  This patch
+adds a "fatal" to linker callbacks, and replaces those calls in bfd/
+too.
+
+Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=31e9e2e8d1090da0c1da97a70005d8841fff8ddd]
+CVE: CVE-2025-1153
+
+Signed-off-by: Sunil Dora <sunilkumar.dora@windriver.com>
+---
+ bfd/archive.c         |  4 ++--
+ bfd/coff-aarch64.c    |  4 +---
+ bfd/coffgen.c         |  2 +-
+ bfd/elf-ifunc.c       |  4 ++--
+ bfd/elf-m10300.c      |  4 ++--
+ bfd/elf-properties.c  |  4 ++--
+ bfd/elf.c             |  4 ++--
+ bfd/elf32-arm.c       |  2 +-
+ bfd/elf32-avr.c       |  4 ++--
+ bfd/elf32-csky.c      |  2 +-
+ bfd/elf32-frv.c       |  4 ++--
+ bfd/elf32-hppa.c      |  6 ++---
+ bfd/elf32-i386.c      |  4 ++--
+ bfd/elf32-m68hc11.c   |  2 +-
+ bfd/elf32-m68hc12.c   |  2 +-
+ bfd/elf32-metag.c     |  2 +-
+ bfd/elf32-spu.c       |  5 ++--
+ bfd/elf64-ia64-vms.c  |  4 ++--
+ bfd/elf64-ppc.c       |  4 ++--
+ bfd/elf64-x86-64.c    | 14 +++++------
+ bfd/elflink.c         |  8 +++----
+ bfd/elfnn-aarch64.c   |  6 ++---
+ bfd/elfnn-ia64.c      |  4 ++--
+ bfd/elfnn-kvx.c       |  2 +-
+ bfd/elfnn-loongarch.c |  4 ++--
+ bfd/elfxx-aarch64.c   |  6 ++---
+ bfd/elfxx-sparc.c     |  4 ++--
+ bfd/elfxx-x86.c       | 56 +++++++++++++++++++++----------------------
+ bfd/linker.c          |  2 +-
+ bfd/reloc.c           |  4 ++--
+ bfd/reloc16.c         |  4 ++--
+ bfd/xcofflink.c       |  2 +-
+ include/bfdlink.h     |  3 +++
+ ld/ldmain.c           |  1 +
+ 34 files changed, 94 insertions(+), 93 deletions(-)
+
+diff --git a/bfd/archive.c b/bfd/archive.c
+index 9f3fbce9..0f617276 100644
+--- a/bfd/archive.c
++++ b/bfd/archive.c
+@@ -749,8 +749,8 @@ _bfd_get_elt_at_filepos (bfd *archive, file_ptr filepos,
+            case bfd_error_system_call:
+              if (info != NULL)
+                {
+-                 info->callbacks->einfo
+-                   (_("%F%P: %pB(%s): error opening thin archive member: %E\n"),
++                 info->callbacks->fatal
++                   (_("%P: %pB(%s): error opening thin archive member: %E\n"),
+                     archive, filename);
+                  break;
+                }
+diff --git a/bfd/coff-aarch64.c b/bfd/coff-aarch64.c
+index 825963c0..53f539e0 100644
+--- a/bfd/coff-aarch64.c
++++ b/bfd/coff-aarch64.c
+@@ -876,10 +876,8 @@ coff_pe_aarch64_relocate_section (bfd *output_bfd,
+          }
+ 
+        default:
+-         info->callbacks->einfo (_("%F%P: Unhandled relocation type %u\n"),
++         info->callbacks->fatal (_("%P: Unhandled relocation type %u\n"),
+                                  rel->r_type);
+-         BFD_FAIL ();
+-         return false;
+        }
+     }
+ 
+diff --git a/bfd/coffgen.c b/bfd/coffgen.c
+index cc1c6557..3270cd2f 100644
+--- a/bfd/coffgen.c
++++ b/bfd/coffgen.c
+@@ -2793,7 +2793,7 @@ _bfd_coff_section_already_linked (bfd *abfd,
+ 
+   /* This is the first section with this name.  Record it.  */
+   if (!bfd_section_already_linked_table_insert (already_linked_list, sec))
+-    info->callbacks->einfo (_("%F%P: already_linked_table: %E\n"));
++    info->callbacks->fatal (_("%P: already_linked_table: %E\n"));
+   return false;
+ }
+ 
+diff --git a/bfd/elf-ifunc.c b/bfd/elf-ifunc.c
+index 42a3bcdf..58a1ca5e 100644
+--- a/bfd/elf-ifunc.c
++++ b/bfd/elf-ifunc.c
+@@ -139,9 +139,9 @@ _bfd_elf_allocate_ifunc_dyn_relocs (struct bfd_link_info *info,
+          || info->export_dynamic)
+       && h->pointer_equality_needed)
+     {
+-      info->callbacks->einfo
++      info->callbacks->fatal
+        /* xgettext:c-format */
+-       (_("%F%P: dynamic STT_GNU_IFUNC symbol `%s' with pointer "
++       (_("%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"),
+         h->root.root.string,
+diff --git a/bfd/elf-m10300.c b/bfd/elf-m10300.c
+index 24ea43a7..cf6bb13b 100644
+--- a/bfd/elf-m10300.c
++++ b/bfd/elf-m10300.c
+@@ -2646,8 +2646,8 @@ mn10300_elf_relax_section (bfd *abfd,
+   bfd_vma align_gap_adjustment;
+ 
+   if (bfd_link_relocatable (link_info))
+-    (*link_info->callbacks->einfo)
+-      (_("%P%F: --relax and -r may not be used together\n"));
++    link_info->callbacks->fatal
++      (_("%P: --relax and -r may not be used together\n"));
+ 
+   /* Assume nothing changes.  */
+   *again = false;
+diff --git a/bfd/elf-properties.c b/bfd/elf-properties.c
+index ee8bd37f..a4591472 100644
+--- a/bfd/elf-properties.c
++++ b/bfd/elf-properties.c
+@@ -665,11 +665,11 @@ _bfd_elf_link_setup_gnu_properties (struct bfd_link_info *info)
+                                              | SEC_HAS_CONTENTS
+                                              | SEC_DATA));
+          if (sec == NULL)
+-           info->callbacks->einfo (_("%F%P: failed to create GNU property section\n"));
++           info->callbacks->fatal (_("%P: failed to create GNU property section\n"));
+ 
+          if (!bfd_set_section_alignment (sec,
+                                          elfclass == ELFCLASS64 ? 3 : 2))
+-           info->callbacks->einfo (_("%F%pA: failed to align section\n"),
++           info->callbacks->fatal (_("%pA: failed to align section\n"),
+                                    sec);
+ 
+          elf_section_type (sec) = SHT_NOTE;
+diff --git a/bfd/elf.c b/bfd/elf.c
+index 8bffd3c5..8e4e1e7f 100644
+--- a/bfd/elf.c
++++ b/bfd/elf.c
+@@ -5188,8 +5188,8 @@ _bfd_elf_map_sections_to_segments (bfd *abfd,
+          && need_layout != NULL
+          && bed->size_relative_relocs
+          && !bed->size_relative_relocs (info, need_layout))
+-       info->callbacks->einfo
+-         (_("%F%P: failed to size relative relocations\n"));
++       info->callbacks->fatal
++         (_("%P: failed to size relative relocations\n"));
+     }
+ 
+   if (no_user_phdrs && bfd_count_sections (abfd) != 0)
+diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
+index 4ad7c354..b4a822f1 100644
+--- a/bfd/elf32-arm.c
++++ b/bfd/elf32-arm.c
+@@ -5053,7 +5053,7 @@ arm_build_one_stub (struct bfd_hash_entry *gen_entry,
+      section.  The user should fix his linker script.  */
+   if (stub_entry->target_section->output_section == NULL
+       && info->non_contiguous_regions)
+-    info->callbacks->einfo (_("%F%P: Could not assign `%pA' to an output section. "
++    info->callbacks->fatal (_("%P: Could not assign `%pA' to an output section. "
+                              "Retry without --enable-non-contiguous-regions.\n"),
+                            stub_entry->target_section);
+ 
+diff --git a/bfd/elf32-avr.c b/bfd/elf32-avr.c
+index 20e03bd7..912f7533 100644
+--- a/bfd/elf32-avr.c
++++ b/bfd/elf32-avr.c
+@@ -2484,8 +2484,8 @@ elf32_avr_relax_section (bfd *abfd,
+     shrinkable = false;
+ 
+   if (bfd_link_relocatable (link_info))
+-    (*link_info->callbacks->einfo)
+-      (_("%P%F: --relax and -r may not be used together\n"));
++    link_info->callbacks->fatal
++      (_("%P: --relax and -r may not be used together\n"));
+ 
+   htab = avr_link_hash_table (link_info);
+   if (htab == NULL)
+diff --git a/bfd/elf32-csky.c b/bfd/elf32-csky.c
+index 9479705d..edff65a9 100644
+--- a/bfd/elf32-csky.c
++++ b/bfd/elf32-csky.c
+@@ -3728,7 +3728,7 @@ csky_build_one_stub (struct bfd_hash_entry *gen_entry,
+      section.  The user should fix his linker script.  */
+   if (stub_entry->target_section->output_section == NULL
+       && info->non_contiguous_regions)
+-    info->callbacks->einfo (_("%F%P: Could not assign `%pA' to an output section. "
++    info->callbacks->fatal (_("%P: Could not assign `%pA' to an output section. "
+                              "Retry without --enable-non-contiguous-regions.\n"),
+                            stub_entry->target_section);
+ 
+diff --git a/bfd/elf32-frv.c b/bfd/elf32-frv.c
+index 5b66b074..245db7c2 100644
+--- a/bfd/elf32-frv.c
++++ b/bfd/elf32-frv.c
+@@ -5617,8 +5617,8 @@ elf32_frvfdpic_relax_section (bfd *abfd ATTRIBUTE_UNUSED, asection *sec,
+   struct _frvfdpic_dynamic_got_plt_info gpinfo;
+ 
+   if (bfd_link_relocatable (info))
+-    (*info->callbacks->einfo)
+-      (_("%P%F: --relax and -r may not be used together\n"));
++    info->callbacks->fatal
++      (_("%P: --relax and -r may not be used together\n"));
+ 
+   /* If we return early, we didn't change anything.  */
+   *again = false;
+diff --git a/bfd/elf32-hppa.c b/bfd/elf32-hppa.c
+index c2a7ad98..f1e67a06 100644
+--- a/bfd/elf32-hppa.c
++++ b/bfd/elf32-hppa.c
+@@ -729,7 +729,7 @@ hppa_build_one_stub (struct bfd_hash_entry *bh, void *in_arg)
+         section.  The user should fix his linker script.  */
+       if (hsh->target_section->output_section == NULL
+          && info->non_contiguous_regions)
+-       info->callbacks->einfo (_("%F%P: Could not assign `%pA' to an output "
++       info->callbacks->fatal (_("%P: Could not assign `%pA' to an output "
+                                  "section. Retry without "
+                                  "--enable-non-contiguous-regions.\n"),
+                                hsh->target_section);
+@@ -758,7 +758,7 @@ hppa_build_one_stub (struct bfd_hash_entry *bh, void *in_arg)
+         section.  The user should fix his linker script.  */
+       if (hsh->target_section->output_section == NULL
+          && info->non_contiguous_regions)
+-       info->callbacks->einfo (_("%F%P: Could not assign `%pA' to an output "
++       info->callbacks->fatal (_("%P: Could not assign `%pA' to an output "
+                                  "section. Retry without "
+                                  "--enable-non-contiguous-regions.\n"),
+                                hsh->target_section);
+@@ -839,7 +839,7 @@ hppa_build_one_stub (struct bfd_hash_entry *bh, void *in_arg)
+         section.  The user should fix his linker script.  */
+       if (hsh->target_section->output_section == NULL
+          && info->non_contiguous_regions)
+-       info->callbacks->einfo (_("%F%P: Could not assign `%pA' to an output "
++       info->callbacks->fatal (_("%P: Could not assign `%pA' to an output "
+                                  "section. Retry without "
+                                  "--enable-non-contiguous-regions.\n"),
+                                hsh->target_section);
+diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
+index e2f88a11..1637e39f 100644
+--- a/bfd/elf32-i386.c
++++ b/bfd/elf32-i386.c
+@@ -4092,8 +4092,8 @@ elf_i386_finish_dynamic_sections (bfd *output_bfd,
+     {
+       if (bfd_is_abs_section (htab->elf.splt->output_section))
+        {
+-         info->callbacks->einfo
+-           (_("%F%P: discarded output section: `%pA'\n"),
++         info->callbacks->fatal
++           (_("%P: discarded output section: `%pA'\n"),
+             htab->elf.splt);
+          return false;
+        }
+diff --git a/bfd/elf32-m68hc11.c b/bfd/elf32-m68hc11.c
+index 5fc611f5..6f705718 100644
+--- a/bfd/elf32-m68hc11.c
++++ b/bfd/elf32-m68hc11.c
+@@ -419,7 +419,7 @@ m68hc11_elf_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+      section.  The user should fix his linker script.  */
+   if (stub_entry->target_section->output_section == NULL
+       && info->non_contiguous_regions)
+-    info->callbacks->einfo (_("%F%P: Could not assign `%pA' to an output section. "
++    info->callbacks->fatal (_("%P: Could not assign `%pA' to an output section. "
+                              "Retry without --enable-non-contiguous-regions.\n"),
+                            stub_entry->target_section);
+ 
+diff --git a/bfd/elf32-m68hc12.c b/bfd/elf32-m68hc12.c
+index 1be174c0..bdfb9ca5 100644
+--- a/bfd/elf32-m68hc12.c
++++ b/bfd/elf32-m68hc12.c
+@@ -539,7 +539,7 @@ m68hc12_elf_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+      section.  The user should fix his linker script.  */
+   if (stub_entry->target_section->output_section == NULL
+       && info->non_contiguous_regions)
+-    info->callbacks->einfo (_("%F%P: Could not assign `%pA' to an output section. "
++    info->callbacks->fatal (_("%P: Could not assign `%pA' to an output section. "
+                              "Retry without --enable-non-contiguous-regions.\n"),
+                            stub_entry->target_section);
+ 
+diff --git a/bfd/elf32-metag.c b/bfd/elf32-metag.c
+index de14dfe5..49f93cc7 100644
+--- a/bfd/elf32-metag.c
++++ b/bfd/elf32-metag.c
+@@ -3342,7 +3342,7 @@ metag_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+      section.  The user should fix his linker script.  */
+   if (hsh->target_section->output_section == NULL
+       && info->non_contiguous_regions)
+-    info->callbacks->einfo (_("%F%P: Could not assign `%pA' to an output section. "
++    info->callbacks->fatal (_("%P: Could not assign `%pA' to an output section. "
+                              "Retry without --enable-non-contiguous-regions.\n"),
+                            hsh->target_section);
+ 
+diff --git a/bfd/elf32-spu.c b/bfd/elf32-spu.c
+index 881d4d8e..dd5d5fbe 100644
+--- a/bfd/elf32-spu.c
++++ b/bfd/elf32-spu.c
+@@ -4689,8 +4689,7 @@ spu_elf_auto_overlay (struct bfd_link_info *info)
+  file_err:
+   bfd_set_error (bfd_error_system_call);
+  err_exit:
+-  info->callbacks->einfo (_("%F%P: auto overlay error: %E\n"));
+-  xexit (1);
++  info->callbacks->fatal (_("%P: auto overlay error: %E\n"));
+ }
+ 
+ /* Provide an estimate of total stack required.  */
+@@ -4743,7 +4742,7 @@ spu_elf_final_link (bfd *output_bfd, struct bfd_link_info *info)
+     info->callbacks->einfo (_("%X%P: stack/lrlive analysis error: %E\n"));
+ 
+   if (!spu_elf_build_stubs (info))
+-    info->callbacks->einfo (_("%F%P: can not build overlay stubs: %E\n"));
++    info->callbacks->fatal (_("%P: can not build overlay stubs: %E\n"));
+ 
+   return bfd_elf_final_link (output_bfd, info);
+ }
+diff --git a/bfd/elf64-ia64-vms.c b/bfd/elf64-ia64-vms.c
+index 2f37e90c..b1eaaac0 100644
+--- a/bfd/elf64-ia64-vms.c
++++ b/bfd/elf64-ia64-vms.c
+@@ -361,8 +361,8 @@ elf64_ia64_relax_section (bfd *abfd, asection *sec,
+   *again = false;
+ 
+   if (bfd_link_relocatable (link_info))
+-    (*link_info->callbacks->einfo)
+-      (_("%P%F: --relax and -r may not be used together\n"));
++    link_info->callbacks->fatal
++      (_("%P: --relax and -r may not be used together\n"));
+ 
+   /* Don't even try to relax for non-ELF outputs.  */
+   if (!is_elf_hash_table (link_info->hash))
+diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
+index 720d6ac9..7b798732 100644
+--- a/bfd/elf64-ppc.c
++++ b/bfd/elf64-ppc.c
+@@ -12289,7 +12289,7 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+   if (stub_entry->target_section != NULL
+       && stub_entry->target_section->output_section == NULL
+       && info->non_contiguous_regions)
+-    info->callbacks->einfo (_("%F%P: Could not assign `%pA' to an output section. "
++    info->callbacks->fatal (_("%P: Could not assign `%pA' to an output section. "
+                              "Retry without --enable-non-contiguous-regions.\n"),
+                            stub_entry->target_section);
+ 
+@@ -12297,7 +12297,7 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+   if (stub_entry->group->stub_sec != NULL
+       && stub_entry->group->stub_sec->output_section == NULL
+       && info->non_contiguous_regions)
+-    info->callbacks->einfo (_("%F%P: Could not assign `%pA' to an output section. "
++    info->callbacks->fatal (_("%P: Could not assign `%pA' to an output section. "
+                              "Retry without --enable-non-contiguous-regions.\n"),
+                            stub_entry->group->stub_sec);
+ 
+diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
+index c3fb375c..a22d57d7 100644
+--- a/bfd/elf64-x86-64.c
++++ b/bfd/elf64-x86-64.c
+@@ -3706,8 +3706,8 @@ elf_x86_64_relocate_section (bfd *output_bfd,
+                              || (roff - 3 + 22) > input_section->size)
+                            {
+                            corrupt_input:
+-                             info->callbacks->einfo
+-                               (_("%F%P: corrupt input: %pB\n"),
++                             info->callbacks->fatal
++                               (_("%P: corrupt input: %pB\n"),
+                                 input_bfd);
+                              return false;
+                            }
+@@ -4679,7 +4679,7 @@ elf_x86_64_finish_dynamic_symbol (bfd *output_bfd,
+       /* Check PC-relative offset overflow in PLT entry.  */
+       if ((plt_got_pcrel_offset + 0x80000000) > 0xffffffff)
+        /* xgettext:c-format */
+-       info->callbacks->einfo (_("%F%pB: PC-relative offset overflow in PLT entry for `%s'\n"),
++       info->callbacks->fatal (_("%pB: PC-relative offset overflow in PLT entry for `%s'\n"),
+                                output_bfd, h->root.root.string);
+ 
+       bfd_put_32 (output_bfd, plt_got_pcrel_offset,
+@@ -4752,7 +4752,7 @@ elf_x86_64_finish_dynamic_symbol (bfd *output_bfd,
+                 will overflow first.  */
+              if (plt0_offset > 0x80000000)
+                /* xgettext:c-format */
+-               info->callbacks->einfo (_("%F%pB: branch displacement overflow in PLT entry for `%s'\n"),
++               info->callbacks->fatal (_("%pB: branch displacement overflow in PLT entry for `%s'\n"),
+                                        output_bfd, h->root.root.string);
+              bfd_put_32 (output_bfd, - plt0_offset,
+                          (plt->contents + h->plt.offset
+@@ -4805,7 +4805,7 @@ elf_x86_64_finish_dynamic_symbol (bfd *output_bfd,
+       if ((got_after_plt && got_pcrel_offset < 0)
+          || (!got_after_plt && got_pcrel_offset > 0))
+        /* xgettext:c-format */
+-       info->callbacks->einfo (_("%F%pB: PC-relative offset overflow in GOT PLT entry for `%s'\n"),
++       info->callbacks->fatal (_("%pB: PC-relative offset overflow in GOT PLT entry for `%s'\n"),
+                                output_bfd, h->root.root.string);
+ 
+       bfd_put_32 (output_bfd, got_pcrel_offset,
+@@ -5092,8 +5092,8 @@ elf_x86_64_finish_dynamic_sections (bfd *output_bfd,
+     {
+       if (bfd_is_abs_section (htab->elf.splt->output_section))
+        {
+-         info->callbacks->einfo
+-           (_("%F%P: discarded output section: `%pA'\n"),
++         info->callbacks->fatal
++           (_("%P: discarded output section: `%pA'\n"),
+             htab->elf.splt);
+          return false;
+        }
+diff --git a/bfd/elflink.c b/bfd/elflink.c
+index 8af6898a..dba176cc 100644
+--- a/bfd/elflink.c
++++ b/bfd/elflink.c
+@@ -12891,8 +12891,8 @@ bfd_elf_final_link (bfd *abfd, struct bfd_link_info *info)
+   if (info->enable_dt_relr
+       && bed->finish_relative_relocs
+       && !bed->finish_relative_relocs (info))
+-    info->callbacks->einfo
+-      (_("%F%P: %pB: failed to finish relative relocations\n"), abfd);
++    info->callbacks->fatal
++      (_("%P: %pB: failed to finish relative relocations\n"), abfd);
+ 
+   /* Since ELF permits relocations to be against local symbols, we
+      must have the local symbols available when we do the relocations.
+@@ -14087,7 +14087,7 @@ _bfd_elf_gc_mark_extra_sections (struct bfd_link_info *info,
+          else if (strcmp (bfd_section_name (isec),
+                           "__patchable_function_entries") == 0
+                   && elf_linked_to_section (isec) == NULL)
+-             info->callbacks->einfo (_("%F%P: %pB(%pA): error: "
++             info->callbacks->fatal (_("%P: %pB(%pA): error: "
+                                        "need linked-to section "
+                                        "for --gc-sections\n"),
+                                      isec->owner, isec);
+@@ -15264,7 +15264,7 @@ _bfd_elf_section_already_linked (bfd *abfd,
+ 
+   /* This is the first section with this name.  Record it.  */
+   if (!bfd_section_already_linked_table_insert (already_linked_list, sec))
+-    info->callbacks->einfo (_("%F%P: already_linked_table: %E\n"));
++    info->callbacks->fatal (_("%P: already_linked_table: %E\n"));
+   return sec->output_section == bfd_abs_section_ptr;
+ }
+ 
+diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
+index 109517db..0f454d23 100644
+--- a/bfd/elfnn-aarch64.c
++++ b/bfd/elfnn-aarch64.c
+@@ -3272,7 +3272,7 @@ aarch64_build_one_stub (struct bfd_hash_entry *gen_entry,
+      section.  The user should fix his linker script.  */
+   if (stub_entry->target_section->output_section == NULL
+       && info->non_contiguous_regions)
+-    info->callbacks->einfo (_("%F%P: Could not assign `%pA' to an output section. "
++    info->callbacks->fatal (_("%P: Could not assign `%pA' to an output section. "
+                              "Retry without "
+                              "--enable-non-contiguous-regions.\n"),
+                            stub_entry->target_section);
+@@ -9008,9 +9008,9 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+        asection *s = p->sec->output_section;
+        if (s != NULL && (s->flags & SEC_READONLY) != 0)
+          {
+-           info->callbacks->einfo
++           info->callbacks->fatal
+                /* xgettext:c-format */
+-               (_ ("%F%P: %pB: copy relocation against non-copyable "
++               (_ ("%P: %pB: copy relocation against non-copyable "
+                    "protected symbol `%s'\n"),
+                 p->sec->owner, h->root.root.string);
+            return false;
+diff --git a/bfd/elfnn-ia64.c b/bfd/elfnn-ia64.c
+index 7081ba1b..41d9e6fe 100644
+--- a/bfd/elfnn-ia64.c
++++ b/bfd/elfnn-ia64.c
+@@ -361,8 +361,8 @@ elfNN_ia64_relax_section (bfd *abfd, asection *sec,
+   *again = false;
+ 
+   if (bfd_link_relocatable (link_info))
+-    (*link_info->callbacks->einfo)
+-      (_("%P%F: --relax and -r may not be used together\n"));
++    link_info->callbacks->fatal
++      (_("%P: --relax and -r may not be used together\n"));
+ 
+   /* Don't even try to relax for non-ELF outputs.  */
+   if (!is_elf_hash_table (link_info->hash))
+diff --git a/bfd/elfnn-kvx.c b/bfd/elfnn-kvx.c
+index ae5ed6bf..b752891b 100644
+--- a/bfd/elfnn-kvx.c
++++ b/bfd/elfnn-kvx.c
+@@ -927,7 +927,7 @@ kvx_build_one_stub (struct bfd_hash_entry *gen_entry,
+      section.  The user should fix his linker script.  */
+   if (stub_entry->target_section->output_section == NULL
+       && info->non_contiguous_regions)
+-    info->callbacks->einfo (_("%F%P: Could not assign '%pA' to an output section. "
++    info->callbacks->fatal (_("%P: Could not assign '%pA' to an output section. "
+                              "Retry without "
+                              "--enable-non-contiguous-regions.\n"),
+                            stub_entry->target_section);
+diff --git a/bfd/elfnn-loongarch.c b/bfd/elfnn-loongarch.c
+index a7daea67..a8c4226d 100644
+--- a/bfd/elfnn-loongarch.c
++++ b/bfd/elfnn-loongarch.c
+@@ -1445,9 +1445,9 @@ local_allocate_ifunc_dyn_relocs (struct bfd_link_info *info,
+          || info->export_dynamic)
+       && h->pointer_equality_needed)
+     {
+-      info->callbacks->einfo
++      info->callbacks->fatal
+        /* xgettext:c-format.  */
+-       (_("%F%P: dynamic STT_GNU_IFUNC symbol `%s' with pointer "
++       (_("%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"),
+         h->root.root.string,
+diff --git a/bfd/elfxx-aarch64.c b/bfd/elfxx-aarch64.c
+index d1279adc..161c8a52 100644
+--- a/bfd/elfxx-aarch64.c
++++ b/bfd/elfxx-aarch64.c
+@@ -754,12 +754,12 @@ _bfd_aarch64_elf_link_setup_gnu_properties (struct bfd_link_info *info,
+                                              | SEC_HAS_CONTENTS
+                                              | SEC_DATA));
+          if (sec == NULL)
+-           info->callbacks->einfo (
+-             _("%F%P: failed to create GNU property section\n"));
++           info->callbacks->fatal (
++             _("%P: failed to create GNU property section\n"));
+ 
+           align = (bfd_get_mach (ebfd) & bfd_mach_aarch64_ilp32) ? 2 : 3;
+          if (!bfd_set_section_alignment (sec, align))
+-           info->callbacks->einfo (_("%F%pA: failed to align section\n"),
++           info->callbacks->fatal (_("%pA: failed to align section\n"),
+                                    sec);
+ 
+          elf_section_type (sec) = SHT_NOTE;
+diff --git a/bfd/elfxx-sparc.c b/bfd/elfxx-sparc.c
+index 6f5062bb..95b1928d 100644
+--- a/bfd/elfxx-sparc.c
++++ b/bfd/elfxx-sparc.c
+@@ -2680,8 +2680,8 @@ _bfd_sparc_elf_relax_section (bfd *abfd ATTRIBUTE_UNUSED,
+                              bool *again)
+ {
+   if (bfd_link_relocatable (link_info))
+-    (*link_info->callbacks->einfo)
+-      (_("%P%F: --relax and -r may not be used together\n"));
++    link_info->callbacks->fatal
++      (_("%P: --relax and -r may not be used together\n"));
+ 
+   *again = false;
+   sec_do_relax (section) = 1;
+diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
+index 8c261cf8..606c8905 100644
+--- a/bfd/elfxx-x86.c
++++ b/bfd/elfxx-x86.c
+@@ -531,9 +531,9 @@ elf_x86_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+          asection *s = p->sec->output_section;
+          if (s != NULL && (s->flags & SEC_READONLY) != 0)
+            {
+-             info->callbacks->einfo
++             info->callbacks->fatal
+                /* xgettext:c-format */
+-               (_("%F%P: %pB: copy relocation against non-copyable "
++               (_("%P: %pB: copy relocation against non-copyable "
+                   "protected symbol `%s' in %pB\n"),
+                 p->sec->owner, h->root.root.string,
+                 h->root.u.def.section->owner);
+@@ -1030,9 +1030,9 @@ elf_x86_relative_reloc_record_add
+ 
+   if (relative_reloc->data == NULL)
+     {
+-      info->callbacks->einfo
++      info->callbacks->fatal
+        /* xgettext:c-format */
+-       (_("%F%P: %pB: failed to allocate relative reloc record\n"),
++       (_("%P: %pB: failed to allocate relative reloc record\n"),
+         info->output_bfd);
+       return false;
+     }
+@@ -1388,9 +1388,9 @@ elf64_dt_relr_bitmap_add
+ 
+   if (bitmap->u.elf64 == NULL)
+     {
+-      info->callbacks->einfo
++      info->callbacks->fatal
+        /* xgettext:c-format */
+-       (_("%F%P: %pB: failed to allocate 64-bit DT_RELR bitmap\n"),
++       (_("%P: %pB: failed to allocate 64-bit DT_RELR bitmap\n"),
+         info->output_bfd);
+     }
+ 
+@@ -1424,9 +1424,9 @@ elf32_dt_relr_bitmap_add
+ 
+   if (bitmap->u.elf32 == NULL)
+     {
+-      info->callbacks->einfo
++      info->callbacks->fatal
+        /* xgettext:c-format */
+-       (_("%F%P: %pB: failed to allocate 32-bit DT_RELR bitmap\n"),
++       (_("%P: %pB: failed to allocate 32-bit DT_RELR bitmap\n"),
+         info->output_bfd);
+     }
+ 
+@@ -1750,9 +1750,9 @@ elf_x86_compute_dl_relr_bitmap
+          *need_layout = true;
+        }
+       else
+-       info->callbacks->einfo
++       info->callbacks->fatal
+          /* xgettext:c-format */
+-         (_("%F%P: %pB: size of compact relative reloc section is "
++         (_("%P: %pB: size of compact relative reloc section is "
+             "changed: new (%lu) != old (%lu)\n"),
+           info->output_bfd, htab->dt_relr_bitmap.count,
+           dt_relr_bitmap_count);
+@@ -1772,9 +1772,9 @@ elf_x86_write_dl_relr_bitmap (struct bfd_link_info *info,
+ 
+   contents = (unsigned char *) bfd_alloc (sec->owner, size);
+   if (contents == NULL)
+-    info->callbacks->einfo
++    info->callbacks->fatal
+       /* xgettext:c-format */
+-      (_("%F%P: %pB: failed to allocate compact relative reloc section\n"),
++      (_("%P: %pB: failed to allocate compact relative reloc section\n"),
+        info->output_bfd);
+ 
+   /* Cache the section contents for elf_link_input_bfd.  */
+@@ -2219,9 +2219,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section,
+          else
+            name = bfd_elf_sym_name (input_section->owner, symtab_hdr,
+                                     sym, NULL);
+-         info->callbacks->einfo
++         info->callbacks->fatal
+            /* xgettext:c-format */
+-           (_("%F%P: %pB: relocation %s against absolute symbol "
++           (_("%P: %pB: relocation %s against absolute symbol "
+               "`%s' in section `%pA' is disallowed\n"),
+             input_section->owner, internal_reloc.howto->name, name,
+             input_section);
+@@ -3429,9 +3429,9 @@ _bfd_x86_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
+            s = p->sec->output_section;
+            if (s != NULL && (s->flags & SEC_READONLY) != 0)
+              {
+-               info->callbacks->einfo
++               info->callbacks->fatal
+                  /* xgettext:c-format */
+-                 (_("%F%P: %pB: copy relocation against non-copyable "
++                 (_("%P: %pB: copy relocation against non-copyable "
+                     "protected symbol `%s' in %pB\n"),
+                   p->sec->owner, h->root.root.string,
+                   h->root.u.def.section->owner);
+@@ -4138,12 +4138,12 @@ _bfd_x86_elf_link_setup_gnu_properties
+                                              | SEC_HAS_CONTENTS
+                                              | SEC_DATA));
+          if (sec == NULL)
+-           info->callbacks->einfo (_("%F%P: failed to create GNU property section\n"));
++           info->callbacks->fatal (_("%P: failed to create GNU property section\n"));
+ 
+          if (!bfd_set_section_alignment (sec, class_align))
+            {
+            error_alignment:
+-             info->callbacks->einfo (_("%F%pA: failed to align section\n"),
++             info->callbacks->fatal (_("%pA: failed to align section\n"),
+                                      sec);
+            }
+ 
+@@ -4404,7 +4404,7 @@ _bfd_x86_elf_link_setup_gnu_properties
+       && !elf_vxworks_create_dynamic_sections (dynobj, info,
+                                               &htab->srelplt2))
+     {
+-      info->callbacks->einfo (_("%F%P: failed to create VxWorks dynamic sections\n"));
++      info->callbacks->fatal (_("%P: failed to create VxWorks dynamic sections\n"));
+       return pbfd;
+     }
+ 
+@@ -4413,7 +4413,7 @@ _bfd_x86_elf_link_setup_gnu_properties
+      don't need to do it in check_relocs.  */
+   if (htab->elf.sgot == NULL
+       && !_bfd_elf_create_got_section (dynobj, info))
+-    info->callbacks->einfo (_("%F%P: failed to create GOT sections\n"));
++    info->callbacks->fatal (_("%P: failed to create GOT sections\n"));
+ 
+   got_align = (bed->target_id == X86_64_ELF_DATA) ? 3 : 2;
+ 
+@@ -4431,7 +4431,7 @@ _bfd_x86_elf_link_setup_gnu_properties
+   /* Create the ifunc sections here so that check_relocs can be
+      simplified.  */
+   if (!_bfd_elf_create_ifunc_sections (dynobj, info))
+-    info->callbacks->einfo (_("%F%P: failed to create ifunc sections\n"));
++    info->callbacks->fatal (_("%P: failed to create ifunc sections\n"));
+ 
+   plt_alignment = bfd_log2 (htab->plt.plt_entry_size);
+ 
+@@ -4468,7 +4468,7 @@ _bfd_x86_elf_link_setup_gnu_properties
+                                                    ".plt.got",
+                                                    pltflags);
+          if (sec == NULL)
+-           info->callbacks->einfo (_("%F%P: failed to create GOT PLT section\n"));
++           info->callbacks->fatal (_("%P: failed to create GOT PLT section\n"));
+ 
+          if (!bfd_set_section_alignment (sec, non_lazy_plt_alignment))
+            goto error_alignment;
+@@ -4487,7 +4487,7 @@ _bfd_x86_elf_link_setup_gnu_properties
+                                                            ".plt.sec",
+                                                            pltflags);
+                  if (sec == NULL)
+-                   info->callbacks->einfo (_("%F%P: failed to create IBT-enabled PLT section\n"));
++                   info->callbacks->fatal (_("%P: failed to create IBT-enabled PLT section\n"));
+ 
+                  if (!bfd_set_section_alignment (sec, plt_alignment))
+                    goto error_alignment;
+@@ -4507,7 +4507,7 @@ _bfd_x86_elf_link_setup_gnu_properties
+                                                    ".eh_frame",
+                                                    flags);
+          if (sec == NULL)
+-           info->callbacks->einfo (_("%F%P: failed to create PLT .eh_frame section\n"));
++           info->callbacks->fatal (_("%P: failed to create PLT .eh_frame section\n"));
+ 
+          if (!bfd_set_section_alignment (sec, class_align))
+            goto error_alignment;
+@@ -4520,7 +4520,7 @@ _bfd_x86_elf_link_setup_gnu_properties
+                                                        ".eh_frame",
+                                                        flags);
+              if (sec == NULL)
+-               info->callbacks->einfo (_("%F%P: failed to create GOT PLT .eh_frame section\n"));
++               info->callbacks->fatal (_("%P: failed to create GOT PLT .eh_frame section\n"));
+ 
+              if (!bfd_set_section_alignment (sec, class_align))
+                goto error_alignment;
+@@ -4534,7 +4534,7 @@ _bfd_x86_elf_link_setup_gnu_properties
+                                                        ".eh_frame",
+                                                        flags);
+              if (sec == NULL)
+-               info->callbacks->einfo (_("%F%P: failed to create the second PLT .eh_frame section\n"));
++               info->callbacks->fatal (_("%P: failed to create the second PLT .eh_frame section\n"));
+ 
+              if (!bfd_set_section_alignment (sec, class_align))
+                goto error_alignment;
+@@ -4554,7 +4554,7 @@ _bfd_x86_elf_link_setup_gnu_properties
+                                                    ".sframe",
+                                                    flags);
+          if (sec == NULL)
+-           info->callbacks->einfo (_("%F%P: failed to create PLT .sframe section\n"));
++           info->callbacks->fatal (_("%P: failed to create PLT .sframe section\n"));
+ 
+          // FIXME check this
+          // if (!bfd_set_section_alignment (sec, class_align))
+@@ -4569,7 +4569,7 @@ _bfd_x86_elf_link_setup_gnu_properties
+                                                        ".sframe",
+                                                        flags);
+              if (sec == NULL)
+-               info->callbacks->einfo (_("%F%P: failed to create second PLT .sframe section\n"));
++               info->callbacks->fatal (_("%P: failed to create second PLT .sframe section\n"));
+ 
+              htab->plt_second_sframe = sec;
+            }
+diff --git a/bfd/linker.c b/bfd/linker.c
+index 0821db55..5b912221 100644
+--- a/bfd/linker.c
++++ b/bfd/linker.c
+@@ -2982,7 +2982,7 @@ _bfd_generic_section_already_linked (bfd *abfd ATTRIBUTE_UNUSED,
+ 
+   /* This is the first section with this name.  Record it.  */
+   if (!bfd_section_already_linked_table_insert (already_linked_list, sec))
+-    info->callbacks->einfo (_("%F%P: already_linked_table: %E\n"));
++    info->callbacks->fatal (_("%P: already_linked_table: %E\n"));
+   return false;
+ }
+ 
+diff --git a/bfd/reloc.c b/bfd/reloc.c
+index 7583b7fd..1fee86f1 100644
+--- a/bfd/reloc.c
++++ b/bfd/reloc.c
+@@ -8465,8 +8465,8 @@ bfd_generic_relax_section (bfd *abfd ATTRIBUTE_UNUSED,
+                           bool *again)
+ {
+   if (bfd_link_relocatable (link_info))
+-    (*link_info->callbacks->einfo)
+-      (_("%P%F: --relax and -r may not be used together\n"));
++    link_info->callbacks->fatal
++      (_("%P: --relax and -r may not be used together\n"));
+ 
+   *again = false;
+   return true;
+diff --git a/bfd/reloc16.c b/bfd/reloc16.c
+index ff5412dc..a16d6b20 100644
+--- a/bfd/reloc16.c
++++ b/bfd/reloc16.c
+@@ -151,8 +151,8 @@ bfd_coff_reloc16_relax_section (bfd *abfd,
+   long reloc_count;
+ 
+   if (bfd_link_relocatable (link_info))
+-    (*link_info->callbacks->einfo)
+-      (_("%P%F: --relax and -r may not be used together\n"));
++    link_info->callbacks->fatal
++      (_("%P: --relax and -r may not be used together\n"));
+ 
+   /* We only do global relaxation once.  It is not safe to do it multiple
+      times (see discussion of the "shrinks" array below).  */
+diff --git a/bfd/xcofflink.c b/bfd/xcofflink.c
+index 6ef9abcd..9b01cc37 100644
+--- a/bfd/xcofflink.c
++++ b/bfd/xcofflink.c
+@@ -4681,7 +4681,7 @@ xcoff_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+   if (hstub->target_section != NULL
+       && hstub->target_section->output_section == NULL
+       && info->non_contiguous_regions)
+-    info->callbacks->einfo (_("%F%P: Could not assign `%pA' to an output section. "
++    info->callbacks->fatal (_("%P: Could not assign `%pA' to an output section. "
+                              "Retry without --enable-non-contiguous-regions.\n"),
+                            hstub->target_section);
+ 
+diff --git a/include/bfdlink.h b/include/bfdlink.h
+index eac07d78..0d03fa70 100644
+--- a/include/bfdlink.h
++++ b/include/bfdlink.h
+@@ -868,6 +868,9 @@ struct bfd_link_callbacks
+     (struct bfd_link_info *, struct bfd_link_hash_entry *h,
+      struct bfd_link_hash_entry *inh,
+      bfd *abfd, asection *section, bfd_vma address, flagword flags);
++  /* Fatal error.  */
++  void (*fatal)
++    (const char *fmt, ...) ATTRIBUTE_NORETURN;
+   /* Error or warning link info message.  */
+   void (*einfo)
+     (const char *fmt, ...);
+diff --git a/ld/ldmain.c b/ld/ldmain.c
+index 878d9536..a61086c3 100644
+--- a/ld/ldmain.c
++++ b/ld/ldmain.c
+@@ -146,6 +146,7 @@ static struct bfd_link_callbacks link_callbacks =
+   reloc_dangerous,
+   unattached_reloc,
+   notice,
++  fatal,
+   einfo,
+   info_msg,
+   minfo,
+-- 
+2.43.0
+
diff --git a/meta/recipes-devtools/binutils/binutils/0021-CVE-2025-1153-3.patch b/meta/recipes-devtools/binutils/binutils/0021-CVE-2025-1153-3.patch
new file mode 100644
index 0000000000..8aef77d2f8
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0021-CVE-2025-1153-3.patch
@@ -0,0 +1,3756 @@
+From fe459e33c676883b5f28cc96c00e242973d906a9 Mon Sep 17 00:00:00 2001
+From: Alan Modra <amodra@gmail.com>
+Date: Thu, 24 Apr 2025 10:01:29 +0930
+Subject: [PATCH] PR 32603, revert message changes
+
+This puts back %F into translated fatal error messages
+(and reverts a few other small changes), to not disturb
+translation work
+
+Upstream-Status: Backport [https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=fe459e33c676883b5f28cc96c00e242973d906a9]
+CVE: CVE-2025-1153
+
+Signed-off-by: Sunil Dora <sunilkumar.dora@windriver.com>
+---
+ bfd/archive.c                 |  2 +-
+ bfd/coff-aarch64.c            |  2 +-
+ bfd/coffgen.c                 |  2 +-
+ bfd/elf-ifunc.c               |  2 +-
+ bfd/elf-m10300.c              |  2 +-
+ bfd/elf-properties.c          |  4 +-
+ bfd/elf.c                     |  2 +-
+ bfd/elf32-arm.c               |  2 +-
+ bfd/elf32-avr.c               |  2 +-
+ bfd/elf32-csky.c              |  2 +-
+ bfd/elf32-frv.c               |  2 +-
+ bfd/elf32-hppa.c              |  6 +--
+ bfd/elf32-i386.c              |  2 +-
+ bfd/elf32-m68hc11.c           |  2 +-
+ bfd/elf32-m68hc12.c           |  2 +-
+ bfd/elf32-metag.c             |  2 +-
+ bfd/elf32-spu.c               |  4 +-
+ bfd/elf64-ia64-vms.c          |  2 +-
+ bfd/elf64-ppc.c               |  4 +-
+ bfd/elf64-x86-64.c            | 10 ++---
+ bfd/elflink.c                 |  6 +--
+ bfd/elfnn-aarch64.c           |  4 +-
+ bfd/elfnn-ia64.c              |  2 +-
+ bfd/elfnn-kvx.c               |  2 +-
+ bfd/elfnn-loongarch.c         |  2 +-
+ bfd/elfxx-aarch64.c           |  4 +-
+ bfd/elfxx-sparc.c             |  2 +-
+ bfd/elfxx-x86.c               | 42 +++++++++---------
+ bfd/linker.c                  |  2 +-
+ bfd/reloc.c                   |  2 +-
+ bfd/reloc16.c                 |  2 +-
+ bfd/xcofflink.c               |  2 +-
+ ld/emulparams/call_nop.sh     |  6 +--
+ ld/emulparams/cet.sh          |  2 +-
+ ld/emulparams/elf32mcore.sh   |  2 +-
+ ld/emulparams/x86-64-lam.sh   |  6 +--
+ ld/emulparams/x86-64-level.sh |  2 +-
+ ld/emultempl/aarch64elf.em    |  6 +--
+ ld/emultempl/aix.em           | 41 +++++++++---------
+ ld/emultempl/armelf.em        | 10 ++---
+ ld/emultempl/avrelf.em        |  2 +-
+ ld/emultempl/beos.em          | 18 ++++----
+ ld/emultempl/cr16elf.em       |  4 +-
+ ld/emultempl/cskyelf.em       |  4 +-
+ ld/emultempl/elf.em           | 14 +++---
+ ld/emultempl/hppaelf.em       |  4 +-
+ ld/emultempl/kvxelf.em        |  4 +-
+ ld/emultempl/loongarchelf.em  |  2 +-
+ ld/emultempl/m68hc1xelf.em    |  2 +-
+ ld/emultempl/m68kelf.em       |  4 +-
+ ld/emultempl/metagelf.em      |  4 +-
+ ld/emultempl/mipself.em       |  2 +-
+ ld/emultempl/mmix-elfnmmo.em  |  2 +-
+ ld/emultempl/nds32elf.em      |  6 +--
+ ld/emultempl/nto.em           | 10 ++---
+ ld/emultempl/pe.em            | 20 ++++-----
+ ld/emultempl/pep.em           | 16 +++----
+ ld/emultempl/ppc32elf.em      |  4 +-
+ ld/emultempl/ppc64elf.em      | 10 ++---
+ ld/emultempl/riscvelf.em      |  2 +-
+ ld/emultempl/s390.em          |  2 +-
+ ld/emultempl/scoreelf.em      |  2 +-
+ ld/emultempl/spuelf.em        | 20 ++++-----
+ ld/emultempl/tic6xdsbt.em     |  6 +--
+ ld/emultempl/ticoff.em        |  2 +-
+ ld/emultempl/v850elf.em       |  2 +-
+ ld/emultempl/vms.em           |  2 +-
+ ld/emultempl/xtensaelf.em     | 12 ++---
+ ld/emultempl/z80.em           |  2 +-
+ ld/ldcref.c                   |  8 ++--
+ ld/ldelf.c                    | 30 ++++++-------
+ ld/ldelfgen.c                 | 14 +++---
+ ld/ldexp.c                    | 42 +++++++++---------
+ ld/ldfile.c                   | 14 +++---
+ ld/ldgram.y                   |  6 +--
+ ld/ldlang.c                   | 82 +++++++++++++++++------------------
+ ld/ldlex.l                    | 10 ++---
+ ld/ldmain.c                   | 44 +++++++++----------
+ ld/ldmisc.c                   |  6 +--
+ ld/ldwrite.c                  | 18 ++++----
+ ld/lexsup.c                   | 64 +++++++++++++--------------
+ ld/mri.c                      |  2 +-
+ ld/pe-dll.c                   | 12 ++---
+ ld/plugin.c                   | 27 ++++++------
+ 84 files changed, 384 insertions(+), 384 deletions(-)
+
+diff --git a/bfd/archive.c b/bfd/archive.c
+index 0f617276..0596a304 100644
+--- a/bfd/archive.c
++++ b/bfd/archive.c
+@@ -750,7 +750,7 @@ _bfd_get_elt_at_filepos (bfd *archive, file_ptr filepos,
+              if (info != NULL)
+                {
+                  info->callbacks->fatal
+-                   (_("%P: %pB(%s): error opening thin archive member: %E\n"),
++                   (_("%F%P: %pB(%s): error opening thin archive member: %E\n"),
+                     archive, filename);
+                  break;
+                }
+diff --git a/bfd/coff-aarch64.c b/bfd/coff-aarch64.c
+index 53f539e0..06007e6d 100644
+--- a/bfd/coff-aarch64.c
++++ b/bfd/coff-aarch64.c
+@@ -876,7 +876,7 @@ coff_pe_aarch64_relocate_section (bfd *output_bfd,
+          }
+ 
+        default:
+-         info->callbacks->fatal (_("%P: Unhandled relocation type %u\n"),
++         info->callbacks->fatal (_("%F%P: Unhandled relocation type %u\n"),
+                                  rel->r_type);
+        }
+     }
+diff --git a/bfd/coffgen.c b/bfd/coffgen.c
+index 3270cd2f..5e24210d 100644
+--- a/bfd/coffgen.c
++++ b/bfd/coffgen.c
+@@ -2793,7 +2793,7 @@ _bfd_coff_section_already_linked (bfd *abfd,
+ 
+   /* This is the first section with this name.  Record it.  */
+   if (!bfd_section_already_linked_table_insert (already_linked_list, sec))
+-    info->callbacks->fatal (_("%P: already_linked_table: %E\n"));
++    info->callbacks->fatal (_("%F%P: already_linked_table: %E\n"));
+   return false;
+ }
+ 
+diff --git a/bfd/elf-ifunc.c b/bfd/elf-ifunc.c
+index 58a1ca5e..cb623563 100644
+--- a/bfd/elf-ifunc.c
++++ b/bfd/elf-ifunc.c
+@@ -141,7 +141,7 @@ _bfd_elf_allocate_ifunc_dyn_relocs (struct bfd_link_info *info,
+     {
+       info->callbacks->fatal
+        /* xgettext:c-format */
+-       (_("%P: dynamic STT_GNU_IFUNC symbol `%s' with pointer "
++       (_("%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"),
+         h->root.root.string,
+diff --git a/bfd/elf-m10300.c b/bfd/elf-m10300.c
+index cf6bb13b..129485fa 100644
+--- a/bfd/elf-m10300.c
++++ b/bfd/elf-m10300.c
+@@ -2647,7 +2647,7 @@ mn10300_elf_relax_section (bfd *abfd,
+ 
+   if (bfd_link_relocatable (link_info))
+     link_info->callbacks->fatal
+-      (_("%P: --relax and -r may not be used together\n"));
++      (_("%P%F: --relax and -r may not be used together\n"));
+ 
+   /* Assume nothing changes.  */
+   *again = false;
+diff --git a/bfd/elf-properties.c b/bfd/elf-properties.c
+index a4591472..2e8cc8af 100644
+--- a/bfd/elf-properties.c
++++ b/bfd/elf-properties.c
+@@ -665,11 +665,11 @@ _bfd_elf_link_setup_gnu_properties (struct bfd_link_info *info)
+                                              | SEC_HAS_CONTENTS
+                                              | SEC_DATA));
+          if (sec == NULL)
+-           info->callbacks->fatal (_("%P: failed to create GNU property section\n"));
++           info->callbacks->fatal (_("%F%P: failed to create GNU property section\n"));
+ 
+          if (!bfd_set_section_alignment (sec,
+                                          elfclass == ELFCLASS64 ? 3 : 2))
+-           info->callbacks->fatal (_("%pA: failed to align section\n"),
++           info->callbacks->fatal (_("%F%pA: failed to align section\n"),
+                                    sec);
+ 
+          elf_section_type (sec) = SHT_NOTE;
+diff --git a/bfd/elf.c b/bfd/elf.c
+index 8e4e1e7f..883aef5e 100644
+--- a/bfd/elf.c
++++ b/bfd/elf.c
+@@ -5189,7 +5189,7 @@ _bfd_elf_map_sections_to_segments (bfd *abfd,
+          && bed->size_relative_relocs
+          && !bed->size_relative_relocs (info, need_layout))
+        info->callbacks->fatal
+-         (_("%P: failed to size relative relocations\n"));
++         (_("%F%P: failed to size relative relocations\n"));
+     }
+ 
+   if (no_user_phdrs && bfd_count_sections (abfd) != 0)
+diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
+index b4a822f1..bb413bb9 100644
+--- a/bfd/elf32-arm.c
++++ b/bfd/elf32-arm.c
+@@ -5053,7 +5053,7 @@ arm_build_one_stub (struct bfd_hash_entry *gen_entry,
+      section.  The user should fix his linker script.  */
+   if (stub_entry->target_section->output_section == NULL
+       && info->non_contiguous_regions)
+-    info->callbacks->fatal (_("%P: Could not assign `%pA' to an output section. "
++    info->callbacks->fatal (_("%F%P: Could not assign `%pA' to an output section. "
+                              "Retry without --enable-non-contiguous-regions.\n"),
+                            stub_entry->target_section);
+ 
+diff --git a/bfd/elf32-avr.c b/bfd/elf32-avr.c
+index 912f7533..fd9f18dd 100644
+--- a/bfd/elf32-avr.c
++++ b/bfd/elf32-avr.c
+@@ -2485,7 +2485,7 @@ elf32_avr_relax_section (bfd *abfd,
+ 
+   if (bfd_link_relocatable (link_info))
+     link_info->callbacks->fatal
+-      (_("%P: --relax and -r may not be used together\n"));
++      (_("%P%F: --relax and -r may not be used together\n"));
+ 
+   htab = avr_link_hash_table (link_info);
+   if (htab == NULL)
+diff --git a/bfd/elf32-csky.c b/bfd/elf32-csky.c
+index edff65a9..3ec0622e 100644
+--- a/bfd/elf32-csky.c
++++ b/bfd/elf32-csky.c
+@@ -3728,7 +3728,7 @@ csky_build_one_stub (struct bfd_hash_entry *gen_entry,
+      section.  The user should fix his linker script.  */
+   if (stub_entry->target_section->output_section == NULL
+       && info->non_contiguous_regions)
+-    info->callbacks->fatal (_("%P: Could not assign `%pA' to an output section. "
++    info->callbacks->fatal (_("%F%P: Could not assign `%pA' to an output section. "
+                              "Retry without --enable-non-contiguous-regions.\n"),
+                            stub_entry->target_section);
+ 
+diff --git a/bfd/elf32-frv.c b/bfd/elf32-frv.c
+index 245db7c2..cac2663e 100644
+--- a/bfd/elf32-frv.c
++++ b/bfd/elf32-frv.c
+@@ -5618,7 +5618,7 @@ elf32_frvfdpic_relax_section (bfd *abfd ATTRIBUTE_UNUSED, asection *sec,
+ 
+   if (bfd_link_relocatable (info))
+     info->callbacks->fatal
+-      (_("%P: --relax and -r may not be used together\n"));
++      (_("%P%F: --relax and -r may not be used together\n"));
+ 
+   /* If we return early, we didn't change anything.  */
+   *again = false;
+diff --git a/bfd/elf32-hppa.c b/bfd/elf32-hppa.c
+index f1e67a06..0d0682de 100644
+--- a/bfd/elf32-hppa.c
++++ b/bfd/elf32-hppa.c
+@@ -729,7 +729,7 @@ hppa_build_one_stub (struct bfd_hash_entry *bh, void *in_arg)
+         section.  The user should fix his linker script.  */
+       if (hsh->target_section->output_section == NULL
+          && info->non_contiguous_regions)
+-       info->callbacks->fatal (_("%P: Could not assign `%pA' to an output "
++       info->callbacks->fatal (_("%F%P: Could not assign `%pA' to an output "
+                                  "section. Retry without "
+                                  "--enable-non-contiguous-regions.\n"),
+                                hsh->target_section);
+@@ -758,7 +758,7 @@ hppa_build_one_stub (struct bfd_hash_entry *bh, void *in_arg)
+         section.  The user should fix his linker script.  */
+       if (hsh->target_section->output_section == NULL
+          && info->non_contiguous_regions)
+-       info->callbacks->fatal (_("%P: Could not assign `%pA' to an output "
++       info->callbacks->fatal (_("%F%P: Could not assign `%pA' to an output "
+                                  "section. Retry without "
+                                  "--enable-non-contiguous-regions.\n"),
+                                hsh->target_section);
+@@ -839,7 +839,7 @@ hppa_build_one_stub (struct bfd_hash_entry *bh, void *in_arg)
+         section.  The user should fix his linker script.  */
+       if (hsh->target_section->output_section == NULL
+          && info->non_contiguous_regions)
+-       info->callbacks->fatal (_("%P: Could not assign `%pA' to an output "
++       info->callbacks->fatal (_("%F%P: Could not assign `%pA' to an output "
+                                  "section. Retry without "
+                                  "--enable-non-contiguous-regions.\n"),
+                                hsh->target_section);
+diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
+index 1637e39f..42b96134 100644
+--- a/bfd/elf32-i386.c
++++ b/bfd/elf32-i386.c
+@@ -4093,7 +4093,7 @@ elf_i386_finish_dynamic_sections (bfd *output_bfd,
+       if (bfd_is_abs_section (htab->elf.splt->output_section))
+        {
+          info->callbacks->fatal
+-           (_("%P: discarded output section: `%pA'\n"),
++           (_("%F%P: discarded output section: `%pA'\n"),
+             htab->elf.splt);
+          return false;
+        }
+diff --git a/bfd/elf32-m68hc11.c b/bfd/elf32-m68hc11.c
+index 6f705718..4b127ac7 100644
+--- a/bfd/elf32-m68hc11.c
++++ b/bfd/elf32-m68hc11.c
+@@ -419,7 +419,7 @@ m68hc11_elf_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+      section.  The user should fix his linker script.  */
+   if (stub_entry->target_section->output_section == NULL
+       && info->non_contiguous_regions)
+-    info->callbacks->fatal (_("%P: Could not assign `%pA' to an output section. "
++    info->callbacks->fatal (_("%F%P: Could not assign `%pA' to an output section. "
+                              "Retry without --enable-non-contiguous-regions.\n"),
+                            stub_entry->target_section);
+ 
+diff --git a/bfd/elf32-m68hc12.c b/bfd/elf32-m68hc12.c
+index bdfb9ca5..9a2f4638 100644
+--- a/bfd/elf32-m68hc12.c
++++ b/bfd/elf32-m68hc12.c
+@@ -539,7 +539,7 @@ m68hc12_elf_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+      section.  The user should fix his linker script.  */
+   if (stub_entry->target_section->output_section == NULL
+       && info->non_contiguous_regions)
+-    info->callbacks->fatal (_("%P: Could not assign `%pA' to an output section. "
++    info->callbacks->fatal (_("%F%P: Could not assign `%pA' to an output section. "
+                              "Retry without --enable-non-contiguous-regions.\n"),
+                            stub_entry->target_section);
+ 
+diff --git a/bfd/elf32-metag.c b/bfd/elf32-metag.c
+index 49f93cc7..94be520e 100644
+--- a/bfd/elf32-metag.c
++++ b/bfd/elf32-metag.c
+@@ -3342,7 +3342,7 @@ metag_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+      section.  The user should fix his linker script.  */
+   if (hsh->target_section->output_section == NULL
+       && info->non_contiguous_regions)
+-    info->callbacks->fatal (_("%P: Could not assign `%pA' to an output section. "
++    info->callbacks->fatal (_("%F%P: Could not assign `%pA' to an output section. "
+                              "Retry without --enable-non-contiguous-regions.\n"),
+                            hsh->target_section);
+ 
+diff --git a/bfd/elf32-spu.c b/bfd/elf32-spu.c
+index dd5d5fbe..c535b1f1 100644
+--- a/bfd/elf32-spu.c
++++ b/bfd/elf32-spu.c
+@@ -4689,7 +4689,7 @@ spu_elf_auto_overlay (struct bfd_link_info *info)
+  file_err:
+   bfd_set_error (bfd_error_system_call);
+  err_exit:
+-  info->callbacks->fatal (_("%P: auto overlay error: %E\n"));
++  info->callbacks->fatal (_("%F%P: auto overlay error: %E\n"));
+ }
+ 
+ /* Provide an estimate of total stack required.  */
+@@ -4742,7 +4742,7 @@ spu_elf_final_link (bfd *output_bfd, struct bfd_link_info *info)
+     info->callbacks->einfo (_("%X%P: stack/lrlive analysis error: %E\n"));
+ 
+   if (!spu_elf_build_stubs (info))
+-    info->callbacks->fatal (_("%P: can not build overlay stubs: %E\n"));
++    info->callbacks->fatal (_("%F%P: can not build overlay stubs: %E\n"));
+ 
+   return bfd_elf_final_link (output_bfd, info);
+ }
+diff --git a/bfd/elf64-ia64-vms.c b/bfd/elf64-ia64-vms.c
+index b1eaaac0..3c29e0d6 100644
+--- a/bfd/elf64-ia64-vms.c
++++ b/bfd/elf64-ia64-vms.c
+@@ -362,7 +362,7 @@ elf64_ia64_relax_section (bfd *abfd, asection *sec,
+ 
+   if (bfd_link_relocatable (link_info))
+     link_info->callbacks->fatal
+-      (_("%P: --relax and -r may not be used together\n"));
++      (_("%P%F: --relax and -r may not be used together\n"));
+ 
+   /* Don't even try to relax for non-ELF outputs.  */
+   if (!is_elf_hash_table (link_info->hash))
+diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
+index 7b798732..68d681a5 100644
+--- a/bfd/elf64-ppc.c
++++ b/bfd/elf64-ppc.c
+@@ -12289,7 +12289,7 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+   if (stub_entry->target_section != NULL
+       && stub_entry->target_section->output_section == NULL
+       && info->non_contiguous_regions)
+-    info->callbacks->fatal (_("%P: Could not assign `%pA' to an output section. "
++    info->callbacks->fatal (_("%F%P: Could not assign `%pA' to an output section. "
+                              "Retry without --enable-non-contiguous-regions.\n"),
+                            stub_entry->target_section);
+ 
+@@ -12297,7 +12297,7 @@ ppc_size_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+   if (stub_entry->group->stub_sec != NULL
+       && stub_entry->group->stub_sec->output_section == NULL
+       && info->non_contiguous_regions)
+-    info->callbacks->fatal (_("%P: Could not assign `%pA' to an output section. "
++    info->callbacks->fatal (_("%F%P: Could not assign `%pA' to an output section. "
+                              "Retry without --enable-non-contiguous-regions.\n"),
+                            stub_entry->group->stub_sec);
+ 
+diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
+index a22d57d7..41341cd8 100644
+--- a/bfd/elf64-x86-64.c
++++ b/bfd/elf64-x86-64.c
+@@ -3707,7 +3707,7 @@ elf_x86_64_relocate_section (bfd *output_bfd,
+                            {
+                            corrupt_input:
+                              info->callbacks->fatal
+-                               (_("%P: corrupt input: %pB\n"),
++                               (_("%F%P: corrupt input: %pB\n"),
+                                 input_bfd);
+                              return false;
+                            }
+@@ -4679,7 +4679,7 @@ elf_x86_64_finish_dynamic_symbol (bfd *output_bfd,
+       /* Check PC-relative offset overflow in PLT entry.  */
+       if ((plt_got_pcrel_offset + 0x80000000) > 0xffffffff)
+        /* xgettext:c-format */
+-       info->callbacks->fatal (_("%pB: PC-relative offset overflow in PLT entry for `%s'\n"),
++       info->callbacks->fatal (_("%F%pB: PC-relative offset overflow in PLT entry for `%s'\n"),
+                                output_bfd, h->root.root.string);
+ 
+       bfd_put_32 (output_bfd, plt_got_pcrel_offset,
+@@ -4752,7 +4752,7 @@ elf_x86_64_finish_dynamic_symbol (bfd *output_bfd,
+                 will overflow first.  */
+              if (plt0_offset > 0x80000000)
+                /* xgettext:c-format */
+-               info->callbacks->fatal (_("%pB: branch displacement overflow in PLT entry for `%s'\n"),
++               info->callbacks->fatal (_("%F%pB: branch displacement overflow in PLT entry for `%s'\n"),
+                                        output_bfd, h->root.root.string);
+              bfd_put_32 (output_bfd, - plt0_offset,
+                          (plt->contents + h->plt.offset
+@@ -4805,7 +4805,7 @@ elf_x86_64_finish_dynamic_symbol (bfd *output_bfd,
+       if ((got_after_plt && got_pcrel_offset < 0)
+          || (!got_after_plt && got_pcrel_offset > 0))
+        /* xgettext:c-format */
+-       info->callbacks->fatal (_("%pB: PC-relative offset overflow in GOT PLT entry for `%s'\n"),
++       info->callbacks->fatal (_("%F%pB: PC-relative offset overflow in GOT PLT entry for `%s'\n"),
+                                output_bfd, h->root.root.string);
+ 
+       bfd_put_32 (output_bfd, got_pcrel_offset,
+@@ -5093,7 +5093,7 @@ elf_x86_64_finish_dynamic_sections (bfd *output_bfd,
+       if (bfd_is_abs_section (htab->elf.splt->output_section))
+        {
+          info->callbacks->fatal
+-           (_("%P: discarded output section: `%pA'\n"),
++           (_("%F%P: discarded output section: `%pA'\n"),
+             htab->elf.splt);
+          return false;
+        }
+diff --git a/bfd/elflink.c b/bfd/elflink.c
+index dba176cc..0c3ea0a3 100644
+--- a/bfd/elflink.c
++++ b/bfd/elflink.c
+@@ -12892,7 +12892,7 @@ bfd_elf_final_link (bfd *abfd, struct bfd_link_info *info)
+       && bed->finish_relative_relocs
+       && !bed->finish_relative_relocs (info))
+     info->callbacks->fatal
+-      (_("%P: %pB: failed to finish relative relocations\n"), abfd);
++      (_("%F%P: %pB: failed to finish relative relocations\n"), abfd);
+ 
+   /* Since ELF permits relocations to be against local symbols, we
+      must have the local symbols available when we do the relocations.
+@@ -14087,7 +14087,7 @@ _bfd_elf_gc_mark_extra_sections (struct bfd_link_info *info,
+          else if (strcmp (bfd_section_name (isec),
+                           "__patchable_function_entries") == 0
+                   && elf_linked_to_section (isec) == NULL)
+-             info->callbacks->fatal (_("%P: %pB(%pA): error: "
++             info->callbacks->fatal (_("%F%P: %pB(%pA): error: "
+                                        "need linked-to section "
+                                        "for --gc-sections\n"),
+                                      isec->owner, isec);
+@@ -15264,7 +15264,7 @@ _bfd_elf_section_already_linked (bfd *abfd,
+ 
+   /* This is the first section with this name.  Record it.  */
+   if (!bfd_section_already_linked_table_insert (already_linked_list, sec))
+-    info->callbacks->fatal (_("%P: already_linked_table: %E\n"));
++    info->callbacks->fatal (_("%F%P: already_linked_table: %E\n"));
+   return sec->output_section == bfd_abs_section_ptr;
+ }
+ 
+diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
+index 0f454d23..d7a85ef0 100644
+--- a/bfd/elfnn-aarch64.c
++++ b/bfd/elfnn-aarch64.c
+@@ -3272,7 +3272,7 @@ aarch64_build_one_stub (struct bfd_hash_entry *gen_entry,
+      section.  The user should fix his linker script.  */
+   if (stub_entry->target_section->output_section == NULL
+       && info->non_contiguous_regions)
+-    info->callbacks->fatal (_("%P: Could not assign `%pA' to an output section. "
++    info->callbacks->fatal (_("%F%P: Could not assign `%pA' to an output section. "
+                              "Retry without "
+                              "--enable-non-contiguous-regions.\n"),
+                            stub_entry->target_section);
+@@ -9010,7 +9010,7 @@ elfNN_aarch64_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+          {
+            info->callbacks->fatal
+                /* xgettext:c-format */
+-               (_ ("%P: %pB: copy relocation against non-copyable "
++               (_ ("%F%P: %pB: copy relocation against non-copyable "
+                    "protected symbol `%s'\n"),
+                 p->sec->owner, h->root.root.string);
+            return false;
+diff --git a/bfd/elfnn-ia64.c b/bfd/elfnn-ia64.c
+index 41d9e6fe..8d576c81 100644
+--- a/bfd/elfnn-ia64.c
++++ b/bfd/elfnn-ia64.c
+@@ -362,7 +362,7 @@ elfNN_ia64_relax_section (bfd *abfd, asection *sec,
+ 
+   if (bfd_link_relocatable (link_info))
+     link_info->callbacks->fatal
+-      (_("%P: --relax and -r may not be used together\n"));
++      (_("%P%F: --relax and -r may not be used together\n"));
+ 
+   /* Don't even try to relax for non-ELF outputs.  */
+   if (!is_elf_hash_table (link_info->hash))
+diff --git a/bfd/elfnn-kvx.c b/bfd/elfnn-kvx.c
+index b752891b..9bbbc929 100644
+--- a/bfd/elfnn-kvx.c
++++ b/bfd/elfnn-kvx.c
+@@ -927,7 +927,7 @@ kvx_build_one_stub (struct bfd_hash_entry *gen_entry,
+      section.  The user should fix his linker script.  */
+   if (stub_entry->target_section->output_section == NULL
+       && info->non_contiguous_regions)
+-    info->callbacks->fatal (_("%P: Could not assign '%pA' to an output section. "
++    info->callbacks->fatal (_("%F%P: Could not assign '%pA' to an output section. "
+                              "Retry without "
+                              "--enable-non-contiguous-regions.\n"),
+                            stub_entry->target_section);
+diff --git a/bfd/elfnn-loongarch.c b/bfd/elfnn-loongarch.c
+index a8c4226d..12ee56a9 100644
+--- a/bfd/elfnn-loongarch.c
++++ b/bfd/elfnn-loongarch.c
+@@ -1447,7 +1447,7 @@ local_allocate_ifunc_dyn_relocs (struct bfd_link_info *info,
+     {
+       info->callbacks->fatal
+        /* xgettext:c-format.  */
+-       (_("%P: dynamic STT_GNU_IFUNC symbol `%s' with pointer "
++       (_("%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"),
+         h->root.root.string,
+diff --git a/bfd/elfxx-aarch64.c b/bfd/elfxx-aarch64.c
+index 161c8a52..2aa7dd54 100644
+--- a/bfd/elfxx-aarch64.c
++++ b/bfd/elfxx-aarch64.c
+@@ -755,11 +755,11 @@ _bfd_aarch64_elf_link_setup_gnu_properties (struct bfd_link_info *info,
+                                              | SEC_DATA));
+          if (sec == NULL)
+            info->callbacks->fatal (
+-             _("%P: failed to create GNU property section\n"));
++             _("%F%P: failed to create GNU property section\n"));
+ 
+           align = (bfd_get_mach (ebfd) & bfd_mach_aarch64_ilp32) ? 2 : 3;
+          if (!bfd_set_section_alignment (sec, align))
+-           info->callbacks->fatal (_("%pA: failed to align section\n"),
++           info->callbacks->fatal (_("%F%pA: failed to align section\n"),
+                                    sec);
+ 
+          elf_section_type (sec) = SHT_NOTE;
+diff --git a/bfd/elfxx-sparc.c b/bfd/elfxx-sparc.c
+index 95b1928d..76057d3b 100644
+--- a/bfd/elfxx-sparc.c
++++ b/bfd/elfxx-sparc.c
+@@ -2681,7 +2681,7 @@ _bfd_sparc_elf_relax_section (bfd *abfd ATTRIBUTE_UNUSED,
+ {
+   if (bfd_link_relocatable (link_info))
+     link_info->callbacks->fatal
+-      (_("%P: --relax and -r may not be used together\n"));
++      (_("%P%F: --relax and -r may not be used together\n"));
+ 
+   *again = false;
+   sec_do_relax (section) = 1;
+diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
+index 606c8905..803d6a54 100644
+--- a/bfd/elfxx-x86.c
++++ b/bfd/elfxx-x86.c
+@@ -533,7 +533,7 @@ elf_x86_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+            {
+              info->callbacks->fatal
+                /* xgettext:c-format */
+-               (_("%P: %pB: copy relocation against non-copyable "
++               (_("%F%P: %pB: copy relocation against non-copyable "
+                   "protected symbol `%s' in %pB\n"),
+                 p->sec->owner, h->root.root.string,
+                 h->root.u.def.section->owner);
+@@ -1032,7 +1032,7 @@ elf_x86_relative_reloc_record_add
+     {
+       info->callbacks->fatal
+        /* xgettext:c-format */
+-       (_("%P: %pB: failed to allocate relative reloc record\n"),
++       (_("%F%P: %pB: failed to allocate relative reloc record\n"),
+         info->output_bfd);
+       return false;
+     }
+@@ -1390,7 +1390,7 @@ elf64_dt_relr_bitmap_add
+     {
+       info->callbacks->fatal
+        /* xgettext:c-format */
+-       (_("%P: %pB: failed to allocate 64-bit DT_RELR bitmap\n"),
++       (_("%F%P: %pB: failed to allocate 64-bit DT_RELR bitmap\n"),
+         info->output_bfd);
+     }
+ 
+@@ -1426,7 +1426,7 @@ elf32_dt_relr_bitmap_add
+     {
+       info->callbacks->fatal
+        /* xgettext:c-format */
+-       (_("%P: %pB: failed to allocate 32-bit DT_RELR bitmap\n"),
++       (_("%F%P: %pB: failed to allocate 32-bit DT_RELR bitmap\n"),
+         info->output_bfd);
+     }
+ 
+@@ -1563,7 +1563,7 @@ elf_x86_size_or_finish_relative_reloc
+                          if (!bfd_malloc_and_get_section (sec->owner,
+                                                           sec,
+                                                           &contents))
+-                           info->callbacks->einfo
++                           info->callbacks->fatal
+                              /* xgettext:c-format */
+                              (_("%F%P: %pB: failed to allocate memory for section `%pA'\n"),
+                               info->output_bfd, sec);
+@@ -1752,7 +1752,7 @@ elf_x86_compute_dl_relr_bitmap
+       else
+        info->callbacks->fatal
+          /* xgettext:c-format */
+-         (_("%P: %pB: size of compact relative reloc section is "
++         (_("%F%P: %pB: size of compact relative reloc section is "
+             "changed: new (%lu) != old (%lu)\n"),
+           info->output_bfd, htab->dt_relr_bitmap.count,
+           dt_relr_bitmap_count);
+@@ -1774,7 +1774,7 @@ elf_x86_write_dl_relr_bitmap (struct bfd_link_info *info,
+   if (contents == NULL)
+     info->callbacks->fatal
+       /* xgettext:c-format */
+-      (_("%P: %pB: failed to allocate compact relative reloc section\n"),
++      (_("%F%P: %pB: failed to allocate compact relative reloc section\n"),
+        info->output_bfd);
+ 
+   /* Cache the section contents for elf_link_input_bfd.  */
+@@ -2221,7 +2221,7 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section,
+                                     sym, NULL);
+          info->callbacks->fatal
+            /* xgettext:c-format */
+-           (_("%P: %pB: relocation %s against absolute symbol "
++           (_("%F%P: %pB: relocation %s against absolute symbol "
+               "`%s' in section `%pA' is disallowed\n"),
+             input_section->owner, internal_reloc.howto->name, name,
+             input_section);
+@@ -3431,7 +3431,7 @@ _bfd_x86_elf_adjust_dynamic_symbol (struct bfd_link_info *info,
+              {
+                info->callbacks->fatal
+                  /* xgettext:c-format */
+-                 (_("%P: %pB: copy relocation against non-copyable "
++                 (_("%F%P: %pB: copy relocation against non-copyable "
+                     "protected symbol `%s' in %pB\n"),
+                   p->sec->owner, h->root.root.string,
+                   h->root.u.def.section->owner);
+@@ -4138,12 +4138,12 @@ _bfd_x86_elf_link_setup_gnu_properties
+                                              | SEC_HAS_CONTENTS
+                                              | SEC_DATA));
+          if (sec == NULL)
+-           info->callbacks->fatal (_("%P: failed to create GNU property section\n"));
++           info->callbacks->fatal (_("%F%P: failed to create GNU property section\n"));
+ 
+          if (!bfd_set_section_alignment (sec, class_align))
+            {
+            error_alignment:
+-             info->callbacks->fatal (_("%pA: failed to align section\n"),
++             info->callbacks->fatal (_("%F%pA: failed to align section\n"),
+                                      sec);
+            }
+ 
+@@ -4404,7 +4404,7 @@ _bfd_x86_elf_link_setup_gnu_properties
+       && !elf_vxworks_create_dynamic_sections (dynobj, info,
+                                               &htab->srelplt2))
+     {
+-      info->callbacks->fatal (_("%P: failed to create VxWorks dynamic sections\n"));
++      info->callbacks->fatal (_("%F%P: failed to create VxWorks dynamic sections\n"));
+       return pbfd;
+     }
+ 
+@@ -4413,7 +4413,7 @@ _bfd_x86_elf_link_setup_gnu_properties
+      don't need to do it in check_relocs.  */
+   if (htab->elf.sgot == NULL
+       && !_bfd_elf_create_got_section (dynobj, info))
+-    info->callbacks->fatal (_("%P: failed to create GOT sections\n"));
++    info->callbacks->fatal (_("%F%P: failed to create GOT sections\n"));
+ 
+   got_align = (bed->target_id == X86_64_ELF_DATA) ? 3 : 2;
+ 
+@@ -4431,7 +4431,7 @@ _bfd_x86_elf_link_setup_gnu_properties
+   /* Create the ifunc sections here so that check_relocs can be
+      simplified.  */
+   if (!_bfd_elf_create_ifunc_sections (dynobj, info))
+-    info->callbacks->fatal (_("%P: failed to create ifunc sections\n"));
++    info->callbacks->fatal (_("%F%P: failed to create ifunc sections\n"));
+ 
+   plt_alignment = bfd_log2 (htab->plt.plt_entry_size);
+ 
+@@ -4468,7 +4468,7 @@ _bfd_x86_elf_link_setup_gnu_properties
+                                                    ".plt.got",
+                                                    pltflags);
+          if (sec == NULL)
+-           info->callbacks->fatal (_("%P: failed to create GOT PLT section\n"));
++           info->callbacks->fatal (_("%F%P: failed to create GOT PLT section\n"));
+ 
+          if (!bfd_set_section_alignment (sec, non_lazy_plt_alignment))
+            goto error_alignment;
+@@ -4487,7 +4487,7 @@ _bfd_x86_elf_link_setup_gnu_properties
+                                                            ".plt.sec",
+                                                            pltflags);
+                  if (sec == NULL)
+-                   info->callbacks->fatal (_("%P: failed to create IBT-enabled PLT section\n"));
++                   info->callbacks->fatal (_("%F%P: failed to create IBT-enabled PLT section\n"));
+ 
+                  if (!bfd_set_section_alignment (sec, plt_alignment))
+                    goto error_alignment;
+@@ -4507,7 +4507,7 @@ _bfd_x86_elf_link_setup_gnu_properties
+                                                    ".eh_frame",
+                                                    flags);
+          if (sec == NULL)
+-           info->callbacks->fatal (_("%P: failed to create PLT .eh_frame section\n"));
++           info->callbacks->fatal (_("%F%P: failed to create PLT .eh_frame section\n"));
+ 
+          if (!bfd_set_section_alignment (sec, class_align))
+            goto error_alignment;
+@@ -4520,7 +4520,7 @@ _bfd_x86_elf_link_setup_gnu_properties
+                                                        ".eh_frame",
+                                                        flags);
+              if (sec == NULL)
+-               info->callbacks->fatal (_("%P: failed to create GOT PLT .eh_frame section\n"));
++               info->callbacks->fatal (_("%F%P: failed to create GOT PLT .eh_frame section\n"));
+ 
+              if (!bfd_set_section_alignment (sec, class_align))
+                goto error_alignment;
+@@ -4534,7 +4534,7 @@ _bfd_x86_elf_link_setup_gnu_properties
+                                                        ".eh_frame",
+                                                        flags);
+              if (sec == NULL)
+-               info->callbacks->fatal (_("%P: failed to create the second PLT .eh_frame section\n"));
++               info->callbacks->fatal (_("%F%P: failed to create the second PLT .eh_frame section\n"));
+ 
+              if (!bfd_set_section_alignment (sec, class_align))
+                goto error_alignment;
+@@ -4554,7 +4554,7 @@ _bfd_x86_elf_link_setup_gnu_properties
+                                                    ".sframe",
+                                                    flags);
+          if (sec == NULL)
+-           info->callbacks->fatal (_("%P: failed to create PLT .sframe section\n"));
++           info->callbacks->fatal (_("%F%P: failed to create PLT .sframe section\n"));
+ 
+          // FIXME check this
+          // if (!bfd_set_section_alignment (sec, class_align))
+@@ -4569,7 +4569,7 @@ _bfd_x86_elf_link_setup_gnu_properties
+                                                        ".sframe",
+                                                        flags);
+              if (sec == NULL)
+-               info->callbacks->fatal (_("%P: failed to create second PLT .sframe section\n"));
++               info->callbacks->fatal (_("%F%P: failed to create second PLT .sframe section\n"));
+ 
+              htab->plt_second_sframe = sec;
+            }
+diff --git a/bfd/linker.c b/bfd/linker.c
+index 5b912221..7940e587 100644
+--- a/bfd/linker.c
++++ b/bfd/linker.c
+@@ -2982,7 +2982,7 @@ _bfd_generic_section_already_linked (bfd *abfd ATTRIBUTE_UNUSED,
+ 
+   /* This is the first section with this name.  Record it.  */
+   if (!bfd_section_already_linked_table_insert (already_linked_list, sec))
+-    info->callbacks->fatal (_("%P: already_linked_table: %E\n"));
++    info->callbacks->fatal (_("%F%P: already_linked_table: %E\n"));
+   return false;
+ }
+ 
+diff --git a/bfd/reloc.c b/bfd/reloc.c
+index 1fee86f1..433f8e74 100644
+--- a/bfd/reloc.c
++++ b/bfd/reloc.c
+@@ -8466,7 +8466,7 @@ bfd_generic_relax_section (bfd *abfd ATTRIBUTE_UNUSED,
+ {
+   if (bfd_link_relocatable (link_info))
+     link_info->callbacks->fatal
+-      (_("%P: --relax and -r may not be used together\n"));
++      (_("%P%F: --relax and -r may not be used together\n"));
+ 
+   *again = false;
+   return true;
+diff --git a/bfd/reloc16.c b/bfd/reloc16.c
+index a16d6b20..b45ac263 100644
+--- a/bfd/reloc16.c
++++ b/bfd/reloc16.c
+@@ -152,7 +152,7 @@ bfd_coff_reloc16_relax_section (bfd *abfd,
+ 
+   if (bfd_link_relocatable (link_info))
+     link_info->callbacks->fatal
+-      (_("%P: --relax and -r may not be used together\n"));
++      (_("%P%F: --relax and -r may not be used together\n"));
+ 
+   /* We only do global relaxation once.  It is not safe to do it multiple
+      times (see discussion of the "shrinks" array below).  */
+diff --git a/bfd/xcofflink.c b/bfd/xcofflink.c
+index 9b01cc37..e0165d20 100644
+--- a/bfd/xcofflink.c
++++ b/bfd/xcofflink.c
+@@ -4681,7 +4681,7 @@ xcoff_build_one_stub (struct bfd_hash_entry *gen_entry, void *in_arg)
+   if (hstub->target_section != NULL
+       && hstub->target_section->output_section == NULL
+       && info->non_contiguous_regions)
+-    info->callbacks->fatal (_("%P: Could not assign `%pA' to an output section. "
++    info->callbacks->fatal (_("%F%P: Could not assign `%pA' to an output section. "
+                              "Retry without --enable-non-contiguous-regions.\n"),
+                            hstub->target_section);
+ 
+diff --git a/ld/emulparams/call_nop.sh b/ld/emulparams/call_nop.sh
+index 7dd6dfb1..450d05ab 100644
+--- a/ld/emulparams/call_nop.sh
++++ b/ld/emulparams/call_nop.sh
+@@ -20,7 +20,7 @@ PARSE_AND_LIST_ARGS_CASE_Z_CALL_NOP='
+              char *end;
+              params.call_nop_byte = strtoul (optarg + 16 , &end, 0);
+              if (*end)
+-               fatal (_("%P: invalid number for -z call-nop=prefix-: %s\n"),
++               fatal (_("%F%P: invalid number for -z call-nop=prefix-: %s\n"),
+                       optarg + 16);
+              params.call_nop_as_suffix = false;
+            }
+@@ -29,12 +29,12 @@ PARSE_AND_LIST_ARGS_CASE_Z_CALL_NOP='
+              char *end;
+              params.call_nop_byte = strtoul (optarg + 16, &end, 0);
+              if (*end)
+-               fatal (_("%P: invalid number for -z call-nop=suffix-: %s\n"),
++               fatal (_("%F%P: invalid number for -z call-nop=suffix-: %s\n"),
+                       optarg + 16);
+              params.call_nop_as_suffix = true;
+            }
+          else
+-           fatal (_("%P: unsupported option: -z %s\n"), optarg);
++           fatal (_("%F%P: unsupported option: -z %s\n"), optarg);
+        }
+ '
+ 
+diff --git a/ld/emulparams/cet.sh b/ld/emulparams/cet.sh
+index e463441d..824bcf0e 100644
+--- a/ld/emulparams/cet.sh
++++ b/ld/emulparams/cet.sh
+@@ -29,7 +29,7 @@ PARSE_AND_LIST_ARGS_CASE_Z_CET='
+                                 | prop_report_ibt
+                                 | prop_report_shstk);
+          else
+-           fatal (_("%P: invalid option for -z cet-report=: %s\n"),
++           fatal (_("%F%P: invalid option for -z cet-report=: %s\n"),
+                   optarg + 11);
+        }
+ '
+diff --git a/ld/emulparams/elf32mcore.sh b/ld/emulparams/elf32mcore.sh
+index 275a796f..99261ca8 100644
+--- a/ld/emulparams/elf32mcore.sh
++++ b/ld/emulparams/elf32mcore.sh
+@@ -46,6 +46,6 @@ PARSE_AND_LIST_ARGS_CASES='
+     case OPTION_BASE_FILE:
+       link_info.base_file = fopen (optarg, FOPEN_WB);
+       if (link_info.base_file == NULL)
+-       fatal (_("%P: cannot open base file %s\n"), optarg);
++       fatal (_("%F%P: cannot open base file %s\n"), optarg);
+       break;
+ '
+diff --git a/ld/emulparams/x86-64-lam.sh b/ld/emulparams/x86-64-lam.sh
+index 6e629ebb..8675a01f 100644
+--- a/ld/emulparams/x86-64-lam.sh
++++ b/ld/emulparams/x86-64-lam.sh
+@@ -25,7 +25,7 @@ PARSE_AND_LIST_ARGS_CASE_Z_LAM='
+          else if (strcmp (optarg + 15, "error") == 0)
+            params.lam_u48_report = prop_report_error;
+          else
+-           fatal (_("%P: invalid option for -z lam-u48-report=: %s\n"),
++           fatal (_("%F%P: invalid option for -z lam-u48-report=: %s\n"),
+                   optarg + 15);
+        }
+       else if (strcmp (optarg, "lam-u57") == 0)
+@@ -39,7 +39,7 @@ PARSE_AND_LIST_ARGS_CASE_Z_LAM='
+          else if (strcmp (optarg + 15, "error") == 0)
+            params.lam_u57_report = prop_report_error;
+          else
+-           fatal (_("%P: invalid option for -z lam-u57-report=: %s\n"),
++           fatal (_("%F%P: invalid option for -z lam-u57-report=: %s\n"),
+                   optarg + 15);
+        }
+       else if (strncmp (optarg, "lam-report=", 11) == 0)
+@@ -60,7 +60,7 @@ PARSE_AND_LIST_ARGS_CASE_Z_LAM='
+              params.lam_u57_report = prop_report_error;
+            }
+          else
+-           fatal (_("%P: invalid option for -z lam-report=: %s\n"),
++           fatal (_("%F%P: invalid option for -z lam-report=: %s\n"),
+                   optarg + 11);
+        }
+ '
+diff --git a/ld/emulparams/x86-64-level.sh b/ld/emulparams/x86-64-level.sh
+index 7e27cf1e..3002a1f7 100644
+--- a/ld/emulparams/x86-64-level.sh
++++ b/ld/emulparams/x86-64-level.sh
+@@ -10,7 +10,7 @@ PARSE_AND_LIST_ARGS_CASE_Z_X86_64_LEVEL='
+          char *end;
+          unsigned int level = strtoul (optarg + 8 , &end, 10);
+          if (*end != '\0' || level < 2 || level > 4)
+-           fatal (_("%P: invalid x86-64 ISA level: %s\n"), optarg);
++           fatal (_("%F%P: invalid x86-64 ISA level: %s\n"), optarg);
+          params.isa_level = level;
+        }
+ '
+diff --git a/ld/emultempl/aarch64elf.em b/ld/emultempl/aarch64elf.em
+index a6637718..1cdd433d 100644
+--- a/ld/emultempl/aarch64elf.em
++++ b/ld/emultempl/aarch64elf.em
+@@ -316,7 +316,7 @@ aarch64_elf_create_output_section_statements (void)
+         These will only be created if the output format is an arm format,
+         hence we do not support linking and changing output formats at the
+         same time.  Use a link followed by objcopy to change output formats.  */
+-      fatal (_("%P: error: cannot change output format "
++      fatal (_("%F%P: error: cannot change output format "
+               "whilst linking %s binaries\n"), "AArch64");
+       return;
+     }
+@@ -342,7 +342,7 @@ aarch64_elf_create_output_section_statements (void)
+                              bfd_get_arch (link_info.output_bfd),
+                              bfd_get_mach (link_info.output_bfd)))
+     {
+-      fatal (_("%P: can not create BFD: %E\n"));
++      fatal (_("%F%P: can not create BFD: %E\n"));
+       return;
+     }
+ 
+@@ -468,7 +468,7 @@ PARSE_AND_LIST_ARGS_CASES='
+ 
+        group_size = bfd_scan_vma (optarg, &end, 0);
+        if (*end)
+-         fatal (_("%P: invalid number `%s'\''\n"), optarg);
++         fatal (_("%F%P: invalid number `%s'\''\n"), optarg);
+       }
+       break;
+ '
+diff --git a/ld/emultempl/aix.em b/ld/emultempl/aix.em
+index 29acdbc9..85bd45fa 100644
+--- a/ld/emultempl/aix.em
++++ b/ld/emultempl/aix.em
+@@ -335,7 +335,7 @@ read_file_list (const char *filename)
+   f = fopen (filename, FOPEN_RT);
+   if (f == NULL)
+     {
+-      fatal (_("%P: cannot open %s\n"), filename);
++      fatal (_("%F%P: cannot open %s\n"), filename);
+       return;
+     }
+   if (fseek (f, 0L, SEEK_END) == -1)
+@@ -383,7 +383,7 @@ read_file_list (const char *filename)
+ 
+  error:
+   fclose (f);
+-  fatal (_("%P: cannot read %s\n"), optarg);
++  fatal (_("%F%P: cannot read %s\n"), optarg);
+ }
+ 
+ static bool
+@@ -734,7 +734,7 @@ gld${EMULATION_NAME}_after_open (void)
+       size = (p->count + 2) * 4;
+       if (!bfd_xcoff_link_record_set (link_info.output_bfd, &link_info,
+                                      p->h, size))
+-       fatal (_("%P: bfd_xcoff_link_record_set failed: %E\n"));
++       fatal (_("%F%P: bfd_xcoff_link_record_set failed: %E\n"));
+     }
+ }
+ 
+@@ -764,9 +764,9 @@ gld${EMULATION_NAME}_before_allocation (void)
+ 
+       h = bfd_link_hash_lookup (link_info.hash, el->name, false, false, false);
+       if (h == NULL)
+-       fatal (_("%P: bfd_link_hash_lookup of export symbol failed: %E\n"));
++       fatal (_("%F%P: bfd_link_hash_lookup of export symbol failed: %E\n"));
+       if (!bfd_xcoff_export_symbol (link_info.output_bfd, &link_info, h))
+-       fatal (_("%P: bfd_xcoff_export_symbol failed: %E\n"));
++       fatal (_("%F%P: bfd_xcoff_export_symbol failed: %E\n"));
+     }
+ 
+   /* Track down all relocations called for by the linker script (these
+@@ -849,7 +849,7 @@ gld${EMULATION_NAME}_before_allocation (void)
+       (link_info.output_bfd, &link_info, libpath, entry_symbol.name,
+        file_align, maxstack, maxdata, gc && !unix_ld,
+        modtype, textro, flags, special_sections, rtld))
+-    fatal (_("%P: failed to set dynamic section sizes: %E\n"));
++    fatal (_("%F%P: failed to set dynamic section sizes: %E\n"));
+ 
+   /* Look through the special sections, and put them in the right
+      place in the link ordering.  This is especially magic.  */
+@@ -871,8 +871,8 @@ gld${EMULATION_NAME}_before_allocation (void)
+       is = NULL;
+       os = lang_output_section_get (sec->output_section);
+       if (os == NULL)
+-       fatal (_("%P: can't find output section %pA\n"),
+-              sec->output_section);
++       fatal (_("%F%P: can't find output section %s\n"),
++              sec->output_section->name);
+ 
+       for (pls = &os->children.head; *pls != NULL; pls = &(*pls)->header.next)
+        {
+@@ -908,7 +908,8 @@ gld${EMULATION_NAME}_before_allocation (void)
+ 
+       if (is == NULL)
+        {
+-         fatal (_("%P: can't find %pA in output section\n"), sec);
++         fatal (_("%F%P: can't find %s in output section\n"),
++                bfd_section_name (sec));
+        }
+ 
+       /* Now figure out where the section should go.  */
+@@ -1161,7 +1162,7 @@ gld${EMULATION_NAME}_after_allocation (void)
+ 
+   /* Now that everything is in place, finalize the dynamic sections.  */
+   if (!bfd_xcoff_build_dynamic_sections (link_info.output_bfd, &link_info))
+-    fatal (_("%P: failed to layout dynamic sections: %E\n"));
++    fatal (_("%F%P: failed to layout dynamic sections: %E\n"));
+ 
+   if (!bfd_link_relocatable (&link_info))
+     {
+@@ -1312,7 +1313,7 @@ gld${EMULATION_NAME}_read_file (const char *filename, bool import)
+   if (f == NULL)
+     {
+       bfd_set_error (bfd_error_system_call);
+-      fatal ("%P: %s: %E\n", filename);
++      fatal ("%F%P: %s: %E\n", filename);
+       return;
+     }
+ 
+@@ -1374,7 +1375,7 @@ gld${EMULATION_NAME}_read_file (const char *filename, bool import)
+              obstack_free (o, obstack_base (o));
+            }
+          else if (*s == '(')
+-           fatal (_("%P:%s:%d: #! ([member]) is not supported "
++           fatal (_("%F%P:%s:%d: #! ([member]) is not supported "
+                     "in import files\n"),
+                   filename, lineno);
+          else
+@@ -1391,7 +1392,7 @@ gld${EMULATION_NAME}_read_file (const char *filename, bool import)
+              *s = '\0';
+              if (!bfd_xcoff_split_import_path (link_info.output_bfd,
+                                                start, &imppath, &impfile))
+-               fatal (_("%P: could not parse import path: %E\n"));
++               fatal (_("%F%P: could not parse import path: %E\n"));
+              while (ISSPACE (cs))
+                {
+                  ++s;
+@@ -1546,10 +1547,10 @@ gld${EMULATION_NAME}_find_relocs (lang_statement_union_type *s)
+ 
+       rs = &s->reloc_statement;
+       if (rs->name == NULL)
+-       fatal (_("%P: only relocations against symbols are permitted\n"));
++       fatal (_("%F%P: only relocations against symbols are permitted\n"));
+       if (!bfd_xcoff_link_count_reloc (link_info.output_bfd, &link_info,
+                                       rs->name))
+-       fatal (_("%P: bfd_xcoff_link_count_reloc failed: %E\n"));
++       fatal (_("%F%P: bfd_xcoff_link_count_reloc failed: %E\n"));
+     }
+ 
+   if (s->header.type == lang_assignment_statement_enum)
+@@ -1578,7 +1579,7 @@ gld${EMULATION_NAME}_find_exp_assignment (etree_type *exp)
+          if (!bfd_xcoff_record_link_assignment (link_info.output_bfd,
+                                                 &link_info,
+                                                 exp->assign.dst))
+-           fatal (_("%P: failed to record assignment to %s: %E\n"),
++           fatal (_("%F%P: failed to record assignment to %s: %E\n"),
+                   exp->assign.dst);
+        }
+       gld${EMULATION_NAME}_find_exp_assignment (exp->assign.src);
+@@ -1673,7 +1674,7 @@ gld${EMULATION_NAME}_create_output_section_statements (void)
+                             bfd_get_arch (link_info.output_bfd),
+                             bfd_get_mach (link_info.output_bfd)))
+     {
+-      fatal (_("%P: can not create stub BFD: %E\n"));
++      fatal (_("%F%P: can not create stub BFD: %E\n"));
+       return;
+     }
+ 
+@@ -1683,7 +1684,7 @@ gld${EMULATION_NAME}_create_output_section_statements (void)
+ 
+   /* Pass linker params to the back-end. */
+   if (!bfd_xcoff_link_init (&link_info, &params))
+-    fatal (_("%P: can not init BFD: %E\n"));
++    fatal (_("%F%P: can not init BFD: %E\n"));
+ 
+   /* __rtinit */
+   if (link_info.init_function != NULL
+@@ -1700,7 +1701,7 @@ gld${EMULATION_NAME}_create_output_section_statements (void)
+                                  bfd_get_arch (link_info.output_bfd),
+                                  bfd_get_mach (link_info.output_bfd)))
+        {
+-         fatal (_("%P: can not create BFD: %E\n"));
++         fatal (_("%F%P: can not create BFD: %E\n"));
+          return;
+        }
+ 
+@@ -1710,7 +1711,7 @@ gld${EMULATION_NAME}_create_output_section_statements (void)
+                                            link_info.fini_function,
+                                            rtld))
+        {
+-         fatal (_("%P: can not create BFD: %E\n"));
++         fatal (_("%F%P: can not create BFD: %E\n"));
+          return;
+        }
+ 
+diff --git a/ld/emultempl/armelf.em b/ld/emultempl/armelf.em
+index 504fb0cd..4240f4e7 100644
+--- a/ld/emultempl/armelf.em
++++ b/ld/emultempl/armelf.em
+@@ -521,7 +521,7 @@ arm_elf_create_output_section_statements (void)
+         These will only be created if the output format is an arm format,
+         hence we do not support linking and changing output formats at the
+         same time.  Use a link followed by objcopy to change output formats.  */
+-      fatal (_("%P: error: cannot change output format "
++      fatal (_("%F%P: error: cannot change output format "
+               "whilst linking %s binaries\n"), "ARM");
+       return;
+     }
+@@ -532,10 +532,10 @@ arm_elf_create_output_section_statements (void)
+                                        bfd_get_target (link_info.output_bfd));
+ 
+       if (params.in_implib_bfd == NULL)
+-       fatal (_("%P: %s: can't open: %E\n"), in_implib_filename);
++       fatal (_("%F%P: %s: can't open: %E\n"), in_implib_filename);
+ 
+       if (!bfd_check_format (params.in_implib_bfd, bfd_object))
+-       fatal (_("%P: %s: not a relocatable file: %E\n"), in_implib_filename);
++       fatal (_("%F%P: %s: not a relocatable file: %E\n"), in_implib_filename);
+     }
+ 
+   bfd_elf32_arm_set_target_params (link_info.output_bfd, &link_info, &params);
+@@ -549,7 +549,7 @@ arm_elf_create_output_section_statements (void)
+                              bfd_get_arch (link_info.output_bfd),
+                              bfd_get_mach (link_info.output_bfd)))
+     {
+-      fatal (_("%P: can not create BFD: %E\n"));
++      fatal (_("%F%P: can not create BFD: %E\n"));
+       return;
+     }
+ 
+@@ -734,7 +734,7 @@ PARSE_AND_LIST_ARGS_CASES='
+ 
+        group_size = bfd_scan_vma (optarg, &end, 0);
+        if (*end)
+-         fatal (_("%P: invalid number `%s'\''\n"), optarg);
++         fatal (_("%F%P: invalid number `%s'\''\n"), optarg);
+       }
+       break;
+ 
+diff --git a/ld/emultempl/avrelf.em b/ld/emultempl/avrelf.em
+index dd5b57d1..854c57bb 100644
+--- a/ld/emultempl/avrelf.em
++++ b/ld/emultempl/avrelf.em
+@@ -116,7 +116,7 @@ avr_elf_create_output_section_statements (void)
+ 
+   if (bfd_get_flavour (link_info.output_bfd) != bfd_target_elf_flavour)
+     {
+-      fatal (_("%P: error: cannot change output format "
++      fatal (_("%F%P: error: cannot change output format "
+               "whilst linking %s binaries\n"), "AVR");
+       return;
+     }
+diff --git a/ld/emultempl/beos.em b/ld/emultempl/beos.em
+index 81878b02..e936b4f5 100644
+--- a/ld/emultempl/beos.em
++++ b/ld/emultempl/beos.em
+@@ -227,7 +227,7 @@ set_pe_subsystem (void)
+          return;
+        }
+     }
+-  fatal (_("%P: invalid subsystem type %s\n"), optarg);
++  fatal (_("%F%P: invalid subsystem type %s\n"), optarg);
+ }
+ 
+ 
+@@ -237,7 +237,7 @@ set_pe_value (char *name)
+   char *end;
+   set_pe_name (name,  strtoul (optarg, &end, 0));
+   if (end == optarg)
+-    fatal (_("%P: invalid hex number for PE parameter '%s'\n"), optarg);
++    fatal (_("%F%P: invalid hex number for PE parameter '%s'\n"), optarg);
+ 
+   optarg = end;
+ }
+@@ -252,7 +252,7 @@ set_pe_stack_heap (char *resname, char *comname)
+       set_pe_value (comname);
+     }
+   else if (*optarg)
+-    fatal (_("%P: strange hex info for PE parameter '%s'\n"), optarg);
++    fatal (_("%F%P: strange hex info for PE parameter '%s'\n"), optarg);
+ }
+ 
+ 
+@@ -267,7 +267,7 @@ gld${EMULATION_NAME}_handle_option (int optc)
+     case OPTION_BASE_FILE:
+       link_info.base_file = fopen (optarg, FOPEN_WB);
+       if (link_info.base_file == NULL)
+-       fatal (_("%P: cannot open base file %s\n"), optarg);
++       fatal (_("%F%P: cannot open base file %s\n"), optarg);
+       break;
+ 
+       /* PE options */
+@@ -376,7 +376,7 @@ gld${EMULATION_NAME}_after_open (void)
+      FIXME: This should be done via a function, rather than by
+      including an internal BFD header.  */
+   if (!obj_pe (link_info.output_bfd))
+-    fatal (_("%P: PE operations on non PE file\n"));
++    fatal (_("%F%P: PE operations on non PE file\n"));
+ 
+   pe_data(link_info.output_bfd)->pe_opthdr = pe;
+   pe_data(link_info.output_bfd)->dll = init[DLLOFF].value;
+@@ -425,12 +425,12 @@ sort_by_file_name (const void *a, const void *b)
+ 
+       if (!bfd_get_section_contents (sa->owner, sa, &a_sec, (file_ptr) 0,
+                                     (bfd_size_type) sizeof (a_sec)))
+-       fatal (_("%P: %pB: can't read contents of section .idata: %E\n"),
++       fatal (_("%F%P: %pB: can't read contents of section .idata: %E\n"),
+               sa->owner);
+ 
+       if (!bfd_get_section_contents (sb->owner, sb, &b_sec, (file_ptr) 0,
+                                     (bfd_size_type) sizeof (b_sec)))
+-       fatal (_("%P: %pB: can't read contents of section .idata: %E\n"),
++       fatal (_("%F%P: %pB: can't read contents of section .idata: %E\n"),
+               sb->owner);
+ 
+       i = a_sec < b_sec ? -1 : 0;
+@@ -662,7 +662,7 @@ gld${EMULATION_NAME}_place_orphan (asection *s,
+   /* Everything from the '\$' on gets deleted so don't allow '\$' as the
+      first character.  */
+   if (*secname == '\$')
+-    fatal (_("%P: section %s has '\$' as first character\n"), secname);
++    fatal (_("%F%P: section %s has '\$' as first character\n"), secname);
+   if (strchr (secname + 1, '\$') == NULL)
+     return NULL;
+ 
+@@ -692,7 +692,7 @@ gld${EMULATION_NAME}_place_orphan (asection *s,
+       }
+   ps[0] = 0;
+   if (l == NULL)
+-    fatal (_("%P: *(%s\$) missing from linker script\n"), output_secname);
++    fatal (_("%F%P: *(%s\$) missing from linker script\n"), output_secname);
+ 
+   /* Link the input section in and we're done for now.
+      The sections still have to be sorted, but that has to wait until
+diff --git a/ld/emultempl/cr16elf.em b/ld/emultempl/cr16elf.em
+index 5464edf1..cd24728c 100644
+--- a/ld/emultempl/cr16elf.em
++++ b/ld/emultempl/cr16elf.em
+@@ -58,7 +58,7 @@ cr16_elf_after_open (void)
+             COFF and ELF.  */
+          if (bfd_get_flavour (abfd) != bfd_target_coff_flavour
+              && bfd_get_flavour (abfd) != bfd_target_elf_flavour)
+-           fatal (_("%P: %pB: all input objects must be COFF or ELF "
++           fatal (_("%F%P: %pB: all input objects must be COFF or ELF "
+                     "for --embedded-relocs\n"));
+ 
+          datasec = bfd_get_section_by_name (abfd, ".data.rel");
+@@ -82,7 +82,7 @@ cr16_elf_after_open (void)
+                                                      | SEC_IN_MEMORY))
+                  || !bfd_set_section_alignment (relsec, 2)
+                  || !bfd_set_section_size (relsec, datasec->reloc_count * 8))
+-               fatal (_("%P: %pB: can not create .emreloc section: %E\n"));
++               fatal (_("%F%P: %pB: can not create .emreloc section: %E\n"));
+            }
+ 
+          /* Double check that all other data sections are empty, as is
+diff --git a/ld/emultempl/cskyelf.em b/ld/emultempl/cskyelf.em
+index 9c91d7ac..b4896c45 100644
+--- a/ld/emultempl/cskyelf.em
++++ b/ld/emultempl/cskyelf.em
+@@ -151,7 +151,7 @@ csky_elf_create_output_section_statements (void)
+          bfd_get_arch (link_info.output_bfd),
+          bfd_get_mach (link_info.output_bfd)))
+     {
+-      fatal (_("%P: can not create BFD: %E\n"));
++      fatal (_("%F%P: can not create BFD: %E\n"));
+       return;
+     }
+ 
+@@ -324,7 +324,7 @@ PARSE_AND_LIST_ARGS_CASES='
+ 
+       group_size = bfd_scan_vma (optarg, &end, 0);
+       if (*end)
+-       fatal (_("%P: invalid number `%s'\''\n"), optarg);
++       fatal (_("%F%P: invalid number `%s'\''\n"), optarg);
+     }
+     break;
+ '
+diff --git a/ld/emultempl/elf.em b/ld/emultempl/elf.em
+index 5cc38194..fbbff87f 100644
+--- a/ld/emultempl/elf.em
++++ b/ld/emultempl/elf.em
+@@ -667,12 +667,12 @@ gld${EMULATION_NAME}_handle_option (int optc)
+        {
+ #ifndef HAVE_ZSTD
+          if (config.compress_debug == COMPRESS_DEBUG_ZSTD)
+-           fatal (_("%P: --compress-debug-sections=zstd: ld is not built "
++           fatal (_("%F%P: --compress-debug-sections=zstd: ld is not built "
+                     "with zstd support\n"));
+ #endif
+        }
+       if (config.compress_debug == COMPRESS_UNKNOWN)
+-       fatal (_("%P: invalid --compress-debug-sections option: \`%s'\n"),
++       fatal (_("%F%P: invalid --compress-debug-sections option: \`%s'\n"),
+                optarg);
+       break;
+ EOF
+@@ -727,7 +727,7 @@ fragment <<EOF
+          link_info.emit_gnu_hash = true;
+        }
+       else
+-       fatal (_("%P: invalid hash style \`%s'\n"), optarg);
++       fatal (_("%F%P: invalid hash style \`%s'\n"), optarg);
+       break;
+ 
+ EOF
+@@ -747,7 +747,7 @@ fragment <<EOF
+          link_info.maxpagesize = strtoul (optarg + 14, &end, 0);
+          if (*end
+              || (link_info.maxpagesize & (link_info.maxpagesize - 1)) != 0)
+-           fatal (_("%P: invalid maximum page size \`%s'\n"),
++           fatal (_("%F%P: invalid maximum page size \`%s'\n"),
+                   optarg + 14);
+          link_info.maxpagesize_is_set = true;
+        }
+@@ -757,7 +757,7 @@ fragment <<EOF
+          link_info.commonpagesize = strtoul (optarg + 17, &end, 0);
+          if (*end
+              || (link_info.commonpagesize & (link_info.commonpagesize - 1)) != 0)
+-           fatal (_("%P: invalid common page size \`%s'\n"),
++           fatal (_("%F%P: invalid common page size \`%s'\n"),
+                   optarg + 17);
+          link_info.commonpagesize_is_set = true;
+        }
+@@ -766,7 +766,7 @@ fragment <<EOF
+          char *end;
+          link_info.stacksize = strtoul (optarg + 11, &end, 0);
+          if (*end || link_info.stacksize < 0)
+-           fatal (_("%P: invalid stack size \`%s'\n"), optarg + 11);
++           fatal (_("%F%P: invalid stack size \`%s'\n"), optarg + 11);
+          if (!link_info.stacksize)
+            /* Use -1 for explicit no-stack, because zero means
+               'default'.   */
+@@ -805,7 +805,7 @@ fragment <<EOF
+          else if (strcmp (optarg, "start-stop-visibility=protected") == 0)
+            link_info.start_stop_visibility = STV_PROTECTED;
+          else
+-           fatal (_("%P: invalid visibility in \`-z %s'; "
++           fatal (_("%F%P: invalid visibility in \`-z %s'; "
+                     "must be default, internal, hidden, or protected"),
+                   optarg);
+        }
+diff --git a/ld/emultempl/hppaelf.em b/ld/emultempl/hppaelf.em
+index f0284ea3..e8e98a49 100644
+--- a/ld/emultempl/hppaelf.em
++++ b/ld/emultempl/hppaelf.em
+@@ -82,7 +82,7 @@ hppaelf_create_output_section_statements (void)
+                              bfd_get_arch (link_info.output_bfd),
+                              bfd_get_mach (link_info.output_bfd)))
+     {
+-      fatal (_("%P: can not create BFD: %E\n"));
++      fatal (_("%F%P: can not create BFD: %E\n"));
+       return;
+     }
+ 
+@@ -351,7 +351,7 @@ PARSE_AND_LIST_ARGS_CASES='
+        const char *end;
+        group_size = bfd_scan_vma (optarg, &end, 0);
+        if (*end)
+-         fatal (_("%P: invalid number `%s'\''\n"), optarg);
++         fatal (_("%F%P: invalid number `%s'\''\n"), optarg);
+       }
+       break;
+ '
+diff --git a/ld/emultempl/kvxelf.em b/ld/emultempl/kvxelf.em
+index 1ffbd1db..81713678 100644
+--- a/ld/emultempl/kvxelf.em
++++ b/ld/emultempl/kvxelf.em
+@@ -36,7 +36,7 @@ EOF
+ if test x"${EMULATION_NAME}" != x"elf64kvx_linux"; then
+ fragment <<EOF
+   if (bfd_link_pie (&link_info))
+-    fatal (_(":%P: -pie not supported\n"));
++    fatal (_("%F:%P: -pie not supported\n"));
+ EOF
+ fi
+ fragment <<EOF
+@@ -299,7 +299,7 @@ kvx_elf_create_output_section_statements (void)
+   ldlang_add_file (stub_file);
+ 
+   if (!kvx_elf${ELFSIZE}_init_stub_bfd (&link_info, stub_file->the_bfd))
+-    einfo ("%P: can not init BFD: %E\n");
++    fatal ("%F%P: can not init BFD: %E\n");
+ }
+ 
+ 
+diff --git a/ld/emultempl/loongarchelf.em b/ld/emultempl/loongarchelf.em
+index 5a3d7b79..153094b0 100644
+--- a/ld/emultempl/loongarchelf.em
++++ b/ld/emultempl/loongarchelf.em
+@@ -71,7 +71,7 @@ gld${EMULATION_NAME}_after_allocation (void)
+       if (!_bfd_elf_map_sections_to_segments (link_info.output_bfd,
+                                              &link_info,
+                                              NULL))
+-       fatal (_("%P: map sections to segments failed: %E\n"));
++        fatal (_("%F%P: map sections to segments failed: %E\n"));
+     }
+ 
+   /* Adjust program header size and .eh_frame_hdr size before
+diff --git a/ld/emultempl/m68hc1xelf.em b/ld/emultempl/m68hc1xelf.em
+index 36f5f068..fe6dd85b 100644
+--- a/ld/emultempl/m68hc1xelf.em
++++ b/ld/emultempl/m68hc1xelf.em
+@@ -159,7 +159,7 @@ m68hc11elf_create_output_section_statements (void)
+                             bfd_get_arch (link_info.output_bfd),
+                             bfd_get_mach (link_info.output_bfd)))
+     {
+-      fatal (_("%P: can not create BFD: %E\n"));
++      fatal (_("%F%P: can not create BFD: %E\n"));
+       return;
+     }
+ 
+diff --git a/ld/emultempl/m68kelf.em b/ld/emultempl/m68kelf.em
+index f9a5bec2..e6eed5cc 100644
+--- a/ld/emultempl/m68kelf.em
++++ b/ld/emultempl/m68kelf.em
+@@ -82,7 +82,7 @@ m68k_elf_after_open (void)
+          asection *datasec;
+ 
+          if (bfd_get_flavour (abfd) != bfd_target_elf_flavour)
+-           fatal (_("%P: %pB: all input objects must be ELF "
++           fatal (_("%F%P: %pB: all input objects must be ELF "
+                     "for --embedded-relocs\n"));
+ 
+          datasec = bfd_get_section_by_name (abfd, ".data");
+@@ -106,7 +106,7 @@ m68k_elf_after_open (void)
+              if (relsec == NULL
+                  || !bfd_set_section_alignment (relsec, 2)
+                  || !bfd_set_section_size (relsec, datasec->reloc_count * 12))
+-               fatal (_("%P: %pB: can not create .emreloc section: %E\n"));
++               fatal (_("%F%P: %pB: can not create .emreloc section: %E\n"));
+            }
+ 
+          /* Double check that all other data sections are empty, as is
+diff --git a/ld/emultempl/metagelf.em b/ld/emultempl/metagelf.em
+index 313d7ed5..95655ad0 100644
+--- a/ld/emultempl/metagelf.em
++++ b/ld/emultempl/metagelf.em
+@@ -59,7 +59,7 @@ metagelf_create_output_section_statements (void)
+                              bfd_get_arch (link_info.output_bfd),
+                              bfd_get_mach (link_info.output_bfd)))
+     {
+-      fatal (_("%P: can not create BFD: %E\n"));
++      fatal (_("%F%P: can not create BFD: %E\n"));
+       return;
+     }
+ 
+@@ -309,7 +309,7 @@ PARSE_AND_LIST_ARGS_CASES='
+        const char *end;
+        group_size = bfd_scan_vma (optarg, &end, 0);
+        if (*end)
+-         fatal (_("%P: invalid number `%s'\''\n"), optarg);
++         fatal (_("%F%P: invalid number `%s'\''\n"), optarg);
+       }
+       break;
+ '
+diff --git a/ld/emultempl/mipself.em b/ld/emultempl/mipself.em
+index 2a22ba49..a4f158b7 100644
+--- a/ld/emultempl/mipself.em
++++ b/ld/emultempl/mipself.em
+@@ -152,7 +152,7 @@ mips_add_stub_section (const char *stub_sec_name, asection *input_section,
+                                 bfd_get_arch (link_info.output_bfd),
+                                 bfd_get_mach (link_info.output_bfd)))
+        {
+-         fatal (_("%P: can not create BFD: %E\n"));
++         fatal (_("%F%P: can not create BFD: %E\n"));
+          return NULL;
+        }
+       stub_bfd->flags |= BFD_LINKER_CREATED;
+diff --git a/ld/emultempl/mmix-elfnmmo.em b/ld/emultempl/mmix-elfnmmo.em
+index 03186363..c4288d82 100644
+--- a/ld/emultempl/mmix-elfnmmo.em
++++ b/ld/emultempl/mmix-elfnmmo.em
+@@ -113,7 +113,7 @@ mmix_after_allocation (void)
+     bfd_set_section_vma (sec, 0);
+ 
+   if (!_bfd_mmix_after_linker_allocation (link_info.output_bfd, &link_info))
+-    fatal (_("%P: can't finalize linker-allocated global registers\n"));
++    fatal (_("%F%P: can't finalize linker-allocated global registers\n"));
+ }
+ EOF
+ 
+diff --git a/ld/emultempl/nds32elf.em b/ld/emultempl/nds32elf.em
+index 36260573..8598d0a8 100644
+--- a/ld/emultempl/nds32elf.em
++++ b/ld/emultempl/nds32elf.em
+@@ -44,7 +44,7 @@ nds32_elf_create_output_section_statements (void)
+   if (strstr (bfd_get_target (link_info.output_bfd), "nds32") == NULL)
+     {
+       /* Check the output target is nds32.  */
+-      fatal (_("%P: error: cannot change output format whilst "
++      fatal (_("%F%P: error: cannot change output format whilst "
+               "linking %s binaries\n"), "NDS32");
+       return;
+     }
+@@ -96,7 +96,7 @@ nds32_elf_after_open (void)
+               && abi_ver != (elf_elfheader (abfd)->e_flags & EF_NDS_ABI))
+        {
+          /* Incompatible objects.  */
+-         fatal (_("%P: %pB: ABI version of object files mismatched\n"),
++         fatal (_("%F%P: %pB: ABI version of object files mismatched\n"),
+                 abfd);
+        }
+     }
+@@ -195,7 +195,7 @@ PARSE_AND_LIST_ARGS_CASES='
+       {
+        sym_ld_script = fopen (optarg, FOPEN_WT);
+        if(sym_ld_script == NULL)
+-         fatal (_("%P: cannot open map file %s: %E\n"), optarg);
++         fatal (_("%F%P: cannot open map file %s: %E\n"), optarg);
+       }
+     break;
+   case OPTION_HYPER_RELAX:
+diff --git a/ld/emultempl/nto.em b/ld/emultempl/nto.em
+index 609d0217..bed2d374 100644
+--- a/ld/emultempl/nto.em
++++ b/ld/emultempl/nto.em
+@@ -51,7 +51,7 @@ nto_create_QNX_note_section(int type)
+      is called before this function, stub_file should already be defined.  */
+   if (!stub_file)
+     {
+-      fatal (_("%P: cannot create .note section in stub BFD.\n"));
++      fatal (_("%F%P: cannot create .note section in stub BFD.\n"));
+       return NULL;
+     }
+ 
+@@ -60,7 +60,7 @@ nto_create_QNX_note_section(int type)
+   note_sec = bfd_make_section_anyway_with_flags (stub_file->the_bfd, ".note", flags);
+   if (! note_sec)
+     {
+-      fatal (_("%P: failed to create .note section\n"));
++      fatal (_("%F%P: failed to create .note section\n"));
+       return NULL;
+     }
+ 
+@@ -101,7 +101,7 @@ nto_lookup_QNX_note_section(int type)
+       sec->contents = xmalloc(sec->size);
+       if (!bfd_get_section_contents (sec->owner, sec, sec->contents, (file_ptr) 0,
+                                     sec->size))
+-       fatal (_("%P: %pB: can't read contents of section .note: %E\n"),
++       fatal (_("%F%P: %pB: can't read contents of section .note: %E\n"),
+               sec->owner);
+ 
+       e_note = (Elf_External_Note *) sec->contents;
+@@ -144,7 +144,7 @@ nto_add_note_section (void) {
+ 
+   if (nto_lazy_stack && !link_info.stacksize)
+     {
+-      fatal (_("%P: error: --lazy-stack must follow -zstack-size=<size>\n"));
++      fatal (_("%F%P: error: --lazy-stack must follow -zstack-size=<size>\n"));
+       return;
+     }
+ 
+@@ -216,7 +216,7 @@ PARSE_AND_LIST_ARGS_CASES=${PARSE_AND_LIST_ARGS_CASES}'
+        char *end;
+        link_info.stacksize = strtoul (optarg, &end, 0);
+        if (*end || link_info.stacksize < 0)
+-         fatal (_("%P: invalid stack size `%s'\''\n"), optarg + 11);
++         fatal (_("%F%P: invalid stack size `%s'\''\n"), optarg + 11);
+        if (!link_info.stacksize)
+          /* Use -1 for explicit no-stack, because zero means
+             'default'.   */
+diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em
+index 4cb1488e..3eeaffec 100644
+--- a/ld/emultempl/pe.em
++++ b/ld/emultempl/pe.em
+@@ -726,7 +726,7 @@ set_pe_subsystem (void)
+ 
+       if (v[i].name == NULL)
+        {
+-         fatal (_("%P: invalid subsystem type %s\n"), optarg);
++         fatal (_("%F%P: invalid subsystem type %s\n"), optarg);
+          return;
+        }
+ 
+@@ -747,7 +747,7 @@ set_pe_value (char *name)
+   set_pe_name (name,  strtoul (optarg, &end, 0));
+ 
+   if (end == optarg)
+-    fatal (_("%P: invalid hex number for PE parameter '%s'\n"), optarg);
++    fatal (_("%F%P: invalid hex number for PE parameter '%s'\n"), optarg);
+ 
+   optarg = end;
+ }
+@@ -764,7 +764,7 @@ set_pe_stack_heap (char *resname, char *comname)
+       set_pe_value (comname);
+     }
+   else if (*optarg)
+-    fatal (_("%P: strange hex info for PE parameter '%s'\n"), optarg);
++    fatal (_("%F%P: strange hex info for PE parameter '%s'\n"), optarg);
+ }
+ 
+ #define DEFAULT_BUILD_ID_STYLE "md5"
+@@ -780,7 +780,7 @@ gld${EMULATION_NAME}_handle_option (int optc)
+     case OPTION_BASE_FILE:
+       link_info.base_file = fopen (optarg, FOPEN_WB);
+       if (link_info.base_file == NULL)
+-       fatal (_("%P: cannot open base file %s\n"), optarg);
++       fatal (_("%F%P: cannot open base file %s\n"), optarg);
+       break;
+ 
+       /* PE options.  */
+@@ -1309,7 +1309,7 @@ make_runtime_ref (void)
+     = bfd_wrapped_link_hash_lookup (link_info.output_bfd, &link_info,
+                                    rr, true, false, true);
+   if (!h)
+-    fatal (_("%P: bfd_link_hash_lookup failed: %E\n"));
++    fatal (_("%F%P: bfd_link_hash_lookup failed: %E\n"));
+   else
+     {
+       if (h->type == bfd_link_hash_new)
+@@ -1607,7 +1607,7 @@ gld${EMULATION_NAME}_after_open (void)
+   if (bfd_get_flavour (link_info.output_bfd) != bfd_target_coff_flavour
+       || coff_data (link_info.output_bfd) == NULL
+       || !obj_pe (link_info.output_bfd))
+-    fatal (_("%P: cannot perform PE operations on non PE output file '%pB'\n"),
++    fatal (_("%F%P: cannot perform PE operations on non PE output file '%pB'\n"),
+           link_info.output_bfd);
+ 
+   pe_data (link_info.output_bfd)->pe_opthdr = pe;
+@@ -1680,7 +1680,7 @@ gld${EMULATION_NAME}_after_open (void)
+         These will only be created if the output format is an arm format,
+         hence we do not support linking and changing output formats at the
+         same time.  Use a link followed by objcopy to change output formats.  */
+-      fatal (_("%P: error: cannot change output format "
++      fatal (_("%F%P: error: cannot change output format "
+               "whilst linking %s binaries\n"), "ARM");
+       return;
+     }
+@@ -1740,7 +1740,7 @@ gld${EMULATION_NAME}_after_open (void)
+ 
+                    if (!bfd_generic_link_read_symbols (is->the_bfd))
+                      {
+-                       fatal (_("%P: %pB: could not read symbols: %E\n"),
++                       fatal (_("%F%P: %pB: could not read symbols: %E\n"),
+                               is->the_bfd);
+                        return;
+                      }
+@@ -1912,7 +1912,7 @@ gld${EMULATION_NAME}_after_open (void)
+ 
+                if (!bfd_generic_link_read_symbols (is->the_bfd))
+                  {
+-                   fatal (_("%P: %pB: could not read symbols: %E\n"),
++                   fatal (_("%F%P: %pB: could not read symbols: %E\n"),
+                           is->the_bfd);
+                    return;
+                  }
+@@ -2023,7 +2023,7 @@ gld${EMULATION_NAME}_unrecognized_file (lang_input_statement_type *entry ATTRIBU
+ 
+              h = bfd_link_hash_lookup (link_info.hash, buf, true, true, true);
+              if (h == (struct bfd_link_hash_entry *) NULL)
+-               fatal (_("%P: bfd_link_hash_lookup failed: %E\n"));
++               fatal (_("%F%P: bfd_link_hash_lookup failed: %E\n"));
+              if (h->type == bfd_link_hash_new)
+                {
+                  h->type = bfd_link_hash_undefined;
+diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em
+index 2d033dd3..ac0e192f 100644
+--- a/ld/emultempl/pep.em
++++ b/ld/emultempl/pep.em
+@@ -698,7 +698,7 @@ set_pep_subsystem (void)
+ 
+       if (v[i].name == NULL)
+        {
+-         fatal (_("%P: invalid subsystem type %s\n"), optarg);
++         fatal (_("%F%P: invalid subsystem type %s\n"), optarg);
+          return;
+        }
+ 
+@@ -719,7 +719,7 @@ set_pep_value (char *name)
+   set_pep_name (name,  (bfd_vma) strtoull (optarg, &end, 0));
+ 
+   if (end == optarg)
+-    fatal (_("%P: invalid hex number for PE parameter '%s'\n"), optarg);
++    fatal (_("%F%P: invalid hex number for PE parameter '%s'\n"), optarg);
+ 
+   optarg = end;
+ }
+@@ -736,7 +736,7 @@ set_pep_stack_heap (char *resname, char *comname)
+       set_pep_value (comname);
+     }
+   else if (*optarg)
+-    fatal (_("%P: strange hex info for PE parameter '%s'\n"), optarg);
++    fatal (_("%F%P: strange hex info for PE parameter '%s'\n"), optarg);
+ }
+ 
+ #define DEFAULT_BUILD_ID_STYLE "md5"
+@@ -753,7 +753,7 @@ gld${EMULATION_NAME}_handle_option (int optc)
+     case OPTION_BASE_FILE:
+       link_info.base_file = fopen (optarg, FOPEN_WB);
+       if (link_info.base_file == NULL)
+-       fatal (_("%P: cannot open base file %s\n"), optarg);
++       fatal (_("%F%P: cannot open base file %s\n"), optarg);
+       break;
+ 
+       /* PE options.  */
+@@ -1306,7 +1306,7 @@ make_runtime_ref (void)
+     = bfd_wrapped_link_hash_lookup (link_info.output_bfd, &link_info,
+                                    rr, true, false, true);
+   if (!h)
+-    fatal (_("%P: bfd_link_hash_lookup failed: %E\n"));
++    fatal (_("%F%P: bfd_link_hash_lookup failed: %E\n"));
+   else
+     {
+       if (h->type == bfd_link_hash_new)
+@@ -1606,7 +1606,7 @@ gld${EMULATION_NAME}_after_open (void)
+   if (bfd_get_flavour (link_info.output_bfd) != bfd_target_coff_flavour
+       || coff_data (link_info.output_bfd) == NULL
+       || !obj_pe (link_info.output_bfd))
+-    fatal (_("%P: cannot perform PE operations on non PE output file '%pB'\n"),
++    fatal (_("%F%P: cannot perform PE operations on non PE output file '%pB'\n"),
+           link_info.output_bfd);
+ 
+   pe_data (link_info.output_bfd)->pe_opthdr = pep;
+@@ -1718,7 +1718,7 @@ gld${EMULATION_NAME}_after_open (void)
+ 
+                    if (!bfd_generic_link_read_symbols (is->the_bfd))
+                      {
+-                       fatal (_("%P: %pB: could not read symbols: %E\n"),
++                       fatal (_("%F%P: %pB: could not read symbols: %E\n"),
+                               is->the_bfd);
+                        return;
+                      }
+@@ -1907,7 +1907,7 @@ gld${EMULATION_NAME}_unrecognized_file (lang_input_statement_type *entry ATTRIBU
+ 
+              h = bfd_link_hash_lookup (link_info.hash, buf, true, true, true);
+              if (h == (struct bfd_link_hash_entry *) NULL)
+-               fatal (_("%P: bfd_link_hash_lookup failed: %E\n"));
++               fatal (_("%F%P: bfd_link_hash_lookup failed: %E\n"));
+              if (h->type == bfd_link_hash_new)
+                {
+                  h->type = bfd_link_hash_undefined;
+diff --git a/ld/emultempl/ppc32elf.em b/ld/emultempl/ppc32elf.em
+index ffacadc6..73bad022 100644
+--- a/ld/emultempl/ppc32elf.em
++++ b/ld/emultempl/ppc32elf.em
+@@ -386,7 +386,7 @@ PARSE_AND_LIST_ARGS_CASES=${PARSE_AND_LIST_ARGS_CASES}'
+          char *end;
+          unsigned long val = strtoul (optarg, &end, 0);
+          if (*end || val > 5)
+-           fatal (_("%P: invalid --plt-align `%s'\''\n"), optarg);
++           fatal (_("%F%P: invalid --plt-align `%s'\''\n"), optarg);
+          params.plt_stub_align = val;
+        }
+       else
+@@ -419,7 +419,7 @@ PARSE_AND_LIST_ARGS_CASES=${PARSE_AND_LIST_ARGS_CASES}'
+          if (*end
+              || (params.pagesize < 4096 && params.pagesize != 0)
+              || params.pagesize != (params.pagesize & -params.pagesize))
+-           fatal (_("%P: invalid pagesize `%s'\''\n"), optarg);
++           fatal (_("%F%P: invalid pagesize `%s'\''\n"), optarg);
+        }
+       break;
+ 
+diff --git a/ld/emultempl/ppc64elf.em b/ld/emultempl/ppc64elf.em
+index 92bf4f58..a884f6b5 100644
+--- a/ld/emultempl/ppc64elf.em
++++ b/ld/emultempl/ppc64elf.em
+@@ -91,7 +91,7 @@ ppc_create_output_section_statements (void)
+                             bfd_get_arch (link_info.output_bfd),
+                             bfd_get_mach (link_info.output_bfd)))
+     {
+-      fatal (_("%P: can not create BFD: %E\n"));
++      fatal (_("%F%P: can not create BFD: %E\n"));
+       return;
+     }
+ 
+@@ -101,7 +101,7 @@ ppc_create_output_section_statements (void)
+   if (params.save_restore_funcs < 0)
+     params.save_restore_funcs = !bfd_link_relocatable (&link_info);
+   if (!ppc64_elf_init_stub_bfd (&link_info, &params))
+-    fatal (_("%P: can not init BFD: %E\n"));
++    fatal (_("%F%P: can not init BFD: %E\n"));
+ }
+ 
+ /* Called after opening files but before mapping sections.  */
+@@ -860,7 +860,7 @@ PARSE_AND_LIST_ARGS_CASES=${PARSE_AND_LIST_ARGS_CASES}'
+        const char *end;
+        params.group_size = bfd_scan_vma (optarg, &end, 0);
+        if (*end)
+-         fatal (_("%P: invalid number `%s'\''\n"), optarg);
++         fatal (_("%F%P: invalid number `%s'\''\n"), optarg);
+       }
+       break;
+ 
+@@ -886,7 +886,7 @@ PARSE_AND_LIST_ARGS_CASES=${PARSE_AND_LIST_ARGS_CASES}'
+          char *end;
+          long val = strtol (optarg, &end, 0);
+          if (*end || (unsigned long) val + 8 > 16)
+-           fatal (_("%P: invalid --plt-align `%s'\''\n"), optarg);
++           fatal (_("%F%P: invalid --plt-align `%s'\''\n"), optarg);
+          params.plt_stub_align = val;
+        }
+       else
+@@ -915,7 +915,7 @@ PARSE_AND_LIST_ARGS_CASES=${PARSE_AND_LIST_ARGS_CASES}'
+          else if (strcasecmp (optarg, "no") == 0)
+            params.power10_stubs = 0;
+          else
+-           fatal (_("%P: invalid --power10-stubs argument `%s'\''\n"),
++           fatal (_("%F%P: invalid --power10-stubs argument `%s'\''\n"),
+                   optarg);
+        }
+       else
+diff --git a/ld/emultempl/riscvelf.em b/ld/emultempl/riscvelf.em
+index 006e4edb..d5012b33 100644
+--- a/ld/emultempl/riscvelf.em
++++ b/ld/emultempl/riscvelf.em
+@@ -141,7 +141,7 @@ riscv_create_output_section_statements (void)
+         These will only be created if the output format is a RISC-V format,
+         hence we do not support linking and changing output formats at the
+         same time.  Use a link followed by objcopy to change output formats.  */
+-      fatal (_("%P: error: cannot change output format"
++      fatal (_("%F%P: error: cannot change output format"
+               " whilst linking %s binaries\n"), "RISC-V");
+       return;
+     }
+diff --git a/ld/emultempl/s390.em b/ld/emultempl/s390.em
+index 0a93d76b..bb589069 100644
+--- a/ld/emultempl/s390.em
++++ b/ld/emultempl/s390.em
+@@ -34,7 +34,7 @@ static void
+ s390_elf_create_output_section_statements (void)
+ {
+   if (!bfd_elf_s390_set_options (&link_info, &params))
+-    fatal (_("%P: can not init BFD: %E\n"));
++    fatal (_("%F%P: can not init BFD: %E\n"));
+ }
+ 
+ EOF
+diff --git a/ld/emultempl/scoreelf.em b/ld/emultempl/scoreelf.em
+index 6413f330..e420a7bd 100644
+--- a/ld/emultempl/scoreelf.em
++++ b/ld/emultempl/scoreelf.em
+@@ -62,7 +62,7 @@ score_elf_after_open (void)
+         These will only be created if the output format is an score format,
+         hence we do not support linking and changing output formats at the
+         same time.  Use a link followed by objcopy to change output formats.  */
+-      fatal (_("%P: error: cannot change output format "
++      fatal (_("%F%P: error: cannot change output format "
+               "whilst linking %s binaries\n"), "S+core");
+       return;
+     }
+diff --git a/ld/emultempl/spuelf.em b/ld/emultempl/spuelf.em
+index c694b828..800cca30 100644
+--- a/ld/emultempl/spuelf.em
++++ b/ld/emultempl/spuelf.em
+@@ -202,7 +202,7 @@ spu_elf_load_ovl_mgr (void)
+       /* User supplied __ovly_load.  */
+     }
+   else if (mgr_stream->start == mgr_stream->end)
+-    fatal (_("%P: no built-in overlay manager\n"));
++    fatal (_("%F%P: no built-in overlay manager\n"));
+   else
+     {
+       lang_input_statement_type *ovl_is;
+@@ -379,7 +379,7 @@ spu_elf_open_overlay_script (void)
+   if (script == NULL)
+     {
+     file_err:
+-      fatal (_("%P: can not open script: %E\n"));
++      fatal (_("%F%P: can not open script: %E\n"));
+     }
+   return script;
+ }
+@@ -719,7 +719,7 @@ PARSE_AND_LIST_ARGS_CASES='
+            if (*end == 0)
+              break;
+          }
+-       fatal (_("%P: invalid --local-store address range `%s'\''\n"), optarg);
++       fatal (_("%F%P: invalid --local-store address range `%s'\''\n"), optarg);
+       }
+       break;
+ 
+@@ -755,12 +755,12 @@ PARSE_AND_LIST_ARGS_CASES='
+       if (!num_lines_set)
+        params.num_lines = 32;
+       else if ((params.num_lines & -params.num_lines) != params.num_lines)
+-       fatal (_("%P: invalid --num-lines/--num-regions `%u'\''\n"),
++       fatal (_("%F%P: invalid --num-lines/--num-regions `%u'\''\n"),
+               params.num_lines);
+       if (!line_size_set)
+        params.line_size = 1024;
+       else if ((params.line_size & -params.line_size) != params.line_size)
+-       fatal (_("%P: invalid --line-size/--region-size `%u'\''\n"),
++       fatal (_("%F%P: invalid --line-size/--region-size `%u'\''\n"),
+               params.line_size);
+       break;
+ 
+@@ -781,7 +781,7 @@ PARSE_AND_LIST_ARGS_CASES='
+            && (params.ovly_flavour != ovly_soft_icache
+                || (params.num_lines & -params.num_lines) == params.num_lines))
+          break;
+-       fatal (_("%P: invalid --num-lines/--num-regions `%s'\''\n"), optarg);
++       fatal (_("%F%P: invalid --num-lines/--num-regions `%s'\''\n"), optarg);
+       }
+       break;
+ 
+@@ -794,7 +794,7 @@ PARSE_AND_LIST_ARGS_CASES='
+            && (params.ovly_flavour != ovly_soft_icache
+                || (params.line_size & -params.line_size) == params.line_size))
+          break;
+-       fatal (_("%P: invalid --line-size/--region-size `%s'\''\n"), optarg);
++       fatal (_("%F%P: invalid --line-size/--region-size `%s'\''\n"), optarg);
+       }
+       break;
+ 
+@@ -803,7 +803,7 @@ PARSE_AND_LIST_ARGS_CASES='
+        char *end;
+        params.auto_overlay_fixed = strtoul (optarg, &end, 0);
+        if (*end != 0)
+-         fatal (_("%P: invalid --fixed-space value `%s'\''\n"), optarg);
++         fatal (_("%F%P: invalid --fixed-space value `%s'\''\n"), optarg);
+       }
+       break;
+ 
+@@ -812,7 +812,7 @@ PARSE_AND_LIST_ARGS_CASES='
+        char *end;
+        params.auto_overlay_reserved = strtoul (optarg, &end, 0);
+        if (*end != 0)
+-         fatal (_("%P: invalid --reserved-space value `%s'\''\n"), optarg);
++         fatal (_("%F%P: invalid --reserved-space value `%s'\''\n"), optarg);
+       }
+       break;
+ 
+@@ -821,7 +821,7 @@ PARSE_AND_LIST_ARGS_CASES='
+        char *end;
+        params.extra_stack_space = strtol (optarg, &end, 0);
+        if (*end != 0)
+-         fatal (_("%P: invalid --extra-stack-space value `%s'\''\n"), optarg);
++         fatal (_("%F%P: invalid --extra-stack-space value `%s'\''\n"), optarg);
+       }
+       break;
+ 
+diff --git a/ld/emultempl/tic6xdsbt.em b/ld/emultempl/tic6xdsbt.em
+index a830be7e..7d3b97cc 100644
+--- a/ld/emultempl/tic6xdsbt.em
++++ b/ld/emultempl/tic6xdsbt.em
+@@ -59,7 +59,7 @@ tic6x_after_open (void)
+   if (is_tic6x_target ())
+     {
+       if (params.dsbt_index >= params.dsbt_size)
+-       fatal (_("%P: invalid --dsbt-index %d, outside DSBT size\n"),
++       fatal (_("%F%P: invalid --dsbt-index %d, outside DSBT size\n"),
+               params.dsbt_index);
+       elf32_tic6x_setup (&link_info, &params);
+     }
+@@ -190,7 +190,7 @@ PARSE_AND_LIST_ARGS_CASES='
+        if (*end == 0
+            && params.dsbt_index >= 0 && params.dsbt_index < 0x7fff)
+          break;
+-       fatal (_("%P: invalid --dsbt-index %s\n"), optarg);
++       fatal (_("%F%P: invalid --dsbt-index %s\n"), optarg);
+       }
+       break;
+     case OPTION_DSBT_SIZE:
+@@ -200,7 +200,7 @@ PARSE_AND_LIST_ARGS_CASES='
+        if (*end == 0
+            && params.dsbt_size >= 0 && params.dsbt_size < 0x7fff)
+          break;
+-       fatal (_("%P: invalid --dsbt-size %s\n"), optarg);
++       fatal (_("%F%P: invalid --dsbt-size %s\n"), optarg);
+       }
+       break;
+    case OPTION_NO_MERGE_EXIDX_ENTRIES:
+diff --git a/ld/emultempl/ticoff.em b/ld/emultempl/ticoff.em
+index bbf30f4a..5d0feede 100644
+--- a/ld/emultempl/ticoff.em
++++ b/ld/emultempl/ticoff.em
+@@ -88,7 +88,7 @@ gld${EMULATION_NAME}_handle_option (int optc)
+          lang_add_output_format (buf, NULL, NULL, 0);
+        }
+       else
+-       fatal (_("%P: invalid COFF format version %s\n"), optarg);
++       fatal (_("%F%P: invalid COFF format version %s\n"), optarg);
+       break;
+     }
+   return false;
+diff --git a/ld/emultempl/v850elf.em b/ld/emultempl/v850elf.em
+index 49ad2cc8..925e3994 100644
+--- a/ld/emultempl/v850elf.em
++++ b/ld/emultempl/v850elf.em
+@@ -63,7 +63,7 @@ v850_create_output_section_statements (void)
+         These will only be created if the output format is an arm format,
+         hence we do not support linking and changing output formats at the
+         same time.  Use a link followed by objcopy to change output formats.  */
+-      fatal (_("%P: error: cannot change output format"
++      fatal (_("%F%P: error: cannot change output format"
+               " whilst linking %s binaries\n"), "V850");
+       return;
+     }
+diff --git a/ld/emultempl/vms.em b/ld/emultempl/vms.em
+index 4ca2c942..1c7b426c 100644
+--- a/ld/emultempl/vms.em
++++ b/ld/emultempl/vms.em
+@@ -201,7 +201,7 @@ gld${EMULATION_NAME}_before_allocation (void)
+       && bed->elf_backend_size_dynamic_sections
+       && ! (*bed->elf_backend_size_dynamic_sections) (link_info.output_bfd,
+                                                      &link_info))
+-    fatal (_("%P: failed to set dynamic section sizes: %E\n"));
++    fatal (_("%F%P: failed to set dynamic section sizes: %E\n"));
+ 
+   before_allocation_default ();
+ }
+diff --git a/ld/emultempl/xtensaelf.em b/ld/emultempl/xtensaelf.em
+index 208f730d..751e7762 100644
+--- a/ld/emultempl/xtensaelf.em
++++ b/ld/emultempl/xtensaelf.em
+@@ -388,7 +388,7 @@ check_xtensa_info (bfd *abfd, asection *info_sec)
+ 
+   data = xmalloc (info_sec->size);
+   if (! bfd_get_section_contents (abfd, info_sec, data, 0, info_sec->size))
+-    fatal (_("%P: %pB: cannot read contents of section %pA\n"), abfd, info_sec);
++    fatal (_("%F%P: %pB: cannot read contents of section %pA\n"), abfd, info_sec);
+ 
+   if (info_sec->size > 24
+       && info_sec->size >= 24 + bfd_get_32 (abfd, data + 4)
+@@ -429,13 +429,13 @@ elf_xtensa_before_allocation (void)
+   if (is_big_endian
+       && link_info.output_bfd->xvec->byteorder == BFD_ENDIAN_LITTLE)
+     {
+-      fatal (_("%P: little endian output does not match "
++      fatal (_("%F%P: little endian output does not match "
+               "Xtensa configuration\n"));
+     }
+   if (!is_big_endian
+       && link_info.output_bfd->xvec->byteorder == BFD_ENDIAN_BIG)
+     {
+-      fatal (_("%P: big endian output does not match "
++      fatal (_("%F%P: big endian output does not match "
+               "Xtensa configuration\n"));
+     }
+ 
+@@ -454,7 +454,7 @@ elf_xtensa_before_allocation (void)
+         cannot go any further if there are any mismatches.  */
+       if ((is_big_endian && f->the_bfd->xvec->byteorder == BFD_ENDIAN_LITTLE)
+          || (!is_big_endian && f->the_bfd->xvec->byteorder == BFD_ENDIAN_BIG))
+-       fatal (_("%P: cross-endian linking for %pB not supported\n"),
++       fatal (_("%F%P: cross-endian linking for %pB not supported\n"),
+               f->the_bfd);
+ 
+       if (! first_bfd)
+@@ -485,7 +485,7 @@ elf_xtensa_before_allocation (void)
+       info_sec = bfd_make_section_with_flags (first_bfd, ".xtensa.info",
+                                              SEC_HAS_CONTENTS | SEC_READONLY);
+       if (! info_sec)
+-       fatal (_("%P: failed to create .xtensa.info section\n"));
++       fatal (_("%F%P: failed to create .xtensa.info section\n"));
+     }
+   if (info_sec)
+     {
+@@ -1224,7 +1224,7 @@ ld_build_required_section_dependence (lang_statement_union_type *s)
+       lang_statement_union_type *l = iter_stack_current (&stack);
+ 
+       if (l == NULL && link_info.non_contiguous_regions)
+-       fatal (_("%P: Relaxation not supported with "
++       fatal (_("%F%P: Relaxation not supported with "
+                 "--enable-non-contiguous-regions.\n"));
+ 
+       if (l->header.type == lang_input_section_enum)
+diff --git a/ld/emultempl/z80.em b/ld/emultempl/z80.em
+index 555f6024..06cfa72e 100644
+--- a/ld/emultempl/z80.em
++++ b/ld/emultempl/z80.em
+@@ -48,7 +48,7 @@ z80_after_open (void)
+       const bfd_arch_info_type *info;
+       info = bfd_arch_get_compatible (link_info.output_bfd, abfd, false);
+       if (info == NULL)
+-       fatal (_("%P: %pB: Instruction sets of object files incompatible\n"),
++       fatal (_("%F%P: %pB: Instruction sets of object files incompatible\n"),
+               abfd);
+       else
+         bfd_set_arch_info (link_info.output_bfd, info);
+diff --git a/ld/ldcref.c b/ld/ldcref.c
+index 572d4f4d..68dd2a5f 100644
+--- a/ld/ldcref.c
++++ b/ld/ldcref.c
+@@ -514,7 +514,7 @@ check_local_sym_xref (lang_input_statement_type *statement)
+     return;
+ 
+   if (!bfd_generic_link_read_symbols (abfd))
+-    fatal (_("%P: %pB: could not read symbols: %E\n"), abfd);
++    fatal (_("%F%P: %pB: could not read symbols: %E\n"), abfd);
+ 
+   for (syms = bfd_get_outsymbols (abfd); *syms; ++syms)
+     {
+@@ -625,7 +625,7 @@ check_refs (const char *name,
+      BFD might contain a prohibited cross reference.  */
+ 
+   if (!bfd_generic_link_read_symbols (abfd))
+-    fatal (_("%P: %pB: could not read symbols: %E\n"), abfd);
++    fatal (_("%F%P: %pB: could not read symbols: %E\n"), abfd);
+ 
+   info.sym_name = name;
+   info.global = global;
+@@ -687,14 +687,14 @@ check_reloc_refs (bfd *abfd, asection *sec, void *iarg)
+ 
+   relsize = bfd_get_reloc_upper_bound (abfd, sec);
+   if (relsize < 0)
+-    fatal (_("%P: %pB: could not read relocs: %E\n"), abfd);
++    fatal (_("%F%P: %pB: could not read relocs: %E\n"), abfd);
+   if (relsize == 0)
+     return;
+ 
+   relpp = (arelent **) xmalloc (relsize);
+   relcount = bfd_canonicalize_reloc (abfd, sec, relpp, info->asymbols);
+   if (relcount < 0)
+-    fatal (_("%P: %pB: could not read relocs: %E\n"), abfd);
++    fatal (_("%F%P: %pB: could not read relocs: %E\n"), abfd);
+ 
+   p = relpp;
+   pend = p + relcount;
+diff --git a/ld/ldelf.c b/ld/ldelf.c
+index fb95b7a9..d8c0817b 100644
+--- a/ld/ldelf.c
++++ b/ld/ldelf.c
+@@ -94,7 +94,7 @@ ldelf_after_parse (void)
+       else if (!link_info.maxpagesize_is_set)
+        link_info.maxpagesize = link_info.commonpagesize;
+       else
+-       fatal (_("%P: common page size (0x%v) > maximum page size (0x%v)\n"),
++       fatal (_("%F%P: common page size (0x%v) > maximum page size (0x%v)\n"),
+               link_info.commonpagesize, link_info.maxpagesize);
+     }
+ }
+@@ -120,7 +120,7 @@ ldelf_load_symbols (lang_input_statement_type *entry)
+ 
+   if (entry->flags.just_syms
+       && (bfd_get_file_flags (entry->the_bfd) & DYNAMIC) != 0)
+-    fatal (_("%P: %pB: --just-symbols may not be used on DSO\n"),
++    fatal (_("%F%P: %pB: --just-symbols may not be used on DSO\n"),
+           entry->the_bfd);
+ 
+   if (link_class == 0
+@@ -320,7 +320,7 @@ ldelf_try_needed (struct dt_needed *needed, int force, int is_linux)
+       struct bfd_link_needed_list *needs;
+ 
+       if (! bfd_elf_get_bfd_needed_list (abfd, &needs))
+-       fatal (_("%P: %pB: bfd_elf_get_bfd_needed_list failed: %E\n"), abfd);
++       fatal (_("%F%P: %pB: bfd_elf_get_bfd_needed_list failed: %E\n"), abfd);
+ 
+       if (needs != NULL)
+        {
+@@ -368,7 +368,7 @@ ldelf_try_needed (struct dt_needed *needed, int force, int is_linux)
+      can only check that using stat.  */
+ 
+   if (bfd_stat (abfd, &global_stat) != 0)
+-    fatal (_("%P: %pB: bfd_stat failed: %E\n"), abfd);
++    fatal (_("%F%P: %pB: bfd_stat failed: %E\n"), abfd);
+ 
+   /* First strip off everything before the last '/'.  */
+   soname = lbasename (bfd_get_filename (abfd));
+@@ -407,7 +407,7 @@ ldelf_try_needed (struct dt_needed *needed, int force, int is_linux)
+ 
+   /* Add this file into the symbol table.  */
+   if (! bfd_link_add_symbols (abfd, &link_info))
+-    fatal (_("%P: %pB: error adding symbols: %E\n"), abfd);
++    fatal (_("%F%P: %pB: error adding symbols: %E\n"), abfd);
+ 
+   return true;
+ }
+@@ -1205,7 +1205,7 @@ ldelf_handle_dt_needed (struct elf_link_hash_table *htab,
+          && elf_dt_name (abfd) != NULL)
+        {
+          if (bfd_elf_add_dt_needed_tag (abfd, &link_info) < 0)
+-           fatal (_("%P: failed to add DT_NEEDED dynamic tag\n"));
++           fatal (_("%F%P: failed to add DT_NEEDED dynamic tag\n"));
+        }
+ 
+   link_info.input_bfds_tail = save_input_bfd_tail;
+@@ -1256,7 +1256,7 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd,
+                     bfd_get_target (link_info.output_bfd));
+ 
+       if (link_info.out_implib_bfd == NULL)
+-       fatal (_("%P: %s: can't open for writing: %E\n"),
++       fatal (_("%F%P: %s: can't open for writing: %E\n"),
+               command_line.out_implib_filename);
+     }
+ 
+@@ -1311,7 +1311,7 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd,
+          && (elf_tdata (abfd)->elf_header->e_type == ET_EXEC
+              || (elf_tdata (abfd)->elf_header->e_type == ET_DYN
+                  && elf_tdata (abfd)->is_pie)))
+-       fatal (_("%P: cannot use executable file '%pB' as input to a link\n"),
++       fatal (_("%F%P: cannot use executable file '%pB' as input to a link\n"),
+               abfd);
+     }
+ 
+@@ -1365,7 +1365,7 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd,
+                }
+              else if (seen_type != type)
+                {
+-                 fatal (_("%P: compact frame descriptions incompatible with"
++                 fatal (_("%F%P: compact frame descriptions incompatible with"
+                           " DWARF2 .eh_frame from %pB\n"),
+                         type == DWARF2_EH_HDR ? abfd : elfbfd);
+                  break;
+@@ -1407,7 +1407,7 @@ ldelf_after_open (int use_libpath, int native, int is_linux, int is_freebsd,
+ 
+   if (link_info.eh_frame_hdr_type == COMPACT_EH_HDR)
+     if (!bfd_elf_parse_eh_frame_entries (NULL, &link_info))
+-      fatal (_("%P: failed to parse EH frame entries\n"));
++      fatal (_("%F%P: failed to parse EH frame entries\n"));
+ 
+   ldelf_handle_dt_needed (htab, use_libpath, native, is_linux,
+                          is_freebsd, elfsize, prefix);
+@@ -1664,7 +1664,7 @@ ldelf_find_exp_assignment (etree_type *exp)
+                                               &link_info,
+                                               exp->assign.dst, provide,
+                                               exp->assign.hidden))
+-           fatal (_("%P: failed to record assignment to %s: %E\n"),
++           fatal (_("%F%P: failed to record assignment to %s: %E\n"),
+                   exp->assign.dst);
+        }
+       ldelf_find_exp_assignment (exp->assign.src);
+@@ -1844,7 +1844,7 @@ ldelf_before_allocation (char *audit, char *depaudit,
+          command_line.filter_shlib, audit, depaudit,
+          (const char * const *) command_line.auxiliary_filters,
+          &link_info, &sinterp)))
+-    fatal (_("%P: failed to set dynamic section sizes: %E\n"));
++    fatal (_("%F%P: failed to set dynamic section sizes: %E\n"));
+ 
+   if (sinterp != NULL)
+     {
+@@ -1881,8 +1881,8 @@ ldelf_before_allocation (char *audit, char *depaudit,
+        msg = (char *) xmalloc ((size_t) (sz + 1));
+        if (! bfd_get_section_contents (is->the_bfd, s, msg,
+                                        (file_ptr) 0, sz))
+-         fatal (_("%P: %pB: can't read contents of section %pA: %E\n"),
+-                is->the_bfd, s);
++         fatal (_("%F%P: %pB: can't read contents of section .gnu.warning: %E\n"),
++                is->the_bfd);
+        msg[sz] = '\0';
+        (*link_info.callbacks->warning) (&link_info, msg,
+                                         (const char *) NULL, is->the_bfd,
+@@ -1909,7 +1909,7 @@ ldelf_before_allocation (char *audit, char *depaudit,
+   before_allocation_default ();
+ 
+   if (!bfd_elf_size_dynsym_hash_dynstr (link_info.output_bfd, &link_info))
+-    fatal (_("%P: failed to set dynamic section sizes: %E\n"));
++    fatal (_("%F%P: failed to set dynamic section sizes: %E\n"));
+ 
+   if (ehdr_start != NULL)
+     {
+diff --git a/ld/ldelfgen.c b/ld/ldelfgen.c
+index 1b1e49ce..cceefc6d 100644
+--- a/ld/ldelfgen.c
++++ b/ld/ldelfgen.c
+@@ -282,7 +282,7 @@ ldelf_map_segments (bool need_layout)
+                  if (os_info->ordered != os_info->count
+                      && bfd_link_relocatable (&link_info))
+                    {
+-                     fatal (_("%P: "
++                     fatal (_("%F%P: "
+                               "%pA has both ordered and unordered sections\n"),
+                             os->bfd_section);
+                      return;
+@@ -307,7 +307,7 @@ ldelf_map_segments (bool need_layout)
+          if (!_bfd_elf_map_sections_to_segments (link_info.output_bfd,
+                                                  &link_info,
+                                                  &need_layout))
+-           fatal (_("%P: map sections to segments failed: %E\n"));
++           fatal (_("%F%P: map sections to segments failed: %E\n"));
+ 
+          if (phdr_size != elf_program_header_size (link_info.output_bfd))
+            {
+@@ -327,7 +327,7 @@ ldelf_map_segments (bool need_layout)
+   while (need_layout && --tries);
+ 
+   if (tries == 0)
+-    fatal (_("%P: looping in map_segments\n"));
++    fatal (_("%F%P: looping in map_segments\n"));
+ 
+   if (bfd_get_flavour (link_info.output_bfd) == bfd_target_elf_flavour
+       && lang_phdr_list == NULL)
+@@ -338,7 +338,7 @@ ldelf_map_segments (bool need_layout)
+        = get_elf_backend_data (link_info.output_bfd);
+       if (bed->elf_backend_strip_zero_sized_dynamic_sections
+          && !bed->elf_backend_strip_zero_sized_dynamic_sections (&link_info))
+-       fatal (_("%P: failed to strip zero-sized dynamic sections\n"));
++         fatal (_("%F%P: failed to strip zero-sized dynamic sections\n"));
+     }
+ }
+ 
+@@ -416,7 +416,7 @@ ldelf_acquire_strings_for_ctf
+     {
+       if (ctf_link_add_strtab (ctf_output, ldelf_ctf_strtab_iter_cb,
+                               &args) < 0)
+-       fatal (_("%P: warning: CTF strtab association failed; strings will "
++       fatal (_("%F%P: warning: CTF strtab association failed; strings will "
+                 "not be shared: %s\n"),
+               ctf_errmsg (ctf_errno (ctf_output)));
+     }
+@@ -443,7 +443,7 @@ ldelf_new_dynsym_for_ctf (struct ctf_dict *ctf_output, int symidx,
+       lsym.st_value = sym->st_value;
+       if (ctf_link_add_linker_symbol (ctf_output, &lsym) < 0)
+        {
+-         fatal (_("%P: warning: CTF symbol addition failed; CTF will "
++         fatal (_("%F%P: warning: CTF symbol addition failed; CTF will "
+                   "not be tied to symbols: %s\n"),
+                 ctf_errmsg (ctf_errno (ctf_output)));
+        }
+@@ -453,7 +453,7 @@ ldelf_new_dynsym_for_ctf (struct ctf_dict *ctf_output, int symidx,
+       /* Shuffle all the symbols.  */
+ 
+       if (ctf_link_shuffle_syms (ctf_output) < 0)
+-       fatal (_("%P: warning: CTF symbol shuffling failed; CTF will "
++       fatal (_("%F%P: warning: CTF symbol shuffling failed; CTF will "
+                 "not be tied to symbols: %s\n"),
+               ctf_errmsg (ctf_errno (ctf_output)));
+     }
+diff --git a/ld/ldexp.c b/ld/ldexp.c
+index 45dffbc6..86f82a09 100644
+--- a/ld/ldexp.c
++++ b/ld/ldexp.c
+@@ -282,7 +282,7 @@ definedness_newfunc (struct bfd_hash_entry *entry,
+       bfd_hash_allocate (table, sizeof (struct definedness_hash_entry));
+ 
+   if (ret == NULL)
+-    fatal (_("%P: bfd_hash_allocate failed creating symbol %s\n"), name);
++    fatal (_("%F%P: bfd_hash_allocate failed creating symbol %s\n"), name);
+ 
+   ret->by_object = 0;
+   ret->iteration = 0;
+@@ -313,7 +313,7 @@ update_definedness (const char *name, struct bfd_link_hash_entry *h)
+     bfd_hash_lookup (&definedness_table, name, true, false);
+ 
+   if (defentry == NULL)
+-    fatal (_("%P: bfd_hash_lookup failed creating symbol %s\n"), name);
++    fatal (_("%F%P: bfd_hash_lookup failed creating symbol %s\n"), name);
+ 
+   /* If the symbol was already defined, and not by a script, then it
+      must be defined by an object file or by the linker target code.  */
+@@ -638,7 +638,7 @@ fold_binary (etree_type *tree)
+            expld.result.value = ((bfd_signed_vma) lhs.value
+                                  % (bfd_signed_vma) expld.result.value);
+          else if (expld.phase != lang_mark_phase_enum)
+-           fatal (_("%P:%pS %% by zero\n"), tree->binary.rhs);
++           fatal (_("%F%P:%pS %% by zero\n"), tree->binary.rhs);
+          arith_result_section (&lhs);
+          break;
+ 
+@@ -647,7 +647,7 @@ fold_binary (etree_type *tree)
+            expld.result.value = ((bfd_signed_vma) lhs.value
+                                  / (bfd_signed_vma) expld.result.value);
+          else if (expld.phase != lang_mark_phase_enum)
+-           fatal (_("%P:%pS / by zero\n"), tree->binary.rhs);
++           fatal (_("%F%P:%pS / by zero\n"), tree->binary.rhs);
+          arith_result_section (&lhs);
+          break;
+ 
+@@ -761,7 +761,7 @@ fold_name (etree_type *tree)
+          if (!h)
+            {
+              if (expld.phase != lang_first_phase_enum)
+-               fatal (_("%P: bfd_link_hash_lookup failed: %E\n"));
++               fatal (_("%F%P: bfd_link_hash_lookup failed: %E\n"));
+            }
+          else if (h->type == bfd_link_hash_defined
+                   || h->type == bfd_link_hash_defweak)
+@@ -789,7 +789,7 @@ fold_name (etree_type *tree)
+          else if (expld.phase == lang_final_phase_enum
+                   || (expld.phase != lang_mark_phase_enum
+                       && expld.assigning_to_dot))
+-           fatal (_("%P:%pS: undefined symbol `%s'"
++           fatal (_("%F%P:%pS: undefined symbol `%s'"
+                     " referenced in expression\n"),
+                   tree, tree->name.name);
+          else if (h->type == bfd_link_hash_new)
+@@ -827,7 +827,7 @@ fold_name (etree_type *tree)
+          if (os == NULL)
+            {
+              if (expld.phase == lang_final_phase_enum)
+-               fatal (_("%P:%pS: undefined section `%s'"
++               fatal (_("%F%P:%pS: undefined section `%s'"
+                         " referenced in expression\n"),
+                       tree, tree->name.name);
+            }
+@@ -845,7 +845,7 @@ fold_name (etree_type *tree)
+          if (os == NULL)
+            {
+              if (expld.phase == lang_final_phase_enum)
+-               fatal (_("%P:%pS: undefined section `%s'"
++               fatal (_("%F%P:%pS: undefined section `%s'"
+                         " referenced in expression\n"),
+                       tree, tree->name.name);
+            }
+@@ -873,7 +873,7 @@ fold_name (etree_type *tree)
+          if (os == NULL)
+            {
+              if (expld.phase == lang_final_phase_enum)
+-               fatal (_("%P:%pS: undefined section `%s'"
++               fatal (_("%F%P:%pS: undefined section `%s'"
+                         " referenced in expression\n"),
+                       tree, tree->name.name);
+              new_number (0);
+@@ -912,7 +912,7 @@ fold_name (etree_type *tree)
+        if (mem != NULL)
+          new_number (mem->length);
+        else
+-         fatal (_("%P:%pS: undefined MEMORY region `%s'"
++         fatal (_("%F%P:%pS: undefined MEMORY region `%s'"
+                   " referenced in expression\n"),
+                 tree, tree->name.name);
+       }
+@@ -926,7 +926,7 @@ fold_name (etree_type *tree)
+        if (mem != NULL)
+          new_rel_from_abs (mem->origin);
+        else
+-         fatal (_("%P:%pS: undefined MEMORY region `%s'"
++         fatal (_("%F%P:%pS: undefined MEMORY region `%s'"
+                   " referenced in expression\n"),
+                 tree, tree->name.name);
+       }
+@@ -938,7 +938,7 @@ fold_name (etree_type *tree)
+       else if (strcmp (tree->name.name, "COMMONPAGESIZE") == 0)
+        new_number (link_info.commonpagesize);
+       else
+-       fatal (_("%P:%pS: unknown constant `%s' referenced in expression\n"),
++       fatal (_("%F%P:%pS: unknown constant `%s' referenced in expression\n"),
+               tree, tree->name.name);
+       break;
+ 
+@@ -1086,7 +1086,7 @@ exp_fold_tree_1 (etree_type *tree)
+       if (tree->assign.dst[0] == '.' && tree->assign.dst[1] == 0)
+        {
+          if (tree->type.node_class != etree_assign)
+-           fatal (_("%P:%pS can not PROVIDE assignment to"
++           fatal (_("%F%P:%pS can not PROVIDE assignment to"
+                     " location counter\n"), tree);
+          if (expld.phase != lang_first_phase_enum)
+            {
+@@ -1119,11 +1119,11 @@ exp_fold_tree_1 (etree_type *tree)
+                  || expld.section == bfd_und_section_ptr)
+                {
+                  if (expld.phase != lang_mark_phase_enum)
+-                   fatal (_("%P:%pS invalid assignment to"
++                   fatal (_("%F%P:%pS invalid assignment to"
+                             " location counter\n"), tree);
+                }
+              else if (expld.dotp == NULL)
+-               fatal (_("%P:%pS assignment to location counter"
++               fatal (_("%F%P:%pS assignment to location counter"
+                         " invalid outside of SECTIONS\n"), tree);
+ 
+              /* After allocation, assignment to dot should not be
+@@ -1142,7 +1142,7 @@ exp_fold_tree_1 (etree_type *tree)
+                    nextdot += expld.section->vma;
+                  if (nextdot < expld.dot
+                      && expld.section != bfd_abs_section_ptr)
+-                   fatal (_("%P:%pS cannot move location counter backwards"
++                   fatal (_("%F%P:%pS cannot move location counter backwards"
+                             " (from %V to %V)\n"),
+                           tree, expld.dot, nextdot);
+                  else
+@@ -1202,7 +1202,7 @@ exp_fold_tree_1 (etree_type *tree)
+                  h = bfd_link_hash_lookup (link_info.hash, tree->assign.dst,
+                                            true, false, true);
+                  if (h == NULL)
+-                   fatal (_("%P:%s: hash creation failed\n"),
++                   fatal (_("%F%P:%s: hash creation failed\n"),
+                           tree->assign.dst);
+                }
+ 
+@@ -1578,7 +1578,7 @@ exp_get_vma (etree_type *tree, lang_output_section_statement_type *os,
+       if (expld.result.valid_p)
+        return expld.result.value;
+       else if (name != NULL && expld.phase != lang_mark_phase_enum)
+-       fatal (_("%P:%pS: nonconstant expression for %s\n"),
++       fatal (_("%F%P:%pS: nonconstant expression for %s\n"),
+               tree, name);
+     }
+   return def;
+@@ -1621,7 +1621,7 @@ exp_get_fill (etree_type *tree, fill_type *def, char *name)
+   if (!expld.result.valid_p)
+     {
+       if (name != NULL && expld.phase != lang_mark_phase_enum)
+-       fatal (_("%P:%pS: nonconstant expression for %s\n"),
++       fatal (_("%F%P:%pS: nonconstant expression for %s\n"),
+               tree, name);
+       return def;
+     }
+@@ -1681,7 +1681,7 @@ exp_get_abs_int (etree_type *tree, int def, char *name)
+        }
+       else if (name != NULL && expld.phase != lang_mark_phase_enum)
+        {
+-         fatal (_("%P:%pS: nonconstant expression for %s\n"),
++         fatal (_("%F%P:%pS: nonconstant expression for %s\n"),
+                 tree, name);
+        }
+     }
+@@ -1707,7 +1707,7 @@ ldexp_init (void)
+                              definedness_newfunc,
+                              sizeof (struct definedness_hash_entry),
+                              13))
+-    fatal (_("%P: can not create hash table: %E\n"));
++    fatal (_("%F%P: can not create hash table: %E\n"));
+ }
+ 
+ /* Convert absolute symbols defined by a script from "dot" (also
+diff --git a/ld/ldfile.c b/ld/ldfile.c
+index ddab0d37..040a8886 100644
+--- a/ld/ldfile.c
++++ b/ld/ldfile.c
+@@ -183,7 +183,7 @@ ldfile_add_remap_file (const char * file)
+ 
+       if (*p == '\0')
+        {
+-         fatal ("%P: malformed remap file entry: %s\n", line);
++         fatal ("%F%P: malformed remap file entry: %s\n", line);
+          continue;
+        }
+ 
+@@ -195,7 +195,7 @@ ldfile_add_remap_file (const char * file)
+ 
+       if (*p == '\0')
+        {
+-         fatal ("%P: malformed remap file entry: %s\n", line);
++         fatal ("%F%P: malformed remap file entry: %s\n", line);
+          continue;
+        }
+ 
+@@ -365,7 +365,7 @@ ldfile_try_open_bfd (const char *attempt,
+   if (entry->the_bfd == NULL)
+     {
+       if (bfd_get_error () == bfd_error_invalid_target)
+-       fatal (_("%P: invalid BFD target `%s'\n"), entry->target);
++       fatal (_("%F%P: invalid BFD target `%s'\n"), entry->target);
+       return false;
+     }
+ 
+@@ -508,7 +508,7 @@ ldfile_try_open_bfd (const char *attempt,
+ 
+          if (!entry->flags.dynamic && (entry->the_bfd->flags & DYNAMIC) != 0)
+            {
+-             fatal (_("%P: attempted static link of dynamic object `%s'\n"),
++             fatal (_("%F%P: attempted static link of dynamic object `%s'\n"),
+                     attempt);
+              bfd_close (entry->the_bfd);
+              entry->the_bfd = NULL;
+@@ -919,7 +919,7 @@ ldfile_open_command_file_1 (const char *name, enum script_open_style open_how)
+       if ((open_how != script_nonT || script->open_how != script_nonT)
+          && strcmp (name, script->name) == 0)
+        {
+-         fatal (_("%P: error: linker script file '%s'"
++         fatal (_("%F%P: error: linker script file '%s'"
+                   " appears multiple times\n"), name);
+          return;
+        }
+@@ -941,7 +941,7 @@ ldfile_open_command_file_1 (const char *name, enum script_open_style open_how)
+   if (ldlex_input_stack == NULL)
+     {
+       bfd_set_error (bfd_error_system_call);
+-      fatal (_("%P: cannot open linker script file %s: %E\n"), name);
++      fatal (_("%F%P: cannot open linker script file %s: %E\n"), name);
+       return;
+     }
+ 
+@@ -1012,5 +1012,5 @@ ldfile_set_output_arch (const char *string, enum bfd_architecture defarch)
+   else if (defarch != bfd_arch_unknown)
+     ldfile_output_architecture = defarch;
+   else
+-    fatal (_("%P: cannot represent machine `%s'\n"), string);
++    fatal (_("%F%P: cannot represent machine `%s'\n"), string);
+ }
+diff --git a/ld/ldgram.y b/ld/ldgram.y
+index c2f1e298..81bb8fd8 100644
+--- a/ld/ldgram.y
++++ b/ld/ldgram.y
+@@ -209,7 +209,7 @@ mri_script_command:
+                CHIP  exp
+        |       CHIP  exp ',' exp
+        |       NAME    {
+-                       fatal (_("%P: unrecognised keyword in MRI style script '%s'\n"), $1);
++                       fatal(_("%F%P: unrecognised keyword in MRI style script '%s'\n"),$1);
+                        }
+        |       LIST    {
+                        config.map_filename = "-";
+@@ -1547,7 +1547,7 @@ yyerror (const char *arg)
+     einfo (_("%P:%s: file format not recognized; treating as linker script\n"),
+           ldlex_filename ());
+   if (error_index > 0 && error_index < ERROR_NAME_MAX)
+-    fatal (_("%P:%pS: %s in %s\n"), NULL, arg, error_names[error_index - 1]);
++    fatal (_("%F%P:%pS: %s in %s\n"), NULL, arg, error_names[error_index - 1]);
+   else
+-    fatal ("%P:%pS: %s\n", NULL, arg);
++    fatal ("%F%P:%pS: %s\n", NULL, arg);
+ }
+diff --git a/ld/ldlang.c b/ld/ldlang.c
+index 9bf5fcbe..57d9a777 100644
+--- a/ld/ldlang.c
++++ b/ld/ldlang.c
+@@ -1325,7 +1325,7 @@ output_section_statement_table_init (void)
+                              output_section_statement_newfunc,
+                              sizeof (struct out_section_hash_entry),
+                              61))
+-    fatal (_("%P: can not create hash table: %E\n"));
++    fatal (_("%F%P: can not create hash table: %E\n"));
+ }
+ 
+ static void
+@@ -1453,7 +1453,7 @@ lang_memory_region_alias (const char *alias, const char *region_name)
+      the default memory region.  */
+   if (strcmp (region_name, DEFAULT_MEMORY_REGION) == 0
+       || strcmp (alias, DEFAULT_MEMORY_REGION) == 0)
+-    fatal (_("%P:%pS: error: alias for default memory region\n"), NULL);
++    fatal (_("%F%P:%pS: error: alias for default memory region\n"), NULL);
+ 
+   /* Look for the target region and check if the alias is not already
+      in use.  */
+@@ -1464,14 +1464,14 @@ lang_memory_region_alias (const char *alias, const char *region_name)
+        if (region == NULL && strcmp (n->name, region_name) == 0)
+          region = r;
+        if (strcmp (n->name, alias) == 0)
+-         fatal (_("%P:%pS: error: redefinition of memory region "
++         fatal (_("%F%P:%pS: error: redefinition of memory region "
+                   "alias `%s'\n"),
+                 NULL, alias);
+       }
+ 
+   /* Check if the target region exists.  */
+   if (region == NULL)
+-    fatal (_("%P:%pS: error: memory region `%s' "
++    fatal (_("%F%P:%pS: error: memory region `%s' "
+             "for alias `%s' does not exist\n"),
+           NULL, region_name, alias);
+ 
+@@ -1532,7 +1532,7 @@ lang_output_section_statement_lookup (const char *name,
+   if (entry == NULL)
+     {
+       if (create)
+-       fatal (_("%P: failed creating section `%s': %E\n"), name);
++       fatal (_("%F%P: failed creating section `%s': %E\n"), name);
+       return NULL;
+     }
+ 
+@@ -2426,7 +2426,7 @@ static void
+ init_os (lang_output_section_statement_type *s, flagword flags)
+ {
+   if (strcmp (s->name, DISCARD_SECTION_NAME) == 0)
+-    fatal (_("%P: illegal use of `%s' section\n"), DISCARD_SECTION_NAME);
++    fatal (_("%F%P: illegal use of `%s' section\n"), DISCARD_SECTION_NAME);
+ 
+   if (!s->dup_output)
+     s->bfd_section = bfd_get_section_by_name (link_info.output_bfd, s->name);
+@@ -2435,7 +2435,7 @@ init_os (lang_output_section_statement_type *s, flagword flags)
+                                                         s->name, flags);
+   if (s->bfd_section == NULL)
+     {
+-      fatal (_("%P: output format %s cannot represent section"
++      fatal (_("%F%P: output format %s cannot represent section"
+               " called %s: %E\n"),
+             link_info.output_bfd->xvec->name, s->name);
+     }
+@@ -3027,7 +3027,7 @@ load_symbols (lang_input_statement_type *entry,
+        }
+       else if (err != bfd_error_file_not_recognized
+               || place == NULL)
+-       fatal (_("%P: %pB: file not recognized: %E\n"), entry->the_bfd);
++       fatal (_("%F%P: %pB: file not recognized: %E\n"), entry->the_bfd);
+ 
+       bfd_close (entry->the_bfd);
+       entry->the_bfd = NULL;
+@@ -3100,7 +3100,7 @@ load_symbols (lang_input_statement_type *entry,
+ 
+              if (!bfd_check_format (member, bfd_object))
+                {
+-                 fatal (_("%P: %pB: member %pB in archive is not an object\n"),
++                 fatal (_("%F%P: %pB: member %pB in archive is not an object\n"),
+                         entry->the_bfd, member);
+                  loaded = false;
+                }
+@@ -3115,7 +3115,7 @@ load_symbols (lang_input_statement_type *entry,
+                 substitute BFD for us.  */
+              if (!bfd_link_add_symbols (subsbfd, &link_info))
+                {
+-                 fatal (_("%P: %pB: error adding symbols: %E\n"), member);
++                 fatal (_("%F%P: %pB: error adding symbols: %E\n"), member);
+                  loaded = false;
+                }
+            }
+@@ -3129,7 +3129,7 @@ load_symbols (lang_input_statement_type *entry,
+   if (bfd_link_add_symbols (entry->the_bfd, &link_info))
+     entry->flags.loaded = true;
+   else
+-    fatal (_("%P: %pB: error adding symbols: %E\n"), entry->the_bfd);
++    fatal (_("%F%P: %pB: error adding symbols: %E\n"), entry->the_bfd);
+ 
+   return entry->flags.loaded;
+ }
+@@ -3370,7 +3370,7 @@ open_output (const char *name)
+       {
+        char *in = lrealpath (f->local_sym_name);
+        if (filename_cmp (in, out) == 0)
+-         fatal (_("%P: input file '%s' is the same as output file\n"),
++         fatal (_("%F%P: input file '%s' is the same as output file\n"),
+                 f->filename);
+        free (in);
+       }
+@@ -3432,23 +3432,23 @@ open_output (const char *name)
+   if (link_info.output_bfd == NULL)
+     {
+       if (bfd_get_error () == bfd_error_invalid_target)
+-       fatal (_("%P: target %s not found\n"), output_target);
++       fatal (_("%F%P: target %s not found\n"), output_target);
+ 
+-      fatal (_("%P: cannot open output file %s: %E\n"), name);
++      fatal (_("%F%P: cannot open output file %s: %E\n"), name);
+     }
+ 
+   delete_output_file_on_failure = true;
+ 
+   if (!bfd_set_format (link_info.output_bfd, bfd_object))
+-    fatal (_("%P: %s: can not make object file: %E\n"), name);
++    fatal (_("%F%P: %s: can not make object file: %E\n"), name);
+   if (!bfd_set_arch_mach (link_info.output_bfd,
+                          ldfile_output_architecture,
+                          ldfile_output_machine))
+-    fatal (_("%P: %s: can not set architecture: %E\n"), name);
++    fatal (_("%F%P: %s: can not set architecture: %E\n"), name);
+ 
+   link_info.hash = bfd_link_hash_table_create (link_info.output_bfd);
+   if (link_info.hash == NULL)
+-    fatal (_("%P: can not create hash table: %E\n"));
++    fatal (_("%F%P: can not create hash table: %E\n"));
+ 
+   bfd_set_gp_size (link_info.output_bfd, g_switch_value);
+ }
+@@ -3973,7 +3973,7 @@ insert_undefined (const char *name)
+ 
+   h = bfd_link_hash_lookup (link_info.hash, name, true, false, true);
+   if (h == NULL)
+-    fatal (_("%P: bfd_link_hash_lookup failed: %E\n"));
++    fatal (_("%F%P: bfd_link_hash_lookup failed: %E\n"));
+   if (h->type == bfd_link_hash_new)
+     {
+       h->type = bfd_link_hash_undefined;
+@@ -4259,7 +4259,7 @@ map_input_to_output_sections
+                  else if (strcmp (name, "SHT_PREINIT_ARRAY") == 0)
+                    type = SHT_PREINIT_ARRAY;
+                  else
+-                   fatal (_ ("%P: invalid type for output section `%s'\n"),
++                   fatal (_ ("%F%P: invalid type for output section `%s'\n"),
+                           os->name);
+                }
+             else
+@@ -4268,7 +4268,7 @@ map_input_to_output_sections
+                 if (expld.result.valid_p)
+                   type = expld.result.value;
+                 else
+-                  fatal (_ ("%P: invalid type for output section `%s'\n"),
++                  fatal (_ ("%F%P: invalid type for output section `%s'\n"),
+                          os->name);
+               }
+              break;
+@@ -4417,7 +4417,7 @@ process_insert_statements (lang_statement_union_type **start)
+            }
+          if (where == NULL)
+            {
+-             fatal (_("%P: %s not found for insert\n"), i->where);
++             fatal (_("%F%P: %s not found for insert\n"), i->where);
+              return;
+            }
+ 
+@@ -5499,12 +5499,12 @@ size_input_section
+              if (dot + TO_ADDR (i->size) > end)
+                {
+                  if (i->flags & SEC_LINKER_CREATED)
+-                   fatal (_("%P: Output section `%pA' not large enough for "
++                   fatal (_("%F%P: Output section `%pA' not large enough for "
+                             "the linker-created stubs section `%pA'.\n"),
+                           i->output_section, i);
+ 
+                  if (i->rawsize && i->rawsize != i->size)
+-                   fatal (_("%P: Relaxation not supported with "
++                   fatal (_("%F%P: Relaxation not supported with "
+                             "--enable-non-contiguous-regions (section `%pA' "
+                             "would overflow `%pA' after it changed size).\n"),
+                           i, i->output_section);
+@@ -5860,7 +5860,7 @@ lang_size_sections_1
+                      dot += expld.result.section->vma;
+                  }
+                else if (expld.phase != lang_mark_phase_enum)
+-                 fatal (_("%P:%pS: non constant or forward reference"
++                 fatal (_("%F%P:%pS: non constant or forward reference"
+                           " address expression for section %s\n"),
+                         os->addr_tree, os->name);
+              }
+@@ -5943,7 +5943,7 @@ lang_size_sections_1
+                           overridden by the using the --no-check-sections
+                           switch.  */
+                        if (command_line.check_section_addresses)
+-                         fatal (_("%P: error: no memory region specified"
++                         fatal (_("%F%P: error: no memory region specified"
+                                   " for loadable section `%s'\n"),
+                                 bfd_section_name (os->bfd_section));
+                        else
+@@ -6250,7 +6250,7 @@ lang_size_sections_1
+                bool again;
+ 
+                if (!bfd_relax_section (i->owner, i, &link_info, &again))
+-                 fatal (_("%P: can't relax section: %E\n"));
++                 fatal (_("%F%P: can't relax section: %E\n"));
+                if (again)
+                  *relax = true;
+              }
+@@ -6659,7 +6659,7 @@ lang_do_assignments_1 (lang_statement_union_type *s,
+                s->data_statement.value += expld.result.section->vma;
+            }
+          else if (expld.phase == lang_final_phase_enum)
+-           fatal (_("%P: invalid data statement\n"));
++           fatal (_("%F%P: invalid data statement\n"));
+          {
+            unsigned int size;
+            switch (s->data_statement.type)
+@@ -6692,7 +6692,7 @@ lang_do_assignments_1 (lang_statement_union_type *s,
+          if (expld.result.valid_p)
+            s->reloc_statement.addend_value = expld.result.value;
+          else if (expld.phase == lang_final_phase_enum)
+-           fatal (_("%P: invalid reloc statement\n"));
++           fatal (_("%F%P: invalid reloc statement\n"));
+          dot += TO_ADDR (bfd_get_reloc_size (s->reloc_statement.howto));
+          break;
+ 
+@@ -7110,7 +7110,7 @@ lang_end (void)
+            break;
+        }
+       if (!sym)
+-       fatal (_("%P: --gc-sections requires a defined symbol root "
++       fatal (_("%F%P: --gc-sections requires a defined symbol root "
+                 "specified by -e or -u\n"));
+     }
+ 
+@@ -7135,7 +7135,7 @@ lang_end (void)
+             + bfd_section_vma (h->u.def.section->output_section)
+             + h->u.def.section->output_offset);
+       if (!bfd_set_start_address (link_info.output_bfd, val))
+-       fatal (_("%P: %s: can't set start address\n"), entry_symbol.name);
++       fatal (_("%F%P: %s: can't set start address\n"), entry_symbol.name);
+     }
+   else
+     {
+@@ -7148,7 +7148,7 @@ lang_end (void)
+       if (*send == '\0')
+        {
+          if (!bfd_set_start_address (link_info.output_bfd, val))
+-           fatal (_("%P: can't set start address\n"));
++           fatal (_("%F%P: can't set start address\n"));
+        }
+       /* BZ 2004952: Only use the start of the entry section for executables.  */
+       else if bfd_link_executable (&link_info)
+@@ -7167,7 +7167,7 @@ lang_end (void)
+                       bfd_section_vma (ts));
+              if (!bfd_set_start_address (link_info.output_bfd,
+                                          bfd_section_vma (ts)))
+-               fatal (_("%P: can't set start address\n"));
++               fatal (_("%F%P: can't set start address\n"));
+            }
+          else
+            {
+@@ -7236,7 +7236,7 @@ lang_check (void)
+                  != bfd_get_flavour (link_info.output_bfd)))
+          && (bfd_get_file_flags (input_bfd) & HAS_RELOC) != 0)
+        {
+-         fatal (_("%P: relocatable linking with relocations from"
++         fatal (_("%F%P: relocatable linking with relocations from"
+                   " format %s (%pB) to format %s (%pB) is not supported\n"),
+                 bfd_get_target (input_bfd), input_bfd,
+                 bfd_get_target (link_info.output_bfd), link_info.output_bfd);
+@@ -7340,7 +7340,7 @@ lang_one_common (struct bfd_link_hash_entry *h, void *info)
+ 
+   section = h->u.c.p->section;
+   if (!bfd_define_common_symbol (link_info.output_bfd, &link_info, h))
+-    fatal (_("%P: could not define common symbol `%pT': %E\n"),
++    fatal (_("%F%P: could not define common symbol `%pT': %E\n"),
+           h->root.string);
+ 
+   if (config.map_file != NULL)
+@@ -7518,7 +7518,7 @@ lang_set_flags (lang_memory_region_type *ptr, const char *flags, int invert)
+          break;
+ 
+        default:
+-         fatal (_("%P: invalid character %c (%d) in flags\n"),
++         fatal (_("%F%P: invalid character %c (%d) in flags\n"),
+                 *flags, *flags);
+          break;
+        }
+@@ -7630,7 +7630,7 @@ lang_enter_output_section_statement (const char *output_section_statement_name,
+ 
+   os->align_lma_with_input = align_with_input == ALIGN_WITH_INPUT;
+   if (os->align_lma_with_input && align != NULL)
+-    fatal (_("%P:%pS: error: align with input and explicit align specified\n"),
++    fatal (_("%F%P:%pS: error: align with input and explicit align specified\n"),
+           NULL);
+ 
+   os->subsection_alignment = subalign;
+@@ -8142,7 +8142,7 @@ lang_process (void)
+   lang_place_undefineds ();
+ 
+   if (!bfd_section_already_linked_table_init ())
+-    fatal (_("%P: can not create hash table: %E\n"));
++    fatal (_("%F%P: can not create hash table: %E\n"));
+ 
+   /* A first pass through the memory regions ensures that if any region
+      references a symbol for its origin or length then this symbol will be
+@@ -8180,7 +8180,7 @@ lang_process (void)
+       files = file_chain;
+       inputfiles = input_file_chain;
+       if (plugin_call_all_symbols_read ())
+-       fatal (_("%P: %s: plugin reported error after all symbols read\n"),
++       fatal (_("%F%P: %s: plugin reported error after all symbols read\n"),
+               plugin_error_plugin ());
+       link_info.lto_all_symbols_read = true;
+       /* Open any newly added files, updating the file chains.  */
+@@ -8757,7 +8757,7 @@ void
+ lang_startup (const char *name)
+ {
+   if (first_file->filename != NULL)
+-    fatal (_("%P: multiple STARTUP files\n"));
++    fatal (_("%F%P: multiple STARTUP files\n"));
+   first_file->filename = name;
+   first_file->local_sym_name = name;
+   first_file->flags.real = true;
+@@ -8981,7 +8981,7 @@ lang_record_phdrs (void)
+                        break;
+                      }
+                  if (last == NULL)
+-                   fatal (_("%P: no sections assigned to phdrs\n"));
++                   fatal (_("%F%P: no sections assigned to phdrs\n"));
+                }
+              pl = last;
+            }
+@@ -9019,7 +9019,7 @@ lang_record_phdrs (void)
+       if (!bfd_record_phdr (link_info.output_bfd, l->type,
+                            l->flags != NULL, flags, l->at != NULL,
+                            at, l->filehdr, l->phdrs, c, secs))
+-       fatal (_("%P: bfd_record_phdr failed: %E\n"));
++       fatal (_("%F%P: bfd_record_phdr failed: %E\n"));
+     }
+ 
+   free (secs);
+diff --git a/ld/ldlex.l b/ld/ldlex.l
+index 7cbade08..0a7d63e6 100644
+--- a/ld/ldlex.l
++++ b/ld/ldlex.l
+@@ -504,7 +504,7 @@ void
+ lex_push_file (FILE *file, const char *name, unsigned int sysrooted)
+ {
+   if (include_stack_ptr >= MAX_INCLUDE_DEPTH)
+-    fatal (_("%P: includes nested too deeply\n"));
++    fatal (_("%F:includes nested too deeply\n"));
+   file_name_stack[include_stack_ptr] = name;
+   lineno_stack[include_stack_ptr] = lineno;
+   sysrooted_stack[include_stack_ptr] = input_flags.sysrooted;
+@@ -566,7 +566,7 @@ lex_redirect (const char *string, const char *fake_filename, unsigned int count)
+ 
+   yy_init = 0;
+   if (include_stack_ptr >= MAX_INCLUDE_DEPTH)
+-    fatal (_("%P: macros nested too deeply\n"));
++    fatal (_("%F: macros nested too deeply\n"));
+   file_name_stack[include_stack_ptr] = fake_filename;
+   lineno_stack[include_stack_ptr] = lineno;
+   include_stack[include_stack_ptr] = YY_CURRENT_BUFFER;
+@@ -670,7 +670,7 @@ yy_input (char *buf, int max_size)
+        {
+          result = fread (buf, 1, max_size, yyin);
+          if (result < max_size && ferror (yyin))
+-           fatal (_("%P: read in flex scanner failed\n"));
++           fatal (_("%F%P: read in flex scanner failed\n"));
+        }
+     }
+   return result;
+@@ -707,7 +707,7 @@ comment (void)
+ 
+       if (c == 0)
+        {
+-         fatal (_("%P: EOF in comment\n"));
++         fatal (_("%F%P: EOF in comment\n"));
+          break;
+        }
+     }
+@@ -728,7 +728,7 @@ lex_warn_invalid (char *where, char *what)
+   if (ldfile_assumed_script)
+     {
+       bfd_set_error (bfd_error_file_not_recognized);
+-      fatal (_("%s: file not recognized: %E\n"), ldlex_filename ());
++      fatal (_("%F%s: file not recognized: %E\n"), ldlex_filename ());
+     }
+ 
+   if (! ISPRINT (*what))
+diff --git a/ld/ldmain.c b/ld/ldmain.c
+index a61086c3..8250ae08 100644
+--- a/ld/ldmain.c
++++ b/ld/ldmain.c
+@@ -193,7 +193,7 @@ write_dependency_file (void)
+   out = fopen (config.dependency_file, FOPEN_WT);
+   if (out == NULL)
+     {
+-      fatal (_("%P: cannot open dependency file %s: %E\n"),
++      fatal (_("%F%P: cannot open dependency file %s: %E\n"),
+             config.dependency_file);
+     }
+ 
+@@ -266,7 +266,7 @@ main (int argc, char **argv)
+   expandargv (&argc, &argv);
+ 
+   if (bfd_init () != BFD_INIT_MAGIC)
+-    fatal (_("%P: fatal error: libbfd ABI mismatch\n"));
++    fatal (_("%F%P: fatal error: libbfd ABI mismatch\n"));
+ 
+   bfd_set_error_program_name (program_name);
+ 
+@@ -468,13 +468,13 @@ main (int argc, char **argv)
+     xexit (0);
+ 
+   if (link_info.inhibit_common_definition && !bfd_link_dll (&link_info))
+-    fatal (_("%P: --no-define-common may not be used without -shared\n"));
++    fatal (_("%F%P: --no-define-common may not be used without -shared\n"));
+ 
+   if (!lang_has_input_file)
+     {
+       if (version_printed || command_line.print_output_format)
+        xexit (0);
+-      fatal (_("%P: no input files\n"));
++      fatal (_("%F%P: no input files\n"));
+     }
+ 
+   if (verbose)
+@@ -494,7 +494,7 @@ main (int argc, char **argv)
+          if (config.map_file == (FILE *) NULL)
+            {
+              bfd_set_error (bfd_error_system_call);
+-             einfo (_("%P: cannot open map file %s: %E\n"),
++             fatal (_("%F%P: cannot open map file %s: %E\n"),
+                     config.map_filename);
+            }
+        }
+@@ -569,7 +569,7 @@ main (int argc, char **argv)
+       bfd *obfd = link_info.output_bfd;
+       link_info.output_bfd = NULL;
+       if (!bfd_close (obfd))
+-       fatal (_("%P: %s: final close failed: %E\n"), output_filename);
++       fatal (_("%F%P: %s: final close failed: %E\n"), output_filename);
+ 
+       /* If the --force-exe-suffix is enabled, and we're making an
+         executable file and it doesn't end in .exe, copy it to one
+@@ -596,10 +596,10 @@ main (int argc, char **argv)
+              dst = fopen (dst_name, FOPEN_WB);
+ 
+              if (!src)
+-               fatal (_("%P: unable to open for source of copy `%s'\n"),
++               fatal (_("%F%P: unable to open for source of copy `%s'\n"),
+                       output_filename);
+              if (!dst)
+-               fatal (_("%P: unable to open for destination of copy `%s'\n"),
++               fatal (_("%F%P: unable to open for destination of copy `%s'\n"),
+                       dst_name);
+              while ((l = fread (buf, 1, bsize, src)) > 0)
+                {
+@@ -710,7 +710,7 @@ get_emulation (int argc, char **argv)
+                  i++;
+                }
+              else
+-               fatal (_("%P: missing argument to -m\n"));
++               fatal (_("%F%P: missing argument to -m\n"));
+            }
+          else if (strcmp (argv[i], "-mips1") == 0
+                   || strcmp (argv[i], "-mips2") == 0
+@@ -764,11 +764,11 @@ add_ysym (const char *name)
+                                  bfd_hash_newfunc,
+                                  sizeof (struct bfd_hash_entry),
+                                  61))
+-       fatal (_("%P: bfd_hash_table_init failed: %E\n"));
++       fatal (_("%F%P: bfd_hash_table_init failed: %E\n"));
+     }
+ 
+   if (bfd_hash_lookup (link_info.notice_hash, name, true, true) == NULL)
+-    fatal (_("%P: bfd_hash_lookup failed: %E\n"));
++    fatal (_("%F%P: bfd_hash_lookup failed: %E\n"));
+ }
+ 
+ void
+@@ -781,11 +781,11 @@ add_ignoresym (struct bfd_link_info *info, const char *name)
+                                  bfd_hash_newfunc,
+                                  sizeof (struct bfd_hash_entry),
+                                  61))
+-       fatal (_("%P: bfd_hash_table_init failed: %E\n"));
++       fatal (_("%F%P: bfd_hash_table_init failed: %E\n"));
+     }
+ 
+   if (bfd_hash_lookup (info->ignore_hash, name, true, true) == NULL)
+-    fatal (_("%P: bfd_hash_lookup failed: %E\n"));
++    fatal (_("%F%P: bfd_hash_lookup failed: %E\n"));
+ }
+ 
+ /* Record a symbol to be wrapped, from the --wrap option.  */
+@@ -801,11 +801,11 @@ add_wrap (const char *name)
+                                  bfd_hash_newfunc,
+                                  sizeof (struct bfd_hash_entry),
+                                  61))
+-       fatal (_("%P: bfd_hash_table_init failed: %E\n"));
++       fatal (_("%F%P: bfd_hash_table_init failed: %E\n"));
+     }
+ 
+   if (bfd_hash_lookup (link_info.wrap_hash, name, true, true) == NULL)
+-    fatal (_("%P: bfd_hash_lookup failed: %E\n"));
++    fatal (_("%F%P: bfd_hash_lookup failed: %E\n"));
+ }
+ 
+ /* Handle the -retain-symbols-file option.  */
+@@ -833,7 +833,7 @@ add_keepsyms_file (const char *filename)
+       xmalloc (sizeof (struct bfd_hash_table));
+   if (!bfd_hash_table_init (link_info.keep_hash, bfd_hash_newfunc,
+                            sizeof (struct bfd_hash_entry)))
+-    fatal (_("%P: bfd_hash_table_init failed: %E\n"));
++    fatal (_("%F%P: bfd_hash_table_init failed: %E\n"));
+ 
+   bufsize = 100;
+   buf = (char *) xmalloc (bufsize);
+@@ -863,7 +863,7 @@ add_keepsyms_file (const char *filename)
+          buf[len] = '\0';
+ 
+          if (bfd_hash_lookup (link_info.keep_hash, buf, true, true) == NULL)
+-           fatal (_("%P: bfd_hash_lookup for insertion failed: %E\n"));
++           fatal (_("%F%P: bfd_hash_lookup for insertion failed: %E\n"));
+        }
+     }
+ 
+@@ -1270,7 +1270,7 @@ constructor_callback (struct bfd_link_info *info,
+   if (bfd_reloc_type_lookup (info->output_bfd, BFD_RELOC_CTOR) == NULL
+       && (bfd_link_relocatable (info)
+          || bfd_reloc_type_lookup (abfd, BFD_RELOC_CTOR) == NULL))
+-    fatal (_("%P: BFD backend error: BFD_RELOC_CTOR unsupported\n"));
++    fatal (_("%F%P: BFD backend error: BFD_RELOC_CTOR unsupported\n"));
+ 
+   s = set_name;
+   if (bfd_get_symbol_leading_char (abfd) != '\0')
+@@ -1282,7 +1282,7 @@ constructor_callback (struct bfd_link_info *info,
+ 
+   h = bfd_link_hash_lookup (info->hash, set_name, true, true, true);
+   if (h == (struct bfd_link_hash_entry *) NULL)
+-    fatal (_("%P: bfd_link_hash_lookup failed: %E\n"));
++    fatal (_("%F%P: bfd_link_hash_lookup failed: %E\n"));
+   if (h->type == bfd_link_hash_new)
+     {
+       h->type = bfd_link_hash_undefined;
+@@ -1315,7 +1315,7 @@ symbol_warning (const char *warning, const char *symbol, bfd *abfd)
+   struct warning_callback_info cinfo;
+ 
+   if (!bfd_generic_link_read_symbols (abfd))
+-    fatal (_("%P: %pB: could not read symbols: %E\n"), abfd);
++    fatal (_("%F%P: %pB: could not read symbols: %E\n"), abfd);
+ 
+   cinfo.found = false;
+   cinfo.warning = warning;
+@@ -1377,14 +1377,14 @@ warning_find_reloc (bfd *abfd, asection *sec, void *iarg)
+ 
+   relsize = bfd_get_reloc_upper_bound (abfd, sec);
+   if (relsize < 0)
+-    fatal (_("%P: %pB: could not read relocs: %E\n"), abfd);
++    fatal (_("%F%P: %pB: could not read relocs: %E\n"), abfd);
+   if (relsize == 0)
+     return;
+ 
+   relpp = (arelent **) xmalloc (relsize);
+   relcount = bfd_canonicalize_reloc (abfd, sec, relpp, info->asymbols);
+   if (relcount < 0)
+-    fatal (_("%P: %pB: could not read relocs: %E\n"), abfd);
++    fatal (_("%F%P: %pB: could not read relocs: %E\n"), abfd);
+ 
+   p = relpp;
+   pend = p + relcount;
+diff --git a/ld/ldmisc.c b/ld/ldmisc.c
+index d1257214..1d9d0cf2 100644
+--- a/ld/ldmisc.c
++++ b/ld/ldmisc.c
+@@ -324,7 +324,7 @@ vfinfo (FILE *fp, const char *fmt, va_list ap, bool is_warning)
+                if (abfd != NULL)
+                  {
+                    if (!bfd_generic_link_read_symbols (abfd))
+-                     fatal (_("%P: %pB: could not read symbols: %E\n"), abfd);
++                     fatal (_("%F%P: %pB: could not read symbols: %E\n"), abfd);
+ 
+                    asymbols = bfd_get_outsymbols (abfd);
+                  }
+@@ -638,7 +638,7 @@ fatal (const char *fmt, ...)
+ void
+ info_assert (const char *file, unsigned int line)
+ {
+-  fatal (_("%P: internal error %s %d\n"), file, line);
++  fatal (_("%F%P: internal error %s %d\n"), file, line);
+ }
+ 
+ /* ('m' for map) Format info message and print on map.  */
+@@ -707,5 +707,5 @@ ld_abort (const char *file, int line, const char *fn)
+   else
+     einfo (_("%P: internal error: aborting at %s:%d\n"),
+           file, line);
+-  fatal (_("%P: please report this bug\n"));
++  fatal (_("%F%P: please report this bug\n"));
+ }
+diff --git a/ld/ldwrite.c b/ld/ldwrite.c
+index ace5e564..216d3583 100644
+--- a/ld/ldwrite.c
++++ b/ld/ldwrite.c
+@@ -57,14 +57,14 @@ build_link_order (lang_statement_union_type *statement)
+ 
+        link_order = bfd_new_link_order (link_info.output_bfd, output_section);
+        if (link_order == NULL)
+-         fatal (_("%P: bfd_new_link_order failed: %E\n"));
++         fatal (_("%F%P: bfd_new_link_order failed: %E\n"));
+ 
+        link_order->type = bfd_data_link_order;
+        link_order->offset = statement->data_statement.output_offset;
+        link_order->u.data.contents = bfd_alloc (link_info.output_bfd,
+                                                 QUAD_SIZE);
+        if (link_order->u.data.contents == NULL)
+-         fatal (_("%P: bfd_new_link_order failed: %E\n"));
++         fatal (_("%F%P: bfd_new_link_order failed: %E\n"));
+ 
+        value = statement->data_statement.value;
+ 
+@@ -170,7 +170,7 @@ build_link_order (lang_statement_union_type *statement)
+ 
+        link_order = bfd_new_link_order (link_info.output_bfd, output_section);
+        if (link_order == NULL)
+-         fatal (_("%P: bfd_new_link_order failed: %E\n"));
++         fatal (_("%F%P: bfd_new_link_order failed: %E\n"));
+ 
+        link_order->offset = rs->output_offset;
+        link_order->size = bfd_get_reloc_size (rs->howto);
+@@ -178,7 +178,7 @@ build_link_order (lang_statement_union_type *statement)
+        link_order->u.reloc.p = (struct bfd_link_order_reloc *)
+          bfd_alloc (link_info.output_bfd, sizeof (struct bfd_link_order_reloc));
+        if (link_order->u.reloc.p == NULL)
+-         fatal (_("%P: bfd_new_link_order failed: %E\n"));
++         fatal (_("%F%P: bfd_new_link_order failed: %E\n"));
+ 
+        link_order->u.reloc.p->reloc = rs->reloc;
+        link_order->u.reloc.p->addend = rs->addend_value;
+@@ -224,7 +224,7 @@ build_link_order (lang_statement_union_type *statement)
+            link_order = bfd_new_link_order (link_info.output_bfd,
+                                             output_section);
+            if (link_order == NULL)
+-             fatal (_("%P: bfd_new_link_order failed: %E\n"));
++             fatal (_("%F%P: bfd_new_link_order failed: %E\n"));
+ 
+            if ((i->flags & SEC_NEVER_LOAD) != 0
+                && (i->flags & SEC_DEBUGGING) == 0)
+@@ -265,7 +265,7 @@ build_link_order (lang_statement_union_type *statement)
+        link_order = bfd_new_link_order (link_info.output_bfd,
+                                         output_section);
+        if (link_order == NULL)
+-         fatal (_("%P: bfd_new_link_order failed: %E\n"));
++         fatal (_("%F%P: bfd_new_link_order failed: %E\n"));
+        link_order->type = bfd_data_link_order;
+        link_order->size = statement->padding_statement.size;
+        link_order->offset = statement->padding_statement.output_offset;
+@@ -334,7 +334,7 @@ clone_section (bfd *abfd, asection *s, const char *name, int *count)
+       if (startswith (name, ".stab")
+          || strcmp (name, "$GDB_SYMBOLS$") == 0)
+        {
+-         fatal (_ ("%P: cannot create split section name for %s\n"), name);
++         fatal (_ ("%F%P: cannot create split section name for %s\n"), name);
+          return NULL;
+        }
+       tname[5] = 0;
+@@ -345,7 +345,7 @@ clone_section (bfd *abfd, asection *s, const char *name, int *count)
+       || (h = bfd_link_hash_lookup (link_info.hash,
+                                    sname, true, true, false)) == NULL)
+     {
+-      fatal (_("%P: clone section failed: %E\n"));
++      fatal (_("%F%P: clone section failed: %E\n"));
+       return NULL;
+     }
+   free (tname);
+@@ -552,7 +552,7 @@ ldwrite (void)
+         out.  */
+ 
+       if (bfd_get_error () != bfd_error_no_error)
+-       fatal (_("%P: final link failed: %E\n"));
++       fatal (_("%F%P: final link failed: %E\n"));
+       else
+        xexit (1);
+     }
+diff --git a/ld/lexsup.c b/ld/lexsup.c
+index 00346348..2b17499c 100644
+--- a/ld/lexsup.c
++++ b/ld/lexsup.c
+@@ -810,7 +810,7 @@ parse_args (unsigned argc, char **argv)
+               && optc != argv[last_optind][1])
+        {
+          if (optarg)
+-           fatal (_("%P: Error: unable to disambiguate: "
++           fatal (_("%F%P: Error: unable to disambiguate: "
+                     "%s (did you mean -%s ?)\n"),
+                   argv[last_optind], argv[last_optind]);
+          else
+@@ -851,7 +851,7 @@ parse_args (unsigned argc, char **argv)
+          /* Fall through.  */
+ 
+        default:
+-         fatal (_("%P: use the --help option for usage information\n"));
++         fatal (_("%F%P: use the --help option for usage information\n"));
+          break;
+ 
+        case 1:                 /* File name.  */
+@@ -870,7 +870,7 @@ parse_args (unsigned argc, char **argv)
+                   || strcmp (optarg, "default") == 0)
+            input_flags.dynamic = true;
+          else
+-           fatal (_("%P: unrecognized -a option `%s'\n"), optarg);
++           fatal (_("%F%P: unrecognized -a option `%s'\n"), optarg);
+          break;
+        case OPTION_ASSERT:
+          /* FIXME: We just ignore these, but we should handle them.  */
+@@ -883,7 +883,7 @@ parse_args (unsigned argc, char **argv)
+          else if (strcmp (optarg, "pure-text") == 0)
+            ;
+          else
+-           fatal (_("%P: unrecognized -assert option `%s'\n"), optarg);
++           fatal (_("%F%P: unrecognized -assert option `%s'\n"), optarg);
+          break;
+        case 'A':
+          ldfile_add_arch (optarg);
+@@ -927,7 +927,7 @@ parse_args (unsigned argc, char **argv)
+ 
+              style = cplus_demangle_name_to_style (optarg);
+              if (style == unknown_demangling)
+-               fatal (_("%P: unknown demangling style `%s'\n"), optarg);
++               fatal (_("%F%P: unknown demangling style `%s'\n"), optarg);
+ 
+              cplus_demangle_set_style (style);
+            }
+@@ -1034,7 +1034,7 @@ parse_args (unsigned argc, char **argv)
+            char *end;
+            g_switch_value = strtoul (optarg, &end, 0);
+            if (*end)
+-             fatal (_("%P: invalid number `%s'\n"), optarg);
++             fatal (_("%F%P: invalid number `%s'\n"), optarg);
+          }
+          break;
+        case 'g':
+@@ -1130,7 +1130,7 @@ parse_args (unsigned argc, char **argv)
+              link_info.unresolved_syms_in_shared_libs = RM_IGNORE;
+            }
+          else
+-           fatal (_("%P: bad --unresolved-symbols option: %s\n"), optarg);
++           fatal (_("%F%P: bad --unresolved-symbols option: %s\n"), optarg);
+          break;
+        case OPTION_WARN_UNRESOLVED_SYMBOLS:
+          link_info.warn_unresolved_syms = true;
+@@ -1217,7 +1217,7 @@ parse_args (unsigned argc, char **argv)
+          break;
+        case OPTION_PLUGIN_OPT:
+          if (plugin_opt_plugin_arg (optarg))
+-           fatal (_("%P: bad -plugin-opt option\n"));
++           fatal (_("%F%P: bad -plugin-opt option\n"));
+          break;
+ #endif /* BFD_SUPPORTS_PLUGINS */
+        case 'q':
+@@ -1234,10 +1234,10 @@ parse_args (unsigned argc, char **argv)
+               an error message here.  We cannot just make this a warning,
+               increment optind, and continue because getopt is too confused
+               and will seg-fault the next time around.  */
+-           fatal(_("%P: unrecognised option: %s\n"), argv[optind]);
++           fatal(_("%F%P: unrecognised option: %s\n"), argv[optind]);
+ 
+          if (bfd_link_pic (&link_info))
+-           fatal (_("%P: -r and %s may not be used together\n"),
++           fatal (_("%F%P: -r and %s may not be used together\n"),
+                   bfd_link_dll (&link_info) ? "-shared" : "-pie");
+ 
+          link_info.type = type_relocatable;
+@@ -1347,7 +1347,7 @@ parse_args (unsigned argc, char **argv)
+          if (config.has_shared)
+            {
+              if (bfd_link_relocatable (&link_info))
+-               fatal (_("%P: -r and %s may not be used together\n"),
++               fatal (_("%F%P: -r and %s may not be used together\n"),
+                       "-shared");
+ 
+              link_info.type = type_dll;
+@@ -1359,7 +1359,7 @@ parse_args (unsigned argc, char **argv)
+                link_info.unresolved_syms_in_shared_libs = RM_IGNORE;
+            }
+          else
+-           fatal (_("%P: -shared not supported\n"));
++           fatal (_("%F%P: -shared not supported\n"));
+          break;
+        case OPTION_NO_PIE:
+          link_info.type = type_pde;
+@@ -1368,12 +1368,12 @@ parse_args (unsigned argc, char **argv)
+          if (config.has_shared)
+            {
+              if (bfd_link_relocatable (&link_info))
+-               fatal (_("%P: -r and %s may not be used together\n"), "-pie");
++               fatal (_("%F%P: -r and %s may not be used together\n"), "-pie");
+ 
+              link_info.type = type_pie;
+            }
+          else
+-           fatal (_("%P: -pie not supported\n"));
++           fatal (_("%F%P: -pie not supported\n"));
+          break;
+        case 'h':               /* Used on Solaris.  */
+        case OPTION_SONAME:
+@@ -1390,7 +1390,7 @@ parse_args (unsigned argc, char **argv)
+          else if (strcmp (optarg, N_("ascending")) == 0)
+            config.sort_common = sort_ascending;
+          else
+-           fatal (_("%P: invalid common section sorting option: %s\n"),
++           fatal (_("%F%P: invalid common section sorting option: %s\n"),
+                   optarg);
+          break;
+        case OPTION_SORT_SECTION:
+@@ -1399,7 +1399,7 @@ parse_args (unsigned argc, char **argv)
+          else if (strcmp (optarg, N_("alignment")) == 0)
+            sort_section = by_alignment;
+          else
+-           fatal (_("%P: invalid section sorting option: %s\n"), optarg);
++           fatal (_("%F%P: invalid section sorting option: %s\n"), optarg);
+          break;
+        case OPTION_STATS:
+          config.stats = true;
+@@ -1435,14 +1435,14 @@ parse_args (unsigned argc, char **argv)
+            /* Check for <something>=<somthing>...  */
+            optarg2 = strchr (optarg, '=');
+            if (optarg2 == NULL)
+-             fatal (_("%P: invalid argument to option"
++             fatal (_("%F%P: invalid argument to option"
+                       " \"--section-start\"\n"));
+ 
+            optarg2++;
+ 
+            /* So far so good.  Are all the args present?  */
+            if ((*optarg == '\0') || (*optarg2 == '\0'))
+-             fatal (_("%P: missing argument(s) to option"
++             fatal (_("%F%P: missing argument(s) to option"
+                       " \"--section-start\"\n"));
+ 
+            /* We must copy the section name as set_section_start
+@@ -1486,7 +1486,7 @@ parse_args (unsigned argc, char **argv)
+          /* Fall through.  */
+        case OPTION_UR:
+          if (bfd_link_pic (&link_info))
+-           fatal (_("%P: -r and %s may not be used together\n"),
++           fatal (_("%F%P: -r and %s may not be used together\n"),
+                   bfd_link_dll (&link_info) ? "-shared" : "-pie");
+ 
+          link_info.type = type_relocatable;
+@@ -1517,7 +1517,7 @@ parse_args (unsigned argc, char **argv)
+              char *end;
+              int level ATTRIBUTE_UNUSED = strtoul (optarg, &end, 0);
+              if (*end)
+-               fatal (_("%P: invalid number `%s'\n"), optarg);
++               fatal (_("%F%P: invalid number `%s'\n"), optarg);
+ #if BFD_SUPPORTS_PLUGINS
+              report_plugin_symbols = level > 1;
+ #endif /* BFD_SUPPORTS_PLUGINS */
+@@ -1712,7 +1712,7 @@ parse_args (unsigned argc, char **argv)
+          break;
+        case ')':
+          if (! ingroup)
+-           fatal (_("%P: group ended before it began (--help for usage)\n"));
++           fatal (_("%F%P: group ended before it began (--help for usage)\n"));
+ 
+          lang_leave_group ();
+          ingroup--;
+@@ -1728,7 +1728,7 @@ parse_args (unsigned argc, char **argv)
+ 
+        case OPTION_REMAP_INPUTS_FILE:
+          if (! ldfile_add_remap_file (optarg))
+-           fatal (_("%P: failed to add remap file %s\n"), optarg);
++           fatal (_("%F%P: failed to add remap file %s\n"), optarg);
+          break;
+ 
+        case OPTION_REMAP_INPUTS:
+@@ -1737,7 +1737,7 @@ parse_args (unsigned argc, char **argv)
+            if (optarg2 == NULL)
+              /* FIXME: Should we allow --remap-inputs=@myfile as a synonym
+                 for --remap-inputs-file=myfile ?  */
+-             fatal (_("%P: invalid argument to option --remap-inputs\n"));
++             fatal (_("%F%P: invalid argument to option --remap-inputs\n"));
+            size_t len = optarg2 - optarg;
+            char * pattern = xmalloc (len + 1);
+            memcpy (pattern, optarg, len);
+@@ -1758,7 +1758,7 @@ parse_args (unsigned argc, char **argv)
+            char *end;
+            bfd_size_type cache_size = strtoul (optarg, &end, 0);
+            if (*end != '\0')
+-             fatal (_("%P: invalid cache memory size: %s\n"), optarg);
++             fatal (_("%F%P: invalid cache memory size: %s\n"), optarg);
+            link_info.max_cache_size = cache_size;
+          }
+          break;
+@@ -1783,7 +1783,7 @@ parse_args (unsigned argc, char **argv)
+ 
+        case OPTION_POP_STATE:
+          if (input_flags.pushed == NULL)
+-           fatal (_("%P: no state pushed before popping\n"));
++           fatal (_("%F%P: no state pushed before popping\n"));
+          else
+            {
+              struct lang_input_statement_flags *oldp = input_flags.pushed;
+@@ -1806,7 +1806,7 @@ parse_args (unsigned argc, char **argv)
+          else if (strcasecmp (optarg, "discard") == 0)
+            config.orphan_handling = orphan_handling_discard;
+          else
+-           fatal (_("%P: invalid argument to option"
++           fatal (_("%F%P: invalid argument to option"
+                     " \"--orphan-handling\"\n"));
+          break;
+ 
+@@ -1851,7 +1851,7 @@ parse_args (unsigned argc, char **argv)
+          else if (strcmp (optarg, "share-duplicated") == 0)
+            config.ctf_share_duplicated = true;
+          else
+-           fatal (_("%P: bad --ctf-share-types option: %s\n"), optarg);
++           fatal (_("%F%P: bad --ctf-share-types option: %s\n"), optarg);
+          break;
+        }
+     }
+@@ -2046,7 +2046,7 @@ parse_args (unsigned argc, char **argv)
+   if (config.no_section_header)
+     {
+       if (bfd_link_relocatable (&link_info))
+-       fatal (_("%P: -r and -z nosectionheader may not be used together\n"));
++       fatal (_("%F%P: -r and -z nosectionheader may not be used together\n"));
+ 
+       link_info.strip = strip_all;
+     }
+@@ -2054,9 +2054,9 @@ parse_args (unsigned argc, char **argv)
+   if (!bfd_link_dll (&link_info))
+     {
+       if (command_line.filter_shlib)
+-       fatal (_("%P: -F may not be used without -shared\n"));
++       fatal (_("%F%P: -F may not be used without -shared\n"));
+       if (command_line.auxiliary_filters)
+-       fatal (_("%P: -f may not be used without -shared\n"));
++       fatal (_("%F%P: -f may not be used without -shared\n"));
+     }
+ 
+   /* Treat ld -r -s as ld -r -S -x (i.e., strip all local symbols).  I
+@@ -2097,7 +2097,7 @@ set_section_start (char *sect, char *valstr)
+   const char *end;
+   bfd_vma val = bfd_scan_vma (valstr, &end, 16);
+   if (*end)
+-    fatal (_("%P: invalid hex number `%s'\n"), valstr);
++    fatal (_("%F%P: invalid hex number `%s'\n"), valstr);
+   lang_section_start (sect, exp_intop (val), NULL);
+ }
+ 
+@@ -2110,7 +2110,7 @@ set_segment_start (const char *section, char *valstr)
+ 
+   bfd_vma val = bfd_scan_vma (valstr, &end, 16);
+   if (*end)
+-    fatal (_("%P: invalid hex number `%s'\n"), valstr);
++    fatal (_("%F%P: invalid hex number `%s'\n"), valstr);
+   /* If we already have an entry for this segment, update the existing
+      value.  */
+   name = section + 1;
+diff --git a/ld/mri.c b/ld/mri.c
+index 7c8e59fa..aea2bd44 100644
+--- a/ld/mri.c
++++ b/ld/mri.c
+@@ -288,7 +288,7 @@ mri_format (const char *name)
+     lang_add_output_format ("srec", NULL, NULL, 1);
+ 
+   else
+-    fatal (_("%P: unknown format type %s\n"), name);
++    fatal (_("%F%P: unknown format type %s\n"), name);
+ }
+ 
+ void
+diff --git a/ld/pe-dll.c b/ld/pe-dll.c
+index 800d00c8..ae294986 100644
+--- a/ld/pe-dll.c
++++ b/ld/pe-dll.c
+@@ -756,7 +756,7 @@ process_def_file_and_drectve (bfd *abfd ATTRIBUTE_UNUSED, struct bfd_link_info *
+ 
+          if (!bfd_generic_link_read_symbols (b))
+            {
+-             fatal (_("%P: %pB: could not read symbols: %E\n"), b);
++             fatal (_("%F%P: %pB: could not read symbols: %E\n"), b);
+              return;
+            }
+ 
+@@ -1048,7 +1048,7 @@ build_filler_bfd (bool include_edata)
+                             bfd_get_arch (link_info.output_bfd),
+                             bfd_get_mach (link_info.output_bfd)))
+     {
+-      fatal (_("%P: can not create BFD: %E\n"));
++      fatal (_("%F%P: can not create BFD: %E\n"));
+       return;
+     }
+ 
+@@ -1326,7 +1326,7 @@ pe_walk_relocs (struct bfd_link_info *info,
+ 
+       if (!bfd_generic_link_read_symbols (b))
+        {
+-         fatal (_("%P: %pB: could not read symbols: %E\n"), b);
++         fatal (_("%F%P: %pB: could not read symbols: %E\n"), b);
+          return;
+        }
+ 
+@@ -1407,7 +1407,7 @@ pe_find_data_imports (const char *symhead,
+       if (!bfd_hash_table_init (import_hash,
+                                bfd_hash_newfunc,
+                                sizeof (struct bfd_hash_entry)))
+-       fatal (_("%P: bfd_hash_table_init failed: %E\n"));
++       fatal (_("%F%P: bfd_hash_table_init failed: %E\n"));
+     }
+   else
+     import_hash = NULL;
+@@ -1447,7 +1447,7 @@ pe_find_data_imports (const char *symhead,
+ 
+                if (!bfd_generic_link_read_symbols (b))
+                  {
+-                   fatal (_("%P: %pB: could not read symbols: %E\n"), b);
++                   fatal (_("%F%P: %pB: could not read symbols: %E\n"), b);
+                    return;
+                  }
+ 
+@@ -1549,7 +1549,7 @@ generate_reloc (bfd *abfd, struct bfd_link_info *info)
+ 
+       if (!bfd_generic_link_read_symbols (b))
+        {
+-         fatal (_("%P: %pB: could not read symbols: %E\n"), b);
++         fatal (_("%F%P: %pB: could not read symbols: %E\n"), b);
+          return;
+        }
+ 
+diff --git a/ld/plugin.c b/ld/plugin.c
+index 0a99d406..27f69b97 100644
+--- a/ld/plugin.c
++++ b/ld/plugin.c
+@@ -252,7 +252,7 @@ plugin_opt_plugin (const char *plugin)
+   newplug->name = plugin;
+   newplug->dlhandle = dlopen (plugin, RTLD_NOW);
+   if (!newplug->dlhandle)
+-    fatal (_("%P: %s: error loading plugin: %s\n"), plugin, dlerror ());
++    fatal (_("%F%P: %s: error loading plugin: %s\n"), plugin, dlerror ());
+ 
+   /* Check if plugin has been loaded already.  */
+   while (curplug)
+@@ -345,7 +345,7 @@ plugin_get_ir_dummy_bfd (const char *name, bfd *srctemplate)
+        }
+     }
+  report_error:
+-  fatal (_("%P: could not create dummy IR bfd: %E\n"));
++  fatal (_("%F%P: could not create dummy IR bfd: %E\n"));
+   return NULL;
+ }
+ 
+@@ -426,7 +426,7 @@ asymbol_from_plugin_symbol (bfd *abfd, asymbol *asym,
+       unsigned char visibility;
+ 
+       if (!elfsym)
+-       fatal (_("%P: %s: non-ELF symbol in ELF BFD!\n"), asym->name);
++       fatal (_("%F%P: %s: non-ELF symbol in ELF BFD!\n"), asym->name);
+ 
+       if (ldsym->def == LDPK_COMMON)
+        {
+@@ -437,7 +437,7 @@ asymbol_from_plugin_symbol (bfd *abfd, asymbol *asym,
+       switch (ldsym->visibility)
+        {
+        default:
+-         fatal (_("%P: unknown ELF symbol visibility: %d!\n"),
++         fatal (_("%F%P: unknown ELF symbol visibility: %d!\n"),
+                 ldsym->visibility);
+          return LDPS_ERR;
+ 
+@@ -555,7 +555,7 @@ get_view (const void *handle, const void **viewp)
+ 
+   /* FIXME: einfo should support %lld.  */
+   if ((off_t) size != input->filesize)
+-    fatal (_("%P: unsupported input file size: %s (%ld bytes)\n"),
++    fatal (_("%F%P: unsupported input file size: %s (%ld bytes)\n"),
+           input->name, (long) input->filesize);
+ 
+   /* Check the cached view buffer.  */
+@@ -826,7 +826,7 @@ get_symbols (const void *handle, int nsyms, struct ld_plugin_symbol *syms,
+          && blhe->type != bfd_link_hash_common)
+        {
+          /* We should not have a new, indirect or warning symbol here.  */
+-         fatal (_("%P: %s: plugin symbol table corrupt (sym type %d)\n"),
++         fatal (_("%F%P: %s: plugin symbol table corrupt (sym type %d)\n"),
+                 called_plugin->name, blhe->type);
+        }
+ 
+@@ -978,14 +978,13 @@ message (int level, const char *format, ...)
+     case LDPL_ERROR:
+     default:
+       {
+-       char *newfmt = concat (_("%X%P: error: "), format, "\n",
++       char *newfmt = concat (level == LDPL_FATAL ? "%F" : "%X",
++                              _("%P: error: "), format, "\n",
+                               (const char *) NULL);
+        fflush (stdout);
+        vfinfo (stderr, newfmt, args, true);
+        fflush (stderr);
+        free (newfmt);
+-       if (level == LDPL_FATAL)
+-         fatal ("");
+       }
+       break;
+     }
+@@ -1128,14 +1127,14 @@ plugin_load_plugins (void)
+       if (!onloadfn)
+        onloadfn = (ld_plugin_onload) dlsym (curplug->dlhandle, "_onload");
+       if (!onloadfn)
+-       fatal (_("%P: %s: error loading plugin: %s\n"),
++       fatal (_("%F%P: %s: error loading plugin: %s\n"),
+               curplug->name, dlerror ());
+       set_tv_plugin_args (curplug, &my_tv[tv_header_size]);
+       called_plugin = curplug;
+       rv = (*onloadfn) (my_tv);
+       called_plugin = NULL;
+       if (rv != LDPS_OK)
+-       fatal (_("%P: %s: plugin error: %d\n"), curplug->name, rv);
++       fatal (_("%F%P: %s: plugin error: %d\n"), curplug->name, rv);
+       curplug = curplug->next;
+     }
+ 
+@@ -1194,7 +1193,7 @@ plugin_strdup (bfd *abfd, const char *str)
+   strlength = strlen (str) + 1;
+   copy = bfd_alloc (abfd, strlength);
+   if (copy == NULL)
+-    fatal (_("%P: plugin_strdup failed to allocate memory: %s\n"),
++    fatal (_("%F%P: plugin_strdup failed to allocate memory: %s\n"),
+           bfd_get_error ());
+   memcpy (copy, str, strlength);
+   return copy;
+@@ -1231,7 +1230,7 @@ plugin_object_p (bfd *ibfd, bool known_used)
+ 
+   input = bfd_alloc (abfd, sizeof (*input));
+   if (input == NULL)
+-    fatal (_("%P: plugin failed to allocate memory for input: %s\n"),
++    fatal (_("%F%P: plugin failed to allocate memory for input: %s\n"),
+           bfd_get_error ());
+ 
+   if (!bfd_plugin_open_input (ibfd, &file))
+@@ -1259,7 +1258,7 @@ plugin_object_p (bfd *ibfd, bool known_used)
+   claimed = 0;
+ 
+   if (plugin_call_claim_file (&file, &claimed, known_used))
+-    fatal (_("%P: %s: plugin reported error claiming file\n"),
++    fatal (_("%F%P: %s: plugin reported error claiming file\n"),
+           plugin_error_plugin ());
+ 
+   if (input->fd != -1
+-- 
+2.43.0
+
diff --git a/meta/recipes-devtools/binutils/binutils/0022-CVE-2025-5244.patch b/meta/recipes-devtools/binutils/binutils/0022-CVE-2025-5244.patch
new file mode 100644
index 0000000000..e8855a4b4b
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0022-CVE-2025-5244.patch
@@ -0,0 +1,25 @@
+From: Alan Modra <amodra@gmail.com>
+Date: Thu, 10 Apr 2025 19:41:49 +0930
+
+Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=d1458933830456e54223d9fc61f0d9b3a19256f5]
+CVE: CVE-2025-5244
+
+PR32858 ld segfault on fuzzed object
+We missed one place where it is necessary to check for empty groups.
+
+Signed-off-by: Deepesh Varatharajan <Deepesh.Varatharajan@windriver.com>
+
+diff --git a/bfd/elflink.c b/bfd/elflink.c
+index a76e8e38da7..549b7b7dd92 100644
+--- a/bfd/elflink.c
++++ b/bfd/elflink.c
+@@ -14408,7 +14408,8 @@ elf_gc_sweep (bfd *abfd, struct bfd_link_info *info)
+          if (o->flags & SEC_GROUP)
+            {
+              asection *first = elf_next_in_group (o);
+-             o->gc_mark = first->gc_mark;
++             if (first != NULL)
++               o->gc_mark = first->gc_mark;
+            }
+ 
+          if (o->gc_mark)
diff --git a/meta/recipes-devtools/binutils/binutils/0022-CVE-2025-5245.patch b/meta/recipes-devtools/binutils/binutils/0022-CVE-2025-5245.patch
new file mode 100644
index 0000000000..d4b7d55966
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0022-CVE-2025-5245.patch
@@ -0,0 +1,38 @@
+From: Alan Modra <amodra@gmail.com>
+Date: Tue, 1 Apr 2025 22:36:54 +1030
+
+PR32829, SEGV on objdump function debug_type_samep
+u.kenum is always non-NULL, see debug_make_enum_type.
+
+Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=6c3458a8b7ee7d39f070c7b2350851cb2110c65a]
+CVE: CVE-2025-5245
+
+Signed-off-by: Deepesh Varatharajan <Deepesh.Varatharajan@windriver.com>
+
+diff --git a/binutils/debug.c b/binutils/debug.c
+index dcc8ccde..465b18e7 100644
+--- a/binutils/debug.c
++++ b/binutils/debug.c
+@@ -2554,9 +2554,6 @@ debug_write_type (struct debug_handle *info,
+     case DEBUG_KIND_UNION_CLASS:
+       return debug_write_class_type (info, fns, fhandle, type, tag);
+     case DEBUG_KIND_ENUM:
+-      if (type->u.kenum == NULL)
+-       return (*fns->enum_type) (fhandle, tag, (const char **) NULL,
+-                                 (bfd_signed_vma *) NULL);
+       return (*fns->enum_type) (fhandle, tag, type->u.kenum->names,
+                                type->u.kenum->values);
+     case DEBUG_KIND_POINTER:
+@@ -3097,9 +3094,9 @@ debug_type_samep (struct debug_handle *info, struct debug_type_s *t1,
+       break;
+ 
+     case DEBUG_KIND_ENUM:
+-      if (t1->u.kenum == NULL)
+-       ret = t2->u.kenum == NULL;
+-      else if (t2->u.kenum == NULL)
++      if (t1->u.kenum->names == NULL)
++       ret = t2->u.kenum->names == NULL;
++      else if (t2->u.kenum->names == NULL)
+        ret = false;
+       else
+        {
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2025-1179-pre.patch b/meta/recipes-devtools/binutils/binutils/CVE-2025-1179-pre.patch
new file mode 100644
index 0000000000..b5bf27ec6d
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/CVE-2025-1179-pre.patch
@@ -0,0 +1,1086 @@
+From 1d68a49ac5d71b648304f69af978fce0f4413800 Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Tue, 23 Jul 2024 23:39:50 -0700
+Subject: [PATCH 1/2] x86: Improve TLS transition error check
+
+Provide detailed TLS transition errors when unsupported instructions are
+used.  Treat R_X86_64_CODE_4_GOTTPOFF and R_X86_64_CODE_6_GOTTPOFF as
+R_X86_64_GOTTPOFF when performing TLS transition.
+
+bfd/
+
+        PR ld/32017
+        * elf32-i386.c (elf_i386_check_tls_transition): Return different
+        enums for different errors.
+        (elf_i386_tls_transition): Change argument from r_symndx to sym.
+        Call _bfd_x86_elf_link_report_tls_transition_error to report TLS
+        transition errors.
+        (elf_i386_scan_relocs): Pass isym instead of r_symndx to
+        elf_i386_tls_transition.
+        (elf_i386_relocate_section): Pass sym instead of r_symndx to
+        elf_i386_tls_transition.
+        * elf64-x86-64.c (elf_x86_64_check_tls_transition): Return
+        different enums for different errors.
+        (elf_x86_64_tls_transition): Change argument from r_symndx to sym.
+        Treat R_X86_64_CODE_4_GOTTPOFF and R_X86_64_CODE_6_GOTTPOFF as
+        R_X86_64_GOTTPOFF.  Call
+        _bfd_x86_elf_link_report_tls_transition_error to report TLS
+        transition errors.
+        (elf_x86_64_scan_relocs): Pass isym instead of r_symndx to
+        elf_x86_64_tls_transition.
+        (elf_x86_64_relocate_section): Pass sym instead of r_symndx to
+        elf_x86_64_tls_transition.
+        * elfxx-x86.c (_bfd_x86_elf_link_report_tls_transition_error): New.
+        * elfxx-x86.h (elf_x86_tls_error_type): Likewise.
+        (_bfd_x86_elf_link_report_tls_transition_error): Likewise.
+
+ld/
+
+        PR ld/32017
+        * testsuite/ld-i386/i386.exp: Run tlsgdesc1 and tlsgdesc2.
+        * testsuite/ld-i386/tlsie2.d: Updated.
+        * testsuite/ld-i386/tlsie3.d: Likewise.
+        * testsuite/ld-i386/tlsie4.d: Likewise.
+        * testsuite/ld-i386/tlsie5.d: Likewise.
+        * testsuite/ld-x86-64/tlsie2.d: Likewise.
+        * testsuite/ld-x86-64/tlsie3.d: Likewise.
+        * testsuite/ld-i386/tlsgdesc1.d: New file.
+        * testsuite/ld-i386/tlsgdesc1.s: Likewise.
+        * testsuite/ld-i386/tlsgdesc2.d: Likewise.
+        * testsuite/ld-i386/tlsgdesc2.s: Likewise.
+        * testsuite/ld-x86-64/tlsdesc3.d: Likewise.
+        * testsuite/ld-x86-64/tlsdesc3.s: Likewise.
+        * testsuite/ld-x86-64/tlsdesc4.d: Likewise.
+        * testsuite/ld-x86-64/tlsdesc4.s: Likewise.
+        * testsuite/ld-x86-64/tlsie5.d: Likewise.
+        * testsuite/ld-x86-64/tlsie5.s: Likewise.
+        * testsuite/ld-x86-64/x86-64.exp: Run tlsie5, tlsdesc3 and
+        tlsdesc4.
+
+(cherry picked from commit:1d68a49ac5d71b648304f69af978fce0f4413800)
+Upstream-Status: Submitted [https://sourceware.org/pipermail/binutils/2025-May/141322.html]
+CVE: CVE-2025-1179
+
+Signed-off-by: Harish Sadineni <Harish.Sadineni@windriver.com>
+---
+ bfd/elf32-i386.c                  | 118 +++++++++++++-------------
+ bfd/elf64-x86-64.c                | 133 ++++++++++++++++--------------
+ bfd/elfxx-x86.c                   |  85 +++++++++++++++++++
+ bfd/elfxx-x86.h                   |  18 ++++
+ ld/testsuite/ld-i386/i386.exp     |   2 +
+ ld/testsuite/ld-i386/tlsgdesc1.d  |   4 +
+ ld/testsuite/ld-i386/tlsgdesc1.s  |  11 +++
+ ld/testsuite/ld-i386/tlsgdesc2.d  |   4 +
+ ld/testsuite/ld-i386/tlsgdesc2.s  |  11 +++
+ ld/testsuite/ld-i386/tlsie2.d     |   2 +-
+ ld/testsuite/ld-i386/tlsie3.d     |   2 +-
+ ld/testsuite/ld-i386/tlsie4.d     |   2 +-
+ ld/testsuite/ld-i386/tlsie5.d     |   2 +-
+ ld/testsuite/ld-x86-64/tlsdesc3.d |   4 +
+ ld/testsuite/ld-x86-64/tlsdesc3.s |  13 +++
+ ld/testsuite/ld-x86-64/tlsdesc4.d |   4 +
+ ld/testsuite/ld-x86-64/tlsdesc4.s |  13 +++
+ ld/testsuite/ld-x86-64/tlsie2.d   |   2 +-
+ ld/testsuite/ld-x86-64/tlsie3.d   |   2 +-
+ ld/testsuite/ld-x86-64/tlsie5.d   |   4 +
+ ld/testsuite/ld-x86-64/tlsie5.s   |  12 +++
+ ld/testsuite/ld-x86-64/x86-64.exp |   3 +
+ 22 files changed, 319 insertions(+), 132 deletions(-)
+ create mode 100644 ld/testsuite/ld-i386/tlsgdesc1.d
+ create mode 100644 ld/testsuite/ld-i386/tlsgdesc1.s
+ create mode 100644 ld/testsuite/ld-i386/tlsgdesc2.d
+ create mode 100644 ld/testsuite/ld-i386/tlsgdesc2.s
+ create mode 100644 ld/testsuite/ld-x86-64/tlsdesc3.d
+ create mode 100644 ld/testsuite/ld-x86-64/tlsdesc3.s
+ create mode 100644 ld/testsuite/ld-x86-64/tlsdesc4.d
+ create mode 100644 ld/testsuite/ld-x86-64/tlsdesc4.s
+ create mode 100644 ld/testsuite/ld-x86-64/tlsie5.d
+ create mode 100644 ld/testsuite/ld-x86-64/tlsie5.s
+
+diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
+index e2f88a11487..18a28d2491c 100644
+--- a/bfd/elf32-i386.c
++++ b/bfd/elf32-i386.c
+@@ -839,7 +839,7 @@ static const struct elf_x86_non_lazy_plt_layout elf_i386_non_lazy_ibt_plt =
+ /* Return TRUE if the TLS access code sequence support transition
+    from R_TYPE.  */
+ 
+-static bool
++static enum elf_x86_tls_error_type
+ elf_i386_check_tls_transition (asection *sec,
+                               bfd_byte *contents,
+                               Elf_Internal_Shdr *symtab_hdr,
+@@ -861,7 +861,7 @@ elf_i386_check_tls_transition (asection *sec,
+     case R_386_TLS_GD:
+     case R_386_TLS_LDM:
+       if (offset < 2 || (rel + 1) >= relend)
+-       return false;
++       return elf_x86_tls_error_yes;
+ 
+       indirect_call = false;
+       call = contents + offset + 4;
+@@ -884,19 +884,19 @@ elf_i386_check_tls_transition (asection *sec,
+             can transit to different access model.  */
+          if ((offset + 10) > sec->size
+              || (type != 0x8d && type != 0x04))
+-           return false;
++           return elf_x86_tls_error_yes;
+ 
+          if (type == 0x04)
+            {
+              /* leal foo@tlsgd(,%ebx,1), %eax
+                 call ___tls_get_addr@PLT  */
+              if (offset < 3)
+-               return false;
++               return elf_x86_tls_error_yes;
+ 
+              if (*(call - 7) != 0x8d
+                  || val != 0x1d
+                  || call[0] != 0xe8)
+-               return false;
++               return elf_x86_tls_error_yes;
+            }
+          else
+            {
+@@ -914,7 +914,7 @@ elf_i386_check_tls_transition (asection *sec,
+                 is used to pass parameter to ___tls_get_addr.  */
+              reg = val & 7;
+              if ((val & 0xf8) != 0x80 || reg == 4 || reg == 0)
+-               return false;
++               return elf_x86_tls_error_yes;
+ 
+              indirect_call = call[0] == 0xff;
+              if (!(reg == 3 && call[0] == 0xe8 && call[5] == 0x90)
+@@ -922,7 +922,7 @@ elf_i386_check_tls_transition (asection *sec,
+                  && !(indirect_call
+                       && (call[1] & 0xf8) == 0x90
+                       && (call[1] & 0x7) == reg))
+-               return false;
++               return elf_x86_tls_error_yes;
+            }
+        }
+       else
+@@ -937,13 +937,13 @@ elf_i386_check_tls_transition (asection *sec,
+                addr32 call ___tls_get_addr
+             can transit to different access model.  */
+          if (type != 0x8d || (offset + 9) > sec->size)
+-           return false;
++           return elf_x86_tls_error_yes;
+ 
+          /* %eax can't be used as the GOT base register since it is
+             used to pass parameter to ___tls_get_addr.  */
+          reg = val & 7;
+          if ((val & 0xf8) != 0x80 || reg == 4 || reg == 0)
+-           return false;
++           return elf_x86_tls_error_yes;
+ 
+          indirect_call = call[0] == 0xff;
+          if (!(reg == 3 && call[0] == 0xe8)
+@@ -951,23 +951,27 @@ elf_i386_check_tls_transition (asection *sec,
+              && !(indirect_call
+                   && (call[1] & 0xf8) == 0x90
+                   && (call[1] & 0x7) == reg))
+-           return false;
++           return elf_x86_tls_error_yes;
+        }
+ 
+       r_symndx = ELF32_R_SYM (rel[1].r_info);
+       if (r_symndx < symtab_hdr->sh_info)
+-       return false;
++       return elf_x86_tls_error_yes;
+ 
+       h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+       if (h == NULL
+          || !((struct elf_x86_link_hash_entry *) h)->tls_get_addr)
+-       return false;
++       return elf_x86_tls_error_yes;
+       else if (indirect_call)
+-       return (ELF32_R_TYPE (rel[1].r_info) == R_386_GOT32X
+-               || ELF32_R_TYPE (rel[1].r_info) == R_386_GOT32);
++       return ((ELF32_R_TYPE (rel[1].r_info) == R_386_GOT32X
++                || ELF32_R_TYPE (rel[1].r_info) == R_386_GOT32)
++               ? elf_x86_tls_error_none
++               : elf_x86_tls_error_yes);
+       else
+-       return (ELF32_R_TYPE (rel[1].r_info) == R_386_PC32
+-               || ELF32_R_TYPE (rel[1].r_info) == R_386_PLT32);
++       return ((ELF32_R_TYPE (rel[1].r_info) == R_386_PC32
++               || ELF32_R_TYPE (rel[1].r_info) == R_386_PLT32)
++               ? elf_x86_tls_error_none
++               : elf_x86_tls_error_yes);
+ 
+     case R_386_TLS_IE:
+       /* Check transition from IE access model:
+@@ -977,20 +981,23 @@ elf_i386_check_tls_transition (asection *sec,
+        */
+ 
+       if (offset < 1 || (offset + 4) > sec->size)
+-       return false;
++       return elf_x86_tls_error_yes;
+ 
+       /* Check "movl foo@tpoff(%rip), %eax" first.  */
+       val = bfd_get_8 (abfd, contents + offset - 1);
+       if (val == 0xa1)
+-       return true;
++       return elf_x86_tls_error_none;
+ 
+       if (offset < 2)
+-       return false;
++       return elf_x86_tls_error_yes;
+ 
+       /* Check movl|addl foo@tpoff(%rip), %reg.   */
+       type = bfd_get_8 (abfd, contents + offset - 2);
+-      return ((type == 0x8b || type == 0x03)
+-             && (val & 0xc7) == 0x05);
++      if (type != 0x8b && type != 0x03)
++       return elf_x86_tls_error_add_mov;
++      return ((val & 0xc7) == 0x05
++             ? elf_x86_tls_error_none
++             : elf_x86_tls_error_yes);
+ 
+     case R_386_TLS_GOTIE:
+     case R_386_TLS_IE_32:
+@@ -1001,14 +1008,16 @@ elf_i386_check_tls_transition (asection *sec,
+        */
+ 
+       if (offset < 2 || (offset + 4) > sec->size)
+-       return false;
++       return elf_x86_tls_error_yes;
+ 
+       val = bfd_get_8 (abfd, contents + offset - 1);
+       if ((val & 0xc0) != 0x80 || (val & 7) == 4)
+-       return false;
++       return elf_x86_tls_error_yes;
+ 
+       type = bfd_get_8 (abfd, contents + offset - 2);
+-      return type == 0x8b || type == 0x2b || type == 0x03;
++      return (type == 0x8b || type == 0x2b || type == 0x03
++             ? elf_x86_tls_error_none
++             : elf_x86_tls_error_add_sub_mov);
+ 
+     case R_386_TLS_GOTDESC:
+       /* Check transition from GDesc access model:
+@@ -1019,13 +1028,15 @@ elf_i386_check_tls_transition (asection *sec,
+         going to be eax.  */
+ 
+       if (offset < 2 || (offset + 4) > sec->size)
+-       return false;
++       return elf_x86_tls_error_yes;
+ 
+       if (bfd_get_8 (abfd, contents + offset - 2) != 0x8d)
+-       return false;
++       return elf_x86_tls_error_lea;
+ 
+       val = bfd_get_8 (abfd, contents + offset - 1);
+-      return (val & 0xc7) == 0x83;
++      return ((val & 0xc7) == 0x83
++             ? elf_x86_tls_error_none
++             : elf_x86_tls_error_yes);
+ 
+     case R_386_TLS_DESC_CALL:
+       /* Check transition from GDesc access model:
+@@ -1035,10 +1046,12 @@ elf_i386_check_tls_transition (asection *sec,
+        {
+          /* Make sure that it's a call *x@tlsdesc(%eax).  */
+          call = contents + offset;
+-         return call[0] == 0xff && call[1] == 0x10;
++         return (call[0] == 0xff && call[1] == 0x10
++                 ? elf_x86_tls_error_none
++                 : elf_x86_tls_error_indirect_call);
+        }
+ 
+-      return false;
++      return elf_x86_tls_error_yes;
+ 
+     default:
+       abort ();
+@@ -1057,7 +1070,7 @@ elf_i386_tls_transition (struct bfd_link_info *info, bfd *abfd,
+                         const Elf_Internal_Rela *rel,
+                         const Elf_Internal_Rela *relend,
+                         struct elf_link_hash_entry *h,
+-                        unsigned long r_symndx,
++                        Elf_Internal_Sym *sym,
+                         bool from_relocate_section)
+ {
+   unsigned int from_type = *r_type;
+@@ -1142,43 +1155,24 @@ elf_i386_tls_transition (struct bfd_link_info *info, bfd *abfd,
+     return true;
+ 
+   /* Check if the transition can be performed.  */
++  enum elf_x86_tls_error_type tls_error;
+   if (check
+-      && ! elf_i386_check_tls_transition (sec, contents,
+-                                         symtab_hdr, sym_hashes,
+-                                         from_type, rel, relend))
++      && ((tls_error = elf_i386_check_tls_transition (sec, contents,
++                                                     symtab_hdr,
++                                                     sym_hashes,
++                                                     from_type, rel,
++                                                     relend))
++         != elf_x86_tls_error_none))
+     {
+       reloc_howto_type *from, *to;
+-      const char *name;
+ 
+       from = elf_i386_rtype_to_howto (from_type);
+       to = elf_i386_rtype_to_howto (to_type);
+ 
+-      if (h)
+-       name = h->root.root.string;
+-      else
+-       {
+-         struct elf_x86_link_hash_table *htab;
+-
+-         htab = elf_x86_hash_table (info, I386_ELF_DATA);
+-         if (htab == NULL)
+-           name = "*unknown*";
+-         else
+-           {
+-             Elf_Internal_Sym *isym;
+-
+-             isym = bfd_sym_from_r_symndx (&htab->elf.sym_cache,
+-                                           abfd, r_symndx);
+-             name = bfd_elf_sym_name (abfd, symtab_hdr, isym, NULL);
+-           }
+-       }
++      _bfd_x86_elf_link_report_tls_transition_error
++       (info, abfd, sec, symtab_hdr, h, sym, rel, from->name,
++        to->name, tls_error);
+ 
+-      _bfd_error_handler
+-       /* xgettext:c-format */
+-       (_("%pB: TLS transition from %s to %s against `%s'"
+-          " at %#" PRIx64 " in section `%pA' failed"),
+-        abfd, from->name, to->name, name,
+-        (uint64_t) rel->r_offset, sec);
+-      bfd_set_error (bfd_error_bad_value);
+       return false;
+     }
+ 
+@@ -1600,7 +1594,7 @@ elf_i386_scan_relocs (bfd *abfd,
+       if (! elf_i386_tls_transition (info, abfd, sec, contents,
+                                     symtab_hdr, sym_hashes,
+                                     &r_type, GOT_UNKNOWN,
+-                                    rel, rel_end, h, r_symndx, false))
++                                    rel, rel_end, h, isym, false))
+        goto error_return;
+ 
+       /* Check if _GLOBAL_OFFSET_TABLE_ is referenced.  */
+@@ -2875,7 +2869,7 @@ elf_i386_relocate_section (bfd *output_bfd,
+                                         input_section, contents,
+                                         symtab_hdr, sym_hashes,
+                                         &r_type_tls, tls_type, rel,
+-                                        relend, h, r_symndx, true))
++                                        relend, h, sym, true))
+            return false;
+ 
+          expected_tls_le = htab->elf.target_os == is_solaris
+@@ -3365,7 +3359,7 @@ elf_i386_relocate_section (bfd *output_bfd,
+                                         input_section, contents,
+                                         symtab_hdr, sym_hashes,
+                                         &r_type, GOT_UNKNOWN, rel,
+-                                        relend, h, r_symndx, true))
++                                        relend, h, sym, true))
+            return false;
+ 
+          if (r_type != R_386_TLS_LDM)
+diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
+index 2ed120af780..f116e423f61 100644
+--- a/bfd/elf64-x86-64.c
++++ b/bfd/elf64-x86-64.c
+@@ -1120,7 +1120,7 @@ elf32_x86_64_elf_object_p (bfd *abfd)
+ /* Return TRUE if the TLS access code sequence support transition
+    from R_TYPE.  */
+ 
+-static bool
++static enum elf_x86_tls_error_type
+ elf_x86_64_check_tls_transition (bfd *abfd,
+                                 struct bfd_link_info *info,
+                                 asection *sec,
+@@ -1147,7 +1147,7 @@ elf_x86_64_check_tls_transition (bfd *abfd,
+     case R_X86_64_TLSGD:
+     case R_X86_64_TLSLD:
+       if ((rel + 1) >= relend)
+-       return false;
++       return elf_x86_tls_error_yes;
+ 
+       if (r_type == R_X86_64_TLSGD)
+        {
+@@ -1184,7 +1184,7 @@ elf_x86_64_check_tls_transition (bfd *abfd,
+          static const unsigned char leaq[] = { 0x66, 0x48, 0x8d, 0x3d };
+ 
+          if ((offset + 12) > sec->size)
+-           return false;
++           return elf_x86_tls_error_yes;
+ 
+          call = contents + offset + 4;
+          if (call[0] != 0x66
+@@ -1208,20 +1208,20 @@ elf_x86_64_check_tls_transition (bfd *abfd,
+                  || call[14] != 0xd0
+                  || !((call[10] == 0x48 && call[12] == 0xd8)
+                       || (call[10] == 0x4c && call[12] == 0xf8)))
+-               return false;
++               return elf_x86_tls_error_yes;
+              largepic = true;
+            }
+          else if (ABI_64_P (abfd))
+            {
+              if (offset < 4
+                  || memcmp (contents + offset - 4, leaq, 4) != 0)
+-               return false;
++               return elf_x86_tls_error_yes;
+            }
+          else
+            {
+              if (offset < 3
+                  || memcmp (contents + offset - 3, leaq + 1, 3) != 0)
+-               return false;
++               return elf_x86_tls_error_yes;
+            }
+          indirect_call = call[2] == 0xff;
+        }
+@@ -1250,10 +1250,10 @@ elf_x86_64_check_tls_transition (bfd *abfd,
+          static const unsigned char lea[] = { 0x48, 0x8d, 0x3d };
+ 
+          if (offset < 3 || (offset + 9) > sec->size)
+-           return false;
++           return elf_x86_tls_error_yes;
+ 
+          if (memcmp (contents + offset - 3, lea, 3) != 0)
+-           return false;
++           return elf_x86_tls_error_yes;
+ 
+          call = contents + offset + 4;
+          if (!(call[0] == 0xe8
+@@ -1268,7 +1268,7 @@ elf_x86_64_check_tls_transition (bfd *abfd,
+                  || call[14] != 0xd0
+                  || !((call[10] == 0x48 && call[12] == 0xd8)
+                       || (call[10] == 0x4c && call[12] == 0xf8)))
+-               return false;
++               return elf_x86_tls_error_yes;
+              largepic = true;
+            }
+          indirect_call = call[0] == 0xff;
+@@ -1276,22 +1276,30 @@ elf_x86_64_check_tls_transition (bfd *abfd,
+ 
+       r_symndx = htab->r_sym (rel[1].r_info);
+       if (r_symndx < symtab_hdr->sh_info)
+-       return false;
++       return elf_x86_tls_error_yes;
+ 
+       h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+       if (h == NULL
+          || !((struct elf_x86_link_hash_entry *) h)->tls_get_addr)
+-       return false;
++       return elf_x86_tls_error_yes;
+       else
+        {
+          r_type = (ELF32_R_TYPE (rel[1].r_info)
+                    & ~R_X86_64_converted_reloc_bit);
+          if (largepic)
+-           return r_type == R_X86_64_PLTOFF64;
++           return (r_type == R_X86_64_PLTOFF64
++                   ? elf_x86_tls_error_none
++                   : elf_x86_tls_error_yes);
+          else if (indirect_call)
+-           return (r_type == R_X86_64_GOTPCRELX || r_type == R_X86_64_GOTPCREL);
++           return ((r_type == R_X86_64_GOTPCRELX
++                    || r_type == R_X86_64_GOTPCREL)
++                   ? elf_x86_tls_error_none
++                   : elf_x86_tls_error_yes);
+          else
+-           return (r_type == R_X86_64_PC32 || r_type == R_X86_64_PLT32);
++           return ((r_type == R_X86_64_PC32
++                    || r_type == R_X86_64_PLT32)
++                   ? elf_x86_tls_error_none
++                   : elf_x86_tls_error_yes);
+        }
+ 
+     case R_X86_64_CODE_4_GOTTPOFF:
+@@ -1303,7 +1311,7 @@ elf_x86_64_check_tls_transition (bfd *abfd,
+       if (offset < 4
+          || (offset + 4) > sec->size
+          || contents[offset - 4] != 0xd5)
+-       return false;
++       return elf_x86_tls_error_yes;
+ 
+       goto check_gottpoff;
+ 
+@@ -1315,14 +1323,16 @@ elf_x86_64_check_tls_transition (bfd *abfd,
+       if (offset < 6
+          || (offset + 4) > sec->size
+          || contents[offset - 6] != 0x62)
+-       return false;
++       return elf_x86_tls_error_yes;
+ 
+       val = bfd_get_8 (abfd, contents + offset - 2);
+       if (val != 0x01 && val != 0x03)
+-       return false;
++       return elf_x86_tls_error_add;
+ 
+       val = bfd_get_8 (abfd, contents + offset - 1);
+-      return (val & 0xc7) == 5;
++      return ((val & 0xc7) == 5
++             ? elf_x86_tls_error_none
++             : elf_x86_tls_error_yes);
+ 
+     case R_X86_64_GOTTPOFF:
+       /* Check transition from IE access model:
+@@ -1338,25 +1348,27 @@ elf_x86_64_check_tls_transition (bfd *abfd,
+            {
+              /* X32 may have 0x44 REX prefix or no REX prefix.  */
+              if (ABI_64_P (abfd))
+-               return false;
++               return elf_x86_tls_error_yes;
+            }
+        }
+       else
+        {
+          /* X32 may not have any REX prefix.  */
+          if (ABI_64_P (abfd))
+-           return false;
++           return elf_x86_tls_error_yes;
+          if (offset < 2 || (offset + 3) > sec->size)
+-           return false;
++           return elf_x86_tls_error_yes;
+        }
+ 
+  check_gottpoff:
+       val = bfd_get_8 (abfd, contents + offset - 2);
+       if (val != 0x8b && val != 0x03)
+-       return false;
++       return elf_x86_tls_error_add_mov;
+ 
+       val = bfd_get_8 (abfd, contents + offset - 1);
+-      return (val & 0xc7) == 5;
++      return ((val & 0xc7) == 5
++             ? elf_x86_tls_error_none
++             : elf_x86_tls_error_yes);
+ 
+     case R_X86_64_CODE_4_GOTPC32_TLSDESC:
+       /* Check transition from GDesc access model:
+@@ -1366,7 +1378,7 @@ elf_x86_64_check_tls_transition (bfd *abfd,
+       if (offset < 4
+          || (offset + 4) > sec->size
+          || contents[offset - 4] != 0xd5)
+-       return false;
++       return elf_x86_tls_error_yes;
+ 
+       goto check_tlsdesc;
+ 
+@@ -1380,19 +1392,21 @@ elf_x86_64_check_tls_transition (bfd *abfd,
+         going to be rax.  */
+ 
+       if (offset < 3 || (offset + 4) > sec->size)
+-       return false;
++       return elf_x86_tls_error_yes;
+ 
+       val = bfd_get_8 (abfd, contents + offset - 3);
+       val &= 0xfb;
+       if (val != 0x48 && (ABI_64_P (abfd) || val != 0x40))
+-       return false;
++       return elf_x86_tls_error_yes;
+ 
+  check_tlsdesc:
+       if (bfd_get_8 (abfd, contents + offset - 2) != 0x8d)
+-       return false;
++       return elf_x86_tls_error_lea;
+ 
+       val = bfd_get_8 (abfd, contents + offset - 1);
+-      return (val & 0xc7) == 0x05;
++      return ((val & 0xc7) == 0x05
++             ? elf_x86_tls_error_none
++             : elf_x86_tls_error_yes);
+ 
+     case R_X86_64_TLSDESC_CALL:
+       /* Check transition from GDesc access model:
+@@ -1411,14 +1425,16 @@ elf_x86_64_check_tls_transition (bfd *abfd,
+                {
+                  prefix = 1;
+                  if (offset + 3 > sec->size)
+-                   return false;
++                   return elf_x86_tls_error_yes;
+                }
+            }
+          /* Make sure that it's a call *x@tlsdesc(%rax).  */
+-         return call[prefix] == 0xff && call[1 + prefix] == 0x10;
++         return (call[prefix] == 0xff && call[1 + prefix] == 0x10
++                 ? elf_x86_tls_error_none
++                 : elf_x86_tls_error_indirect_call);
+        }
+ 
+-      return false;
++      return elf_x86_tls_error_yes;
+ 
+     default:
+       abort ();
+@@ -1437,7 +1453,7 @@ elf_x86_64_tls_transition (struct bfd_link_info *info, bfd *abfd,
+                           const Elf_Internal_Rela *rel,
+                           const Elf_Internal_Rela *relend,
+                           struct elf_link_hash_entry *h,
+-                          unsigned long r_symndx,
++                          Elf_Internal_Sym *sym,
+                           bool from_relocate_section)
+ {
+   unsigned int from_type = *r_type;
+@@ -1488,7 +1504,12 @@ elf_x86_64_tls_transition (struct bfd_link_info *info, bfd *abfd,
+          /* We checked the transition before when we were called from
+             elf_x86_64_scan_relocs.  We only want to check the new
+             transition which hasn't been checked before.  */
+-         check = new_to_type != to_type && from_type == to_type;
++         check = (new_to_type != to_type
++                  && (from_type == to_type
++                      || (from_type == R_X86_64_CODE_4_GOTTPOFF
++                          && to_type == R_X86_64_GOTTPOFF)
++                      || (from_type == R_X86_64_CODE_6_GOTTPOFF
++                          && to_type == R_X86_64_GOTTPOFF)));
+          to_type = new_to_type;
+        }
+ 
+@@ -1512,13 +1533,18 @@ elf_x86_64_tls_transition (struct bfd_link_info *info, bfd *abfd,
+     return true;
+ 
+   /* Check if the transition can be performed.  */
++  enum elf_x86_tls_error_type tls_error;
+   if (check
+-      && ! elf_x86_64_check_tls_transition (abfd, info, sec, contents,
+-                                           symtab_hdr, sym_hashes,
+-                                           from_type, rel, relend))
++      && ((tls_error = elf_x86_64_check_tls_transition (abfd, info, sec,
++                                                       contents,
++                                                       symtab_hdr,
++                                                       sym_hashes,
++                                                       from_type, rel,
++                                                       relend))
++         != elf_x86_tls_error_none))
++
+     {
+       reloc_howto_type *from, *to;
+-      const char *name;
+ 
+       from = elf_x86_64_rtype_to_howto (abfd, from_type);
+       to = elf_x86_64_rtype_to_howto (abfd, to_type);
+@@ -1526,31 +1552,10 @@ elf_x86_64_tls_transition (struct bfd_link_info *info, bfd *abfd,
+       if (from == NULL || to == NULL)
+        return false;
+ 
+-      if (h)
+-       name = h->root.root.string;
+-      else
+-       {
+-         struct elf_x86_link_hash_table *htab;
+-
+-         htab = elf_x86_hash_table (info, X86_64_ELF_DATA);
+-         if (htab == NULL)
+-           name = "*unknown*";
+-         else
+-           {
+-             Elf_Internal_Sym *isym;
++      _bfd_x86_elf_link_report_tls_transition_error
++       (info, abfd, sec, symtab_hdr, h, sym, rel, from->name,
++        to->name, tls_error);
+ 
+-             isym = bfd_sym_from_r_symndx (&htab->elf.sym_cache,
+-                                           abfd, r_symndx);
+-             name = bfd_elf_sym_name (abfd, symtab_hdr, isym, NULL);
+-           }
+-       }
+-
+-      _bfd_error_handler
+-       /* xgettext:c-format */
+-       (_("%pB: TLS transition from %s to %s against `%s' at %#" PRIx64
+-          " in section `%pA' failed"),
+-        abfd, from->name, to->name, name, (uint64_t) rel->r_offset, sec);
+-      bfd_set_error (bfd_error_bad_value);
+       return false;
+     }
+ 
+@@ -2198,7 +2203,7 @@ elf_x86_64_scan_relocs (bfd *abfd, struct bfd_link_info *info,
+       if (! elf_x86_64_tls_transition (info, abfd, sec, contents,
+                                       symtab_hdr, sym_hashes,
+                                       &r_type, GOT_UNKNOWN,
+-                                      rel, rel_end, h, r_symndx, false))
++                                      rel, rel_end, h, isym, false))
+        goto error_return;
+ 
+       /* Check if _GLOBAL_OFFSET_TABLE_ is referenced.  */
+@@ -3648,7 +3653,7 @@ elf_x86_64_relocate_section (bfd *output_bfd,
+                                           input_section, contents,
+                                           symtab_hdr, sym_hashes,
+                                           &r_type_tls, tls_type, rel,
+-                                          relend, h, r_symndx, true))
++                                          relend, h, sym, true))
+            return false;
+ 
+          if (r_type_tls == R_X86_64_TPOFF32)
+@@ -4308,7 +4313,7 @@ elf_x86_64_relocate_section (bfd *output_bfd,
+                                           input_section, contents,
+                                           symtab_hdr, sym_hashes,
+                                           &r_type, GOT_UNKNOWN, rel,
+-                                          relend, h, r_symndx, true))
++                                          relend, h, sym, true))
+            return false;
+ 
+          if (r_type != R_X86_64_TLSLD)
+diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
+index 508fd771da3..b17dad759c8 100644
+--- a/bfd/elfxx-x86.c
++++ b/bfd/elfxx-x86.c
+@@ -3202,6 +3202,91 @@ _bfd_x86_elf_link_report_relative_reloc
+        asect, abfd);
+ }
+ 
++/* Report TLS transition error.  */
++
++void
++_bfd_x86_elf_link_report_tls_transition_error
++  (struct bfd_link_info *info, bfd *abfd, asection *asect,
++   Elf_Internal_Shdr *symtab_hdr, struct elf_link_hash_entry *h,
++   Elf_Internal_Sym *sym, const Elf_Internal_Rela *rel,
++   const char *from_reloc_name, const char *to_reloc_name,
++   enum elf_x86_tls_error_type tls_error)
++{
++  const char *name;
++
++  if (h)
++    name = h->root.root.string;
++  else
++    {
++      const struct elf_backend_data *bed
++       = get_elf_backend_data (abfd);
++      struct elf_x86_link_hash_table *htab
++       = elf_x86_hash_table (info, bed->target_id);
++      if (htab == NULL)
++       name = "*unknown*";
++      else
++       name = bfd_elf_sym_name (abfd, symtab_hdr, sym, NULL);
++    }
++
++  switch (tls_error)
++    {
++    case elf_x86_tls_error_yes:
++      info->callbacks->einfo
++       /* xgettext:c-format */
++       (_("%pB: TLS transition from %s to %s against `%s' at 0x%v in "
++          "section `%pA' failed"),
++        abfd, from_reloc_name, to_reloc_name, name, rel->r_offset,
++        asect);
++      break;
++
++    case elf_x86_tls_error_add:
++      info->callbacks->einfo
++       /* xgettext:c-format */
++       (_("%pB(%pA+0x%v): relocation %s against `%s' must be used "
++          "in ADD only"),
++        abfd, asect, rel->r_offset, from_reloc_name, name);
++      break;
++
++    case elf_x86_tls_error_add_mov:
++      info->callbacks->einfo
++       /* xgettext:c-format */
++       (_("%pB(%pA+0x%v): relocation %s against `%s' must be used "
++          "in ADD or MOV only"),
++        abfd, asect, rel->r_offset, from_reloc_name, name);
++      break;
++
++    case elf_x86_tls_error_add_sub_mov:
++      info->callbacks->einfo
++       /* xgettext:c-format */
++       (_("%pB(%pA+0x%v): relocation %s against `%s' must be used "
++          "in ADD, SUB or MOV only"),
++        abfd, asect, rel->r_offset, from_reloc_name, name);
++      break;
++
++    case elf_x86_tls_error_indirect_call:
++      info->callbacks->einfo
++       /* xgettext:c-format */
++       (_("%pB(%pA+0x%v): relocation %s against `%s' must be used "
++          "in indirect CALL only"),
++        abfd, asect, rel->r_offset, from_reloc_name, name);
++      break;
++
++    case elf_x86_tls_error_lea:
++      info->callbacks->einfo
++       /* xgettext:c-format */
++       (_("%pB(%pA+0x%v): relocation %s against `%s' must be used "
++          "in LEA only"),
++        abfd, asect, rel->r_offset, from_reloc_name, name);
++      break;
++
++    default:
++      abort ();
++      break;
++    }
++
++  bfd_set_error (bfd_error_bad_value);
++}
++
+ /* Return TRUE if symbol should be hashed in the `.gnu.hash' section.  */
+ 
+ bool
+diff --git a/bfd/elfxx-x86.h b/bfd/elfxx-x86.h
+index 110bcb9ad71..02e2efa6c56 100644
+--- a/bfd/elfxx-x86.h
++++ b/bfd/elfxx-x86.h
+@@ -767,6 +767,18 @@ struct elf_x86_plt
+   long count;
+ };
+ 
++enum elf_x86_tls_error_type
++{
++  elf_x86_tls_error_none,
++  elf_x86_tls_error_add,
++  elf_x86_tls_error_add_mov,
++  elf_x86_tls_error_add_sub_mov,
++  elf_x86_tls_error_indirect_call,
++  elf_x86_tls_error_lea,
++  elf_x86_tls_error_yes
++};
++
++
+ /* Set if a relocation is converted from a GOTPCREL relocation.  */
+ #define R_X86_64_converted_reloc_bit (1 << 7)
+ 
+@@ -908,6 +920,12 @@ extern void _bfd_x86_elf_link_fixup_ifunc_symbol
+ extern void _bfd_x86_elf_link_report_relative_reloc
+   (struct bfd_link_info *, asection *, struct elf_link_hash_entry *,
+    Elf_Internal_Sym *, const char *, const void *);
++extern void _bfd_x86_elf_link_report_tls_transition_error
++  (struct bfd_link_info *, bfd *, asection *, Elf_Internal_Shdr *,
++   struct elf_link_hash_entry *, Elf_Internal_Sym *,
++   const Elf_Internal_Rela *, const char *, const char *,
++   enum elf_x86_tls_error_type);
++
+ 
+ #define bfd_elf64_mkobject \
+   _bfd_x86_elf_mkobject
+diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp
+index 18d1c9198ca..a8db2c713f3 100644
+--- a/ld/testsuite/ld-i386/i386.exp
++++ b/ld/testsuite/ld-i386/i386.exp
+@@ -541,6 +541,8 @@ run_dump_test "tlsdesc2"
+ run_dump_test "report-reloc-1"
+ run_dump_test "pr27998a"
+ run_dump_test "pr27998b"
++run_dump_test "tlsgdesc1"
++run_dump_test "tlsgdesc2"
+ 
+ proc undefined_weak {cflags ldflags} {
+     set testname "Undefined weak symbol"
+diff --git a/ld/testsuite/ld-i386/tlsgdesc1.d b/ld/testsuite/ld-i386/tlsgdesc1.d
+new file mode 100644
+index 00000000000..2a70e81c444
+--- /dev/null
++++ b/ld/testsuite/ld-i386/tlsgdesc1.d
+@@ -0,0 +1,4 @@
++#name: TLS GDesc->LE transition check (LEA)
++#as: --32
++#ld: -melf_i386
++#error: .*: relocation R_386_TLS_GOTDESC against `foo' must be used in LEA only
+diff --git a/ld/testsuite/ld-i386/tlsgdesc1.s b/ld/testsuite/ld-i386/tlsgdesc1.s
+new file mode 100644
+index 00000000000..c30f7523462
+--- /dev/null
++++ b/ld/testsuite/ld-i386/tlsgdesc1.s
+@@ -0,0 +1,11 @@
++       .text
++       .globl _start
++_start:
++       movl    foo@tlsdesc(%ebx), %eax
++       call    *foo@tlscall(%eax)
++       .section        .tdata,"awT",@progbits
++       .align 4
++       .type   foo, @object
++       .size   foo, 4
++foo:
++       .long   100
+diff --git a/ld/testsuite/ld-i386/tlsgdesc2.d b/ld/testsuite/ld-i386/tlsgdesc2.d
+new file mode 100644
+index 00000000000..2e6a66d372c
+--- /dev/null
++++ b/ld/testsuite/ld-i386/tlsgdesc2.d
+@@ -0,0 +1,4 @@
++#name: TLS GDesc->LE transition check (indirect CALL)
++#as: --32
++#ld: -melf_i386
++#error: .*: relocation R_386_TLS_DESC_CALL against `foo' must be used in indirect CALL only
+diff --git a/ld/testsuite/ld-i386/tlsgdesc2.s b/ld/testsuite/ld-i386/tlsgdesc2.s
+new file mode 100644
+index 00000000000..7d9d556e2ab
+--- /dev/null
++++ b/ld/testsuite/ld-i386/tlsgdesc2.s
+@@ -0,0 +1,11 @@
++       .text
++       .globl _start
++_start:
++       leal    foo@tlsdesc(%ebx), %eax
++       jmp     *foo@tlscall(%eax)
++       .section        .tdata,"awT",@progbits
++       .align 4
++       .type   foo, @object
++       .size   foo, 4
++foo:
++       .long   100
+diff --git a/ld/testsuite/ld-i386/tlsie2.d b/ld/testsuite/ld-i386/tlsie2.d
+index ebb85fde7e7..9f9e63029d6 100644
+--- a/ld/testsuite/ld-i386/tlsie2.d
++++ b/ld/testsuite/ld-i386/tlsie2.d
+@@ -1,4 +1,4 @@
+ #name: TLS IE->LE transition check (R_386_TLS_GOTIE with %eax)
+ #as: --32
+ #ld: -melf_i386
+-#error: .*TLS transition from R_386_TLS_GOTIE to R_386_TLS_LE_32 against `foo'.*failed.*
++#error: .*: relocation R_386_TLS_GOTIE against `foo' must be used in ADD, SUB or MOV only
+diff --git a/ld/testsuite/ld-i386/tlsie3.d b/ld/testsuite/ld-i386/tlsie3.d
+index d993f303c25..506f1a02605 100644
+--- a/ld/testsuite/ld-i386/tlsie3.d
++++ b/ld/testsuite/ld-i386/tlsie3.d
+@@ -1,4 +1,4 @@
+ #name: TLS IE->LE transition check (R_386_TLS_GOTIE)
+ #as: --32
+ #ld: -melf_i386
+-#error: .*TLS transition from R_386_TLS_GOTIE to R_386_TLS_LE_32 against `foo'.*failed.*
++#error: .*: relocation R_386_TLS_GOTIE against `foo' must be used in ADD, SUB or MOV only
+diff --git a/ld/testsuite/ld-i386/tlsie4.d b/ld/testsuite/ld-i386/tlsie4.d
+index 3ca8fddf5dd..a516d002660 100644
+--- a/ld/testsuite/ld-i386/tlsie4.d
++++ b/ld/testsuite/ld-i386/tlsie4.d
+@@ -1,4 +1,4 @@
+ #name: TLS IE->LE transition check (R_386_TLS_IE with %eax)
+ #as: --32
+ #ld: -melf_i386
+-#error: .*TLS transition from R_386_TLS_IE to R_386_TLS_LE_32 against `foo'.*failed.*
++#error: .*: relocation R_386_TLS_IE against `foo' must be used in ADD or MOV only
+diff --git a/ld/testsuite/ld-i386/tlsie5.d b/ld/testsuite/ld-i386/tlsie5.d
+index 3febeb159a9..d3447182e19 100644
+--- a/ld/testsuite/ld-i386/tlsie5.d
++++ b/ld/testsuite/ld-i386/tlsie5.d
+@@ -1,4 +1,4 @@
+ #name: TLS IE->LE transition check (R_386_TLS_IE)
+ #as: --32
+ #ld: -melf_i386
+-#error: .*TLS transition from R_386_TLS_IE to R_386_TLS_LE_32 against `foo'.*failed.*
++#error: .*: relocation R_386_TLS_IE against `foo' must be used in ADD or MOV only
+diff --git a/ld/testsuite/ld-x86-64/tlsdesc3.d b/ld/testsuite/ld-x86-64/tlsdesc3.d
+new file mode 100644
+index 00000000000..bbf22ebeafe
+--- /dev/null
++++ b/ld/testsuite/ld-x86-64/tlsdesc3.d
+@@ -0,0 +1,4 @@
++#name: TLS GDesc->LE transition check (LEA)
++#as: --64
++#ld: -melf_x86_64
++#error: .*: relocation R_X86_64_GOTPC32_TLSDESC against `foo' must be used in LEA only
+diff --git a/ld/testsuite/ld-x86-64/tlsdesc3.s b/ld/testsuite/ld-x86-64/tlsdesc3.s
+new file mode 100644
+index 00000000000..45310654ffc
+--- /dev/null
++++ b/ld/testsuite/ld-x86-64/tlsdesc3.s
+@@ -0,0 +1,13 @@
++       .text
++       .globl  _start
++       .type   _start,@function
++_start:
++       movq    foo@tlsdesc(%rip), %rax
++       call    *foo@tlscall(%rax)
++       .globl foo
++       .section        .tdata,"awT",@progbits
++       .align 8
++       .type   foo, @object
++       .size   foo, 8
++foo:
++       .quad   100
+diff --git a/ld/testsuite/ld-x86-64/tlsdesc4.d b/ld/testsuite/ld-x86-64/tlsdesc4.d
+new file mode 100644
+index 00000000000..b50115c7178
+--- /dev/null
++++ b/ld/testsuite/ld-x86-64/tlsdesc4.d
+@@ -0,0 +1,4 @@
++#name: TLS GDesc->LE transition check (indirect CALL)
++#as: --64
++#ld: -melf_x86_64
++#error: .*: relocation R_X86_64_TLSDESC_CALL against `foo' must be used in indirect CALL only
+diff --git a/ld/testsuite/ld-x86-64/tlsdesc4.s b/ld/testsuite/ld-x86-64/tlsdesc4.s
+new file mode 100644
+index 00000000000..b3d6c12d4fc
+--- /dev/null
++++ b/ld/testsuite/ld-x86-64/tlsdesc4.s
+@@ -0,0 +1,13 @@
++       .text
++       .globl  _start
++       .type   _start,@function
++_start:
++       leaq    foo@tlsdesc(%rip), %rax
++       jmp     *foo@tlscall(%rax)
++       .globl foo
++       .section        .tdata,"awT",@progbits
++       .align 8
++       .type   foo, @object
++       .size   foo, 8
++foo:
++       .quad   100
+diff --git a/ld/testsuite/ld-x86-64/tlsie2.d b/ld/testsuite/ld-x86-64/tlsie2.d
+index 97dcc288a3d..bf8a8198b5b 100644
+--- a/ld/testsuite/ld-x86-64/tlsie2.d
++++ b/ld/testsuite/ld-x86-64/tlsie2.d
+@@ -1,4 +1,4 @@
+ #name: TLS IE->LE transition check
+ #as: --64
+ #ld: -melf_x86_64
+-#error: .*TLS transition from R_X86_64_GOTTPOFF to R_X86_64_TPOFF32 against `foo'.*failed.*
++#error: .*: relocation R_X86_64_GOTTPOFF against `foo' must be used in ADD or MOV only
+diff --git a/ld/testsuite/ld-x86-64/tlsie3.d b/ld/testsuite/ld-x86-64/tlsie3.d
+index 8c982a69838..49d8464fbaf 100644
+--- a/ld/testsuite/ld-x86-64/tlsie3.d
++++ b/ld/testsuite/ld-x86-64/tlsie3.d
+@@ -1,4 +1,4 @@
+ #name: TLS IE->LE transition check (%r12)
+ #as: --64
+ #ld: -melf_x86_64
+-#error: .*TLS transition from R_X86_64_GOTTPOFF to R_X86_64_TPOFF32 against `foo'.*failed.*
++#error: .*: relocation R_X86_64_GOTTPOFF against `foo' must be used in ADD or MOV only
+diff --git a/ld/testsuite/ld-x86-64/tlsie5.d b/ld/testsuite/ld-x86-64/tlsie5.d
+new file mode 100644
+index 00000000000..29de1cebf8e
+--- /dev/null
++++ b/ld/testsuite/ld-x86-64/tlsie5.d
+@@ -0,0 +1,4 @@
++#name: TLS IE->LE transition check (APX)
++#as: --64
++#ld: -melf_x86_64
++#error: .*: relocation R_X86_64_CODE_6_GOTTPOFF against `foo' must be used in ADD only
+diff --git a/ld/testsuite/ld-x86-64/tlsie5.s b/ld/testsuite/ld-x86-64/tlsie5.s
+new file mode 100644
+index 00000000000..c39e46fd97b
+--- /dev/null
++++ b/ld/testsuite/ld-x86-64/tlsie5.s
+@@ -0,0 +1,12 @@
++       .text
++       .globl _start
++_start:
++       xorq    %rax, foo@GOTTPOFF(%rip), %rax
++       movq    (%rax), %rax
++       .globl  foo
++       .section        .tdata,"awT",@progbits
++       .align 4
++       .type   foo, @object
++       .size   foo, 4
++foo:
++       .long   100
+diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp
+index 2a40f0b095b..811813466f8 100644
+--- a/ld/testsuite/ld-x86-64/x86-64.exp
++++ b/ld/testsuite/ld-x86-64/x86-64.exp
+@@ -741,6 +741,9 @@ run_dump_test "pr27016b"
+ run_dump_test "report-reloc-1"
+ run_dump_test "report-reloc-1-x32"
+ run_dump_test "pr29820"
++run_dump_test "tlsie5"
++run_dump_test "tlsdesc3"
++run_dump_test "tlsdesc4"
+ 
+ proc undefined_weak {cflags ldflags} {
+     set testname "Undefined weak symbol"
+-- 
+2.49.0
+
diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2025-1179.patch b/meta/recipes-devtools/binutils/binutils/CVE-2025-1179.patch
new file mode 100644
index 0000000000..89312d8501
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/CVE-2025-1179.patch
@@ -0,0 +1,269 @@
+From 67e30b15212adc1502b898a1ca224fdf65dc110d Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Thu, 29 Aug 2024 08:47:00 -0700
+Subject: [PATCH] x86: Check invalid TLS descriptor call TLS descriptor
+ call,
+
+call *x@tlsdesc(%rax)
+
+or
+
+call *x@tlsdesc(%eax)
+
+calls _dl_tlsdesc_return which expects that RAX/EAX points to the TLS
+descriptor.  Update x86 linker to issue an error with or without TLS
+transition.
+
+bfd/
+
+        PR ld/32123
+        * elf32-i386.c (elf_i386_check_tls_transition): Move
+        R_386_TLS_DESC_CALL to ...
+        (elf_i386_tls_transition): Here.
+        * elf64-x86-64.c (elf_x86_64_check_tls_transition): Move.
+        R_X86_64_TLSDESC_CALL check to ...
+        (elf_x86_64_tls_transition): Here.
+
+ld/
+
+        PR ld/32123
+        * testsuite/ld-i386/i386.exp: Run tlsgdesc3.
+        * testsuite/ld-i386/tlsgdesc3.d: New file.
+        * testsuite/ld-x86-64/tlsdesc5.d: Likewise.
+        * testsuite/ld-x86-64/x86-64.exp: Run tlsdesc5.
+
+(cherry picked from commit:67e30b15212adc1502b898a1ca224fdf65dc110d)
+Upstream-Status: Submitted [https://sourceware.org/pipermail/binutils/2025-May/141321.html]
+CVE: CVE-2025-1179
+
+Signed-off-by: Harish Sadineni <Harish.Sadineni@windriver.com>
+---
+ bfd/elf32-i386.c                  | 44 +++++++++++++------
+ bfd/elf64-x86-64.c                | 71 +++++++++++++++++++------------
+ ld/testsuite/ld-i386/i386.exp     |  1 +
+ ld/testsuite/ld-i386/tlsgdesc3.d  |  5 +++
+ ld/testsuite/ld-x86-64/tlsdesc5.d |  5 +++
+ ld/testsuite/ld-x86-64/x86-64.exp |  1 +
+ 6 files changed, 86 insertions(+), 41 deletions(-)
+ create mode 100644 ld/testsuite/ld-i386/tlsgdesc3.d
+ create mode 100644 ld/testsuite/ld-x86-64/tlsdesc5.d
+
+diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
+index 18a28d2491c..9dea465f721 100644
+--- a/bfd/elf32-i386.c
++++ b/bfd/elf32-i386.c
+@@ -1039,19 +1039,8 @@ elf_i386_check_tls_transition (asection *sec,
+              : elf_x86_tls_error_yes);
+ 
+     case R_386_TLS_DESC_CALL:
+-      /* Check transition from GDesc access model:
+-               call *x@tlsdesc(%eax)
+-       */
+-      if (offset + 2 <= sec->size)
+-       {
+-         /* Make sure that it's a call *x@tlsdesc(%eax).  */
+-         call = contents + offset;
+-         return (call[0] == 0xff && call[1] == 0x10
+-                 ? elf_x86_tls_error_none
+-                 : elf_x86_tls_error_indirect_call);
+-       }
+-
+-      return elf_x86_tls_error_yes;
++      /* It has been checked in elf_i386_tls_transition.  */
++      return elf_x86_tls_error_none;
+ 
+     default:
+       abort ();
+@@ -1077,6 +1066,8 @@ elf_i386_tls_transition (struct bfd_link_info *info, bfd *abfd,
+   unsigned int to_type = from_type;
+   bool check = true;
+   unsigned int to_le_type, to_ie_type;
++  bfd_vma offset;
++  bfd_byte *call;
+ 
+   /* Skip TLS transition for functions.  */
+   if (h != NULL
+@@ -1098,9 +1089,34 @@ elf_i386_tls_transition (struct bfd_link_info *info, bfd *abfd,
+ 
+   switch (from_type)
+     {
++    case R_386_TLS_DESC_CALL:
++      /* Check valid GDesc call:
++               call *x@tlsdesc(%eax)
++       */
++      offset = rel->r_offset;
++      call = NULL;
++      if (offset + 2 <= sec->size)
++       {
++         /* Make sure that it's a call *x@tlsdesc(%eax).  */
++         call = contents + offset;
++         if (call[0] != 0xff || call[1] != 0x10)
++           call = NULL;
++       }
++
++      if (call == NULL)
++       {
++         _bfd_x86_elf_link_report_tls_transition_error
++           (info, abfd, sec, symtab_hdr, h, sym, rel,
++            "R_386_TLS_DESC_CALL", NULL,
++            elf_x86_tls_error_indirect_call);
++
++         return false;
++       }
++
++      /* Fall through.  */
++
+     case R_386_TLS_GD:
+     case R_386_TLS_GOTDESC:
+-    case R_386_TLS_DESC_CALL:
+     case R_386_TLS_IE_32:
+     case R_386_TLS_IE:
+     case R_386_TLS_GOTIE:
+diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
+index f116e423f61..7af2e607b02 100644
+--- a/bfd/elf64-x86-64.c
++++ b/bfd/elf64-x86-64.c
+@@ -1409,32 +1409,8 @@ elf_x86_64_check_tls_transition (bfd *abfd,
+              : elf_x86_tls_error_yes);
+ 
+     case R_X86_64_TLSDESC_CALL:
+-      /* Check transition from GDesc access model:
+-               call *x@tlsdesc(%rax) <--- LP64 mode.
+-               call *x@tlsdesc(%eax) <--- X32 mode.
+-       */
+-      if (offset + 2 <= sec->size)
+-       {
+-         unsigned int prefix;
+-         call = contents + offset;
+-         prefix = 0;
+-         if (!ABI_64_P (abfd))
+-           {
+-             /* Check for call *x@tlsdesc(%eax).  */
+-             if (call[0] == 0x67)
+-               {
+-                 prefix = 1;
+-                 if (offset + 3 > sec->size)
+-                   return elf_x86_tls_error_yes;
+-               }
+-           }
+-         /* Make sure that it's a call *x@tlsdesc(%rax).  */
+-         return (call[prefix] == 0xff && call[1 + prefix] == 0x10
+-                 ? elf_x86_tls_error_none
+-                 : elf_x86_tls_error_indirect_call);
+-       }
+-
+-      return elf_x86_tls_error_yes;
++      /* It has been checked in elf_x86_64_tls_transition.  */
++      return elf_x86_tls_error_none;
+ 
+     default:
+       abort ();
+@@ -1459,6 +1435,8 @@ elf_x86_64_tls_transition (struct bfd_link_info *info, bfd *abfd,
+   unsigned int from_type = *r_type;
+   unsigned int to_type = from_type;
+   bool check = true;
++  bfd_vma offset;
++  bfd_byte *call;
+ 
+   /* Skip TLS transition for functions.  */
+   if (h != NULL
+@@ -1468,10 +1446,49 @@ elf_x86_64_tls_transition (struct bfd_link_info *info, bfd *abfd,
+ 
+   switch (from_type)
+     {
++    case R_X86_64_TLSDESC_CALL:
++      /* Check valid GDesc call:
++               call *x@tlsdesc(%rax) <--- LP64 mode.
++               call *x@tlsdesc(%eax) <--- X32 mode.
++       */
++      offset = rel->r_offset;
++      call = NULL;
++      if (offset + 2 <= sec->size)
++       {
++         unsigned int prefix;
++         call = contents + offset;
++         prefix = 0;
++         if (!ABI_64_P (abfd))
++           {
++             /* Check for call *x@tlsdesc(%eax).  */
++             if (call[0] == 0x67)
++               {
++                 prefix = 1;
++                 if (offset + 3 > sec->size)
++                   call = NULL;
++               }
++           }
++
++         /* Make sure that it's a call *x@tlsdesc(%rax).  */
++         if (call != NULL
++             && (call[prefix] != 0xff || call[1 + prefix] != 0x10))
++           call = NULL;
++       }
++
++      if (call == NULL)
++       {
++         _bfd_x86_elf_link_report_tls_transition_error
++           (info, abfd, sec, symtab_hdr, h, sym, rel,
++            "R_X86_64_TLSDESC_CALL", NULL,
++            elf_x86_tls_error_indirect_call);
++         return false;
++       }
++
++      /* Fall through.  */
++
+     case R_X86_64_TLSGD:
+     case R_X86_64_GOTPC32_TLSDESC:
+     case R_X86_64_CODE_4_GOTPC32_TLSDESC:
+-    case R_X86_64_TLSDESC_CALL:
+     case R_X86_64_GOTTPOFF:
+     case R_X86_64_CODE_4_GOTTPOFF:
+     case R_X86_64_CODE_6_GOTTPOFF:
+diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp
+index a8db2c713f3..41e8725d059 100644
+--- a/ld/testsuite/ld-i386/i386.exp
++++ b/ld/testsuite/ld-i386/i386.exp
+@@ -543,6 +543,7 @@ run_dump_test "pr27998a"
+ run_dump_test "pr27998b"
+ run_dump_test "tlsgdesc1"
+ run_dump_test "tlsgdesc2"
++run_dump_test "tlsgdesc3"
+ 
+ proc undefined_weak {cflags ldflags} {
+     set testname "Undefined weak symbol"
+diff --git a/ld/testsuite/ld-i386/tlsgdesc3.d b/ld/testsuite/ld-i386/tlsgdesc3.d
+new file mode 100644
+index 00000000000..f2c29d880f2
+--- /dev/null
++++ b/ld/testsuite/ld-i386/tlsgdesc3.d
+@@ -0,0 +1,5 @@
++#source: tlsgdesc2.s
++#name: TLS GDesc call (indirect CALL)
++#as: --32
++#ld: -shared -melf_i386
++#error: .*: relocation R_386_TLS_DESC_CALL against `foo' must be used in indirect CALL with EAX register only
+diff --git a/ld/testsuite/ld-x86-64/tlsdesc5.d b/ld/testsuite/ld-x86-64/tlsdesc5.d
+new file mode 100644
+index 00000000000..6a0158b44b7
+--- /dev/null
++++ b/ld/testsuite/ld-x86-64/tlsdesc5.d
+@@ -0,0 +1,5 @@
++#source: tlsdesc4.s
++#name: TLS GDesc call (indirect CALL)
++#as: --64
++#ld: -shared -melf_x86_64
++#error: .*: relocation R_X86_64_TLSDESC_CALL against `foo' must be used in indirect CALL with RAX register only
+diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp
+index 811813466f8..82b0520c52a 100644
+--- a/ld/testsuite/ld-x86-64/x86-64.exp
++++ b/ld/testsuite/ld-x86-64/x86-64.exp
+@@ -744,6 +744,7 @@ run_dump_test "pr29820"
+ run_dump_test "tlsie5"
+ run_dump_test "tlsdesc3"
+ run_dump_test "tlsdesc4"
++run_dump_test "tlsdesc5"
+ 
+ proc undefined_weak {cflags ldflags} {
+     set testname "Undefined weak symbol"
+-- 
+2.49.0
+
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.28.3.bb b/meta/recipes-devtools/cmake/cmake-native_3.28.3.bb
index 546d117156..376da3254b 100644
--- a/meta/recipes-devtools/cmake/cmake-native_3.28.3.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_3.28.3.bb
@@ -51,7 +51,7 @@ do_compile() {
 do_install() {
         oe_runmake 'DESTDIR=${D}' install
 
-        # The following codes are here because eSDK needs to provide compatibilty
+        # The following codes are here because eSDK needs to provide compatibility
         # for SDK. That is, eSDK could also be used like traditional SDK.
         mkdir -p ${D}${datadir}/cmake
         install -m 644 ${WORKDIR}/OEToolchainConfig.cmake ${D}${datadir}/cmake/
diff --git a/meta/recipes-devtools/cmake/cmake/0001-ctest-Allow-arbitrary-characters-in-test-names-of-CT.patch b/meta/recipes-devtools/cmake/cmake/0001-ctest-Allow-arbitrary-characters-in-test-names-of-CT.patch
new file mode 100644
index 0000000000..77c1d6378d
--- /dev/null
+++ b/meta/recipes-devtools/cmake/cmake/0001-ctest-Allow-arbitrary-characters-in-test-names-of-CT.patch
@@ -0,0 +1,205 @@
+From 49576cf1df618609be4aa1000749ad087c143df0 Mon Sep 17 00:00:00 2001
+From: John Drouhard <john@drouhard.dev>
+Date: Thu, 9 Jan 2025 20:34:42 -0600
+Subject: [PATCH] ctest: Allow arbitrary characters in test names of
+ CTestCostData.txt
+
+This changes the way lines in CTestCostData.txt are parsed to allow for
+spaces in the test name.
+
+It does so by looking for space characters from the end; and once two
+have been found, assumes everything from the beginning up to that
+second-to-last-space is the test name.
+
+Additionally, parsing the file should be much more efficient since there
+is no string or vector heap allocation per line. The std::string used by
+the parse function to convert the int and float should be within most
+standard libraries' small string optimization.
+
+Fixes: #26594
+
+Upstream-Status: Backport [4.0.0, 040da7d83216ace59710407e8ce35d5fd38e1340]
+Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de>
+---
+ Source/CTest/cmCTestMultiProcessHandler.cxx | 80 +++++++++++++++------
+ Source/CTest/cmCTestMultiProcessHandler.h   |  3 +-
+ Tests/CTestTestScheduler/CMakeLists.txt     |  4 +-
+ 3 files changed, 64 insertions(+), 23 deletions(-)
+
+diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx
+index ca07a081eafced40697d82b08c0e2a504939fc4d..59a101454b84367d219e79a01ff72702df0dfa7f 100644
+--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
++++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
+@@ -20,6 +20,7 @@
+ 
+ #include <cm/memory>
+ #include <cm/optional>
++#include <cm/string_view>
+ #include <cmext/algorithm>
+ 
+ #include <cm3p/json/value.h>
+@@ -43,6 +44,51 @@
+ #include "cmUVSignalHackRAII.h" // IWYU pragma: keep
+ #include "cmWorkingDirectory.h"
+ 
++namespace {
++
++struct CostEntry
++{
++  cm::string_view name;
++  int prevRuns;
++  float cost;
++};
++
++cm::optional<CostEntry> splitCostLine(cm::string_view line)
++{
++  std::string part;
++  cm::string_view::size_type pos1 = line.size();
++  cm::string_view::size_type pos2 = line.find_last_of(' ', pos1);
++  auto findNext = [line, &part, &pos1, &pos2]() -> bool {
++    if (pos2 != cm::string_view::npos) {
++      cm::string_view sub = line.substr(pos2 + 1, pos1 - pos2 - 1);
++      part.assign(sub.begin(), sub.end());
++      pos1 = pos2;
++      if (pos1 > 0) {
++        pos2 = line.find_last_of(' ', pos1 - 1);
++      }
++      return true;
++    }
++    return false;
++  };
++
++  // parse the cost
++  if (!findNext()) {
++    return cm::nullopt;
++  }
++  float cost = static_cast<float>(atof(part.c_str()));
++
++  // parse the previous runs
++  if (!findNext()) {
++    return cm::nullopt;
++  }
++  int prev = atoi(part.c_str());
++
++  // from start to the last found space is the name
++  return CostEntry{ line.substr(0, pos1), prev, cost };
++}
++
++}
++
+ namespace cmsys {
+ class RegularExpression;
+ }
+@@ -697,24 +743,21 @@ void cmCTestMultiProcessHandler::UpdateCostData()
+       if (line == "---") {
+         break;
+       }
+-      std::vector<std::string> parts = cmSystemTools::SplitString(line, ' ');
+       // Format: <name> <previous_runs> <avg_cost>
+-      if (parts.size() < 3) {
++      cm::optional<CostEntry> entry = splitCostLine(line);
++      if (!entry) {
+         break;
+       }
+ 
+-      std::string name = parts[0];
+-      int prev = atoi(parts[1].c_str());
+-      float cost = static_cast<float>(atof(parts[2].c_str()));
+-
+-      int index = this->SearchByName(name);
++      int index = this->SearchByName(entry->name);
+       if (index == -1) {
+         // This test is not in memory. We just rewrite the entry
+-        fout << name << " " << prev << " " << cost << "\n";
++        fout << entry->name << " " << entry->prevRuns << " " << entry->cost
++             << "\n";
+       } else {
+         // Update with our new average cost
+-        fout << name << " " << this->Properties[index]->PreviousRuns << " "
+-             << this->Properties[index]->Cost << "\n";
++        fout << entry->name << " " << this->Properties[index]->PreviousRuns
++             << " " << this->Properties[index]->Cost << "\n";
+         temp.erase(index);
+       }
+     }
+@@ -750,28 +793,25 @@ void cmCTestMultiProcessHandler::ReadCostData()
+         break;
+       }
+ 
+-      std::vector<std::string> parts = cmSystemTools::SplitString(line, ' ');
++      // Format: <name> <previous_runs> <avg_cost>
++      cm::optional<CostEntry> entry = splitCostLine(line);
+ 
+       // Probably an older version of the file, will be fixed next run
+-      if (parts.size() < 3) {
++      if (!entry) {
+         fin.close();
+         return;
+       }
+ 
+-      std::string name = parts[0];
+-      int prev = atoi(parts[1].c_str());
+-      float cost = static_cast<float>(atof(parts[2].c_str()));
+-
+-      int index = this->SearchByName(name);
++      int index = this->SearchByName(entry->name);
+       if (index == -1) {
+         continue;
+       }
+ 
+-      this->Properties[index]->PreviousRuns = prev;
++      this->Properties[index]->PreviousRuns = entry->prevRuns;
+       // When not running in parallel mode, don't use cost data
+       if (this->ParallelLevel > 1 && this->Properties[index] &&
+           this->Properties[index]->Cost == 0) {
+-        this->Properties[index]->Cost = cost;
++        this->Properties[index]->Cost = entry->cost;
+       }
+     }
+     // Next part of the file is the failed tests
+@@ -784,7 +824,7 @@ void cmCTestMultiProcessHandler::ReadCostData()
+   }
+ }
+ 
+-int cmCTestMultiProcessHandler::SearchByName(std::string const& name)
++int cmCTestMultiProcessHandler::SearchByName(cm::string_view name)
+ {
+   int index = -1;
+ 
+diff --git a/Source/CTest/cmCTestMultiProcessHandler.h b/Source/CTest/cmCTestMultiProcessHandler.h
+index 3b4e9c59ad1871168d8528be0586831e2416ae36..8d33dabcf0d9fc6e11459105c65eadaa1de33e42 100644
+--- a/Source/CTest/cmCTestMultiProcessHandler.h
++++ b/Source/CTest/cmCTestMultiProcessHandler.h
+@@ -12,6 +12,7 @@
+ #include <vector>
+ 
+ #include <cm/optional>
++#include <cm/string_view>
+ 
+ #include <cm3p/uv.h>
+ 
+@@ -113,7 +114,7 @@ protected:
+   void UpdateCostData();
+   void ReadCostData();
+   // Return index of a test based on its name
+-  int SearchByName(std::string const& name);
++  int SearchByName(cm::string_view name);
+ 
+   void CreateTestCostList();
+ 
+diff --git a/Tests/CTestTestScheduler/CMakeLists.txt b/Tests/CTestTestScheduler/CMakeLists.txt
+index 91d565d4020aafda6d49462cd8616d168d5844b6..daf6ce2b23d8c048334ae1047759130b246dccef 100644
+--- a/Tests/CTestTestScheduler/CMakeLists.txt
++++ b/Tests/CTestTestScheduler/CMakeLists.txt
+@@ -1,9 +1,9 @@
+-cmake_minimum_required (VERSION 3.5)
++cmake_minimum_required(VERSION 3.19)
+ project (CTestTestScheduler)
+ include (CTest)
+ 
+ add_executable (Sleep sleep.c)
+ 
+ foreach (time RANGE 1 4)
+-  add_test (TestSleep${time} Sleep ${time})
++  add_test ("TestSleep ${time}" Sleep ${time})
+ endforeach ()
diff --git a/meta/recipes-devtools/cmake/cmake_3.28.3.bb b/meta/recipes-devtools/cmake/cmake_3.28.3.bb
index 6a9a3266df..63d483801a 100644
--- a/meta/recipes-devtools/cmake/cmake_3.28.3.bb
+++ b/meta/recipes-devtools/cmake/cmake_3.28.3.bb
@@ -5,6 +5,7 @@ inherit cmake bash-completion
 DEPENDS += "curl expat zlib libarchive xz ncurses bzip2"
 
 SRC_URI:append:class-nativesdk = " \
+    file://0001-ctest-Allow-arbitrary-characters-in-test-names-of-CT.patch \
     file://OEToolchainConfig.cmake \
     file://SDKToolchainConfig.cmake.template \
     file://cmake-setup.py \
diff --git a/meta/recipes-devtools/gcc/gcc-13.3.inc b/meta/recipes-devtools/gcc/gcc-13.4.inc
index 8b6c2a5938..eefae13530 100644
--- a/meta/recipes-devtools/gcc/gcc-13.3.inc
+++ b/meta/recipes-devtools/gcc/gcc-13.4.inc
@@ -2,11 +2,11 @@ require gcc-common.inc
 
 # Third digit in PV should be incremented after a minor release
 
-PV = "13.3.0"
+PV = "13.4.0"
 
 # BINV should be incremented to a revision after a minor gcc release
 
-BINV = "13.3.0"
+BINV = "13.4.0"
 
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc:${FILE_DIRNAME}/gcc/backport:"
 
@@ -66,10 +66,8 @@ SRC_URI = "${BASEURI} \
            file://0024-Avoid-hardcoded-build-paths-into-ppc-libgcc.patch \
            file://0025-gcc-testsuite-tweaks-for-mips-OE.patch \
            file://0027-Fix-gcc-vect-module-testcases.patch \
-           file://0028-gcc-Fix-c-tweak-for-Wrange-loop-construct.patch \
-           file://gcc.git-ab884fffe3fc82a710bea66ad651720d71c938b8.patch \
 "
-SRC_URI[sha256sum] = "0845e9621c9543a13f484e94584a49ffc0129970e9914624235fc1d061a0c083"
+SRC_URI[sha256sum] = "9c4ce6dbb040568fdc545588ac03c5cbc95a8dbf0c7aa490170843afb59ca8f5"
 
 S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/${SOURCEDIR}"
 B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}"
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_13.3.bb b/meta/recipes-devtools/gcc/gcc-cross-canadian_13.4.bb
index bf53c5cd78..bf53c5cd78 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian_13.3.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian_13.4.bb
diff --git a/meta/recipes-devtools/gcc/gcc-cross_13.3.bb b/meta/recipes-devtools/gcc/gcc-cross_13.4.bb
index b43cca0c52..b43cca0c52 100644
--- a/meta/recipes-devtools/gcc/gcc-cross_13.3.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross_13.4.bb
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk_13.3.bb b/meta/recipes-devtools/gcc/gcc-crosssdk_13.4.bb
index 40a6c4feff..40a6c4feff 100644
--- a/meta/recipes-devtools/gcc/gcc-crosssdk_13.3.bb
+++ b/meta/recipes-devtools/gcc/gcc-crosssdk_13.4.bb
diff --git a/meta/recipes-devtools/gcc/gcc-runtime_13.3.bb b/meta/recipes-devtools/gcc/gcc-runtime_13.4.bb
index dd430b57eb..dd430b57eb 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime_13.3.bb
+++ b/meta/recipes-devtools/gcc/gcc-runtime_13.4.bb
diff --git a/meta/recipes-devtools/gcc/gcc-sanitizers_13.3.bb b/meta/recipes-devtools/gcc/gcc-sanitizers_13.4.bb
index 8bda2ccad6..8bda2ccad6 100644
--- a/meta/recipes-devtools/gcc/gcc-sanitizers_13.3.bb
+++ b/meta/recipes-devtools/gcc/gcc-sanitizers_13.4.bb
diff --git a/meta/recipes-devtools/gcc/gcc-source_13.3.bb b/meta/recipes-devtools/gcc/gcc-source_13.4.bb
index b890fa33ea..b890fa33ea 100644
--- a/meta/recipes-devtools/gcc/gcc-source_13.3.bb
+++ b/meta/recipes-devtools/gcc/gcc-source_13.4.bb
diff --git a/meta/recipes-devtools/gcc/gcc/0028-gcc-Fix-c-tweak-for-Wrange-loop-construct.patch b/meta/recipes-devtools/gcc/gcc/0028-gcc-Fix-c-tweak-for-Wrange-loop-construct.patch
deleted file mode 100644
index 745b38f7f1..0000000000
--- a/meta/recipes-devtools/gcc/gcc/0028-gcc-Fix-c-tweak-for-Wrange-loop-construct.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 66aa69e2add2b8641a652768b0eac30f00427145 Mon Sep 17 00:00:00 2001
-From: Sunil Dora <sunilkumar.dora@windriver.com>
-Date: Wed, 11 Dec 2024 09:48:16 -0800
-Subject: [PATCH] gcc: Fix c++: tweak for Wrange-loop-construct
-
-This commit updates the warning to use a check for "trivially constructible" instead of
-"trivially copyable." The original check was incorrect, as "trivially copyable" only applies
-to types that can be copied trivially, whereas "trivially constructible" is the correct check
-for types that can be trivially default-constructed.
-
-This change ensures the warning is more accurate and aligns with the proper type traits.
-
-LLVM accepted a similar fix:
-https://github.com/llvm/llvm-project/issues/47355
-
-PR c++/116731 [https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116731]
-
-Upstream-Status: Backport [https://gcc.gnu.org/g:179dc0f0fe01012675c1b430591b9891ce96c26e]
-
-Signed-off-by: Marek Polacek <polacek@redhat.com>
-Signed-off-by: Sunil Dora <sunilkumar.dora@windriver.com>
----
- gcc/cp/parser.cc                              |  7 ++-
- .../g++.dg/warn/Wrange-loop-construct3.C      | 57 +++++++++++++++++++
- 2 files changed, 61 insertions(+), 3 deletions(-)
- create mode 100644 gcc/testsuite/g++.dg/warn/Wrange-loop-construct3.C
-
-diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc
-index 4e67da6ff..5dd94357d 100644
---- a/gcc/cp/parser.cc
-+++ b/gcc/cp/parser.cc
-@@ -13854,11 +13854,12 @@ warn_for_range_copy (tree decl, tree expr)
-   else if (!CP_TYPE_CONST_P (type))
-     return;
- 
--  /* Since small trivially copyable types are cheap to copy, we suppress the
--     warning for them.  64B is a common size of a cache line.  */
-+  /* Since small trivially constructible types are cheap to construct, we
-+     suppress the warning for them.  64B is a common size of a cache line.  */
-+  tree list = build_tree_list (NULL_TREE, TREE_TYPE (expr));
-   if (TREE_CODE (TYPE_SIZE_UNIT (type)) != INTEGER_CST
-       || (tree_to_uhwi (TYPE_SIZE_UNIT (type)) <= 64
--         && trivially_copyable_p (type)))
-+         && is_trivially_xible (INIT_EXPR, type, list)))
-     return;
- 
-   /* If we can initialize a reference directly, suggest that to avoid the
-diff --git a/gcc/testsuite/g++.dg/warn/Wrange-loop-construct3.C b/gcc/testsuite/g++.dg/warn/Wrange-loop-construct3.C
-new file mode 100644
-index 000000000..3d9d0c908
---- /dev/null
-+++ b/gcc/testsuite/g++.dg/warn/Wrange-loop-construct3.C
-@@ -0,0 +1,57 @@
-+// PR c++/116731
-+// { dg-do compile { target c++11 } }
-+// { dg-options "-Wrange-loop-construct" }
-+
-+void
-+f0 ()
-+{
-+  struct S {
-+    char a[64];
-+    S& operator=(const S&) { return *this; };
-+  };
-+
-+  S arr[8];
-+  for (const auto r : arr)
-+    (void) r;
-+}
-+
-+void
-+f1 ()
-+{
-+  struct S {
-+    char a[65];
-+    S& operator=(const S&) { return *this; };
-+  };
-+
-+  S arr[8];
-+  for (const auto r : arr) // { dg-warning "creates a copy" }
-+    (void) r;
-+}
-+
-+void
-+f2 ()
-+{
-+  struct S {
-+    char a[64];
-+    S& operator=(const S&) { return *this; };
-+    ~S() { }
-+  };
-+
-+  S arr[8];
-+  for (const auto r : arr) // { dg-warning "creates a copy" }
-+    (void) r;
-+}
-+
-+void
-+f3 ()
-+{
-+  struct S {
-+    char a[65];
-+    S& operator=(const S&) { return *this; };
-+    ~S() { }
-+  };
-+
-+  S arr[8];
-+  for (const auto r : arr) // { dg-warning "creates a copy" }
-+    (void) r;
-+}
--- 
-2.43.0
-
diff --git a/meta/recipes-devtools/gcc/gcc/gcc.git-ab884fffe3fc82a710bea66ad651720d71c938b8.patch b/meta/recipes-devtools/gcc/gcc/gcc.git-ab884fffe3fc82a710bea66ad651720d71c938b8.patch
deleted file mode 100644
index e5abdcc703..0000000000
--- a/meta/recipes-devtools/gcc/gcc/gcc.git-ab884fffe3fc82a710bea66ad651720d71c938b8.patch
+++ /dev/null
@@ -1,549 +0,0 @@
-From ab884fffe3fc82a710bea66ad651720d71c938b8 Mon Sep 17 00:00:00 2001
-From: Jonathan Wakely <jwakely@redhat.com>
-Date: Tue, 30 Apr 2024 09:52:13 +0100
-Subject: [PATCH] libstdc++: Fix std::chrono::tzdb to work with vanguard format
-
-I found some issues in the std::chrono::tzdb parser by testing the
-tzdata "vanguard" format, which uses new features that aren't enabled in
-the "main" and "rearguard" data formats.
-
-Since 2024a the keyword "minimum" is no longer valid for the FROM and TO
-fields in a Rule line, which means that "m" is now a valid abbreviation
-for "maximum". Previously we expected either "mi" or "ma". For backwards
-compatibility, a FROM field beginning with "mi" is still supported and
-is treated as 1900. The "maximum" keyword is only allowed in TO now,
-because it makes no sense in FROM. To support these changes the
-minmax_year and minmax_year2 classes for parsing FROM and TO are
-replaced with a single years_from_to class that reads both fields.
-
-The vanguard format makes use of %z in Zone FORMAT fields, which caused
-an exception to be thrown from ZoneInfo::set_abbrev because no % or /
-characters were expected when a Zone doesn't use a named Rule. The
-ZoneInfo::to(sys_info&) function now uses format_abbrev_str to replace
-any %z with the current offset. Although format_abbrev_str also checks
-for %s and STD/DST formats, those only make sense when a named Rule is
-in effect, so won't occur when ZoneInfo::to(sys_info&) is used.
-
-Since making this change on trunk, the tzdata-2024b release started
-using %z in the main format, not just vanguard. This makes a backport to
-release branches necessary (see PR 116657).
-
-This change also implements a feature that has always been missing from
-time_zone::_M_get_sys_info: finding the Rule that is active before the
-specified time point, so that we can correctly handle %s in the FORMAT
-for the first new sys_info that gets created. This requires implementing
-a poorly documented feature of zic, to get the LETTERS field from a
-later transition, as described at
-https://mm.icann.org/pipermail/tz/2024-April/058891.html
-In order for this to work we need to be able to distinguish an empty
-letters field (as used by CE%sT where the variable part is either empty
-or "S") from "the letters field is not known for this transition". The
-tzdata file uses "-" for an empty letters field, which libstdc++ was
-previously replacing with "" when the Rule was parsed. Instead, we now
-preserve the "-" in the Rule object, so that "" can be used for the case
-where we don't know the letters (and so need to decide it).
-
-(cherry picked from commit 0ca8d56f2085715f27ee536c6c344bc47af49cdd)
-
-Upstream-Status: Backport [https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=5ceea2ac106d6dd1aa8175670b15a801316cf1c9]
-
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
----
- libstdc++-v3/src/c++20/tzdb.cc                | 265 +++++++++++-------
- .../std/time/time_zone/sys_info_abbrev.cc     | 106 +++++++
- libstdc++-v3/testsuite/std/time/tzdb/1.cc     |   6 +-
- 3 files changed, 274 insertions(+), 103 deletions(-)
- create mode 100644 libstdc++-v3/testsuite/std/time/time_zone/sys_info_abbrev.cc
-
-diff --git a/libstdc++-v3/src/c++20/tzdb.cc b/libstdc++-v3/src/c++20/tzdb.cc
-index c7c7cc9deee6..7e8cce7ce8cf 100644
---- a/libstdc++-v3/src/c++20/tzdb.cc
-+++ b/libstdc++-v3/src/c++20/tzdb.cc
-@@ -342,51 +342,103 @@ namespace std::chrono
-       friend istream& operator>>(istream&, on_day&);
-     };
- 
--    // Wrapper for chrono::year that reads a year, or one of the keywords
--    // "minimum" or "maximum", or an unambiguous prefix of a keyword.
--    struct minmax_year
-+    // Wrapper for two chrono::year values, which reads the FROM and TO
-+    // fields of a Rule line. The FROM field is a year and TO is a year or
-+    // one of the keywords "maximum" or "only" (or an abbreviation of those).
-+    // For backwards compatibility, the keyword "minimum" is recognized
-+    // for FROM and interpreted as 1900.
-+    struct years_from_to
-     {
--      year& y;
-+      year& from;
-+      year& to;
- 
--      friend istream& operator>>(istream& in, minmax_year&& y)
-+      friend istream& operator>>(istream& in, years_from_to&& yy)
-       {
--       if (ws(in).peek() == 'm') // keywords "minimum" or "maximum"
-+       string s;
-+       auto c = ws(in).peek();
-+       if (c == 'm') [[unlikely]] // keyword "minimum"
-          {
--           string s;
--           in >> s; // extract the rest of the word, but only look at s[1]
--           if (s[1] == 'a')
--             y.y = year::max();
--           else if (s[1] == 'i')
--             y.y = year::min();
--           else
--             in.setstate(ios::failbit);
-+           in >> s; // extract the rest of the word
-+           yy.from = year(1900);
-+         }
-+       else if (int num = 0; in >> num) [[likely]]
-+         yy.from = year{num};
-+
-+       c = ws(in).peek();
-+       if (c == 'm') // keyword "maximum"
-+         {
-+           in >> s; // extract the rest of the word
-+           yy.to = year::max();
-+         }
-+       else if (c == 'o') // keyword "only"
-+         {
-+           in >> s; // extract the rest of the word
-+           yy.to = yy.from;
-          }
-        else if (int num = 0; in >> num)
--         y.y = year{num};
-+         yy.to = year{num};
-+
-        return in;
-       }
-     };
- 
--    // As above for minmax_year, but also supports the keyword "only",
--    // meaning that the TO year is the same as the FROM year.
--    struct minmax_year2
-+    bool
-+    select_std_or_dst_abbrev(string& abbrev, minutes save)
-     {
--      minmax_year to;
--      year from;
-+      if (size_t pos = abbrev.find('/'); pos != string::npos)
-+       {
-+         // Select one of "STD/DST" for standard or daylight.
-+         if (save == 0min)
-+           abbrev.erase(pos);
-+         else
-+           abbrev.erase(0, pos + 1);
-+         return true;
-+       }
-+      return false;
-+    }
- 
--      friend istream& operator>>(istream& in, minmax_year2&& y)
--      {
--       if (ws(in).peek() == 'o') // keyword "only"
--         {
--           string s;
--           in >> s; // extract the whole keyword
--           y.to.y = y.from;
--         }
--       else
--         in >> std::move(y.to);
--       return in;
--      }
--    };
-+    // Set the sys_info::abbrev string by expanding any placeholders.
-+    void
-+    format_abbrev_str(sys_info& info, string_view letters = {})
-+    {
-+      if (size_t pos = info.abbrev.find('%'); pos != string::npos)
-+       {
-+         if (info.abbrev[pos + 1] == 's')
-+           {
-+             // Expand "%s" to the variable part, given by Rule::letters.
-+             if (letters == "-")
-+               info.abbrev.erase(pos, 2);
-+             else
-+               info.abbrev.replace(pos, 2, letters);
-+           }
-+         else if (info.abbrev[pos + 1] == 'z')
-+           {
-+             // Expand "%z" to the UT offset as +/-hh, +/-hhmm, or +/-hhmmss.
-+             hh_mm_ss<seconds> t(info.offset);
-+             string z(1, "+-"[t.is_negative()]);
-+             long val = t.hours().count();
-+             int digits = 2;
-+             if (int m = t.minutes().count())
-+               {
-+                 digits = 4;
-+                 val *= 100;
-+                 val += m;
-+                 if (int s = t.seconds().count())
-+                   {
-+                     digits = 6;
-+                     val *= 100;
-+                     val += s;
-+                   }
-+               }
-+             auto sval = std::to_string(val);
-+             z += string(digits - sval.size(), '0');
-+             z += sval;
-+             info.abbrev.replace(pos, 2, z);
-+           }
-+       }
-+      else
-+       select_std_or_dst_abbrev(info.abbrev, info.save);
-+    }
- 
-     // A time zone information record.
-     // Zone  NAME        STDOFF  RULES   FORMAT  [UNTIL]
-@@ -462,6 +514,7 @@ namespace std::chrono
-        info.offset = offset();
-        info.save = minutes(m_save);
-        info.abbrev = format();
-+       format_abbrev_str(info); // expand %z
-        return true;
-       }
- 
-@@ -469,12 +522,9 @@ namespace std::chrono
-       friend class time_zone;
- 
-       void
--      set_abbrev(const string& abbrev)
-+      set_abbrev(string abbrev)
-       {
--       // In practice, the FORMAT field never needs expanding here.
--       if (abbrev.find_first_of("/%") != abbrev.npos)
--         __throw_runtime_error("std::chrono::time_zone: invalid data");
--       m_buf = abbrev;
-+       m_buf = std::move(abbrev);
-        m_pos = 0;
-        m_expanded = true;
-       }
-@@ -544,9 +594,7 @@ namespace std::chrono
- 
-        // Rule  NAME  FROM  TO  TYPE  IN  ON  AT  SAVE  LETTER/S
- 
--       in >> quoted(rule.name)
--          >> minmax_year{rule.from}
--          >> minmax_year2{rule.to, rule.from};
-+       in >> quoted(rule.name) >> years_from_to{rule.from, rule.to};
- 
-        if (char type; in >> type && type != '-')
-          in.setstate(ios::failbit);
-@@ -557,7 +605,7 @@ namespace std::chrono
-        if (save_time.indicator != at_time::Wall)
-          {
-            // We don't actually store the save_time.indicator, because we
--           // assume that it's always deducable from the actual offset value.
-+           // assume that it's always deducible from the offset value.
-            auto expected = save_time.time == 0s
-                              ? at_time::Standard
-                              : at_time::Daylight;
-@@ -567,8 +615,6 @@ namespace std::chrono
-        rule.save = save_time.time;
- 
-        in >> rule.letters;
--       if (rule.letters == "-")
--         rule.letters.clear();
-        return in;
-       }
- 
-@@ -719,58 +765,6 @@ namespace std::chrono
- #endif // TZDB_DISABLED
-   };
- 
--#ifndef TZDB_DISABLED
--  namespace
--  {
--    bool
--    select_std_or_dst_abbrev(string& abbrev, minutes save)
--    {
--      if (size_t pos = abbrev.find('/'); pos != string::npos)
--       {
--         // Select one of "STD/DST" for standard or daylight.
--         if (save == 0min)
--           abbrev.erase(pos);
--         else
--           abbrev.erase(0, pos + 1);
--         return true;
--       }
--      return false;
--    }
--
--    // Set the sys_info::abbrev string by expanding any placeholders.
--    void
--    format_abbrev_str(sys_info& info, string_view letters = {})
--    {
--      if (size_t pos = info.abbrev.find("%s"); pos != string::npos)
--       {
--         // Expand "%s" to the variable part, given by Rule::letters.
--         info.abbrev.replace(pos, 2, letters);
--       }
--      else if (size_t pos = info.abbrev.find("%z"); pos != string::npos)
--       {
--         // Expand "%z" to the UT offset as +/-hh, +/-hhmm, or +/-hhmmss.
--         hh_mm_ss<seconds> t(info.offset);
--         string z(1, "+-"[t.is_negative()]);
--         long val = t.hours().count();
--         if (minutes m = t.minutes(); m != m.zero())
--           {
--             val *= 100;
--             val += m.count();
--             if (seconds s = t.seconds(); s != s.zero())
--               {
--                 val *= 100;
--                 val += s.count();
--               }
--           }
--         z += std::to_string(val);
--         info.abbrev.replace(pos, 2, z);
--       }
--      else
--       select_std_or_dst_abbrev(info.abbrev, info.save);
--    }
--  }
--#endif // TZDB_DISABLED
--
-   // Implementation of std::chrono::time_zone::get_info(const sys_time<D>&)
-   sys_info
-   time_zone::_M_get_sys_info(sys_seconds tp) const
-@@ -839,12 +833,72 @@ namespace std::chrono
-     info.abbrev = ri.format();
- 
-     string_view letters;
--    if (i != infos.begin())
-+    if (i != infos.begin() && i[-1].expanded())
-+      letters = i[-1].next_letters();
-+
-+    if (letters.empty())
-       {
--       if (i[-1].expanded())
--         letters = i[-1].next_letters();
--       // XXX else need to find Rule active before this time and use it
--       // to know the initial offset, save, and letters.
-+       sys_seconds t = info.begin - seconds(1);
-+       const year_month_day date(chrono::floor<days>(t));
-+
-+       // Try to find a Rule active before this time, to get initial
-+       // SAVE and LETTERS values. There may not be a Rule for the period
-+       // before the first DST transition, so find the earliest DST->STD
-+       // transition and use the LETTERS from that.
-+       const Rule* active_rule = nullptr;
-+       sys_seconds active_rule_start = sys_seconds::min();
-+       const Rule* first_std = nullptr;
-+       for (const auto& rule : rules)
-+         {
-+           if (rule.save == minutes(0))
-+             {
-+               if (!first_std)
-+                 first_std = &rule;
-+               else if (rule.from < first_std->from)
-+                 first_std = &rule;
-+               else if (rule.from == first_std->from)
-+                 {
-+                   if (rule.start_time(rule.from, {})
-+                         < first_std->start_time(first_std->from, {}))
-+                     first_std = &rule;
-+                 }
-+             }
-+
-+           year y = date.year();
-+
-+           if (y > rule.to) // rule no longer applies at time t
-+             continue;
-+           if (y < rule.from) // rule doesn't apply yet at time t
-+             continue;
-+
-+           sys_seconds rule_start;
-+
-+           seconds offset{}; // appropriate for at_time::Universal
-+           if (rule.when.indicator == at_time::Wall)
-+             offset = info.offset;
-+           else if (rule.when.indicator == at_time::Standard)
-+             offset = ri.offset();
-+
-+           // Time the rule takes effect this year:
-+           rule_start = rule.start_time(y, offset);
-+
-+           if (rule_start >= t && rule.from < y)
-+             {
-+               // Try this rule in the previous year.
-+               rule_start = rule.start_time(--y, offset);
-+             }
-+
-+           if (active_rule_start < rule_start && rule_start < t)
-+             {
-+               active_rule_start = rule_start;
-+               active_rule = &rule;
-+             }
-+         }
-+
-+       if (active_rule)
-+         letters = active_rule->letters;
-+       else if (first_std)
-+         letters = first_std->letters;
-       }
- 
-     const Rule* curr_rule = nullptr;
-@@ -2069,9 +2123,11 @@ namespace std::chrono
-              istringstream in2(std::move(rules));
-              in2 >> rules_time;
-              inf.m_save = duration_cast<minutes>(rules_time.time);
-+             // If the FORMAT is "STD/DST" then we can choose the right one
-+             // now, so that we store a shorter string.
-              select_std_or_dst_abbrev(fmt, inf.m_save);
-            }
--         inf.set_abbrev(fmt);
-+         inf.set_abbrev(std::move(fmt));
-        }
- 
-       // YEAR [MONTH [DAY [TIME]]]
-@@ -2082,7 +2138,12 @@ namespace std::chrono
-          abbrev_month m{January};
-          int d = 1;
-          at_time t{};
-+         // XXX DAY should support ON format, e.g. lastSun or Sun>=8
-          in >> m >> d >> t;
-+         // XXX UNTIL field should be interpreted
-+         // "using the rules in effect just before the transition"
-+         // so might need to store as year_month_day and hh_mm_ss and only
-+         // convert to a sys_time once we know the offset in effect.
-          inf.m_until = sys_days(year(y)/m.m/day(d)) + seconds(t.time);
-        }
-       else
-diff --git a/libstdc++-v3/testsuite/std/time/time_zone/sys_info_abbrev.cc b/libstdc++-v3/testsuite/std/time/time_zone/sys_info_abbrev.cc
-new file mode 100644
-index 000000000000..f1a8fff02f58
---- /dev/null
-+++ b/libstdc++-v3/testsuite/std/time/time_zone/sys_info_abbrev.cc
-@@ -0,0 +1,106 @@
-+// { dg-do run { target c++20 } }
-+// { dg-require-effective-target tzdb }
-+// { dg-require-effective-target cxx11_abi }
-+// { dg-xfail-run-if "no weak override on AIX" { powerpc-ibm-aix* } }
-+
-+#include <chrono>
-+#include <fstream>
-+#include <testsuite_hooks.h>
-+
-+static bool override_used = false;
-+
-+namespace __gnu_cxx
-+{
-+  const char* zoneinfo_dir_override() {
-+    override_used = true;
-+    return "./";
-+  }
-+}
-+
-+using namespace std::chrono;
-+
-+void
-+test_format()
-+{
-+  std::ofstream("tzdata.zi") << R"(# version test_1
-+Zone Africa/Bissau -1:2:20 - LMT 1912 Ja 1 1u
-+                   -1      - %z  1975
-+                   0       - GMT
-+Zon Some/Zone 1:2:3   - %z 1900
-+              1:23:45 - %z 1950
-+Zo Another/Zone 1:2:3 -     AZ0     1901
-+                1     Roolz A%sZ    2000
-+                1     Roolz SAZ/DAZ 2005
-+                1     Roolz %z
-+Rule Roolz 1950 max - April 1 2 1 D
-+Rul  Roolz 1950 max - Oct   1 1 0 S
-+Z Strange/Zone 1       - X%sX    1980
-+               1       - FOO/BAR 1990
-+               2:00    - %zzz    1995
-+               0:9     - %zzz    1996
-+               0:8:7   - %zzz    1997
-+               0:6:5.5 - %zzz    1998
-+)";
-+
-+  const auto& db = reload_tzdb();
-+  VERIFY( override_used ); // If this fails then XFAIL for the target.
-+  VERIFY( db.version == "test_1" );
-+
-+  // Test formatting %z as
-+  auto tz = locate_zone("Africa/Bissau");
-+  auto inf = tz->get_info(sys_days(1974y/1/1));
-+  VERIFY( inf.abbrev == "-01" );
-+
-+  tz = locate_zone("Some/Zone");
-+  inf = tz->get_info(sys_days(1899y/1/1));
-+  VERIFY( inf.abbrev == "+010203" );
-+  inf = tz->get_info(sys_days(1955y/1/1));
-+  VERIFY( inf.abbrev == "+012345" );
-+
-+  tz = locate_zone("Another/Zone");
-+  // Test formatting %s as the LETTER/S field from the active Rule.
-+  inf = tz->get_info(sys_days(1910y/January/1));
-+  VERIFY( inf.abbrev == "ASZ" );
-+  inf = tz->get_info(sys_days(1950y/January/1));
-+  VERIFY( inf.abbrev == "ASZ" );
-+  inf = tz->get_info(sys_days(1950y/June/1));
-+  VERIFY( inf.abbrev == "ADZ" );
-+  inf = tz->get_info(sys_days(1999y/January/1));
-+  VERIFY( inf.abbrev == "ASZ" );
-+  inf = tz->get_info(sys_days(1999y/July/1));
-+  VERIFY( inf.abbrev == "ADZ" );
-+  // Test formatting STD/DST according to the active Rule.
-+  inf = tz->get_info(sys_days(2000y/January/2));
-+  VERIFY( inf.abbrev == "SAZ" );
-+  inf = tz->get_info(sys_days(2001y/January/1));
-+  VERIFY( inf.abbrev == "SAZ" );
-+  inf = tz->get_info(sys_days(2001y/July/1));
-+  VERIFY( inf.abbrev == "DAZ" );
-+  // Test formatting %z as the offset determined by the active Rule.
-+  inf = tz->get_info(sys_days(2005y/January/2));
-+  VERIFY( inf.abbrev == "+01" );
-+  inf = tz->get_info(sys_days(2006y/January/1));
-+  VERIFY( inf.abbrev == "+01" );
-+  inf = tz->get_info(sys_days(2006y/July/1));
-+  VERIFY( inf.abbrev == "+02" );
-+
-+  // Test formatting %z, %s and S/D for a Zone with no associated Rules.
-+  tz = locate_zone("Strange/Zone");
-+  inf = tz->get_info(sys_days(1979y/January/1));
-+  VERIFY( inf.abbrev == "XX" ); // No Rule means nothing to use for %s.
-+  inf = tz->get_info(sys_days(1981y/July/1));
-+  VERIFY( inf.abbrev == "FOO" ); // Always standard time means first string.
-+  inf = tz->get_info(sys_days(1994y/July/1));
-+  VERIFY( inf.abbrev == "+02zz" );
-+  inf = tz->get_info(sys_days(1995y/July/1));
-+  VERIFY( inf.abbrev == "+0009zz" );
-+  inf = tz->get_info(sys_days(1996y/July/1));
-+  VERIFY( inf.abbrev == "+000807zz" );
-+  inf = tz->get_info(sys_days(1997y/July/1));
-+  VERIFY( inf.abbrev == "+000606zz" );
-+}
-+
-+int main()
-+{
-+  test_format();
-+}
-diff --git a/libstdc++-v3/testsuite/std/time/tzdb/1.cc b/libstdc++-v3/testsuite/std/time/tzdb/1.cc
-index 796f3a8b4256..7a31c1c20ba7 100644
---- a/libstdc++-v3/testsuite/std/time/tzdb/1.cc
-+++ b/libstdc++-v3/testsuite/std/time/tzdb/1.cc
-@@ -39,11 +39,15 @@ test_locate()
-   const tzdb& db = get_tzdb();
-   const time_zone* tz = db.locate_zone("GMT");
-   VERIFY( tz != nullptr );
--  VERIFY( tz->name() == "Etc/GMT" );
-   VERIFY( tz == std::chrono::locate_zone("GMT") );
-   VERIFY( tz == db.locate_zone("Etc/GMT") );
-   VERIFY( tz == db.locate_zone("Etc/GMT+0") );
- 
-+  // Since 2022f GMT is now a Zone and Etc/GMT a link instead of vice versa,
-+  // but only when using the vanguard format. As of 2024a, the main and
-+  // rearguard formats still have Etc/GMT as a Zone and GMT as a link.
-+  VERIFY( tz->name() == "GMT" || tz->name() == "Etc/GMT" );
-+
-   VERIFY( db.locate_zone(db.current_zone()->name()) == db.current_zone() );
- }
- 
--- 
-2.43.5
-
diff --git a/meta/recipes-devtools/gcc/gcc_13.3.bb b/meta/recipes-devtools/gcc/gcc_13.4.bb
index 255fe552bd..255fe552bd 100644
--- a/meta/recipes-devtools/gcc/gcc_13.3.bb
+++ b/meta/recipes-devtools/gcc/gcc_13.4.bb
diff --git a/meta/recipes-devtools/gcc/libgcc-initial_13.3.bb b/meta/recipes-devtools/gcc/libgcc-initial_13.4.bb
index a259082b47..a259082b47 100644
--- a/meta/recipes-devtools/gcc/libgcc-initial_13.3.bb
+++ b/meta/recipes-devtools/gcc/libgcc-initial_13.4.bb
diff --git a/meta/recipes-devtools/gcc/libgcc_13.3.bb b/meta/recipes-devtools/gcc/libgcc_13.4.bb
index fdcd6cc0da..fdcd6cc0da 100644
--- a/meta/recipes-devtools/gcc/libgcc_13.3.bb
+++ b/meta/recipes-devtools/gcc/libgcc_13.4.bb
diff --git a/meta/recipes-devtools/gcc/libgfortran_13.3.bb b/meta/recipes-devtools/gcc/libgfortran_13.4.bb
index 71dd8b4bdc..71dd8b4bdc 100644
--- a/meta/recipes-devtools/gcc/libgfortran_13.3.bb
+++ b/meta/recipes-devtools/gcc/libgfortran_13.4.bb
diff --git a/meta/recipes-devtools/go/go-binary-native_1.22.12.bb b/meta/recipes-devtools/go/go-binary-native_1.22.12.bb
index 747737ff94..b15b60a691 100644
--- a/meta/recipes-devtools/go/go-binary-native_1.22.12.bb
+++ b/meta/recipes-devtools/go/go-binary-native_1.22.12.bb
@@ -17,6 +17,7 @@ UPSTREAM_CHECK_URI = "https://golang.org/dl/"
 UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux"
 
 CVE_PRODUCT = "golang:go"
+CVE_STATUS[CVE-2024-3566] = "not-applicable-platform: Issue only applies on Windows"
 
 S = "${WORKDIR}/go"
 
diff --git a/meta/recipes-devtools/go/go-common.inc b/meta/recipes-devtools/go/go-common.inc
index db165792dc..a39dea6c1c 100644
--- a/meta/recipes-devtools/go/go-common.inc
+++ b/meta/recipes-devtools/go/go-common.inc
@@ -21,6 +21,7 @@ UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.src\.tar"
 
 # all recipe variants are created from the same product
 CVE_PRODUCT = "golang:go"
+CVE_STATUS[CVE-2024-3566] = "not-applicable-platform: Issue only applies on Windows"
 
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 SSTATE_SCAN_CMD = "true"
diff --git a/meta/recipes-devtools/python/python3-requests_2.32.3.bb b/meta/recipes-devtools/python/python3-requests_2.32.4.bb
index 36ff75f87d..b86ecfba52 100644
--- a/meta/recipes-devtools/python/python3-requests_2.32.3.bb
+++ b/meta/recipes-devtools/python/python3-requests_2.32.4.bb
@@ -7,7 +7,7 @@ SRC_URI:append:class-nativesdk = " \
            file://environment.d-python3-requests.sh \
 "
 
-SRC_URI[sha256sum] = "55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760"
+SRC_URI[sha256sum] = "27d0316682c8a29834d3264820024b62a36942083d52caf2f14c0591336d3422"
 
 inherit pypi python_setuptools_build_meta
 
diff --git a/meta/recipes-devtools/python/python3-setuptools/CVE-2025-47273-pre1.patch b/meta/recipes-devtools/python/python3-setuptools/CVE-2025-47273-pre1.patch
new file mode 100644
index 0000000000..72bcaea435
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-setuptools/CVE-2025-47273-pre1.patch
@@ -0,0 +1,54 @@
+From d8390feaa99091d1ba9626bec0e4ba7072fc507a Mon Sep 17 00:00:00 2001
+From: "Jason R. Coombs" <jaraco@jaraco.com>
+Date: Sat, 19 Apr 2025 12:49:55 -0400
+Subject: [PATCH] Extract _resolve_download_filename with test.
+
+Upstream-Status: Backport [https://github.com/pypa/setuptools/commit/d8390feaa99091d1ba9626bec0e4ba7072fc507a]
+CVE: CVE-2025-47273 #Dependency Patch
+Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
+---
+ setuptools/package_index.py | 20 ++++++++++++++++----
+ 1 file changed, 16 insertions(+), 4 deletions(-)
+
+diff --git a/setuptools/package_index.py b/setuptools/package_index.py
+index 00a972d..d460fcb 100644
+--- a/setuptools/package_index.py
++++ b/setuptools/package_index.py
+@@ -815,9 +815,16 @@ class PackageIndex(Environment):
+             else:
+                 raise DistutilsError("Download error for %s: %s" % (url, v)) from v
+ 
+-    def _download_url(self, url, tmpdir):
+-        # Determine download filename
+-        #
++    @staticmethod
++    def _resolve_download_filename(url, tmpdir):
++        """
++        >>> du = PackageIndex._resolve_download_filename
++        >>> root = getfixture('tmp_path')
++        >>> url = 'https://files.pythonhosted.org/packages/a9/5a/0db.../setuptools-78.1.0.tar.gz'
++        >>> import pathlib
++        >>> str(pathlib.Path(du(url, root)).relative_to(root))
++        'setuptools-78.1.0.tar.gz'
++        """
+         name, fragment = egg_info_for_url(url)
+         if name:
+             while '..' in name:
+@@ -828,8 +835,13 @@ class PackageIndex(Environment):
+         if name.endswith('.egg.zip'):
+             name = name[:-4]  # strip the extra .zip before download
+ 
+-        filename = os.path.join(tmpdir, name)
++        return os.path.join(tmpdir, name)
+ 
++    def _download_url(self, url, tmpdir):
++        """
++        Determine the download filename.
++        """
++        filename = self._resolve_download_filename(url, tmpdir)
+         return self._download_vcs(url, filename) or self._download_other(url, filename)
+ 
+     @staticmethod
+-- 
+2.25.1
+
diff --git a/meta/recipes-devtools/python/python3-setuptools/CVE-2025-47273.patch b/meta/recipes-devtools/python/python3-setuptools/CVE-2025-47273.patch
new file mode 100644
index 0000000000..be6617e0f6
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-setuptools/CVE-2025-47273.patch
@@ -0,0 +1,59 @@
+From 250a6d17978f9f6ac3ac887091f2d32886fbbb0b Mon Sep 17 00:00:00 2001
+From: "Jason R. Coombs" <jaraco@jaraco.com>
+Date: Sat, 19 Apr 2025 13:03:47 -0400
+Subject: [PATCH] Add a check to ensure the name resolves relative to the
+ tmpdir.
+
+Closes #4946
+
+Upstream-Status: Backport [https://github.com/pypa/setuptools/commit/250a6d17978f9f6ac3ac887091f2d32886fbbb0b]
+CVE: CVE-2025-47273
+Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
+---
+ setuptools/package_index.py | 18 ++++++++++++++++--
+ 1 file changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/setuptools/package_index.py b/setuptools/package_index.py
+index d460fcb..6c7874d 100644
+--- a/setuptools/package_index.py
++++ b/setuptools/package_index.py
+@@ -818,12 +818,20 @@ class PackageIndex(Environment):
+     @staticmethod
+     def _resolve_download_filename(url, tmpdir):
+         """
++        >>> import pathlib
+         >>> du = PackageIndex._resolve_download_filename
+         >>> root = getfixture('tmp_path')
+         >>> url = 'https://files.pythonhosted.org/packages/a9/5a/0db.../setuptools-78.1.0.tar.gz'
+-        >>> import pathlib
+         >>> str(pathlib.Path(du(url, root)).relative_to(root))
+         'setuptools-78.1.0.tar.gz'
++
++        Ensures the target is always in tmpdir.
++
++        >>> url = 'https://anyhost/%2fhome%2fuser%2f.ssh%2fauthorized_keys'
++        >>> du(url, root)
++        Traceback (most recent call last):
++        ...
++        ValueError: Invalid filename...
+         """
+         name, fragment = egg_info_for_url(url)
+         if name:
+@@ -835,7 +843,13 @@ class PackageIndex(Environment):
+         if name.endswith('.egg.zip'):
+             name = name[:-4]  # strip the extra .zip before download
+ 
+-        return os.path.join(tmpdir, name)
++        filename = os.path.join(tmpdir, name)
++
++        # ensure path resolves within the tmpdir
++        if not filename.startswith(str(tmpdir)):
++            raise ValueError(f"Invalid filename {filename}")
++
++        return filename
+ 
+     def _download_url(self, url, tmpdir):
+         """
+-- 
+2.25.1
+
diff --git a/meta/recipes-devtools/python/python3-setuptools_69.1.1.bb b/meta/recipes-devtools/python/python3-setuptools_69.1.1.bb
index 7663101f23..46b2f0ab00 100644
--- a/meta/recipes-devtools/python/python3-setuptools_69.1.1.bb
+++ b/meta/recipes-devtools/python/python3-setuptools_69.1.1.bb
@@ -13,6 +13,8 @@ SRC_URI:append:class-native = " file://0001-conditionally-do-not-fetch-code-by-e
 SRC_URI += " \
             file://0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch \
             file://CVE-2024-6345.patch \
+            file://CVE-2025-47273-pre1.patch \
+            file://CVE-2025-47273.patch \
 "
 
 SRC_URI[sha256sum] = "5c0806c7d9af348e6dd3777b4f4dbb42c7ad85b190104837488eab9a7c945cf8"
diff --git a/meta/recipes-devtools/python/python3/0001-Avoid-shebang-overflow-on-python-config.py.patch b/meta/recipes-devtools/python/python3/0001-Avoid-shebang-overflow-on-python-config.py.patch
index 6e4930b9ec..a8f98d873e 100644
--- a/meta/recipes-devtools/python/python3/0001-Avoid-shebang-overflow-on-python-config.py.patch
+++ b/meta/recipes-devtools/python/python3/0001-Avoid-shebang-overflow-on-python-config.py.patch
@@ -19,7 +19,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
 index 2d235d2..1ac2263 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -2355,6 +2355,8 @@ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh
+@@ -2356,6 +2356,8 @@ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh
         @ # Substitution happens here, as the completely-expanded BINDIR
         @ # is not available in configure
         sed -e "s,@EXENAME@,$(EXENAME)," < $(srcdir)/Misc/python-config.in >python-config.py
diff --git a/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch b/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch
index 1b9f3565d3..c42a56bcb3 100644
--- a/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch
+++ b/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch
@@ -17,7 +17,7 @@ diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
 index 6258b68..d59ec6e 100644
 --- a/Lib/sysconfig.py
 +++ b/Lib/sysconfig.py
-@@ -668,6 +668,11 @@ def _init_config_vars():
+@@ -675,6 +675,11 @@ def _init_config_vars():
          _CONFIG_VARS['VPATH'] = sys._vpath
      if os.name == 'posix':
          _init_posix(_CONFIG_VARS)
diff --git a/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch b/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch
index ec3bb9cbbd..051ec2c635 100644
--- a/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch
+++ b/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch
@@ -26,7 +26,7 @@ diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.
 index 3b4415b..1f94dec 100644
 --- a/Lib/test/_test_multiprocessing.py
 +++ b/Lib/test/_test_multiprocessing.py
-@@ -688,6 +688,7 @@ class _TestProcess(BaseTestCase):
+@@ -692,6 +692,7 @@ class _TestProcess(BaseTestCase):
          close_queue(q)
  
      @support.requires_resource('walltime')
@@ -34,7 +34,7 @@ index 3b4415b..1f94dec 100644
      def test_many_processes(self):
          if self.TYPE == 'threads':
              self.skipTest('test not appropriate for {}'.format(self.TYPE))
-@@ -2211,6 +2212,7 @@ class _TestBarrier(BaseTestCase):
+@@ -2223,6 +2224,7 @@ class _TestBarrier(BaseTestCase):
          except threading.BrokenBarrierError:
              results.append(True)
  
@@ -42,7 +42,7 @@ index 3b4415b..1f94dec 100644
      def test_timeout(self):
          """
          Test wait(timeout)
-@@ -5208,6 +5210,7 @@ class TestWait(unittest.TestCase):
+@@ -5220,6 +5222,7 @@ class TestWait(unittest.TestCase):
          time.sleep(period)
  
      @support.requires_resource('walltime')
diff --git a/meta/recipes-devtools/python/python3/0001-ctypes-correct-gcc-check-in-test.patch b/meta/recipes-devtools/python/python3/0001-ctypes-correct-gcc-check-in-test.patch
deleted file mode 100644
index 3dd762e519..0000000000
--- a/meta/recipes-devtools/python/python3/0001-ctypes-correct-gcc-check-in-test.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 2e2a0c8593a38f2020cc2baeeaa7972eb86773f9 Mon Sep 17 00:00:00 2001
-From: Peter Marko <peter.marko@siemens.com>
-Date: Sat, 8 Feb 2025 23:57:17 +0100
-Subject: [PATCH] ctypes: correct gcc check in test
-
-In case gcc is not available, it will throw exception and test fails.
-So chatch the exception to skip the test correctly.
-
-======================================================================
-ERROR: test_null_dlsym (test.test_ctypes.test_dlerror.TestNullDlsym.test_null_dlsym)
-----------------------------------------------------------------------
-Traceback (most recent call last):
-  File "/usr/lib/python3.12/test/test_ctypes/test_dlerror.py", line 61, in test_null_dlsym
-    retcode = subprocess.call(["gcc", "--version"],
-              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  File "/usr/lib/python3.12/subprocess.py", line 391, in call
-    with Popen(*popenargs, **kwargs) as p:
-         ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  File "/usr/lib/python3.12/subprocess.py", line 1028, in __init__
-    self._execute_child(args, executable, preexec_fn, close_fds,
-  File "/usr/lib/python3.12/subprocess.py", line 1963, in _execute_child
-    raise child_exception_type(errno_num, err_msg, err_filename)
-FileNotFoundError: [Errno 2] No such file or directory: 'gcc'
-
-Upstream-Status: Submitted [https://github.com/python/cpython/pull/129872]
-Signed-off-by: Peter Marko <peter.marko@siemens.com>
----
- Lib/test/test_ctypes/test_dlerror.py | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/Lib/test/test_ctypes/test_dlerror.py b/Lib/test/test_ctypes/test_dlerror.py
-index 6bf492399cb..56eb7622b4d 100644
---- a/Lib/test/test_ctypes/test_dlerror.py
-+++ b/Lib/test/test_ctypes/test_dlerror.py
-@@ -58,11 +58,14 @@ def test_null_dlsym(self):
-         import subprocess
-         import tempfile
- 
--        retcode = subprocess.call(["gcc", "--version"],
--                                  stdout=subprocess.DEVNULL,
--                                  stderr=subprocess.DEVNULL)
--        if retcode != 0:
-+        try:
-+            retcode = subprocess.call(["gcc", "--version"],
-+                                      stdout=subprocess.DEVNULL,
-+                                      stderr=subprocess.DEVNULL)
-+        except:
-             self.skipTest("gcc is missing")
-+        if retcode != 0:
-+            self.skipTest("gcc is not working")
- 
-         pipe_r, pipe_w = os.pipe()
-         self.addCleanup(os.close, pipe_r)
diff --git a/meta/recipes-devtools/python/python3/0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch b/meta/recipes-devtools/python/python3/0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch
index 5c74443e62..1cffdd6e05 100644
--- a/meta/recipes-devtools/python/python3/0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch
+++ b/meta/recipes-devtools/python/python3/0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch
@@ -16,7 +16,7 @@ diff --git a/Lib/tarfile.py b/Lib/tarfile.py
 index 0a0f31e..4dfb67d 100755
 --- a/Lib/tarfile.py
 +++ b/Lib/tarfile.py
-@@ -2590,7 +2590,8 @@ class TarFile(object):
+@@ -2685,7 +2685,8 @@ class TarFile(object):
                      os.lchown(targetpath, u, g)
                  else:
                      os.chown(targetpath, u, g)
diff --git a/meta/recipes-devtools/python/python3/0001-skip-no_stdout_fileno-test-due-to-load-variability.patch b/meta/recipes-devtools/python/python3/0001-skip-no_stdout_fileno-test-due-to-load-variability.patch
index e105f36eca..4920cb9ad9 100644
--- a/meta/recipes-devtools/python/python3/0001-skip-no_stdout_fileno-test-due-to-load-variability.patch
+++ b/meta/recipes-devtools/python/python3/0001-skip-no_stdout_fileno-test-due-to-load-variability.patch
@@ -19,7 +19,7 @@ diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
 index c71c568..e41ab5e 100644
 --- a/Lib/test/test_builtin.py
 +++ b/Lib/test/test_builtin.py
-@@ -2352,6 +2352,7 @@ class PtyTests(unittest.TestCase):
+@@ -2375,6 +2375,7 @@ class PtyTests(unittest.TestCase):
          # Check stdin/stdout error handler is used when invoking PyOS_Readline()
          self.check_input_tty("prompté", b"quux\xe9", "ascii")
  
diff --git a/meta/recipes-devtools/python/python3/0001-test_storlines-skip-due-to-load-variability.patch b/meta/recipes-devtools/python/python3/0001-test_storlines-skip-due-to-load-variability.patch
index 22aabbb2ed..88cd93a51f 100644
--- a/meta/recipes-devtools/python/python3/0001-test_storlines-skip-due-to-load-variability.patch
+++ b/meta/recipes-devtools/python/python3/0001-test_storlines-skip-due-to-load-variability.patch
@@ -19,7 +19,7 @@ diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py
 index 4c4a449..b8c79a4 100644
 --- a/Lib/test/test_ftplib.py
 +++ b/Lib/test/test_ftplib.py
-@@ -626,6 +626,7 @@ class TestFTPClass(TestCase):
+@@ -629,6 +629,7 @@ class TestFTPClass(TestCase):
              self.client.storbinary('stor', f, rest=r)
              self.assertEqual(self.server.handler_instance.rest, str(r))
  
diff --git a/meta/recipes-devtools/python/python3/makerace.patch b/meta/recipes-devtools/python/python3/makerace.patch
index 862b648685..fbe12a5fca 100644
--- a/meta/recipes-devtools/python/python3/makerace.patch
+++ b/meta/recipes-devtools/python/python3/makerace.patch
@@ -20,7 +20,7 @@ diff --git a/Makefile.pre.in b/Makefile.pre.in
 index dce36a5..2d235d2 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -2266,7 +2266,7 @@ COMPILEALL_OPTS=-j0
+@@ -2267,7 +2267,7 @@ COMPILEALL_OPTS=-j0
  TEST_MODULES=@TEST_MODULES@
  
  .PHONY: libinstall
diff --git a/meta/recipes-devtools/python/python3_3.12.9.bb b/meta/recipes-devtools/python/python3_3.12.11.bb
index 8e03ff5f2b..706dabb5cd 100644
--- a/meta/recipes-devtools/python/python3_3.12.9.bb
+++ b/meta/recipes-devtools/python/python3_3.12.11.bb
@@ -34,14 +34,13 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
            file://0001-test_deadlock-skip-problematic-test.patch \
            file://0001-test_active_children-skip-problematic-test.patch \
            file://0001-test_readline-skip-limited-history-test.patch \
-           file://0001-ctypes-correct-gcc-check-in-test.patch \
            "
 
 SRC_URI:append:class-native = " \
            file://0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch \
            "
 
-SRC_URI[sha256sum] = "7220835d9f90b37c006e9842a8dff4580aaca4318674f947302b8d28f3f81112"
+SRC_URI[sha256sum] = "c30bb24b7f1e9a19b11b55a546434f74e739bb4c271a3e3a80ff4380d49f7adb"
 
 # exclude pre-releases for both python 2.x and 3.x
 UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"
diff --git a/meta/recipes-devtools/ruby/ruby/CVE-2025-27221-0001.patch b/meta/recipes-devtools/ruby/ruby/CVE-2025-27221-0001.patch
new file mode 100644
index 0000000000..95802d04f9
--- /dev/null
+++ b/meta/recipes-devtools/ruby/ruby/CVE-2025-27221-0001.patch
@@ -0,0 +1,57 @@
+From 3675494839112b64d5f082a9068237b277ed1495 Mon Sep 17 00:00:00 2001
+From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
+Date: Fri, 21 Feb 2025 16:29:36 +0900
+Subject: [PATCH] Truncate userinfo with URI#join, URI#merge and URI#+
+
+CVE: CVE-2025-27221
+
+Upstream-Status: Backport [https://github.com/ruby/uri/commit/3675494839112b64d5f082a9068237b277ed1495]
+
+Signed-off-by: Divya Chellam <divya.chellam@windriver.com>
+---
+ lib/uri/generic.rb       |  6 +++++-
+ test/uri/test_generic.rb | 11 +++++++++++
+ 2 files changed, 16 insertions(+), 1 deletion(-)
+
+diff --git a/lib/uri/generic.rb b/lib/uri/generic.rb
+index f3540a2..ecc78c5 100644
+--- a/lib/uri/generic.rb
++++ b/lib/uri/generic.rb
+@@ -1141,7 +1141,11 @@ module URI
+       end
+ 
+       # RFC2396, Section 5.2, 7)
+-      base.set_userinfo(rel.userinfo) if rel.userinfo
++      if rel.userinfo
++        base.set_userinfo(rel.userinfo)
++      else
++        base.set_userinfo(nil)
++      end
+       base.set_host(rel.host)         if rel.host
+       base.set_port(rel.port)         if rel.port
+       base.query = rel.query       if rel.query
+diff --git a/test/uri/test_generic.rb b/test/uri/test_generic.rb
+index e661937..17ba2b6 100644
+--- a/test/uri/test_generic.rb
++++ b/test/uri/test_generic.rb
+@@ -164,6 +164,17 @@ class URI::TestGeneric < Test::Unit::TestCase
+     # must be empty string to identify as path-abempty, not path-absolute
+     assert_equal('', url.host)
+     assert_equal('http:////example.com', url.to_s)
++
++    # sec-2957667
++    url = URI.parse('http://user:pass@example.com').merge('//example.net')
++    assert_equal('http://example.net', url.to_s)
++    assert_nil(url.userinfo)
++    url = URI.join('http://user:pass@example.com', '//example.net')
++    assert_equal('http://example.net', url.to_s)
++    assert_nil(url.userinfo)
++    url = URI.parse('http://user:pass@example.com') + '//example.net'
++    assert_equal('http://example.net', url.to_s)
++    assert_nil(url.userinfo)
+   end
+ 
+   def test_parse_scheme_with_symbols
+-- 
+2.40.0
+
diff --git a/meta/recipes-devtools/ruby/ruby/CVE-2025-27221-0002.patch b/meta/recipes-devtools/ruby/ruby/CVE-2025-27221-0002.patch
new file mode 100644
index 0000000000..4435b87c34
--- /dev/null
+++ b/meta/recipes-devtools/ruby/ruby/CVE-2025-27221-0002.patch
@@ -0,0 +1,73 @@
+From 2789182478f42ccbb62197f952eb730e4f02bfc5 Mon Sep 17 00:00:00 2001
+From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
+Date: Fri, 21 Feb 2025 18:16:28 +0900
+Subject: [PATCH] Fix merger of URI with authority component
+
+https://hackerone.com/reports/2957667
+
+Co-authored-by: Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+CVE: CVE-2025-27221
+
+Upstream-Status: Backport [https://github.com/ruby/uri/commit/2789182478f42ccbb62197f952eb730e4f02bfc5]
+
+Signed-off-by: Divya Chellam <divya.chellam@windriver.com>
+---
+ lib/uri/generic.rb       | 19 +++++++------------
+ test/uri/test_generic.rb |  7 +++++++
+ 2 files changed, 14 insertions(+), 12 deletions(-)
+
+diff --git a/lib/uri/generic.rb b/lib/uri/generic.rb
+index ecc78c5..2c0a88d 100644
+--- a/lib/uri/generic.rb
++++ b/lib/uri/generic.rb
+@@ -1133,21 +1133,16 @@ module URI
+       base.fragment=(nil)
+ 
+       # RFC2396, Section 5.2, 4)
+-      if !authority
+-        base.set_path(merge_path(base.path, rel.path)) if base.path && rel.path
+-      else
+-        # RFC2396, Section 5.2, 4)
+-        base.set_path(rel.path) if rel.path
++      if authority
++        base.set_userinfo(rel.userinfo)
++        base.set_host(rel.host)
++        base.set_port(rel.port || base.default_port)
++        base.set_path(rel.path)
++      elsif base.path && rel.path
++        base.set_path(merge_path(base.path, rel.path))
+       end
+ 
+       # RFC2396, Section 5.2, 7)
+-      if rel.userinfo
+-        base.set_userinfo(rel.userinfo)
+-      else
+-        base.set_userinfo(nil)
+-      end
+-      base.set_host(rel.host)         if rel.host
+-      base.set_port(rel.port)         if rel.port
+       base.query = rel.query       if rel.query
+       base.fragment=(rel.fragment) if rel.fragment
+ 
+diff --git a/test/uri/test_generic.rb b/test/uri/test_generic.rb
+index 17ba2b6..1a70dd4 100644
+--- a/test/uri/test_generic.rb
++++ b/test/uri/test_generic.rb
+@@ -267,6 +267,13 @@ class URI::TestGeneric < Test::Unit::TestCase
+     assert_equal(u0, u1)
+   end
+ 
++  def test_merge_authority
++    u = URI.parse('http://user:pass@example.com:8080')
++    u0 = URI.parse('http://new.example.org/path')
++    u1 = u.merge('//new.example.org/path')
++    assert_equal(u0, u1)
++  end
++
+   def test_route
+     url = URI.parse('http://hoge/a.html').route_to('http://hoge/b.html')
+     assert_equal('b.html', url.to_s)
+-- 
+2.40.0
+
diff --git a/meta/recipes-devtools/ruby/ruby_3.3.5.bb b/meta/recipes-devtools/ruby/ruby_3.3.5.bb
index c91c51657f..b37f0d03e7 100644
--- a/meta/recipes-devtools/ruby/ruby_3.3.5.bb
+++ b/meta/recipes-devtools/ruby/ruby_3.3.5.bb
@@ -28,6 +28,8 @@ SRC_URI = "http://cache.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \
            file://0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch \
            file://CVE-2025-27219.patch \
            file://CVE-2025-27220.patch \
+           file://CVE-2025-27221-0001.patch \
+           file://CVE-2025-27221-0002.patch \
            "
 UPSTREAM_CHECK_URI = "https://www.ruby-lang.org/en/downloads/"
 
diff --git a/meta/recipes-extended/ghostscript/ghostscript_10.05.0.bb b/meta/recipes-extended/ghostscript/ghostscript_10.05.1.bb
index 1d05945c30..bd34058517 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_10.05.0.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_10.05.1.bb
@@ -27,7 +27,7 @@ SRC_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/downlo
            file://avoid-host-contamination.patch \
            "
 
-SRC_URI[sha256sum] = "56e77833de683825c420d0af8cb90aa8ba7da71ea6fb5624290cbc1b53fe7942"
+SRC_URI[sha256sum] = "121861b6d29b2461dec6575c9f3cab665b810bd408d4ec02c86719fa708b0a49"
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3"
diff --git a/meta/recipes-extended/iputils/iputils/CVE-2025-47268.patch b/meta/recipes-extended/iputils/iputils/CVE-2025-47268.patch
new file mode 100644
index 0000000000..dd31b79031
--- /dev/null
+++ b/meta/recipes-extended/iputils/iputils/CVE-2025-47268.patch
@@ -0,0 +1,143 @@
+From 070cfacd7348386173231fb16fad4983d4e6ae40 Mon Sep 17 00:00:00 2001
+From: Petr Vorel <pvorel@suse.cz>
+Date: Mon, 5 May 2025 23:55:57 +0200
+Subject: [PATCH] ping: Fix signed 64-bit integer overflow in RTT calculation
+
+Crafted ICMP Echo Reply packet can cause signed integer overflow in
+
+1) triptime calculation:
+triptime = tv->tv_sec * 1000000 + tv->tv_usec;
+
+2) tsum2 increment which uses triptime
+rts->tsum2 += (double)((long long)triptime * (long long)triptime);
+
+3) final tmvar:
+tmvar = (rts->tsum2 / total) - (tmavg * tmavg)
+
+    $ export CFLAGS="-O1 -g -fsanitize=address,undefined -fno-omit-frame-pointer"
+    $ export LDFLAGS="-fsanitize=address,undefined -fno-omit-frame-pointer"
+    $ meson setup .. -Db_sanitize=address,undefined
+    $ ninja
+    $ ./ping/ping -c2 127.0.0.1
+
+    PING 127.0.0.1 (127.0.0.1) 56(84) bytes of data.
+    64 bytes from 127.0.0.1: icmp_seq=1 ttl=64 time=0.061 ms
+    ../ping/ping_common.c:757:25: runtime error: signed integer overflow: -2513732689199106 * 1000000 cannot be represented in type 'long int'
+    ../ping/ping_common.c:757:12: runtime error: signed integer overflow: -4975495174606980224 + -6510615555425289427 cannot be represented in type 'long int'
+    ../ping/ping_common.c:769:47: runtime error: signed integer overflow: 6960633343677281965 * 6960633343677281965 cannot be represented in type 'long int'
+    24 bytes from 127.0.0.1: icmp_seq=1 ttl=64 (truncated)
+    ./ping/ping: Warning: time of day goes back (-7256972569576721377us), taking countermeasures
+    ./ping/ping: Warning: time of day goes back (-7256972569576721232us), taking countermeasures
+    24 bytes from 127.0.0.1: icmp_seq=1 ttl=64 (truncated)
+    ../ping/ping_common.c:265:16: runtime error: signed integer overflow: 6960633343677281965 * 2 cannot be represented in type 'long int'
+    64 bytes from 127.0.0.1: icmp_seq=2 ttl=64 time=0.565 ms
+
+    --- 127.0.0.1 ping statistics ---
+    2 packets transmitted, 2 received, +2 duplicates, 0% packet loss, time 1002ms
+    ../ping/ping_common.c:940:42: runtime error: signed integer overflow: 1740158335919320832 * 1740158335919320832 cannot be represented in type 'long int'
+    rtt min/avg/max/mdev = 0.000/1740158335919320.832/6960633343677281.965/-1623514645242292.-224 ms
+
+To fix the overflow check allowed ranges of struct timeval members:
+* tv_sec <0, LONG_MAX/1000000>
+* tv_usec <0, 999999>
+
+Fix includes 2 new error messages (needs translation).
+Also existing message "time of day goes back ..." needed to be modified
+as it now prints tv->tv_sec which is a second (needs translation update).
+
+After fix:
+
+    $ ./ping/ping -c2 127.0.0.1
+    64 bytes from 127.0.0.1: icmp_seq=1 ttl=64 time=0.057 ms
+    ./ping/ping: Warning: invalid tv_usec -6510615555424928611 us
+    ./ping/ping: Warning: time of day goes back (-3985394643238914 s), taking countermeasures
+    ./ping/ping: Warning: invalid tv_usec -6510615555424928461 us
+    ./ping/ping: Warning: time of day goes back (-3985394643238914 s), taking countermeasures
+    24 bytes from 127.0.0.1: icmp_seq=1 ttl=64 (truncated)
+    ./ping/ping: Warning: invalid tv_usec -6510615555425884541 us
+    ./ping/ping: Warning: time of day goes back (-4243165695442945 s), taking countermeasures
+    24 bytes from 127.0.0.1: icmp_seq=1 ttl=64 (truncated)
+    64 bytes from 127.0.0.1: icmp_seq=2 ttl=64 time=0.111 ms
+
+    --- 127.0.0.1 ping statistics ---
+    2 packets transmitted, 2 received, +2 duplicates, 0% packet loss, time 101ms
+    rtt min/avg/max/mdev = 0.000/0.042/0.111/0.046 ms
+
+Fixes: https://github.com/iputils/iputils/issues/584
+Fixes: CVE-2025-472
+Link: https://github.com/Zephkek/ping-rtt-overflow/
+Co-developed-by: Cyril Hrubis <chrubis@suse.cz>
+Reported-by: Mohamed Maatallah <hotelsmaatallahrecemail@gmail.com>
+Reviewed-by: Mohamed Maatallah <hotelsmaatallahrecemail@gmail.com>
+Reviewed-by: Cyril Hrubis <chrubis@suse.cz>
+Reviewed-by: Noah Meyerhans <noahm@debian.org>
+Signed-off-by: Petr Vorel <pvorel@suse.cz>
+
+CVE: CVE-2025-47268
+
+Upstream-Status: Backport
+[https://github.com/iputils/iputils/commit/070cfacd7348386173231fb16fad4983d4e6ae40]
+
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+---
+ iputils_common.h   |  3 +++
+ ping/ping_common.c | 22 +++++++++++++++++++---
+ 2 files changed, 22 insertions(+), 3 deletions(-)
+
+diff --git a/iputils_common.h b/iputils_common.h
+index 49e790d..829a749 100644
+--- a/iputils_common.h
++++ b/iputils_common.h
+@@ -10,6 +10,9 @@
+          !!__builtin_types_compatible_p(__typeof__(arr), \
+                                         __typeof__(&arr[0]))])) * 0)
+ 
++/* 1000001 = 1000000 tv_sec + 1 tv_usec */
++#define TV_SEC_MAX_VAL (LONG_MAX/1000001)
++
+ #ifdef __GNUC__
+ # define iputils_attribute_format(t, n, m) __attribute__((__format__ (t, n, m)))
+ #else
+diff --git a/ping/ping_common.c b/ping/ping_common.c
+index dadd2a4..4e99d89 100644
+--- a/ping/ping_common.c
++++ b/ping/ping_common.c
+@@ -754,16 +754,32 @@ int gather_statistics(struct ping_rts *rts, uint8_t *icmph, int icmplen,
+ 
+ restamp:
+                tvsub(tv, &tmp_tv);
+-               triptime = tv->tv_sec * 1000000 + tv->tv_usec;
+-               if (triptime < 0) {
+-                       error(0, 0, _("Warning: time of day goes back (%ldus), taking countermeasures"), triptime);
++
++               if (tv->tv_usec >= 1000000) {
++                       error(0, 0, _("Warning: invalid tv_usec %ld us"), tv->tv_usec);
++                       tv->tv_usec = 999999;
++               }
++
++               if (tv->tv_usec < 0) {
++                       error(0, 0, _("Warning: invalid tv_usec %ld us"), tv->tv_usec);
++                       tv->tv_usec = 0;
++               }
++
++               if (tv->tv_sec > TV_SEC_MAX_VAL) {
++                       error(0, 0, _("Warning: invalid tv_sec %ld s"), tv->tv_sec);
++                       triptime = 0;
++               } else if (tv->tv_sec < 0) {
++                       error(0, 0, _("Warning: time of day goes back (%ld s), taking countermeasures"), tv->tv_sec);
+                        triptime = 0;
+                        if (!rts->opt_latency) {
+                                gettimeofday(tv, NULL);
+                                rts->opt_latency = 1;
+                                goto restamp;
+                        }
++               } else {
++                       triptime = tv->tv_sec * 1000000 + tv->tv_usec;
+                }
++
+                if (!csfailed) {
+                        rts->tsum += triptime;
+                        rts->tsum2 += (double)((long long)triptime * (long long)triptime);
+-- 
+2.34.1
+
diff --git a/meta/recipes-extended/iputils/iputils_20240117.bb b/meta/recipes-extended/iputils/iputils_20240117.bb
index 3880689742..5ff5af8847 100644
--- a/meta/recipes-extended/iputils/iputils_20240117.bb
+++ b/meta/recipes-extended/iputils/iputils_20240117.bb
@@ -10,7 +10,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=627cc07ec86a45951d43e30658bbd819"
 
 DEPENDS = "gnutls"
 
-SRC_URI = "git://github.com/iputils/iputils;branch=master;protocol=https"
+SRC_URI = "git://github.com/iputils/iputils;branch=master;protocol=https \
+           file://CVE-2025-47268.patch \
+          "
 SRCREV = "8372f355bdf7a9b0c79338dd8ef8464c00a5c4e2"
 
 S = "${WORKDIR}/git"
diff --git a/meta/recipes-extended/net-tools/net-tools/CVE-2025-46836-01.patch b/meta/recipes-extended/net-tools/net-tools/CVE-2025-46836-01.patch
new file mode 100644
index 0000000000..0d55512497
--- /dev/null
+++ b/meta/recipes-extended/net-tools/net-tools/CVE-2025-46836-01.patch
@@ -0,0 +1,91 @@
+From 7a8f42fb20013a1493d8cae1c43436f85e656f2d Mon Sep 17 00:00:00 2001
+From: Zephkeks <zephyrofficialdiscord@gmail.com>
+Date: Tue, 13 May 2025 11:04:17 +0200
+Subject: [PATCH] CVE-2025-46836: interface.c: Stack-based Buffer Overflow in
+ get_name()
+
+Coordinated as GHSA-pfwf-h6m3-63wf
+
+CVE: CVE-2025-46836
+Upstream-Status: Backport [https://sourceforge.net/p/net-tools/code/ci/7a8f42fb20013a1493d8cae1c43436f85e656f2d/]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ lib/interface.c | 63 ++++++++++++++++++++++++++++++-------------------
+ 1 file changed, 39 insertions(+), 24 deletions(-)
+
+diff --git a/lib/interface.c b/lib/interface.c
+index 71d4163..a054f12 100644
+--- a/lib/interface.c
++++ b/lib/interface.c
+@@ -211,32 +211,47 @@ out:
+ }
+ 
+ static const char *get_name(char *name, const char *p)
++/* Safe version — guarantees at most IFNAMSIZ‑1 bytes are copied
++   and the destination buffer is always NUL‑terminated.             */
+ {
+-    while (isspace(*p))
+-       p++;
+-    while (*p) {
+-       if (isspace(*p))
+-           break;
+-       if (*p == ':') {        /* could be an alias */
+-               const char *dot = p++;
+-               while (*p && isdigit(*p)) p++;
+-               if (*p == ':') {
+-                       /* Yes it is, backup and copy it. */
+-                       p = dot;
+-                       *name++ = *p++;
+-                       while (*p && isdigit(*p)) {
+-                               *name++ = *p++;
+-                       }
+-               } else {
+-                       /* No, it isn't */
+-                       p = dot;
+-           }
+-           p++;
+-           break;
+-       }
+-       *name++ = *p++;
++    char       *dst = name;                 /* current write ptr          */
++    const char *end = name + IFNAMSIZ - 1;  /* last byte we may write     */
++
++    /* Skip leading white‑space. */
++    while (isspace((unsigned char)*p))
++        ++p;
++
++    /* Copy until white‑space, end of string, or buffer full. */
++    while (*p && !isspace((unsigned char)*p) && dst < end) {
++        if (*p == ':') {                    /* possible alias veth0:123:  */
++            const char *dot = p;            /* remember the colon         */
++            ++p;
++            while (*p && isdigit((unsigned char)*p))
++                ++p;
++
++            if (*p == ':') {                /* confirmed alias            */
++                p = dot;                    /* rewind and copy it all     */
++
++                /* copy the colon */
++                if (dst < end)
++                    *dst++ = *p++;
++
++                /* copy the digits */
++                while (*p && isdigit((unsigned char)*p) && dst < end)
++                    *dst++ = *p++;
++
++                if (*p == ':')              /* consume trailing colon     */
++                    ++p;
++            } else {              /* if so treat as normal */
++                p = dot;
++            }
++            break;                          /* interface name ends here   */
++        }
++
++        *dst++ = *p++;                      /* ordinary character copy    */
+     }
+-    *name++ = '\0';
++
++    *dst = '\0';                            /* always NUL‑terminate       */
+     return p;
+ }
+ 
diff --git a/meta/recipes-extended/net-tools/net-tools/CVE-2025-46836-02.patch b/meta/recipes-extended/net-tools/net-tools/CVE-2025-46836-02.patch
new file mode 100644
index 0000000000..d2c3673a24
--- /dev/null
+++ b/meta/recipes-extended/net-tools/net-tools/CVE-2025-46836-02.patch
@@ -0,0 +1,31 @@
+From ddb0e375fb9ca95bb69335540b85bbdaa2714348 Mon Sep 17 00:00:00 2001
+From: Bernd Eckenfels <net-tools@lina.inka.de>
+Date: Sat, 17 May 2025 21:53:23 +0200
+Subject: [PATCH] Interface statistic regression after 7a8f42fb2
+
+CVE: CVE-2025-46836
+Upstream-Status: Backport [https://sourceforge.net/p/net-tools/code/ci/ddb0e375fb9ca95bb69335540b85bbdaa2714348/]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ lib/interface.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/lib/interface.c b/lib/interface.c
+index a054f12..ca4adf1 100644
+--- a/lib/interface.c
++++ b/lib/interface.c
+@@ -239,12 +239,11 @@ static const char *get_name(char *name, const char *p)
+                 /* copy the digits */
+                 while (*p && isdigit((unsigned char)*p) && dst < end)
+                     *dst++ = *p++;
+-
+-                if (*p == ':')              /* consume trailing colon     */
+-                    ++p;
+             } else {              /* if so treat as normal */
+                 p = dot;
+             }
++            if (*p == ':')                  /* consume trailing colon */
++                ++p;
+             break;                          /* interface name ends here   */
+         }
+ 
diff --git a/meta/recipes-extended/net-tools/net-tools_2.10.bb b/meta/recipes-extended/net-tools/net-tools_2.10.bb
index 33304297ec..c4d298181a 100644
--- a/meta/recipes-extended/net-tools/net-tools_2.10.bb
+++ b/meta/recipes-extended/net-tools/net-tools_2.10.bb
@@ -11,6 +11,8 @@ SRC_URI = "git://git.code.sf.net/p/net-tools/code;protocol=https;branch=master \
     file://net-tools-config.h \
     file://net-tools-config.make \
     file://Add_missing_headers.patch \
+    file://CVE-2025-46836-01.patch \
+    file://CVE-2025-46836-02.patch \
 "
 
 S = "${WORKDIR}/git"
diff --git a/meta/recipes-extended/screen/screen/CVE-2025-46802.patch b/meta/recipes-extended/screen/screen/CVE-2025-46802.patch
new file mode 100644
index 0000000000..e46affc480
--- /dev/null
+++ b/meta/recipes-extended/screen/screen/CVE-2025-46802.patch
@@ -0,0 +1,146 @@
+From 049b26b22e197ba3be9c46e5c193032e01a4724a Mon Sep 17 00:00:00 2001
+From: Matthias Gerstner <matthias.gerstner@suse.de>
+Date: Mon, 12 May 2025 15:15:38 +0200
+Subject: [PATCH] fix CVE-2025-46802: attacher.c - prevent temporary 0666 mode
+ on PTYs
+
+This temporary chmod of the PTY to mode 0666 is most likely a remnant of
+past times, before the PTY file descriptor was passed to the target
+session via the UNIX domain socket.
+
+This chmod() causes a race condition during which any other user in the
+system can open the PTY for reading and writing, and thus allows PTY
+hijacking.
+
+Simply remove this logic completely.
+
+CVE: CVE-2025-46802
+
+Upstream-Status: Backport [https://cgit.git.savannah.gnu.org/cgit/screen.git/commit/?id=049b26b22e197ba3be9c46e5c193032e01a4724a]
+
+Signed-off-by: Divya Chellam <divya.chellam@windriver.com>
+---
+ attacher.c | 27 ---------------------------
+ screen.c   | 19 -------------------
+ 2 files changed, 46 deletions(-)
+
+diff --git a/attacher.c b/attacher.c
+index c35ae7a..16b151e 100644
+--- a/attacher.c
++++ b/attacher.c
+@@ -73,7 +73,6 @@ extern int MasterPid, attach_fd;
+ #ifdef MULTIUSER
+ extern char *multi;
+ extern int multiattach, multi_uid, own_uid;
+-extern int tty_mode, tty_oldmode;
+ # ifndef USE_SETEUID
+ static int multipipe[2];
+ # endif
+@@ -160,9 +159,6 @@ int how;
+ 
+       if (pipe(multipipe))
+        Panic(errno, "pipe");
+-      if (chmod(attach_tty, 0666))
+-       Panic(errno, "chmod %s", attach_tty);
+-      tty_oldmode = tty_mode;
+       eff_uid = -1;    /* make UserContext fork */
+       real_uid = multi_uid;
+       if ((ret = UserContext()) <= 0)
+@@ -174,11 +170,6 @@ int how;
+            Panic(errno, "UserContext");
+          close(multipipe[1]);
+          read(multipipe[0], &dummy, 1);
+-         if (tty_oldmode >= 0)
+-           {
+-             chmod(attach_tty, tty_oldmode);
+-             tty_oldmode = -1;
+-           }
+          ret = UserStatus();
+ #ifdef LOCK
+          if (ret == SIG_LOCK)
+@@ -224,9 +215,6 @@ int how;
+       xseteuid(multi_uid);
+       xseteuid(own_uid);
+ #endif
+-      if (chmod(attach_tty, 0666))
+-       Panic(errno, "chmod %s", attach_tty);
+-      tty_oldmode = tty_mode;
+     }
+ # endif /* USE_SETEUID */
+ #endif /* MULTIUSER */
+@@ -423,13 +411,6 @@ int how;
+       ContinuePlease = 0;
+ # ifndef USE_SETEUID
+       close(multipipe[1]);
+-# else
+-      xseteuid(own_uid);
+-      if (tty_oldmode >= 0)
+-        if (chmod(attach_tty, tty_oldmode))
+-          Panic(errno, "chmod %s", attach_tty);
+-      tty_oldmode = -1;
+-      xseteuid(real_uid);
+ # endif
+     }
+ #endif
+@@ -505,14 +486,6 @@ AttacherFinit SIGDEFARG
+          close(s);
+        }
+     }
+-#ifdef MULTIUSER
+-  if (tty_oldmode >= 0)
+-    {
+-      if (setuid(own_uid))
+-        Panic(errno, "setuid");
+-      chmod(attach_tty, tty_oldmode);
+-    }
+-#endif
+   exit(0);
+   SIGRETURN;
+ }
+diff --git a/screen.c b/screen.c
+index 7653cd1..1a23e1a 100644
+--- a/screen.c
++++ b/screen.c
+@@ -230,8 +230,6 @@ char *multi_home;
+ int multi_uid;
+ int own_uid;
+ int multiattach;
+-int tty_mode;
+-int tty_oldmode = -1;
+ #endif
+ 
+ char HostName[MAXSTR];
+@@ -1009,9 +1007,6 @@ int main(int ac, char** av)
+ 
+     /* ttyname implies isatty */
+     SetTtyname(true, &st);
+-#ifdef MULTIUSER
+-    tty_mode = (int)st.st_mode & 0777;
+-#endif
+ 
+     fl = fcntl(0, F_GETFL, 0);
+     if (fl != -1 && (fl & (O_RDWR|O_RDONLY|O_WRONLY)) == O_RDWR)
+@@ -2170,20 +2165,6 @@ DEFINE_VARARGS_FN(Panic)
+       if (D_userpid)
+         Kill(D_userpid, SIG_BYE);
+     }
+-#ifdef MULTIUSER
+-  if (tty_oldmode >= 0) {
+-
+-# ifdef USE_SETEUID
+-    if (setuid(own_uid))
+-      xseteuid(own_uid);       /* may be a loop. sigh. */
+-# else
+-      setuid(own_uid);
+-# endif
+-
+-    debug1("Panic: changing back modes from %s\n", attach_tty);
+-    chmod(attach_tty, tty_oldmode);
+-  }
+-#endif
+   eexit(1);
+ }
+ 
+-- 
+2.40.0
+
diff --git a/meta/recipes-extended/screen/screen/CVE-2025-46804.patch b/meta/recipes-extended/screen/screen/CVE-2025-46804.patch
new file mode 100644
index 0000000000..918c2c5ce9
--- /dev/null
+++ b/meta/recipes-extended/screen/screen/CVE-2025-46804.patch
@@ -0,0 +1,131 @@
+From e0eef5aac453fa98a2664416a56c50ad1d00cb30 Mon Sep 17 00:00:00 2001
+From: Matthias Gerstner <matthias.gerstner@suse.de>
+Date: Mon, 12 May 2025 15:26:11 +0200
+Subject: [PATCH] fix CVE-2025-46804: avoid file existence test information 
+ leaks
+
+In setuid-root context the current error messages give away whether
+certain paths not accessible by the real user exist and what type they
+have. To prevent this only output generic error messages in setuid-root
+context.
+
+In some situations, when an error is pertaining a directory and the
+directory is owner by the real user then we can still output more
+detailed diagnostics.
+
+This change can lead to less helpful error messages when Screen is
+install setuid-root. More complex changes would be needed to avoid this
+(e.g.  only open the `SocketPath` with raised privileges when
+multi-attach is requested).
+
+There might still be lingering some code paths that allow such
+information leaks, since `SocketPath` is a global variable that is used
+across the code base. The majority of issues should be caught with this
+fix, however.
+
+CVE: CVE-2025-46804
+
+Upstream-Status: Backport [https://cgit.git.savannah.gnu.org/cgit/screen.git/commit/?id=e0eef5aac453fa98a2664416a56c50ad1d00cb30]
+
+Signed-off-by: Divya Chellam <divya.chellam@windriver.com>
+---
+ screen.c | 45 ++++++++++++++++++++++++++++++++++-----------
+ socket.c |  9 +++++++--
+ 2 files changed, 41 insertions(+), 13 deletions(-)
+
+diff --git a/screen.c b/screen.c
+index 1a23e1a..6eec151 100644
+--- a/screen.c
++++ b/screen.c
+@@ -1122,15 +1122,28 @@ int main(int ac, char** av)
+ #endif
+   }
+ 
+-  if (stat(SockPath, &st) == -1)
+-    Panic(errno, "Cannot access %s", SockPath);
+-  else
+-    if (!S_ISDIR(st.st_mode))
++  if (stat(SockPath, &st) == -1) {
++    if (eff_uid == real_uid) {
++      Panic(errno, "Cannot access %s", SockPath);
++    } else {
++      Panic(0, "Error accessing %s", SockPath);
++    }
++  } else if (!S_ISDIR(st.st_mode)) {
++    if (eff_uid == real_uid || st.st_uid == real_uid) {
+       Panic(0, "%s is not a directory.", SockPath);
++    } else {
++      Panic(0, "Error accessing %s", SockPath);
++    }
++  }
+ #ifdef MULTIUSER
+   if (multi) {
+-    if ((int)st.st_uid != multi_uid)
+-      Panic(0, "%s is not the owner of %s.", multi, SockPath);
++    if ((int)st.st_uid != multi_uid) {
++      if (eff_uid == real_uid || st.st_uid == real_uid) {
++        Panic(0, "%s is not the owner of %s.", multi, SockPath);
++      } else {
++        Panic(0, "Error accessing %s", SockPath);
++      }
++    }
+   }
+   else
+ #endif
+@@ -1144,9 +1157,13 @@ int main(int ac, char** av)
+       Panic(0, "You are not the owner of %s.", SockPath);
+ #endif
+   }
+-
+-  if ((st.st_mode & 0777) != 0700)
+-    Panic(0, "Directory %s must have mode 700.", SockPath);
++  if ((st.st_mode & 0777) != 0700) {
++    if (eff_uid == real_uid || st.st_uid == real_uid) {
++      Panic(0, "Directory %s must have mode 700.", SockPath);
++    } else {
++      Panic(0, "Error accessing %s", SockPath);
++    }
++  }
+   if (SockMatch && index(SockMatch, '/'))
+     Panic(0, "Bad session name '%s'", SockMatch);
+   SockName = SockPath + strlen(SockPath) + 1;
+@@ -1184,8 +1201,14 @@ int main(int ac, char** av)
+       else
+         exit(9 + (fo || oth ? 1 : 0) + fo);
+     }
+-    if (fo == 0)
+-      Panic(0, "No Sockets found in %s.\n", SockPath);
++    if (fo == 0) {
++      if (eff_uid == real_uid || st.st_uid == real_uid) {
++        Panic(0, "No Sockets found in %s.\n", SockPath);
++      } else {
++        Panic(0, "Error accessing %s", SockPath);
++      }
++    }
++
+     Msg(0, "%d Socket%s in %s.", fo, fo > 1 ? "s" : "", SockPath);
+     eexit(0);
+   }
+diff --git a/socket.c b/socket.c
+index 54d8cb8..6c3502f 100644
+--- a/socket.c
++++ b/socket.c
+@@ -169,8 +169,13 @@ bool *is_sock;
+   xsetegid(real_gid);
+ #endif
+ 
+-  if ((dirp = opendir(SockPath)) == 0)
+-    Panic(errno, "Cannot opendir %s", SockPath);
++  if ((dirp = opendir(SockPath)) == 0) {
++    if (eff_uid == real_uid) {
++      Panic(errno, "Cannot opendir %s", SockPath);
++    } else {
++      Panic(0, "Error accessing %s", SockPath);
++    }
++  }
+ 
+   slist = 0;
+   slisttail = &slist;
+-- 
+2.40.0
+
diff --git a/meta/recipes-extended/screen/screen/CVE-2025-46805.patch b/meta/recipes-extended/screen/screen/CVE-2025-46805.patch
new file mode 100644
index 0000000000..e0207b6072
--- /dev/null
+++ b/meta/recipes-extended/screen/screen/CVE-2025-46805.patch
@@ -0,0 +1,101 @@
+From aa9f51f996a22470b8461d2b6a32e62c7ec30ed5 Mon Sep 17 00:00:00 2001
+From: Axel Beckert <abe@debian.org>
+Date: Mon, 19 May 2025 00:42:42 +0200
+Subject: fix CVE-2025-46805: socket.c - don't send signals with root
+
+Gbp-Pq: fix-CVE-2025-46805-socket.c-don-t-send-signals-with-.patch.
+
+Upstream-Status: Backport [import from ubuntu https://git.launchpad.net/ubuntu/+source/screen/patch/?id=aa9f51f996a22470b8461d2b6a32e62c7ec30ed5 
+Upstream commit https://git.savannah.gnu.org/cgit/screen.git/commit/?id=161f85b98b7e1d5e4893aeed20f4cdb5e3dfaaa4]
+CVE: CVE-2025-46805
+Signed-off-by: Ashish Sharma <asharma@mvista.com>
+
+ socket.c | 21 +++++++++++++--------
+ 1 file changed, 13 insertions(+), 8 deletions(-)
+
+diff --git a/socket.c b/socket.c
+index e268e3d..11b5e59 100644
+--- a/socket.c
++++ b/socket.c
+@@ -832,6 +832,11 @@ int pid;
+   return UserStatus();
+ }
+ 
++static void KillUnpriv(pid_t pid, int sig) {
++    UserContext();
++    UserReturn(kill(pid, sig));
++}
++
+ #ifdef hpux
+ /*
+  * From: "F. K. Bruner" <napalm@ugcs.caltech.edu>
+@@ -917,14 +922,14 @@ struct win *wi;
+             {
+              Msg(errno, "Could not perform necessary sanity checks on pts device.");
+              close(i);
+-             Kill(pid, SIG_BYE);
++             KillUnpriv(pid, SIG_BYE);
+              return -1;
+             }
+           if (strcmp(ttyname_in_ns, m->m_tty))
+             {
+              Msg(errno, "Attach: passed fd does not match tty: %s - %s!", ttyname_in_ns, m->m_tty[0] != '\0' ? m->m_tty : "(null)");
+              close(i);
+-             Kill(pid, SIG_BYE);
++             KillUnpriv(pid, SIG_BYE);
+              return -1;
+            }
+          /* m->m_tty so far contains the actual name of the pts device in the
+@@ -941,19 +946,19 @@ struct win *wi;
+        {
+          Msg(errno, "Attach: passed fd does not match tty: %s - %s!", m->m_tty, myttyname ? myttyname : "NULL");
+          close(i);
+-         Kill(pid, SIG_BYE);
++         KillUnpriv(pid, SIG_BYE);
+          return -1;
+        }
+     }
+   else if ((i = secopen(m->m_tty, O_RDWR | O_NONBLOCK, 0)) < 0)
+     {
+       Msg(errno, "Attach: Could not open %s!", m->m_tty);
+-      Kill(pid, SIG_BYE);
++      KillUnpriv(pid, SIG_BYE);
+       return -1;
+     }
+ #ifdef MULTIUSER
+   if (attach)
+-    Kill(pid, SIGCONT);
++    KillUnpriv(pid, SIGCONT);
+ #endif
+ 
+ #if defined(ultrix) || defined(pyr) || defined(NeXT)
+@@ -966,7 +971,7 @@ struct win *wi;
+        {
+          write(i, "Attaching from inside of screen?\n", 33);
+          close(i);
+-         Kill(pid, SIG_BYE);
++         KillUnpriv(pid, SIG_BYE);
+          Msg(0, "Attach msg ignored: coming from inside.");
+          return -1;
+        }
+@@ -977,7 +982,7 @@ struct win *wi;
+          {
+              write(i, "Access to session denied.\n", 26);
+              close(i);
+-             Kill(pid, SIG_BYE);
++             KillUnpriv(pid, SIG_BYE);
+              Msg(0, "Attach: access denied for user %s.", user);
+              return -1;
+          }
+@@ -1295,7 +1300,7 @@ ReceiveMsg()
+             Msg(0, "Query attempt with bad pid(%d)!", m.m.command.apid);
+           }
+           else {
+-            Kill(m.m.command.apid,
++            KillUnpriv(m.m.command.apid,
+                (queryflag >= 0)
+                    ? SIGCONT
+                    : SIG_BYE); /* Send SIG_BYE if an error happened */
+-- 
+cgit v1.2.3
+
diff --git a/meta/recipes-extended/screen/screen_4.9.1.bb b/meta/recipes-extended/screen/screen_4.9.1.bb
index 7b040e6b57..706351a593 100644
--- a/meta/recipes-extended/screen/screen_4.9.1.bb
+++ b/meta/recipes-extended/screen/screen_4.9.1.bb
@@ -21,6 +21,9 @@ SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \
            file://0002-comm.h-now-depends-on-term.h.patch \
            file://0001-fix-for-multijob-build.patch \
            file://0001-Remove-more-compatibility-stuff.patch \
+           file://CVE-2025-46805.patch \
+           file://CVE-2025-46802.patch \
+           file://CVE-2025-46804.patch \
            "
 
 SRC_URI[sha256sum] = "26cef3e3c42571c0d484ad6faf110c5c15091fbf872b06fa7aa4766c7405ac69"
diff --git a/meta/recipes-gnome/gtk+/gtk4_4.14.1.bb b/meta/recipes-gnome/gtk+/gtk4_4.14.1.bb
index 497be6805a..aae69271ac 100644
--- a/meta/recipes-gnome/gtk+/gtk4_4.14.1.bb
+++ b/meta/recipes-gnome/gtk+/gtk4_4.14.1.bb
@@ -16,6 +16,7 @@ DEPENDS = " \
     graphene \
     harfbuzz \
     jpeg \
+    libdrm \
     libepoxy \
     libpng \
     librsvg \
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
index 05bd9b8386..d855ee3f8a 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
@@ -14,13 +14,13 @@ python () {
         raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
 }
 
-SRCREV_machine ?= "60a86cf65a4bf973b04926050eb05d0e8132690d"
-SRCREV_meta ?= "917317e6b8a757306a04d6d76dd1f5a1a5591ecd"
+SRCREV_machine ?= "1933814ca46d38977965bbfe58ee3a1f8aacfb36"
+SRCREV_meta ?= "8e66f449e449f9ae2809b6c395ed7089aa37d7a3"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.6;destsuffix=${KMETA};protocol=https"
 
-LINUX_VERSION ?= "6.6.84"
+LINUX_VERSION ?= "6.6.92"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
index 3296a4300a..382a74f648 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
@@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc
 # CVE exclusions
 include recipes-kernel/linux/cve-exclusion_6.6.inc
 
-LINUX_VERSION ?= "6.6.84"
+LINUX_VERSION ?= "6.6.92"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
 DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine ?= "36c0e5585c944c19d71f496c306d8229565629a5"
-SRCREV_meta ?= "917317e6b8a757306a04d6d76dd1f5a1a5591ecd"
+SRCREV_machine ?= "c72b190dc393b310be436153c864144694b184a6"
+SRCREV_meta ?= "8e66f449e449f9ae2809b6c395ed7089aa37d7a3"
 
 PV = "${LINUX_VERSION}+git"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.6.bb b/meta/recipes-kernel/linux/linux-yocto_6.6.bb
index 98d820d195..c1bb736e04 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.6.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.6.bb
@@ -18,25 +18,25 @@ KBRANCH:qemux86-64 ?= "v6.6/standard/base"
 KBRANCH:qemuloongarch64  ?= "v6.6/standard/base"
 KBRANCH:qemumips64 ?= "v6.6/standard/mti-malta64"
 
-SRCREV_machine:qemuarm ?= "1411061244e285c0f16dcc35ec34b7a13d7b5708"
-SRCREV_machine:qemuarm64 ?= "cc8c55d771998fb779d3c5990c250a78e223f397"
-SRCREV_machine:qemuloongarch64 ?= "8dd317512c57f68aa212eaf0dcf078fb39afc1bd"
-SRCREV_machine:qemumips ?= "25bda2f47225cf6d74293ba1a0b9583c33b9865d"
-SRCREV_machine:qemuppc ?= "7fd13b08104048b99d66947f682cb5a95360ba65"
-SRCREV_machine:qemuriscv64 ?= "8dd317512c57f68aa212eaf0dcf078fb39afc1bd"
-SRCREV_machine:qemuriscv32 ?= "8dd317512c57f68aa212eaf0dcf078fb39afc1bd"
-SRCREV_machine:qemux86 ?= "8dd317512c57f68aa212eaf0dcf078fb39afc1bd"
-SRCREV_machine:qemux86-64 ?= "8dd317512c57f68aa212eaf0dcf078fb39afc1bd"
-SRCREV_machine:qemumips64 ?= "23fd476a33f79745b2a4c86a2cffcf653564c649"
-SRCREV_machine ?= "8dd317512c57f68aa212eaf0dcf078fb39afc1bd"
-SRCREV_meta ?= "917317e6b8a757306a04d6d76dd1f5a1a5591ecd"
+SRCREV_machine:qemuarm ?= "1d95b0a9486ae02a4eb38df55b94cb64485bd4c0"
+SRCREV_machine:qemuarm64 ?= "8cd580eb06e43c9a4e9c26e1dd954a334f656fbd"
+SRCREV_machine:qemuloongarch64 ?= "6032c9c1ac18edd7c8eadd6f9f655556b5f5e77c"
+SRCREV_machine:qemumips ?= "a3bbede9b1c6dbd0b51132b8447adbbde1f46f85"
+SRCREV_machine:qemuppc ?= "a5bba7e08dbb26c0dc7d7ec0624e903b7c6bac94"
+SRCREV_machine:qemuriscv64 ?= "6032c9c1ac18edd7c8eadd6f9f655556b5f5e77c"
+SRCREV_machine:qemuriscv32 ?= "6032c9c1ac18edd7c8eadd6f9f655556b5f5e77c"
+SRCREV_machine:qemux86 ?= "6032c9c1ac18edd7c8eadd6f9f655556b5f5e77c"
+SRCREV_machine:qemux86-64 ?= "6032c9c1ac18edd7c8eadd6f9f655556b5f5e77c"
+SRCREV_machine:qemumips64 ?= "a1ed8408c3b0bc729270cc2bd2c9dd0056ab9271"
+SRCREV_machine ?= "6032c9c1ac18edd7c8eadd6f9f655556b5f5e77c"
+SRCREV_meta ?= "8e66f449e449f9ae2809b6c395ed7089aa37d7a3"
 
 # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
 # get the <version>/base branch, which is pure upstream -stable, and the same
 # meta SRCREV as the linux-yocto-standard builds. Select your version using the
 # normal PREFERRED_VERSION settings.
 BBCLASSEXTEND = "devupstream:target"
-SRCREV_machine:class-devupstream ?= "4b6a8fa777d29785c7ddb51dcbb2b5411deefaca"
+SRCREV_machine:class-devupstream ?= "ffaf6178137b9cdcc9742d6677b70be164dfeb8c"
 PN:class-devupstream = "linux-yocto-upstream"
 KBRANCH:class-devupstream = "v6.6/base"
 
@@ -44,7 +44,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.6;destsuffix=${KMETA};protocol=https"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-LINUX_VERSION ?= "6.6.84"
+LINUX_VERSION ?= "6.6.92"
 
 PV = "${LINUX_VERSION}+git"
 
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-32230.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-32230.patch
deleted file mode 100644
index 0f30c9ecf5..0000000000
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-32230.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 96449cfeaeb95fcfd7a2b8d9ccf7719e97471ed1 Mon Sep 17 00:00:00 2001
-From: Michael Niedermayer <michael@niedermayer.cc>
-Date: Mon, 8 Apr 2024 18:38:42 +0200
-Subject: [PATCH]  avcodec/mpegvideo_enc: Fix 1 line and one column images
-
-Fixes: Ticket10952
-Fixes: poc21ffmpeg
-Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-
-CVE: CVE-2024-32230
-
-Upstream-Status: Backport [https://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=96449cfeaeb95fcfd7a2b8d9ccf7719e97471ed1]
-
-Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com>
----
- libavcodec/mpegvideo_enc.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
-index e460ca4..fb4aaa2 100644
---- a/libavcodec/mpegvideo_enc.c
-+++ b/libavcodec/mpegvideo_enc.c
-@@ -1198,8 +1198,8 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg)
-                 int dst_stride = i ? s->uvlinesize : s->linesize;
-                 int h_shift = i ? s->chroma_x_shift : 0;
-                 int v_shift = i ? s->chroma_y_shift : 0;
--                int w = s->width  >> h_shift;
--                int h = s->height >> v_shift;
-+                int w = AV_CEIL_RSHIFT(s->width , h_shift);
-+                int h = AV_CEIL_RSHIFT(s->height, v_shift);
-                 const uint8_t *src = pic_arg->data[i];
-                 uint8_t *dst = pic->f->data[i];
-                 int vpad = 16;
--- 
-2.40.0
-
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-35366.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-35366.patch
deleted file mode 100644
index f7f16a5b92..0000000000
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-35366.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 0bed22d597b78999151e3bde0768b7fe763fc2a6 Mon Sep 17 00:00:00 2001
-From: Michael Niedermayer <michael@niedermayer.cc>
-Date: Tue, 26 Mar 2024 00:39:49 +0100
-Subject: [PATCH] avformat/sbgdec: Check for negative duration
-
-Fixes: signed integer overflow: 9223372036854775807 - -8000000 cannot be represented in type 'long'
-Fixes: 62276/clusterfuzz-testcase-minimized-ffmpeg_dem_SBG_fuzzer-5133181743136768
-
-Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
-Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-
-CVE: CVE-2024-35366
-
-Upstream-Status: Backport [https://github.com/ffmpeg/ffmpeg/commit/0bed22d597b78999151e3bde0768b7fe763fc2a6]
-
-Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com>
----
- libavformat/sbgdec.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libavformat/sbgdec.c b/libavformat/sbgdec.c
-index b2662ea..281fe62 100644
---- a/libavformat/sbgdec.c
-+++ b/libavformat/sbgdec.c
-@@ -386,7 +386,7 @@ static int parse_options(struct sbg_parser *p)
-                 case 'L':
-                     FORWARD_ERROR(parse_optarg(p, opt, &oarg));
-                     r = str_to_time(oarg.s, &p->scs.opt_duration);
--                    if (oarg.e != oarg.s + r) {
-+                    if (oarg.e != oarg.s + r || p->scs.opt_duration < 0) {
-                         snprintf(p->err_msg, sizeof(p->err_msg),
-                                  "syntax error for option -L");
-                         return AVERROR_INVALIDDATA;
---
-2.40.0
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36613.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36613.patch
deleted file mode 100644
index 0061b7ad98..0000000000
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36613.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 50d8e4f27398fd5778485a827d7a2817921f8540 Mon Sep 17 00:00:00 2001
-From: Michael Niedermayer <michael@niedermayer.cc>
-Date: Sat, 30 Sep 2023 00:51:29 +0200
-Subject: [PATCH] avformat/dxa: Adjust order of operations around block align
-
-Fixes: 51896/clusterfuzz-testcase-minimized-ffmpeg_dem_DXA_fuzzer-5730576523198464
-Fixes: signed integer overflow: 2147483566 + 82 cannot be represented in type 'int'
-
-Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
-Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-(cherry picked from commit 50d8e4f27398fd5778485a827d7a2817921f8540)
-Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-
-CVE: CVE-2024-36613
-
-Upstream-Status: Backport [https://github.com/ffmpeg/ffmpeg/commit/50d8e4f27398fd5778485a827d7a2817921f8540]
-
-Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com>
----
- libavformat/dxa.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libavformat/dxa.c b/libavformat/dxa.c
-index 474b852..b4d9d00 100644
---- a/libavformat/dxa.c
-+++ b/libavformat/dxa.c
-@@ -122,7 +122,7 @@ static int dxa_read_header(AVFormatContext *s)
-         if(ast->codecpar->block_align) {
-             if (c->bpc > INT_MAX - ast->codecpar->block_align + 1)
-                 return AVERROR_INVALIDDATA;
--            c->bpc = ((c->bpc + ast->codecpar->block_align - 1) / ast->codecpar->block_align) * ast->codecpar->block_align;
-+            c->bpc = ((c->bpc - 1 + ast->codecpar->block_align) / ast->codecpar->block_align) * ast->codecpar->block_align;
-         }
-         c->bytes_left = fsize;
-         c->wavpos = avio_tell(pb);
---
-2.40.0
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36616.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36616.patch
deleted file mode 100644
index 3f02c45b33..0000000000
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36616.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 86f73277bf014e2ce36dd2594f1e0fb8b3bd6661 Mon Sep 17 00:00:00 2001
-From: Michael Niedermayer <michael@niedermayer.cc>
-Date: Tue, 26 Mar 2024 01:00:13 +0100
-Subject: [PATCH] avformat/westwood_vqa: Fix 2g packets
-
-Fixes: signed integer overflow: 2147483424 * 2 cannot be represented in type 'int'
-Fixes: 62276/clusterfuzz-testcase-minimized-ffmpeg_dem_WSVQA_fuzzer-4576211411795968
-
-Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
-Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-
-CVE: CVE-2024-36616
-
-Upstream-Status: Backport [https://github.com/ffmpeg/ffmpeg/commit/86f73277bf014e2ce36dd2594f1e0fb8b3bd6661]
-
-Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com>
----
- libavformat/westwood_vqa.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libavformat/westwood_vqa.c b/libavformat/westwood_vqa.c
-index 03b2d9e..024f5d3 100644
---- a/libavformat/westwood_vqa.c
-+++ b/libavformat/westwood_vqa.c
-@@ -262,7 +262,7 @@ static int wsvqa_read_packet(AVFormatContext *s,
-                     break;
-                 case SND2_TAG:
-                     /* 2 samples/byte, 1 or 2 samples per frame depending on stereo */
--                    pkt->duration = (chunk_size * 2) / wsvqa->channels;
-+                    pkt->duration = (chunk_size * 2LL) / wsvqa->channels;
-                     break;
-                 }
-                 break;
---
-2.40.0
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36617.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36617.patch
deleted file mode 100644
index 5d751213e3..0000000000
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36617.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From d973fcbcc2f944752ff10e6a76b0b2d9329937a7 Mon Sep 17 00:00:00 2001
-From: Michael Niedermayer <michael@niedermayer.cc>
-Date: Sat, 30 Sep 2023 00:38:17 +0200
-Subject: [PATCH] avformat/cafdec: dont seek beyond 64bit
-
-Fixes: signed integer overflow: 64 + 9223372036854775807 cannot be represented in type 'long long'
-Fixes: 51896/clusterfuzz-testcase-minimized-ffmpeg_dem_CAF_fuzzer-6418242730328064
-Fixes: 62276/clusterfuzz-testcase-minimized-ffmpeg_dem_CAF_fuzzer-6418242730328064
-
-Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
-Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-
-CVE: CVE-2024-36617
-
-Upstream-Status: Backport [https://github.com/ffmpeg/ffmpeg/commit/d973fcbcc2f944752ff10e6a76b0b2d9329937a7]
-
-Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com>
----
- libavformat/cafdec.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c
-index f5ba0f4..e92e327 100644
---- a/libavformat/cafdec.c
-+++ b/libavformat/cafdec.c
-@@ -271,7 +271,7 @@ static int read_pakt_chunk(AVFormatContext *s, int64_t size)
-         }
-     }
-
--    if (avio_tell(pb) - ccount > size) {
-+    if (avio_tell(pb) - ccount > size || size > INT64_MAX - ccount) {
-         av_log(s, AV_LOG_ERROR, "error reading packet table\n");
-         return AVERROR_INVALIDDATA;
-     }
---
-2.40.0
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36619.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36619.patch
deleted file mode 100644
index 63d08eabcc..0000000000
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36619.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 28c7094b25b689185155a6833caf2747b94774a4 Mon Sep 17 00:00:00 2001
-From: Michael Niedermayer <michael@niedermayer.cc>
-Date: Thu, 4 Apr 2024 00:15:27 +0200
-Subject: [PATCH] avcodec/wavarc: fix signed integer overflow in block type
- 6/19
-
-Fixes: signed integer overflow: -2088796289 + -91276551 cannot be represented in type 'int'
-Fixes: 67772/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WAVARC_fuzzer-6533568953122816
-
-Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
-Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-
-CVE: CVE-2024-36619
-
-Upstream-Status: Backport [https://github.com/ffmpeg/ffmpeg/commit/28c7094b25b689185155a6833caf2747b94774a4]
-
-Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com>
----
- libavcodec/wavarc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libavcodec/wavarc.c b/libavcodec/wavarc.c
-index 09ed4d4..51d91a4 100644
---- a/libavcodec/wavarc.c
-+++ b/libavcodec/wavarc.c
-@@ -648,7 +648,7 @@ static int decode_5elp(AVCodecContext *avctx,
-                 for (int o = 0; o < order; o++)
-                     sum += s->filter[ch][o] * (unsigned)samples[n + 70 - o - 1];
-
--                samples[n + 70] += ac_out[n] + (sum >> 4);
-+                samples[n + 70] += ac_out[n] + (unsigned)(sum >> 4);
-             }
-
-             for (int n = 0; n < 70; n++)
---
-2.40.0
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-7055.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-7055.patch
deleted file mode 100644
index afd857ceac..0000000000
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-7055.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 587acd0d4020859e67d1f07aeff2c885797ebcce Mon Sep 17 00:00:00 2001
-From: Michael Niedermayer <michael@niedermayer.cc>
-Date: Thu, 18 Jul 2024 21:12:54 +0200
-Subject: [PATCH] avcodec/pnmdec: Use 64bit for input size check
-
-Fixes: out of array read
-Fixes: poc3
-
-Reported-by: VulDB CNA Team
-Found-by: CookedMelon
-Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-(cherry picked from commit 3faadbe2a27e74ff5bb5f7904ec27bb1f5287dc8)
-Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-
-CVE: CVE-2024-7055
-
-Upstream-Status: Backport [https://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=587acd0d4020859e67d1f07aeff2c885797ebcce]
-
-Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com>
----
- libavcodec/pnmdec.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c
-index acd77ea..40cc2ae 100644
---- a/libavcodec/pnmdec.c
-+++ b/libavcodec/pnmdec.c
-@@ -264,7 +264,7 @@ static int pnm_decode_frame(AVCodecContext *avctx, AVFrame *p,
-         break;
-     case AV_PIX_FMT_GBRPF32:
-         if (!s->half) {
--            if (avctx->width * avctx->height * 12 > s->bytestream_end - s->bytestream)
-+            if (avctx->width * avctx->height * 12LL > s->bytestream_end - s->bytestream)
-                 return AVERROR_INVALIDDATA;
-             scale = 1.f / s->scale;
-             if (s->endian) {
---
-2.40.0
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/vulkan_av1_stable_API.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/vulkan_av1_stable_API.patch
index 74db148b3b..be6c6b7416 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg/vulkan_av1_stable_API.patch
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg/vulkan_av1_stable_API.patch
@@ -6,6 +6,9 @@ Subject: [PATCH] vulkan_av1: port to the new stable API
 Co-Authored-by: Dave Airlie <airlied@redhat.com>
 Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
 Upstream-Status: Backport [https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/ecdc94b97f809d5f2b88640842fd0541951ad295]
+
+Comment: Patch is refreshed as per codebase of 6.1.2
+Signed-off-by: Divyanshu Rathore <divyanshu.rathore@kpit.com>
 ---
  configure                                     |   4 +-
  libavcodec/Makefile                           |   5 +-
@@ -26,7 +29,7 @@ diff --git a/configure b/configure
 index e853deb51d..9fa639fca6 100755
 --- a/configure
 +++ b/configure
-@@ -7300,8 +7300,8 @@ enabled vdpau &&
+@@ -7160,8 +7160,8 @@ enabled crystalhd && check_lib crystalhd
           "in maintaining it."
  
  if enabled vulkan; then
@@ -41,21 +44,19 @@ diff --git a/libavcodec/Makefile b/libavcodec/Makefile
 index 7ef2e03ca6..9ce6d445c1 100644
 --- a/libavcodec/Makefile
 +++ b/libavcodec/Makefile
-@@ -1258,8 +1258,7 @@ SKIPHEADERS                            += %_tablegen.h                  \
+@@ -1284,7 +1284,6 @@ SKIPHEADERS                            +
                                            aacenc_quantization.h         \
                                            aacenc_quantization_misc.h    \
                                            bitstream_template.h          \
--                                          vulkan_video_codec_av1std.h   \
--                                          $(ARCH)/vpx_arith.h          \
-+                                          $(ARCH)/vpx_arith.h           \
+-                                          vulkan_video_codec_av1std_mesa.h \
+                                           $(ARCH)/vpx_arith.h          \
  
  SKIPHEADERS-$(CONFIG_AMF)              += amfenc.h
- SKIPHEADERS-$(CONFIG_D3D11VA)          += d3d11va.h dxva2_internal.h
-@@ -1280,7 +1279,7 @@ SKIPHEADERS-$(CONFIG_QSVENC)           += qsvenc.h
+@@ -1306,7 +1305,7 @@ SKIPHEADERS-$(CONFIG_XVMC)             +
  SKIPHEADERS-$(CONFIG_VAAPI)            += vaapi_decode.h vaapi_hevc.h vaapi_encode.h
  SKIPHEADERS-$(CONFIG_VDPAU)            += vdpau.h vdpau_internal.h
  SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX)     += videotoolbox.h vt_internal.h
--SKIPHEADERS-$(CONFIG_VULKAN)           += vulkan.h vulkan_video.h vulkan_decode.h vulkan_video_codec_av1std_decode.h
+-SKIPHEADERS-$(CONFIG_VULKAN)           += vulkan.h vulkan_video.h vulkan_decode.h vulkan_video_codec_av1std_decode_mesa.h
 +SKIPHEADERS-$(CONFIG_VULKAN)           += vulkan.h vulkan_video.h vulkan_decode.h
  SKIPHEADERS-$(CONFIG_V4L2_M2M)         += v4l2_buffers.h v4l2_context.h v4l2_m2m.h
  SKIPHEADERS-$(CONFIG_ZLIB)             += zlib_wrapper.h
@@ -866,19 +867,19 @@ diff --git a/libavcodec/vulkan_video.h b/libavcodec/vulkan_video.h
 index bb69e920bb..01a1de7d9d 100644
 --- a/libavcodec/vulkan_video.h
 +++ b/libavcodec/vulkan_video.h
-@@ -22,8 +22,6 @@
+@@ -23,8 +23,6 @@
  #include "vulkan.h"
  
  #include <vk_video/vulkan_video_codecs_common.h>
--#include "vulkan_video_codec_av1std.h"
--#include "vulkan_video_codec_av1std_decode.h"
+-#include "vulkan_video_codec_av1std_mesa.h"
+-#include "vulkan_video_codec_av1std_decode_mesa.h"
  
  #define CODEC_VER_MAJ(ver) (ver >> 22)
  #define CODEC_VER_MIN(ver) ((ver >> 12) & ((1 << 10) - 1))
-diff --git a/libavcodec/vulkan_video_codec_av1std_decode.h b/libavcodec/vulkan_video_codec_av1std_decode.h
+diff --git a/libavcodec/vulkan_video_codec_av1std_decode_mesa.h b/libavcodec/vulkan_video_codec_av1std_decode_mesa.h
 deleted file mode 100644
 index e2f37b4e6e..0000000000
---- a/libavcodec/vulkan_video_codec_av1std_decode.h
+--- a/libavcodec/vulkan_video_codec_av1std_decode_mesa.h
 +++ /dev/null
 @@ -1,36 +0,0 @@
 -/* Copyright 2023 Lynne
@@ -897,8 +898,8 @@ index e2f37b4e6e..0000000000
 - * limitations under the License.
 - */
 -
--#ifndef VULKAN_VIDEO_CODEC_AV1STD_DECODE_H_
--#define VULKAN_VIDEO_CODEC_AV1STD_DECODE_H_ 1
+-#ifndef VULKAN_VIDEO_CODEC_AV1STD_DECODE_MESA_H_
+-#define VULKAN_VIDEO_CODEC_AV1STD_DECODE_MESA_H_ 1
 -
 -/*
 -** This header is NOT YET generated from the Khronos Vulkan XML API Registry.
@@ -917,10 +918,10 @@ index e2f37b4e6e..0000000000
 -#endif
 -
 -#endif
-diff --git a/libavcodec/vulkan_video_codec_av1std.h b/libavcodec/vulkan_video_codec_av1std.h
+diff --git a/libavcodec/vulkan_video_codec_av1std_mesa.h b/libavcodec/vulkan_video_codec_av1std_mesa.h
 deleted file mode 100644
 index c91589eee2..0000000000
---- a/libavcodec/vulkan_video_codec_av1std.h
+--- a/libavcodec/vulkan_video_codec_av1std_mesa.h
 +++ /dev/null
 @@ -1,403 +0,0 @@
 -/* Copyright 2023 Lynne
@@ -939,8 +940,8 @@ index c91589eee2..0000000000
 - * limitations under the License.
 - */
 -
--#ifndef VULKAN_VIDEO_CODEC_AV1STD_H_
--#define VULKAN_VIDEO_CODEC_AV1STD_H_ 1
+-#ifndef VULKAN_VIDEO_CODEC_AV1STD_MESA_H_
+-#define VULKAN_VIDEO_CODEC_AV1STD_MESA_H_ 1
 -
 -/*
 -** This header is NOT YET generated from the Khronos Vulkan XML API Registry.
@@ -1379,4 +1380,3 @@ diff --git a/libavcodec/vulkan_video.c b/libavcodec/vulkan_video.c
  
 -- 
 2.25.1
-
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.2.bb
index 3d766c3fc7..a789980dde 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.2.bb
@@ -31,21 +31,14 @@ SRC_URI = " \
     file://CVE-2024-31578.patch \
     file://CVE-2024-31582.patch \
     file://CVE-2023-50008.patch \
-    file://CVE-2024-32230.patch \
     file://CVE-2023-49501.patch \
     file://CVE-2024-28661.patch \
     file://CVE-2023-50007.patch \
     file://CVE-2023-49528.patch \
-    file://CVE-2024-7055.patch \
-    file://CVE-2024-35366.patch \
     file://CVE-2024-35367.patch \
     file://CVE-2024-35368.patch \
     file://CVE-2024-35365.patch \
-    file://CVE-2024-36613.patch \
-    file://CVE-2024-36616.patch \
-    file://CVE-2024-36617.patch \
     file://CVE-2024-36618.patch \
-    file://CVE-2024-36619.patch \
     file://CVE-2024-35369.patch \
     file://CVE-2025-25473.patch \
     file://CVE-2025-22919.patch \
@@ -53,7 +46,7 @@ SRC_URI = " \
     file://CVE-2025-0518.patch \
 "
 
-SRC_URI[sha256sum] = "8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968"
+SRC_URI[sha256sum] = "3b624649725ecdc565c903ca6643d41f33bd49239922e45c9b1442c63dca4e38"
 
 # https://nvd.nist.gov/vuln/detail/CVE-2023-39018
 # https://github.com/bramp/ffmpeg-cli-wrapper/issues/291
@@ -62,6 +55,10 @@ SRC_URI[sha256sum] = "8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac08736
 CVE_STATUS[CVE-2023-39018] = "cpe-incorrect: This issue belongs to ffmpeg-cli-wrapper \
 (Java wrapper around the FFmpeg CLI) and not ffmepg itself."
 
+# Introduced: https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/19f7dae81ab2c19643b97da7556383ee3f721e78
+# Fixed: https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/43be8d07281caca2e88bfd8ee2333633e1fb1a13
+CVE_STATUS[CVE-2025-1373]  = "fixed-version: Vulnerable code not present in any release"
+
 # Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
 ARM_INSTRUCTION_SET:armv4 = "arm"
 ARM_INSTRUCTION_SET:armv5 = "arm"
diff --git a/meta/recipes-multimedia/libpng/files/run-ptest b/meta/recipes-multimedia/libpng/files/run-ptest
new file mode 100644
index 0000000000..85051a59f5
--- /dev/null
+++ b/meta/recipes-multimedia/libpng/files/run-ptest
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -eux
+
+cd src
+
+make check-TESTS
diff --git a/meta/recipes-multimedia/libpng/libpng_1.6.42.bb b/meta/recipes-multimedia/libpng/libpng_1.6.42.bb
index 673133bb4a..4c21e8d597 100644
--- a/meta/recipes-multimedia/libpng/libpng_1.6.42.bb
+++ b/meta/recipes-multimedia/libpng/libpng_1.6.42.bb
@@ -10,7 +10,10 @@ DEPENDS = "zlib"
 
 LIBV = "16"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/${PV}/${BP}.tar.xz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/${PV}/${BP}.tar.xz \
+           file://run-ptest \
+"
+
 SRC_URI[sha256sum] = "c919dbc11f4c03b05aba3f8884d8eb7adfe3572ad228af972bb60057bdb48450"
 
 MIRRORS += "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/older-releases/"
@@ -19,7 +22,7 @@ UPSTREAM_CHECK_URI = "http://libpng.org/pub/png/libpng.html"
 
 BINCONFIG = "${bindir}/libpng-config ${bindir}/libpng16-config"
 
-inherit autotools binconfig-disabled pkgconfig
+inherit autotools binconfig-disabled pkgconfig ptest
 
 # Work around missing symbols
 ARMNEON = "${@bb.utils.contains("TUNE_FEATURES", "neon", "--enable-arm-neon=on", "--enable-arm-neon=off", d)}"
@@ -30,4 +33,39 @@ PACKAGES =+ "${PN}-tools"
 
 FILES:${PN}-tools = "${bindir}/png-fix-itxt ${bindir}/pngfix ${bindir}/pngcp"
 
+RDEPENDS:${PN}-ptest += "make bash gawk"
+
+do_install_ptest() {
+    # Install test scripts to ptest path
+    install -d ${D}${PTEST_PATH}/src/tests
+    install -m 755 ${S}/tests/* ${D}${PTEST_PATH}/src/tests
+    install -m 755 ${S}/test-driver ${D}${PTEST_PATH}/src
+    install -d ${D}${PTEST_PATH}/src/tests/scripts
+    install -m 755 ${S}/scripts/*.awk ${D}${PTEST_PATH}/src/tests/scripts
+    install -m 644 ${S}/scripts/pnglib* ${S}/scripts/*.c ${S}/scripts/*.def ${S}/scripts/macro.lst ${D}${PTEST_PATH}/src/tests/scripts
+    install -m 644 ${S}/scripts/pnglibconf.h.prebuilt ${D}${PTEST_PATH}/src/tests/scripts/pnglibconf.h
+    install -d ${D}${PTEST_PATH}/src/contrib/tools
+    install -m 755 ${S}/contrib/tools/*.sh ${D}${PTEST_PATH}/src/contrib/tools
+    install -m 644 ${S}/contrib/tools/*.c ${S}/contrib/tools/*.h ${D}${PTEST_PATH}/src/contrib/tools
+
+    # Install .libs directory binaries to ptest path
+    install -m 755 ${B}/.libs/pngtest ${B}/.libs/pngstest ${B}/.libs/pngimage ${B}/.libs/pngunknown ${B}/.libs/pngvalid ${D}${PTEST_PATH}/src
+
+    # Copy png files to ptest path
+    cd ${S} && find contrib -name '*.png' | cpio -pd ${D}${PTEST_PATH}/src
+
+    # Install Makefile and png files
+    install -m 644 ${S}/pngtest.png ${D}${PTEST_PATH}/src
+    install -m 644 ${S}/*.png ${S}/*.h ${S}/*.c ${S}/*.dfa ${B}/pnglibconf.out ${S}/Makefile.am ${S}/Makefile.in ${D}${PTEST_PATH}/src/tests
+
+    sed -e 's/^abs_srcdir = ..*/abs_srcdir = \.\./'          \
+        -e 's/^top_srcdir = ..*/top_srcdir = \.\./'          \
+        -e 's/^srcdir = ..*/srcdir = \./'                    \
+        -e 's/^Makefile: ..*/Makefile: /'                    \
+        -e 's/check-TESTS: $(check_PROGRAMS)/check-TESTS:/g' \
+        ${B}/Makefile > ${D}${PTEST_PATH}/src/Makefile
+
+    sed -e 's|#!/bin/awk|#!/usr/bin/awk|g' -i ${D}${PTEST_PATH}/src/tests/scripts/*.awk
+}
+
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-support/libatomic-ops/libatomic-ops_7.8.2.bb b/meta/recipes-support/libatomic-ops/libatomic-ops_7.8.2.bb
index 824400e743..6269133408 100644
--- a/meta/recipes-support/libatomic-ops/libatomic-ops_7.8.2.bb
+++ b/meta/recipes-support/libatomic-ops/libatomic-ops_7.8.2.bb
@@ -1,6 +1,6 @@
 SUMMARY = "A library for atomic integer operations"
 DESCRIPTION = "Package provides semi-portable access to hardware-provided atomic memory update operations on a number of architectures."
-HOMEPAGE = "https://github.com/ivmai/libatomic_ops/"
+HOMEPAGE = "https://github.com/bdwgc/libatomic_ops/"
 SECTION = "optional"
 PROVIDES += "libatomics-ops"
 LICENSE = "GPL-2.0-only & MIT"
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     "
 
 SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/libatomic_ops-${PV}.tar.gz"
-GITHUB_BASE_URI = "https://github.com/ivmai/libatomic_ops/releases"
+GITHUB_BASE_URI = "https://github.com/bdwgc/libatomic_ops/releases"
 
 SRC_URI[sha256sum] = "d305207fe207f2b3fb5cb4c019da12b44ce3fcbc593dfd5080d867b1a2419b51"
 
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/CVE-2024-52530.patch b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2024-52530.patch
new file mode 100644
index 0000000000..bd62a748eb
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2024-52530.patch
@@ -0,0 +1,149 @@
+From 04df03bc092ac20607f3e150936624d4f536e68b Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <pgriffis@igalia.com>
+Date: Mon, 8 Jul 2024 12:33:15 -0500
+Subject: [PATCH] headers: Strictly don't allow NUL bytes
+
+In the past (2015) this was allowed for some problematic sites. However Chromium also does not allow NUL bytes in either header names or values these days. So this should no longer be a problem.
+
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/04df03bc092ac20607f3e150936624d4f536e68b]
+CVE: CVE-2024-52530
+Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
+---
+ libsoup/soup-headers.c      | 15 +++------
+ tests/header-parsing-test.c | 62 +++++++++++++++++--------------------
+ 2 files changed, 32 insertions(+), 45 deletions(-)
+
+diff --git a/libsoup/soup-headers.c b/libsoup/soup-headers.c
+index a0cf351ac..f30ee467a 100644
+--- a/libsoup/soup-headers.c
++++ b/libsoup/soup-headers.c
+@@ -51,13 +51,14 @@ soup_headers_parse (const char *str, int len, SoupMessageHeaders *dest)
+         * ignorable trailing whitespace.
+         */
+ 
++       /* No '\0's are allowed */
++       if (memchr (str, '\0', len))
++               return FALSE;
++
+        /* Skip over the Request-Line / Status-Line */
+        headers_start = memchr (str, '\n', len);
+        if (!headers_start)
+                return FALSE;
+-       /* No '\0's in the Request-Line / Status-Line */
+-       if (memchr (str, '\0', headers_start - str))
+-               return FALSE;
+ 
+        /* We work on a copy of the headers, which we can write '\0's
+         * into, so that we don't have to individually g_strndup and
+@@ -69,14 +70,6 @@ soup_headers_parse (const char *str, int len, SoupMessageHeaders *dest)
+        headers_copy[copy_len] = '\0';
+        value_end = headers_copy;
+ 
+-       /* There shouldn't be any '\0's in the headers already, but
+-        * this is the web we're talking about.
+-        */
+-       while ((p = memchr (headers_copy, '\0', copy_len))) {
+-               memmove (p, p + 1, copy_len - (p - headers_copy));
+-               copy_len--;
+-       }
+-
+        while (*(value_end + 1)) {
+                name = value_end + 1;
+                name_end = strchr (name, ':');
+diff --git a/tests/header-parsing-test.c b/tests/header-parsing-test.c
+index edf8eebb3..715c2c6f2 100644
+--- a/tests/header-parsing-test.c
++++ b/tests/header-parsing-test.c
+@@ -358,24 +358,6 @@ static struct RequestTest {
+          }
+        },
+ 
+-       { "NUL in header name", "760832",
+-         "GET / HTTP/1.1\r\nHost\x00: example.com\r\n", 36,
+-         SOUP_STATUS_OK,
+-         "GET", "/", SOUP_HTTP_1_1,
+-         { { "Host", "example.com" },
+-           { NULL }
+-         }
+-       },
+-
+-       { "NUL in header value", "760832",
+-         "GET / HTTP/1.1\r\nHost: example\x00" "com\r\n", 35,
+-         SOUP_STATUS_OK,
+-         "GET", "/", SOUP_HTTP_1_1,
+-         { { "Host", "examplecom" },
+-           { NULL }
+-         }
+-       },
+-
+        /************************/
+        /*** INVALID REQUESTS ***/
+        /************************/
+@@ -448,6 +430,21 @@ static struct RequestTest {
+          SOUP_STATUS_EXPECTATION_FAILED,
+          NULL, NULL, -1,
+          { { NULL } }
++       },
++
++       // https://gitlab.gnome.org/GNOME/libsoup/-/issues/377
++       { "NUL in header name", NULL,
++         "GET / HTTP/1.1\r\nHost\x00: example.com\r\n", 36,
++         SOUP_STATUS_BAD_REQUEST,
++         NULL, NULL, -1,
++         { { NULL } }
++       },
++
++       { "NUL in header value", NULL,
++         "HTTP/1.1 200 OK\r\nFoo: b\x00" "ar\r\n", 28,
++         SOUP_STATUS_BAD_REQUEST,
++           NULL, NULL, -1,
++         { { NULL } }
+        }
+ };
+ static const int num_reqtests = G_N_ELEMENTS (reqtests);
+@@ -620,22 +617,6 @@ static struct ResponseTest {
+            { NULL } }
+        },
+ 
+-       { "NUL in header name", "760832",
+-         "HTTP/1.1 200 OK\r\nF\x00oo: bar\r\n", 28,
+-         SOUP_HTTP_1_1, SOUP_STATUS_OK, "OK",
+-         { { "Foo", "bar" },
+-           { NULL }
+-         }
+-       },
+-
+-       { "NUL in header value", "760832",
+-         "HTTP/1.1 200 OK\r\nFoo: b\x00" "ar\r\n", 28,
+-         SOUP_HTTP_1_1, SOUP_STATUS_OK, "OK",
+-         { { "Foo", "bar" },
+-           { NULL }
+-         }
+-       },
+-
+        /********************************/
+        /*** VALID CONTINUE RESPONSES ***/
+        /********************************/
+@@ -768,6 +749,19 @@ static struct ResponseTest {
+          { { NULL }
+          }
+        },
++
++       // https://gitlab.gnome.org/GNOME/libsoup/-/issues/377
++       { "NUL in header name", NULL,
++         "HTTP/1.1 200 OK\r\nF\x00oo: bar\r\n", 28,
++         -1, 0, NULL,
++         { { NULL } }
++       },
++
++       { "NUL in header value", "760832",
++         "HTTP/1.1 200 OK\r\nFoo: b\x00" "ar\r\n", 28,
++         -1, 0, NULL,
++         { { NULL } }
++       },
+ };
+ static const int num_resptests = G_N_ELEMENTS (resptests);
+ 
+-- 
+GitLab
+
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/CVE-2024-52531-1.patch b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2024-52531-1.patch
new file mode 100644
index 0000000000..d56ad0ff5e
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2024-52531-1.patch
@@ -0,0 +1,131 @@
+From a35222dd0bfab2ac97c10e86b95f762456628283 Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <pgriffis@igalia.com>
+Date: Tue, 27 Aug 2024 13:53:26 -0500
+Subject: [PATCH 1/2] headers: Be more robust against invalid input when
+ parsing params
+
+If you pass invalid input to a function such as soup_header_parse_param_list_strict()
+it can cause an overflow if it decodes the input to UTF-8.
+
+This should never happen with valid UTF-8 input which libsoup's client API
+ensures, however it's server API does not currently.
+
+Upstream-Status: Backport [import from ubuntu https://git.launchpad.net/ubuntu/+source/libsoup2.4/tree/debian/patches/CVE-2024-52531-1.patch?h=ubuntu/jammy-security
+Upstream commit https://gitlab.gnome.org/GNOME/libsoup/-/commit/a35222dd0bfab2ac97c10e86b95f762456628283]
+CVE: CVE-2024-52531
+Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
+---
+ libsoup/soup-headers.c | 46 ++++++++++++++++++++++--------------------
+ 1 file changed, 24 insertions(+), 22 deletions(-)
+
+Index: libsoup2.4-2.74.2/libsoup/soup-headers.c
+===================================================================
+--- libsoup2.4-2.74.2.orig/libsoup/soup-headers.c
++++ libsoup2.4-2.74.2/libsoup/soup-headers.c
+@@ -643,8 +643,9 @@ soup_header_contains (const char *header
+ }
+ 
+ static void
+-decode_quoted_string (char *quoted_string)
++decode_quoted_string_inplace (GString *quoted_gstring)
+ {
++       char *quoted_string = quoted_gstring->str;
+        char *src, *dst;
+ 
+        src = quoted_string + 1;
+@@ -658,10 +659,11 @@ decode_quoted_string (char *quoted_strin
+ }
+ 
+ static gboolean
+-decode_rfc5987 (char *encoded_string)
++decode_rfc5987_inplace (GString *encoded_gstring)
+ {
+        char *q, *decoded;
+        gboolean iso_8859_1 = FALSE;
++       const char *encoded_string = encoded_gstring->str;
+ 
+        q = strchr (encoded_string, '\'');
+        if (!q)
+@@ -690,14 +692,7 @@ decode_rfc5987 (char *encoded_string)
+                decoded = utf8;
+        }
+ 
+-       /* If encoded_string was UTF-8, then each 3-character %-escape
+-        * will be converted to a single byte, and so decoded is
+-        * shorter than encoded_string. If encoded_string was
+-        * iso-8859-1, then each 3-character %-escape will be
+-        * converted into at most 2 bytes in UTF-8, and so it's still
+-        * shorter.
+-        */
+-       strcpy (encoded_string, decoded);
++       g_string_assign (encoded_gstring, decoded);
+        g_free (decoded);
+        return TRUE;
+ }
+@@ -707,15 +702,17 @@ parse_param_list (const char *header, ch
+ {
+        GHashTable *params;
+        GSList *list, *iter;
+-       char *item, *eq, *name_end, *value;
+-       gboolean override, duplicated;
+ 
+        params = g_hash_table_new_full (soup_str_case_hash, 
+                                        soup_str_case_equal,
+-                                       g_free, NULL);
++                                       g_free, g_free);
+ 
+        list = parse_list (header, delim);
+        for (iter = list; iter; iter = iter->next) {
++               char *item, *eq, *name_end;
++               gboolean override, duplicated;
++               GString *parsed_value = NULL;
++
+                item = iter->data;
+                override = FALSE;
+ 
+@@ -730,19 +727,19 @@ parse_param_list (const char *header, ch
+ 
+                        *name_end = '\0';
+ 
+-                       value = (char *)skip_lws (eq + 1);
++                       parsed_value = g_string_new ((char *)skip_lws (eq + 1));
+ 
+                        if (name_end[-1] == '*' && name_end > item + 1) {
+                                name_end[-1] = '\0';
+-                               if (!decode_rfc5987 (value)) {
++                               if (!decode_rfc5987_inplace (parsed_value)) {
++                                       g_string_free (parsed_value, TRUE);
+                                        g_free (item);
+                                        continue;
+                                }
+                                override = TRUE;
+-                       } else if (*value == '"')
+-                               decode_quoted_string (value);
+-               } else
+-                       value = NULL;
++                       } else if (parsed_value->str[0] == '"')
++                               decode_quoted_string_inplace (parsed_value);
++               }
+ 
+                duplicated = g_hash_table_lookup_extended (params, item, NULL, NULL);
+ 
+@@ -750,11 +747,16 @@ parse_param_list (const char *header, ch
+                        soup_header_free_param_list (params);
+                        params = NULL;
+                        g_slist_foreach (iter, (GFunc)g_free, NULL);
++                       if (parsed_value)
++                               g_string_free (parsed_value, TRUE);
+                        break;
+-               } else if (override || !duplicated)
+-                       g_hash_table_replace (params, item, value);
+-               else
++               } else if (override || !duplicated) {
++                       g_hash_table_replace (params, item, parsed_value ? g_string_free (parsed_value, FALSE) : NULL);
++               } else {
++                       if (parsed_value)
++                               g_string_free (parsed_value, TRUE);
+                        g_free (item);
++               }
+        }
+ 
+        g_slist_free (list);
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/CVE-2024-52531-2.patch b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2024-52531-2.patch
new file mode 100644
index 0000000000..19b1872866
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2024-52531-2.patch
@@ -0,0 +1,36 @@
+From 825fda3425546847b42ad5270544e9388ff349fe Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <pgriffis@igalia.com>
+Date: Tue, 27 Aug 2024 13:52:08 -0500
+Subject: [PATCH 2/2] tests: Add test for passing invalid UTF-8 to
+ soup_header_parse_semi_param_list()
+
+Upstream-Status: Backport [import from ubuntu https://git.launchpad.net/ubuntu/+source/libsoup2.4/tree/debian/patches/CVE-2024-52531-2.patch?h=ubuntu/jammy-security
+Upstream commit https://gitlab.gnome.org/GNOME/libsoup/-/commit/825fda3425546847b42ad5270544e9388ff349fe]
+CVE: CVE-2024-52531
+Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
+---
+ tests/header-parsing-test.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+Index: libsoup2.4-2.74.2/tests/header-parsing-test.c
+===================================================================
+--- libsoup2.4-2.74.2.orig/tests/header-parsing-test.c
++++ libsoup2.4-2.74.2/tests/header-parsing-test.c
+@@ -825,6 +825,17 @@ static struct ParamListTest {
+            { "filename", "t\xC3\xA9st.txt" },
+          },
+        },
++
++        /* This tests invalid UTF-8 data which *should* never be passed here but it was designed to be robust against it. */
++        { TRUE,
++              "invalid*=\x69\x27\x27\x93\x93\x93\x93\xff\x61\x61\x61\x61\x61\x61\x61\x62\x63\x64\x65\x0a; filename*=iso-8859-1''\x69\x27\x27\x93\x93\x93\x93\xff\x61\x61\x61\x61\x61\x61\x61\x62\x63\x64\x65\x0a; foo",
++              {
++                    { "filename", "i''\302\223\302\223\302\223\302\223\303\277aaaaaaabcde" },
++                    { "invalid", "\302\223\302\223\302\223\302\223\303\277aaaaaaabcde" },
++                    { "foo", NULL },
++
++                },
++        }
+ };
+ static const int num_paramlisttests = G_N_ELEMENTS (paramlisttests);
+ 
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-1.patch b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-1.patch
new file mode 100644
index 0000000000..68eb942762
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-1.patch
@@ -0,0 +1,36 @@
+From 6adc0e3eb74c257ed4e2a23eb4b2774fdb0d67be Mon Sep 17 00:00:00 2001
+From: Ignacio Casal Quinteiro <qignacio@amazon.com>
+Date: Wed, 11 Sep 2024 11:52:11 +0200
+Subject: [PATCH] websocket: process the frame as soon as we read data
+
+Otherwise we can enter in a read loop because we were not
+validating the data until the all the data was read.
+
+Fixes #391
+
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/6adc0e3eb74c257ed4e2a23eb4b2774fdb0d67be]
+CVE: CVE-2024-52532
+Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
+---
+ libsoup/soup-websocket-connection.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libsoup/soup-websocket-connection.c b/libsoup/soup-websocket-connection.c
+index a4095e1..9d5f4f8 100644
+--- a/libsoup/soup-websocket-connection.c
++++ b/libsoup/soup-websocket-connection.c
+@@ -1140,9 +1140,9 @@ soup_websocket_connection_read (SoupWebsocketConnection *self)
+                }
+ 
+                pv->incoming->len = len + count;
+-       } while (count > 0);
+ 
+-       process_incoming (self);
++               process_incoming (self);
++       } while (count > 0 && !pv->close_sent && !pv->io_closing);
+ 
+        if (end) {
+                if (!pv->close_sent || !pv->close_received) {
+-- 
+2.25.1
+
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-2.patch b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-2.patch
new file mode 100644
index 0000000000..e4e2d03d58
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-2.patch
@@ -0,0 +1,42 @@
+From 29b96fab2512666d7241e46c98cc45b60b795c0c Mon Sep 17 00:00:00 2001
+From: Ignacio Casal Quinteiro <qignacio@amazon.com>
+Date: Wed, 2 Oct 2024 11:17:19 +0200
+Subject: [PATCH] websocket-test: disconnect error copy after the test ends
+
+Otherwise the server will have already sent a few more wrong
+bytes and the client will continue getting errors to copy
+but the error is already != NULL and it will assert
+
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/29b96fab2512666d7241e46c98cc45b60b795c0c]
+CVE: CVE-2024-52532
+Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
+---
+ tests/websocket-test.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tests/websocket-test.c b/tests/websocket-test.c
+index 06c443bb5..6a48c1f9b 100644
+--- a/tests/websocket-test.c
++++ b/tests/websocket-test.c
+@@ -1539,8 +1539,9 @@ test_receive_invalid_encode_length_64 (Test *test,
+        GError *error = NULL;
+        InvalidEncodeLengthTest context = { test, NULL };
+        guint i;
++       guint error_id;
+ 
+-       g_signal_connect (test->client, "error", G_CALLBACK (on_error_copy), &error);
++       error_id = g_signal_connect (test->client, "error", G_CALLBACK (on_error_copy), &error);
+        g_signal_connect (test->client, "message", G_CALLBACK (on_binary_message), &received);
+ 
+        /* We use 127(\x7f) as payload length with 65535 extended length */
+@@ -1553,6 +1554,7 @@ test_receive_invalid_encode_length_64 (Test *test,
+        WAIT_UNTIL (error != NULL || received != NULL);
+        g_assert_error (error, SOUP_WEBSOCKET_ERROR, SOUP_WEBSOCKET_CLOSE_PROTOCOL_ERROR);
+        g_clear_error (&error);
++        g_signal_handler_disconnect (test->client, error_id);
+        g_assert_null (received);
+ 
+         g_thread_join (thread);
+-- 
+GitLab
+
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-3.patch b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-3.patch
new file mode 100644
index 0000000000..edcca86e8c
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-3.patch
@@ -0,0 +1,46 @@
+From 4c9e75c6676a37b6485620c332e568e1a3f530ff Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv@debian.org>
+Date: Wed, 13 Nov 2024 14:14:23 +0000
+Subject: [PATCH] websocket-test: Disconnect error signal in another place
+
+This is the same change as commit 29b96fab "websocket-test: disconnect
+error copy after the test ends", and is done for the same reason, but
+replicating it into a different function.
+
+Fixes: 6adc0e3e "websocket: process the frame as soon as we read data"
+Resolves: https://gitlab.gnome.org/GNOME/libsoup/-/issues/399
+Signed-off-by: Simon McVittie <smcv@debian.org>
+
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/4c9e75c6676a37b6485620c332e568e1a3f530ff]
+CVE: CVE-2024-52532
+Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
+---
+ tests/websocket-test.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tests/websocket-test.c b/tests/websocket-test.c
+index 6a48c1f9..723f2857 100644
+--- a/tests/websocket-test.c
++++ b/tests/websocket-test.c
+@@ -1508,8 +1508,9 @@ test_receive_invalid_encode_length_16 (Test *test,
+        GError *error = NULL;
+        InvalidEncodeLengthTest context = { test, NULL };
+        guint i;
++       guint error_id;
+ 
+-       g_signal_connect (test->client, "error", G_CALLBACK (on_error_copy), &error);
++       error_id = g_signal_connect (test->client, "error", G_CALLBACK (on_error_copy), &error);
+        g_signal_connect (test->client, "message", G_CALLBACK (on_binary_message), &received);
+ 
+        /* We use 126(~) as payload length with 125 extended length */
+@@ -1522,6 +1523,7 @@ test_receive_invalid_encode_length_16 (Test *test,
+        WAIT_UNTIL (error != NULL || received != NULL);
+        g_assert_error (error, SOUP_WEBSOCKET_ERROR, SOUP_WEBSOCKET_CLOSE_PROTOCOL_ERROR);
+        g_clear_error (&error);
++        g_signal_handler_disconnect (test->client, error_id);
+        g_assert_null (received);
+ 
+        g_thread_join (thread);
+-- 
+GitLab
+
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-2784.patch b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-2784.patch
new file mode 100644
index 0000000000..106f907168
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-2784.patch
@@ -0,0 +1,56 @@
+From 2eacbd762332795e00692ddab2515c6da23198d3 Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Mon, 12 May 2025 14:06:41 +0800
+Subject: [PATCH] sniffer: Add better coverage of skip_insignificant_space()
+
+CVE: CVE-2025-2784
+Upstream-Status: Backport
+[https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/435/diffs?commit_id=242a10fbb12dbdc12d254bd8fc8669a0ac055304;
+ https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/442/diffs?commit_id=c415ad0b6771992e66c70edf373566c6e247089d]
+
+Test code is not added since it uses some functions not defined in
+version 2.74. These tests are not used now, so just ignore them.
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-content-sniffer.c |  9 +++----
+ 1 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/libsoup/soup-content-sniffer.c b/libsoup/soup-content-sniffer.c
+index 5f2896e..9554636 100644
+--- a/libsoup/soup-content-sniffer.c
++++ b/libsoup/soup-content-sniffer.c
+@@ -612,8 +612,10 @@ sniff_text_or_binary (SoupContentSniffer *sniffer, SoupBuffer *buffer)
+ }
+ 
+ static gboolean
+-skip_insignificant_space (const char *resource, int *pos, int resource_length)
++skip_insignificant_space (const char *resource, gsize *pos, gsize resource_length)
+ {
++       if (*pos >= resource_length)
++               return TRUE;
+        while ((resource[*pos] == '\x09') ||
+               (resource[*pos] == '\x20') ||
+               (resource[*pos] == '\x0A') ||
+@@ -632,7 +634,7 @@ sniff_feed_or_html (SoupContentSniffer *sniffer, SoupBuffer *buffer)
+ {
+        const char *resource = (const char *)buffer->data;
+        int resource_length = MIN (512, buffer->length);
+-       int pos = 0;
++       gsize pos = 0;
+ 
+        if (resource_length < 3)
+                goto text_html;
+@@ -642,9 +644,6 @@ sniff_feed_or_html (SoupContentSniffer *sniffer, SoupBuffer *buffer)
+                pos = 3;
+ 
+  look_for_tag:
+-       if (pos > resource_length)
+-               goto text_html;
+-
+        if (skip_insignificant_space (resource, &pos, resource_length))
+                goto text_html;
+
+-- 
+2.34.1
+
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32050.patch b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32050.patch
new file mode 100644
index 0000000000..c032846ef0
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32050.patch
@@ -0,0 +1,29 @@
+From 5709dfffb6fdc5b66ce001bf82a755ad8ad1d992 Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <pgriffis@igalia.com>
+Date: Mon, 28 Oct 2024 12:29:48 -0500
+Subject: [PATCH] Fix using int instead of size_t for strcspn return
+
+CVE: CVE-2025-32050
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/9bb0a55de55c6940ced811a64fbca82fe93a9323]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-headers.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libsoup/soup-headers.c b/libsoup/soup-headers.c
+index 9707ca0..67905b2 100644
+--- a/libsoup/soup-headers.c
++++ b/libsoup/soup-headers.c
+@@ -902,7 +902,7 @@ append_param_quoted (GString    *string,
+                     const char *name,
+                     const char *value)
+ {
+-       int len;
++       gsize len;
+ 
+        g_string_append (string, name);
+        g_string_append (string, "=\"");
+-- 
+2.34.1
+
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32052.patch b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32052.patch
new file mode 100644
index 0000000000..34bc8113a4
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32052.patch
@@ -0,0 +1,32 @@
+From f4a67a9a3033586edaee715d40d5992e02d32893 Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <pgriffis@igalia.com>
+Date: Sat, 16 Nov 2024 12:07:30 -0600
+Subject: [PATCH] Fix heap buffer overflow in soup_content_sniffer_sniff
+
+Co-Author: Ar Jun <pkillarjun@protonmail.com>
+
+CVE: CVE-2025-32052
+Upstream-Status: Backport
+[https://gitlab.gnome.org/GNOME/libsoup/-/commit/f182429e5b1fc034050510da20c93256c4fa9652#500da7cfde649872c49169be34b03a1c42a53ddb]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-content-sniffer.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libsoup/soup-content-sniffer.c b/libsoup/soup-content-sniffer.c
+index 9554636..eac9e7b 100644
+--- a/libsoup/soup-content-sniffer.c
++++ b/libsoup/soup-content-sniffer.c
+@@ -504,7 +504,7 @@ sniff_unknown (SoupContentSniffer *sniffer, SoupBuffer *buffer,
+                        guint index_pattern = 0;
+                        gboolean skip_row = FALSE;
+ 
+-                       while ((index_stream < resource_length) &&
++                       while ((index_stream < resource_length - 1) &&
+                               (index_pattern <= type_row->pattern_length)) {
+                                /* Skip insignificant white space ("WS" in the spec) */
+                                if (type_row->pattern[index_pattern] == ' ') {
+-- 
+2.34.1
+
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32053.patch b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32053.patch
new file mode 100644
index 0000000000..0d829d6200
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32053.patch
@@ -0,0 +1,39 @@
+From d9bcffd6cd5e8ec32889a594f7348d67a5101b3a Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Mon, 12 May 2025 13:58:42 +0800
+Subject: [PATCH] Fix heap buffer overflow in
+ soup-content-sniffer.c:sniff_feed_or_html()
+
+CVE: CVE-2025-32053
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/eaed42ca8d40cd9ab63764e3d63641180505f40a]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-content-sniffer.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libsoup/soup-content-sniffer.c b/libsoup/soup-content-sniffer.c
+index 967ec61..5f2896e 100644
+--- a/libsoup/soup-content-sniffer.c
++++ b/libsoup/soup-content-sniffer.c
+@@ -620,7 +620,7 @@ skip_insignificant_space (const char *resource, int *pos, int resource_length)
+               (resource[*pos] == '\x0D')) {
+                *pos = *pos + 1;
+ 
+-               if (*pos > resource_length)
++               if (*pos >= resource_length)
+                        return TRUE;
+        }
+ 
+@@ -682,7 +682,7 @@ sniff_feed_or_html (SoupContentSniffer *sniffer, SoupBuffer *buffer)
+                do {
+                        pos++;
+ 
+-                       if (pos > resource_length)
++                       if ((pos + 1) > resource_length)
+                                goto text_html;
+                } while (resource[pos] != '>');
+ 
+-- 
+2.34.1
+
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32906-1.patch b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32906-1.patch
new file mode 100644
index 0000000000..916a41a71f
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32906-1.patch
@@ -0,0 +1,61 @@
+From 1f509f31b6f8420a3661c3f990424ab7b9164931 Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <pgriffis@igalia.com>
+Date: Tue, 11 Feb 2025 14:36:26 -0600
+Subject: [PATCH] headers: Handle parsing edge case
+
+This version number is specifically crafted to pass sanity checks allowing it to go one byte out of bounds.
+
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/1f509f31b6f8420a3661c3f990424ab7b9164931]
+CVE: CVE-2025-32906 #Dependency Patch
+Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
+---
+ libsoup/soup-headers.c      |  2 +-
+ tests/header-parsing-test.c | 12 ++++++++++++
+ 2 files changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/libsoup/soup-headers.c b/libsoup/soup-headers.c
+index 85385cea..9d6d00a3 100644
+--- a/libsoup/soup-headers.c
++++ b/libsoup/soup-headers.c
+@@ -225,7 +225,7 @@ soup_headers_parse_request (const char          *str,
+            !g_ascii_isdigit (version[5]))
+                return SOUP_STATUS_BAD_REQUEST;
+        major_version = strtoul (version + 5, &p, 10);
+-       if (*p != '.' || !g_ascii_isdigit (p[1]))
++       if (p + 1 >= str + len || *p != '.' || !g_ascii_isdigit (p[1]))
+                return SOUP_STATUS_BAD_REQUEST;
+        minor_version = strtoul (p + 1, &p, 10);
+        version_end = p;
+diff --git a/tests/header-parsing-test.c b/tests/header-parsing-test.c
+index 07ea2866..10ddb684 100644
+--- a/tests/header-parsing-test.c
++++ b/tests/header-parsing-test.c
+@@ -6,6 +6,10 @@ typedef struct {
+        const char *name, *value;
+ } Header;
+ 
++static char unterminated_http_version[] = {
++        'G','E','T',' ','/',' ','H','T','T','P','/','1', '0', '0', '.'
++};
++
+ static struct RequestTest {
+        const char *description;
+        const char *bugref;
+@@ -383,6 +387,14 @@ static struct RequestTest {
+          { { NULL } }
+        },
+ 
++        /* This couldn't be a C string as going one byte over would have been safe. */
++       { "Long HTTP version terminating at missing minor version", "https://gitlab.gnome.org/GNOME/libsoup/-/issues/404",
++         unterminated_http_version, sizeof (unterminated_http_version),
++         SOUP_STATUS_BAD_REQUEST,
++           NULL, NULL, -1,
++         { { NULL } }
++       },
++
+        { "Non-HTTP request", NULL,
+          "GET / SOUP/1.1\r\nHost: example.com\r\n", -1,
+          SOUP_STATUS_BAD_REQUEST,
+-- 
+GitLab
+
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32906-2.patch b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32906-2.patch
new file mode 100644
index 0000000000..5baad15648
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32906-2.patch
@@ -0,0 +1,83 @@
+From af5b9a4a3945c52b940d5ac181ef51bb12011f1f Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <pgriffis@igalia.com>
+Date: Wed, 12 Feb 2025 11:30:02 -0600
+Subject: [PATCH] headers: Handle parsing only newlines
+
+Closes #404
+Closes #407
+
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/af5b9a4a3945c52b940d5ac181ef51bb12011f1f]
+CVE: CVE-2025-32906
+Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
+---
+ libsoup/soup-headers.c      |  4 ++--
+ tests/header-parsing-test.c | 13 ++++++++++++-
+ 2 files changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/libsoup/soup-headers.c b/libsoup/soup-headers.c
+index 9d6d00a3..52ef2ece 100644
+--- a/libsoup/soup-headers.c
++++ b/libsoup/soup-headers.c
+@@ -186,7 +186,7 @@ soup_headers_parse_request (const char          *str,
+        /* RFC 2616 4.1 "servers SHOULD ignore any empty line(s)
+         * received where a Request-Line is expected."
+         */
+-       while ((*str == '\r' || *str == '\n') && len > 0) {
++       while (len > 0 && (*str == '\r' || *str == '\n')) {
+                str++;
+                len--;
+        }
+@@ -371,7 +371,7 @@ soup_headers_parse_response (const char          *str,
+         * after a response, which we then see prepended to the next
+         * response on that connection.
+         */
+-       while ((*str == '\r' || *str == '\n') && len > 0) {
++       while (len > 0 && (*str == '\r' || *str == '\n')) {
+                str++;
+                len--;
+        }
+diff --git a/tests/header-parsing-test.c b/tests/header-parsing-test.c
+index 10ddb684..4faafbd6 100644
+--- a/tests/header-parsing-test.c
++++ b/tests/header-parsing-test.c
+@@ -6,10 +6,15 @@ typedef struct {
+        const char *name, *value;
+ } Header;
+ 
++/* These are not C strings to ensure going one byte over is not safe. */
+ static char unterminated_http_version[] = {
+         'G','E','T',' ','/',' ','H','T','T','P','/','1', '0', '0', '.'
+ };
+ 
++static char only_newlines[] = {
++        '\n', '\n', '\n', '\n'
++};
++
+ static struct RequestTest {
+        const char *description;
+        const char *bugref;
+@@ -387,7 +392,6 @@ static struct RequestTest {
+          { { NULL } }
+        },
+ 
+-        /* This couldn't be a C string as going one byte over would have been safe. */
+        { "Long HTTP version terminating at missing minor version", "https://gitlab.gnome.org/GNOME/libsoup/-/issues/404",
+          unterminated_http_version, sizeof (unterminated_http_version),
+          SOUP_STATUS_BAD_REQUEST,
+@@ -457,6 +461,13 @@ static struct RequestTest {
+          SOUP_STATUS_BAD_REQUEST,
+            NULL, NULL, -1,
+          { { NULL } }
++       },
++
++       { "Only newlines", NULL,
++         only_newlines, sizeof (only_newlines),
++         SOUP_STATUS_BAD_REQUEST,
++           NULL, NULL, -1,
++         { { NULL } }
+        }
+ };
+ static const int num_reqtests = G_N_ELEMENTS (reqtests);
+-- 
+GitLab
+
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32907.patch b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32907.patch
new file mode 100644
index 0000000000..41dd3ff3f4
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32907.patch
@@ -0,0 +1,39 @@
+From 8158b4084dcba2a233dfcb7359c53ab2840148f7 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Tue, 15 Apr 2025 12:17:39 +0200
+Subject: [PATCH 1/2] soup-message-headers: Correct merge of ranges
+
+It had been skipping every second range, which generated an array
+of a lot of insane ranges, causing large memory usage by the server.
+
+Closes #428
+
+Part-of: <https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/452>
+
+CVE: CVE-2025-32907
+Upstream-Status: Backport
+[https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/452/diffs?commit_id=9bb92f7a685e31e10e9e8221d0342280432ce836]
+
+Test part not applied since test codes use some functions not in this
+version
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-message-headers.c |   1 +
+ 1 files changed, 1 insertions(+)
+
+diff --git a/libsoup/soup-message-headers.c b/libsoup/soup-message-headers.c
+index 78b2455..00b9763 100644
+--- a/libsoup/soup-message-headers.c
++++ b/libsoup/soup-message-headers.c
+@@ -1024,6 +1024,7 @@ soup_message_headers_get_ranges_internal (SoupMessageHeaders  *hdrs,
+                        if (cur->start <= prev->end) {
+                                prev->end = MAX (prev->end, cur->end);
+                                g_array_remove_index (array, i);
++                               i--;
+                        }
+                }
+        }
+-- 
+2.34.1
+
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32909.patch b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32909.patch
new file mode 100644
index 0000000000..046f20203f
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32909.patch
@@ -0,0 +1,36 @@
+From ba4c3a6f988beff59e45801ab36067293d24ce92 Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <pgriffis@igalia.com>
+Date: Wed, 8 Jan 2025 16:30:17 -0600
+Subject: [PATCH] content-sniffer: Handle sniffing resource shorter than 4
+ bytes
+
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/ba4c3a6f988beff59e45801ab36067293d24ce92]
+CVE: CVE-2025-32909
+Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
+---
+ libsoup/soup-content-sniffer.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/libsoup/soup-content-sniffer.c b/libsoup/soup-content-sniffer.c
+index 967ec61..a1f23c2 100644
+--- a/libsoup/soup-content-sniffer.c
++++ b/libsoup/soup-content-sniffer.c
+@@ -227,9 +227,14 @@ sniff_mp4 (SoupContentSniffer *sniffer, SoupBuffer *buffer)
+ {
+        const char *resource = (const char *)buffer->data;
+        guint resource_length = MIN (512, buffer->length);
+-       guint32 box_size = *((guint32*)resource);
++       guint32 box_size;
+        guint i;
+ 
++         if (resource_length < sizeof (guint32))
++                 return FALSE;
++
++         box_size = *((guint32*)resource);
++
+ #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+        box_size = ((box_size >> 24) |
+                    ((box_size << 8) & 0x00FF0000) |
+-- 
+2.25.1
+
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-1.patch b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-1.patch
new file mode 100644
index 0000000000..847c76c2b7
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-1.patch
@@ -0,0 +1,36 @@
+From: Patrick Griffis <pgriffis@igalia.com>
+Date: Sun, 8 Dec 2024 20:00:35 -0600
+Subject: auth-digest: Handle missing realm in authenticate header
+
+(cherry picked from commit e40df6d48a1cbab56f5d15016cc861a503423cfe)
+
+Upstream-Status: Backport [import from debian https://salsa.debian.org/gnome-team/libsoup/-/blob/debian/bullseye/debian/patches/CVE-2025-32910-1.patch?ref_type=heads
+Upstream commit https://gitlab.gnome.org/GNOME/libsoup/-/commit/e40df6d48a1cbab56f5d15016cc861a503423cfe]
+CVE: CVE-2025-32910
+Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
+
+Remove test code for fixing do_compile failure of libsoup-2.4, test codes include
+new type added in 3.x version
+../libsoup-2.74.3/tests/auth-test.c:1554:39: error: unknown type name 'SoupServerMessage'; did you mean 'SoupServerClass'?
+ 1554 |                                       SoupServerMessage *msg,
+      |                                       ^~~~~~~~~~~~~~~~~
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-auth-digest.c |  3 +++
+ 1 files changed, 3 insertions(+)
+
+diff --git a/libsoup/soup-auth-digest.c b/libsoup/soup-auth-digest.c
+index e8ba990..263a15a 100644
+--- a/libsoup/soup-auth-digest.c
++++ b/libsoup/soup-auth-digest.c
+@@ -142,6 +142,9 @@ soup_auth_digest_update (SoupAuth *auth, SoupMessage *msg,
+        guint qop_options;
+        gboolean ok = TRUE;
+ 
++        if (!soup_auth_get_realm (auth))
++                return FALSE;
++
+        g_free (priv->domain);
+        g_free (priv->nonce);
+        g_free (priv->opaque);
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-2.patch b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-2.patch
new file mode 100644
index 0000000000..a2168177a4
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-2.patch
@@ -0,0 +1,106 @@
+From: Patrick Griffis <pgriffis@igalia.com>
+Date: Thu, 26 Dec 2024 18:18:35 -0600
+Subject: auth-digest: Handle missing nonce
+
+(cherry picked from commit 405a8a34597a44bd58c4759e7d5e23f02c3b556a)
+
+Upstream-Status: Backport [import from debian https://salsa.debian.org/gnome-team/libsoup/-/blob/debian/bullseye/debian/patches/CVE-2025-32910-2.patch?ref_type=heads
+Upstream commit https://gitlab.gnome.org/GNOME/libsoup/-/commit/405a8a34597a44bd58c4759e7d5e23f02c3b556a]
+CVE: CVE-2025-32910
+Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
+
+Remove test code for fixing do_compile failure of libsoup-2.4, test codes include
+new type added in 3.x version
+../libsoup-2.74.3/tests/auth-test.c:1554:39: error: unknown type name 'SoupServerMessage'; did you mean 'SoupServerClass'?
+ 1554 |                                       SoupServerMessage *msg,
+      |                                       ^~~~~~~~~~~~~~~~~
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-auth-digest.c | 45 +++++++++++++++++++++++++++++++++++----------
+ 1 files changed, 35 insertions(+), 10 deletions(-)
+
+diff --git a/libsoup/soup-auth-digest.c b/libsoup/soup-auth-digest.c
+index 263a15a..393adb6 100644
+--- a/libsoup/soup-auth-digest.c
++++ b/libsoup/soup-auth-digest.c
+@@ -132,6 +132,19 @@ soup_auth_digest_get_qop (SoupAuthDigestQop qop)
+        return g_string_free (out, FALSE);
+ }
+ 
++static gboolean
++validate_params (SoupAuthDigest *auth_digest)
++{
++        SoupAuthDigestPrivate *priv = soup_auth_digest_get_instance_private (auth_digest);
++
++        if (priv->qop || priv->algorithm == SOUP_AUTH_DIGEST_ALGORITHM_MD5_SESS) {
++                if (!priv->nonce)
++                        return FALSE;
++        }
++
++        return TRUE;
++}
++
+ static gboolean
+ soup_auth_digest_update (SoupAuth *auth, SoupMessage *msg,
+                         GHashTable *auth_params)
+@@ -169,16 +182,21 @@ soup_auth_digest_update (SoupAuth *auth, SoupMessage *msg,
+        if (priv->algorithm == -1)
+                ok = FALSE;
+ 
+-       stale = g_hash_table_lookup (auth_params, "stale");
+-       if (stale && !g_ascii_strcasecmp (stale, "TRUE") && *priv->hex_urp)
+-               recompute_hex_a1 (priv);
+-       else {
+-               g_free (priv->user);
+-               priv->user = NULL;
+-               g_free (priv->cnonce);
+-               priv->cnonce = NULL;
+-               memset (priv->hex_urp, 0, sizeof (priv->hex_urp));
+-               memset (priv->hex_a1, 0, sizeof (priv->hex_a1));
++        if (!validate_params (auth_digest))
++                ok = FALSE;
++
++        if (ok) {
++                stale = g_hash_table_lookup (auth_params, "stale");
++                if (stale && !g_ascii_strcasecmp (stale, "TRUE") && *priv->hex_urp)
++                        recompute_hex_a1 (priv);
++                else {
++                        g_free (priv->user);
++                        priv->user = NULL;
++                        g_free (priv->cnonce);
++                        priv->cnonce = NULL;
++                        memset (priv->hex_urp, 0, sizeof (priv->hex_urp));
++                        memset (priv->hex_a1, 0, sizeof (priv->hex_a1));
++                }
+         }
+ 
+        return ok;
+@@ -269,6 +287,8 @@ soup_auth_digest_compute_hex_a1 (const char              *hex_urp,
+ 
+                /* In MD5-sess, A1 is hex_urp:nonce:cnonce */
+ 
++                g_assert (nonce && cnonce);
++
+                checksum = g_checksum_new (G_CHECKSUM_MD5);
+                g_checksum_update (checksum, (guchar *)hex_urp, strlen (hex_urp));
+                g_checksum_update (checksum, (guchar *)":", 1);
+@@ -359,6 +379,8 @@ soup_auth_digest_compute_response (const char        *method,
+        if (qop) {
+                char tmp[9];
+ 
++                g_assert (cnonce);
++
+                g_snprintf (tmp, 9, "%.8x", nc);
+                g_checksum_update (checksum, (guchar *)tmp, strlen (tmp));
+                g_checksum_update (checksum, (guchar *)":", 1);
+@@ -422,6 +444,9 @@ soup_auth_digest_get_authorization (SoupAuth *auth, SoupMessage *msg)
+        g_return_val_if_fail (uri != NULL, NULL);
+        url = soup_uri_to_string (uri, TRUE);
+ 
++        g_assert (priv->nonce);
++        g_assert (!priv->qop || priv->cnonce);
++
+        soup_auth_digest_compute_response (msg->method, url, priv->hex_a1,
+                                           priv->qop, priv->nonce,
+                                           priv->cnonce, priv->nc,
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-3.patch b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-3.patch
new file mode 100644
index 0000000000..ab0f650804
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-3.patch
@@ -0,0 +1,26 @@
+From: Patrick Griffis <pgriffis@igalia.com>
+Date: Fri, 27 Dec 2024 13:52:52 -0600
+Subject: auth-digest: Fix leak
+
+(cherry picked from commit ea16eeacb052e423eb5c3b0b705e5eab34b13832)
+
+Upstream-Status: Backport [import from debian https://salsa.debian.org/gnome-team/libsoup/-/blob/debian/bullseye/debian/patches/CVE-2025-32910-3.patch?ref_type=heads
+Upstream commit https://gitlab.gnome.org/GNOME/libsoup/-/commit/ea16eeacb052e423eb5c3b0b705e5eab34b13832]
+CVE: CVE-2025-32910
+Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
+---
+ libsoup/soup-auth-digest.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libsoup/soup-auth-digest.c b/libsoup/soup-auth-digest.c
+index 393adb6..a1db188 100644
+--- a/libsoup/soup-auth-digest.c
++++ b/libsoup/soup-auth-digest.c
+@@ -66,6 +66,7 @@ soup_auth_digest_finalize (GObject *object)
+        g_free (priv->nonce);
+        g_free (priv->domain);
+        g_free (priv->cnonce);
++        g_free (priv->opaque);
+ 
+        memset (priv->hex_urp, 0, sizeof (priv->hex_urp));
+        memset (priv->hex_a1, 0, sizeof (priv->hex_a1));
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32911_CVE-2025-32913-1.patch b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32911_CVE-2025-32913-1.patch
new file mode 100644
index 0000000000..4652635294
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32911_CVE-2025-32913-1.patch
@@ -0,0 +1,72 @@
+From 7b4ef0e004ece3a308ccfaa714c284f4c96ade34 Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <pgriffis@igalia.com>
+Date: Fri, 27 Dec 2024 17:53:50 -0600
+Subject: [PATCH] soup_message_headers_get_content_disposition: Fix NULL deref
+
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/7b4ef0e004ece3a308ccfaa714c284f4c96ade34]
+CVE: CVE-2025-32911 CVE-2025-32913 #Dependency Patch
+Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
+---
+ libsoup/soup-message-headers.c | 13 +++++++++----
+ tests/header-parsing-test.c    | 14 ++++++++++++++
+ 2 files changed, 23 insertions(+), 4 deletions(-)
+
+diff --git a/libsoup/soup-message-headers.c b/libsoup/soup-message-headers.c
+index 56cc1e9d..04f4c302 100644
+--- a/libsoup/soup-message-headers.c
++++ b/libsoup/soup-message-headers.c
+@@ -1660,10 +1660,15 @@ soup_message_headers_get_content_disposition (SoupMessageHeaders  *hdrs,
+         */
+        if (params && g_hash_table_lookup_extended (*params, "filename",
+                                                    &orig_key, &orig_value)) {
+-               char *filename = strrchr (orig_value, '/');
+-
+-               if (filename)
+-                       g_hash_table_insert (*params, g_strdup (orig_key), filename + 1);
++                if (orig_value) {
++                        char *filename = strrchr (orig_value, '/');
++
++                        if (filename)
++                                g_hash_table_insert (*params, g_strdup (orig_key), filename + 1);
++                } else {
++                        /* filename with no value isn't valid. */
++                        g_hash_table_remove (*params, "filename");
++                }
+        }
+        return TRUE;
+ }
+diff --git a/tests/header-parsing-test.c b/tests/header-parsing-test.c
+index 5e423d2b..d0b360c8 100644
+--- a/tests/header-parsing-test.c
++++ b/tests/header-parsing-test.c
+@@ -1039,6 +1039,7 @@ do_param_list_tests (void)
+ #define RFC5987_TEST_HEADER_FALLBACK "attachment; filename*=Unknown''t%FF%FF%FFst.txt; filename=\"test.txt\""
+ #define RFC5987_TEST_HEADER_NO_TYPE  "filename=\"test.txt\""
+ #define RFC5987_TEST_HEADER_NO_TYPE_2  "filename=\"test.txt\"; foo=bar"
++#define RFC5987_TEST_HEADER_EMPTY_FILENAME ";filename"
+ 
+ static void
+ do_content_disposition_tests (void)
+@@ -1139,6 +1140,19 @@ do_content_disposition_tests (void)
+         g_assert_cmpstr (parameter2, ==, "bar");
+        g_hash_table_destroy (params);
+ 
++        /* Empty filename */
++        soup_message_headers_clear (hdrs);
++        soup_message_headers_append (hdrs, "Content-Disposition",
++                                    RFC5987_TEST_HEADER_EMPTY_FILENAME);
++       if (!soup_message_headers_get_content_disposition (hdrs,
++                                                          &disposition,
++                                                          &params)) {
++               soup_test_assert (FALSE, "empty filename decoding FAILED");
++               return;
++       }
++        g_assert_false (g_hash_table_contains (params, "filename"));
++       g_hash_table_destroy (params);
++
+        soup_message_headers_free (hdrs);
+ 
+        /* Ensure that soup-multipart always quotes filename */
+-- 
+GitLab
+
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32911_CVE-2025-32913-2.patch b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32911_CVE-2025-32913-2.patch
new file mode 100644
index 0000000000..5d9f33c736
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32911_CVE-2025-32913-2.patch
@@ -0,0 +1,44 @@
+From f4a761fb66512fff59798765e8ac5b9e57dceef0 Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <pgriffis@igalia.com>
+Date: Fri, 27 Dec 2024 18:00:39 -0600
+Subject: [PATCH] soup_message_headers_get_content_disposition: strdup
+ truncated filenames
+
+This table frees the strings it contains.
+
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/f4a761fb66512fff59798765e8ac5b9e57dceef0]
+CVE: CVE-2025-32911 CVE-2025-32913
+Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
+---
+ libsoup/soup-message-headers.c | 2 +-
+ tests/header-parsing-test.c    | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libsoup/soup-message-headers.c b/libsoup/soup-message-headers.c
+index 04f4c302..ee7a3cb1 100644
+--- a/libsoup/soup-message-headers.c
++++ b/libsoup/soup-message-headers.c
+@@ -1664,7 +1664,7 @@ soup_message_headers_get_content_disposition (SoupMessageHeaders  *hdrs,
+                         char *filename = strrchr (orig_value, '/');
+ 
+                         if (filename)
+-                                g_hash_table_insert (*params, g_strdup (orig_key), filename + 1);
++                                g_hash_table_insert (*params, g_strdup (orig_key), g_strdup (filename + 1));
+                 } else {
+                         /* filename with no value isn't valid. */
+                         g_hash_table_remove (*params, "filename");
+diff --git a/tests/header-parsing-test.c b/tests/header-parsing-test.c
+index d0b360c8..07ea2866 100644
+--- a/tests/header-parsing-test.c
++++ b/tests/header-parsing-test.c
+@@ -1150,6 +1150,7 @@ do_content_disposition_tests (void)
+                soup_test_assert (FALSE, "empty filename decoding FAILED");
+                return;
+        }
++        g_free (disposition);
+         g_assert_false (g_hash_table_contains (params, "filename"));
+        g_hash_table_destroy (params);
+ 
+-- 
+GitLab
+
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32912-1.patch b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32912-1.patch
new file mode 100644
index 0000000000..906a889c13
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32912-1.patch
@@ -0,0 +1,33 @@
+From cd077513f267e43ce4b659eb18a1734d8a369992 Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <pgriffis@igalia.com>
+Date: Wed, 5 Feb 2025 14:03:05 -0600
+Subject: [PATCH 1/2] auth-digest: Handle missing nonce
+
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/cd077513f267e43ce4b659eb18a1734d8a369992]
+CVE: CVE-2025-32912
+Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
+
+The test codes is based on CVE-2025-32910, test code in CVE-2025-32910
+is removed for fixing do_compile failure. So also remove this test code
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-auth-digest.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletion(-)
+
+diff --git a/libsoup/soup-auth-digest.c b/libsoup/soup-auth-digest.c
+index a1db188..f0edb81 100644
+--- a/libsoup/soup-auth-digest.c
++++ b/libsoup/soup-auth-digest.c
+@@ -156,7 +156,7 @@ soup_auth_digest_update (SoupAuth *auth, SoupMessage *msg,
+        guint qop_options;
+        gboolean ok = TRUE;
+ 
+-        if (!soup_auth_get_realm (auth))
++        if (!soup_auth_get_realm (auth) || !g_hash_table_contains (auth_params, "nonce"))
+                 return FALSE;
+ 
+        g_free (priv->domain);
+-- 
+2.25.1
+
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32912-2.patch b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32912-2.patch
new file mode 100644
index 0000000000..4898068115
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32912-2.patch
@@ -0,0 +1,30 @@
+From 910ebdcd3dd82386717a201c13c834f3a63eed7f Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <pgriffis@igalia.com>
+Date: Sat, 8 Feb 2025 12:30:13 -0600
+Subject: [PATCH 2/2] digest-auth: Handle NULL nonce
+
+`contains` only handles a missing nonce, `lookup` handles both missing and empty.
+
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/910ebdcd3dd82386717a201c13c834f3a63eed7f]
+CVE: CVE-2025-32912
+Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
+---
+ libsoup/soup-auth-digest.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libsoup/soup-auth-digest.c b/libsoup/soup-auth-digest.c
+index f0edb81..c49ffd9 100644
+--- a/libsoup/soup-auth-digest.c
++++ b/libsoup/soup-auth-digest.c
+@@ -156,7 +156,7 @@ soup_auth_digest_update (SoupAuth *auth, SoupMessage *msg,
+        guint qop_options;
+        gboolean ok = TRUE;
+ 
+-        if (!soup_auth_get_realm (auth) || !g_hash_table_contains (auth_params, "nonce"))
++        if (!soup_auth_get_realm (auth) || !g_hash_table_lookup (auth_params, "nonce"))
+                 return FALSE;
+ 
+        g_free (priv->domain);
+-- 
+2.25.1
+
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32914.patch b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32914.patch
new file mode 100644
index 0000000000..e6d4607b5e
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-32914.patch
@@ -0,0 +1,137 @@
+From: Milan Crha <mcrha@redhat.com>
+Date: Tue, 15 Apr 2025 09:03:00 +0200
+Subject: multipart: Fix read out of buffer bounds under
+ soup_multipart_new_from_message()
+
+This is CVE-2025-32914, special crafted input can cause read out of buffer bounds
+of the body argument.
+
+Closes #436
+
+(cherry picked from commit 5bfcf8157597f2d327050114fb37ff600004dbcf)
+
+Upstream-Status: Backport [import from debian https://salsa.debian.org/gnome-team/libsoup/-/blob/debian/bullseye/debian/patches/CVE-2025-32914.patch?ref_type=heads
+Upstream commit https://gitlab.gnome.org/GNOME/libsoup/-/commit/5bfcf8157597f2d327050114fb37ff600004dbcf]
+CVE: CVE-2025-32914
+Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
+---
+ libsoup/soup-multipart.c |  2 +-
+ tests/multipart-test.c   | 85 ++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 86 insertions(+), 1 deletion(-)
+
+diff --git a/libsoup/soup-multipart.c b/libsoup/soup-multipart.c
+index a7e550f..dd93973 100644
+--- a/libsoup/soup-multipart.c
++++ b/libsoup/soup-multipart.c
+@@ -181,7 +181,7 @@ soup_multipart_new_from_message (SoupMessageHeaders *headers,
+                        return NULL;
+                }
+ 
+-               split = strstr (start, "\r\n\r\n");
++               split = g_strstr_len (start, body_end - start, "\r\n\r\n");
+                if (!split || split > end) {
+                        soup_multipart_free (multipart);
+                        soup_buffer_free (flattened);
+diff --git a/tests/multipart-test.c b/tests/multipart-test.c
+index 64a5ebf..834b181 100644
+--- a/tests/multipart-test.c
++++ b/tests/multipart-test.c
+@@ -479,6 +479,89 @@ test_multipart (gconstpointer data)
+        g_main_loop_unref (loop);
+ }
+ 
++static void
++test_multipart_bounds_good (void)
++{
++       #define TEXT "line1\r\nline2"
++       SoupMultipart *multipart;
++       SoupMessageHeaders *headers, *set_headers = NULL;
++       //GBytes *bytes, *set_bytes = NULL;
++       GBytes *bytes;
++       const char *raw_data = "--123\r\nContent-Type: text/plain;\r\n\r\n" TEXT "\r\n--123--\r\n";
++       gboolean success;
++       SoupMessageBody *body = soup_message_body_new ();
++       SoupBuffer *set_buffer = NULL;
++       gconstpointer data;
++       gsize size;
++
++       headers = soup_message_headers_new (SOUP_MESSAGE_HEADERS_MULTIPART);
++       soup_message_headers_append (headers, "Content-Type", "multipart/mixed; boundary=\"123\"");
++
++       bytes = g_bytes_new (raw_data, strlen (raw_data));
++
++       data = g_bytes_get_data(bytes, NULL);
++       size = g_bytes_get_size(bytes);
++
++       soup_message_body_append(body, SOUP_MEMORY_STATIC, data, size);
++
++       //multipart = soup_multipart_new_from_message (headers, bytes);
++       multipart = soup_multipart_new_from_message (headers, body);
++
++       soup_message_body_free (body);
++
++       g_assert_nonnull (multipart);
++       g_assert_cmpint (soup_multipart_get_length (multipart), ==, 1);
++       success = soup_multipart_get_part (multipart, 0, &set_headers, &set_buffer);
++       g_assert_true (success);
++       g_assert_nonnull (set_headers);
++       //g_assert_nonnull (set_bytes);
++       g_assert_nonnull (set_buffer);
++       //g_assert_cmpint (strlen (TEXT), ==, g_bytes_get_size (set_bytes));
++       g_assert_cmpint (strlen (TEXT), ==, set_buffer->length);
++       g_assert_cmpstr ("text/plain", ==, soup_message_headers_get_content_type (set_headers, NULL));
++       //g_assert_cmpmem (TEXT, strlen (TEXT), g_bytes_get_data (set_bytes, NULL), g_bytes_get_size (set_bytes));
++       g_assert_cmpmem(TEXT, strlen(TEXT), set_buffer->data, set_buffer->length);
++
++       soup_message_headers_free (headers);
++       g_bytes_unref (bytes);
++
++       soup_multipart_free (multipart);
++
++       #undef TEXT
++}
++
++static void
++test_multipart_bounds_bad (void)
++{
++       SoupMultipart *multipart;
++       SoupMessageHeaders *headers;
++       GBytes *bytes;
++       const char *raw_data = "--123\r\nContent-Type: text/plain;\r\nline1\r\nline2\r\n--123--\r\n";
++       SoupMessageBody *body = soup_message_body_new ();
++       gconstpointer data;
++       gsize size;
++
++       headers = soup_message_headers_new (SOUP_MESSAGE_HEADERS_MULTIPART);
++       soup_message_headers_append (headers, "Content-Type", "multipart/mixed; boundary=\"123\"");
++
++       bytes = g_bytes_new (raw_data, strlen (raw_data));
++
++       data = g_bytes_get_data(bytes, NULL);
++       size = g_bytes_get_size(bytes);
++
++       soup_message_body_append(body, SOUP_MEMORY_STATIC, data, size);
++
++       /* it did read out of raw_data/bytes bounds */
++       //multipart = soup_multipart_new_from_message (headers, bytes);
++       multipart = soup_multipart_new_from_message (headers, body);
++       g_assert_null (multipart);
++
++       soup_message_body_free (body);
++
++       soup_message_headers_free (headers);
++       g_bytes_unref (bytes);
++}
++
+ int
+ main (int argc, char **argv)
+ {
+@@ -508,6 +591,8 @@ main (int argc, char **argv)
+        g_test_add_data_func ("/multipart/sync", GINT_TO_POINTER (SYNC_MULTIPART), test_multipart);
+        g_test_add_data_func ("/multipart/async", GINT_TO_POINTER (ASYNC_MULTIPART), test_multipart);
+        g_test_add_data_func ("/multipart/async-small-reads", GINT_TO_POINTER (ASYNC_MULTIPART_SMALL_READS), test_multipart);
++       g_test_add_func ("/multipart/bounds-good", test_multipart_bounds_good);
++       g_test_add_func ("/multipart/bounds-bad", test_multipart_bounds_bad);
+ 
+        ret = g_test_run ();
+ 
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-4476.patch b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-4476.patch
new file mode 100644
index 0000000000..874f62e7ad
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-4476.patch
@@ -0,0 +1,38 @@
+From 52a0f9234d384b9dab368835b22e5a5a01542168 Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Fri, 16 May 2025 14:16:10 +0800
+Subject: [PATCH] auth-digest: fix crash in
+ soup_auth_digest_get_protection_space()
+
+We need to validate the Domain parameter in the WWW-Authenticate header.
+
+Unfortunately this crash only occurs when listening on default ports 80
+and 443, so there's no good way to test for this. The test would require
+running as root.
+
+Fixes #440
+
+CVE: CVE-2025-4476
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/e64c221f9c7d09b48b610c5626b3b8c400f0907c?merge_request_iid=457]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-auth-digest.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libsoup/soup-auth-digest.c b/libsoup/soup-auth-digest.c
+index f1621ec..a2dc560 100644
+--- a/libsoup/soup-auth-digest.c
++++ b/libsoup/soup-auth-digest.c
+@@ -229,7 +229,7 @@ soup_auth_digest_get_protection_space (SoupAuth *auth, SoupURI *source_uri)
+                        uri = soup_uri_new (d);
+                        if (uri && uri->scheme == source_uri->scheme &&
+                            uri->port == source_uri->port &&
+-                           !strcmp (uri->host, source_uri->host))
++                           !g_strcmp0 (uri->host, source_uri->host))
+                                dir = g_strdup (uri->path);
+                        else
+                                dir = NULL;
+-- 
+2.34.1
+
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-46420.patch b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-46420.patch
new file mode 100644
index 0000000000..37ab16dc05
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-46420.patch
@@ -0,0 +1,60 @@
+From c9083869ec2a3037e6df4bd86b45c419ba295f8e Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <pgriffis@igalia.com>
+Date: Thu, 26 Dec 2024 18:31:42 -0600
+Subject: [PATCH] soup_header_parse_quality_list: Fix leak
+
+When iterating over the parsed list we now steal the allocated strings that we want and then free_full the list which may contain remaining strings.
+
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/c9083869ec2a3037e6df4bd86b45c419ba295f8e]
+CVE: CVE-2025-46420
+Signed-off-by: Ashish Sharma <asharma@mvista.com>
+
+ libsoup/soup-headers.c | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/libsoup/soup-headers.c b/libsoup/soup-headers.c
+index a5f7a7f6..85385cea 100644
+--- a/libsoup/soup-headers.c
++++ b/libsoup/soup-headers.c
+@@ -530,7 +530,7 @@ soup_header_parse_quality_list (const char *header, GSList **unacceptable)
+        GSList *unsorted;
+        QualityItem *array;
+        GSList *sorted, *iter;
+-       char *item, *semi;
++       char *semi;
+        const char *param, *equal, *value;
+        double qval;
+        int n;
+@@ -543,9 +543,8 @@ soup_header_parse_quality_list (const char *header, GSList **unacceptable)
+        unsorted = soup_header_parse_list (header);
+        array = g_new0 (QualityItem, g_slist_length (unsorted));
+        for (iter = unsorted, n = 0; iter; iter = iter->next) {
+-               item = iter->data;
+                qval = 1.0;
+-               for (semi = strchr (item, ';'); semi; semi = strchr (semi + 1, ';')) {
++               for (semi = strchr (iter->data, ';'); semi; semi = strchr (semi + 1, ';')) {
+                        param = skip_lws (semi + 1);
+                        if (*param != 'q')
+                                continue;
+@@ -577,15 +576,15 @@ soup_header_parse_quality_list (const char *header, GSList **unacceptable)
+                if (qval == 0.0) {
+                        if (unacceptable) {
+                                *unacceptable = g_slist_prepend (*unacceptable,
+-                                                                item);
++                                                                g_steal_pointer (&iter->data));
+                        }
+                } else {
+-                       array[n].item = item;
++                       array[n].item = g_steal_pointer (&iter->data);
+                        array[n].qval = qval;
+                        n++;
+                }
+        }
+-       g_slist_free (unsorted);
++       g_slist_free_full (unsorted, g_free);
+ 
+        qsort (array, n, sizeof (QualityItem), sort_by_qval);
+        sorted = NULL;
+-- 
+GitLab
+
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-46421.patch b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-46421.patch
new file mode 100644
index 0000000000..26067c4bb8
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-46421.patch
@@ -0,0 +1,47 @@
+From 5eb225f02bb35de56cfeedd87bde716bf1cb750b Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <pgriffis@igalia.com>
+Date: Wed, 5 Feb 2025 16:18:10 -0600
+Subject: [PATCH] session: Strip authentication credentails on
+ cross-origin redirect
+
+This should match the behavior of Firefox and Safari but not of Chromium.
+
+CVE: CVE-2025-46421
+Upstream-Status: Backport
+[https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/436/diffs?commit_id=3e5c26415811f19e7737238bb23305ffaf96f66b]
+
+Test code not added since it included some headers not in version 2.74.3
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-session.c |  8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c
+index 83421ef..8d6ac61 100644
+--- a/libsoup/soup-session.c
++++ b/libsoup/soup-session.c
+@@ -1189,12 +1189,18 @@ soup_session_redirect_message (SoupSession *session, SoupMessage *msg)
+                                                   SOUP_ENCODING_NONE);
+        }
+ 
++       /* Strip all credentials on cross-origin redirect. */
++       if (!soup_uri_host_equal (soup_message_get_uri (msg), new_uri)) {
++               soup_message_headers_remove (msg->request_headers, "Authorization");
++               soup_message_set_auth (msg, NULL);
++       }
++
+        soup_message_set_uri (msg, new_uri);
+        soup_uri_free (new_uri);
+ 
+        soup_session_requeue_message (session, msg);
+        return TRUE;
+-}
++}
+ 
+ static void
+ redirect_handler (SoupMessage *msg, gpointer user_data)
+ 
+-- 
+2.34.1
+
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-4948.patch b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-4948.patch
new file mode 100644
index 0000000000..b15b8c763d
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-4948.patch
@@ -0,0 +1,38 @@
+From dfdc9b3cc73e6fe88cc12792ba00e14642572339 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Thu, 15 May 2025 17:49:11 +0200
+Subject: [PATCH] soup-multipart: Verify boundary limits for multipart body
+
+It could happen that the boundary started at a place which resulted into
+a negative number, which in an unsigned integer is a very large value.
+Check the body size is not a negative value before setting it.
+
+Closes https://gitlab.gnome.org/GNOME/libsoup/-/issues/449
+
+Part-of: <https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/463>
+
+CVE: CVE-2025-4948
+Upstream-Status: Backport
+[https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/463/diffs?commit_id=f2f28afe0b3b2b3009ab67d6874457ec6bac70c0]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-multipart.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libsoup/soup-multipart.c b/libsoup/soup-multipart.c
+index dd93973..ce2fc10 100644
+--- a/libsoup/soup-multipart.c
++++ b/libsoup/soup-multipart.c
+@@ -214,7 +214,7 @@ soup_multipart_new_from_message (SoupMessageHeaders *headers,
+                 */
+                part_body = soup_buffer_new_subbuffer (flattened,
+                                                       split - flattened->data,
+-                                                      end - 2 - split);
++                                                      end - 2 >= split ? end - 2 - split : 0);
+                g_ptr_array_add (multipart->bodies, part_body);
+ 
+                start = end;
+-- 
+2.34.1
+
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-4969.patch b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-4969.patch
new file mode 100644
index 0000000000..d45b2a2cb0
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-2.4/CVE-2025-4969.patch
@@ -0,0 +1,76 @@
+From 07b94e27afafebf31ef3cd868866a1e383750086 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Mon, 19 May 2025 17:48:27 +0200
+Subject: [PATCH] soup-multipart: Verify array bounds before accessing its
+ members
+
+The boundary could be at a place which, calculated, pointed
+before the beginning of the array. Check the bounds, to avoid
+read out of the array bounds.
+
+Closes https://gitlab.gnome.org/GNOME/libsoup/-/issues/447
+
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/07b94e27afafebf31ef3cd868866a1e383750086]
+CVE: CVE-2025-4969
+Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
+---
+ libsoup/soup-multipart.c |  2 +-
+ tests/multipart-test.c   | 22 ++++++++++++++++++++++
+ 2 files changed, 23 insertions(+), 1 deletion(-)
+
+diff --git a/libsoup/soup-multipart.c b/libsoup/soup-multipart.c
+index dd93973..b3611db 100644
+--- a/libsoup/soup-multipart.c
++++ b/libsoup/soup-multipart.c
+@@ -108,7 +108,7 @@ find_boundary (const char *start, const char *end,
+                        continue;
+ 
+                /* Check that it's at start of line */
+-               if (!(b == start || (b[-1] == '\n' && b[-2] == '\r')))
++               if (!(b == start || (b - start >= 2 && b[-1] == '\n' && b[-2] == '\r')))
+                        continue;
+ 
+                /* Check for "--" or "\r\n" after boundary */
+diff --git a/tests/multipart-test.c b/tests/multipart-test.c
+index 834b181..980eb68 100644
+--- a/tests/multipart-test.c
++++ b/tests/multipart-test.c
+@@ -562,6 +562,27 @@ test_multipart_bounds_bad (void)
+        g_bytes_unref (bytes);
+ }
+ 
++static void
++test_multipart_bounds_bad_2 (void)
++{
++       SoupMultipart *multipart;
++       SoupMessageHeaders *headers;
++       GBytes *bytes;
++       const char *raw_data = "\n--123\r\nline\r\n--123--\r";
++
++       headers = soup_message_headers_new (SOUP_MESSAGE_HEADERS_MULTIPART);
++       soup_message_headers_append (headers, "Content-Type", "multipart/mixed; boundary=\"123\"");
++
++       bytes = g_bytes_new (raw_data, strlen (raw_data));
++
++       multipart = soup_multipart_new_from_message (headers, bytes);
++       g_assert_nonnull (multipart);
++
++       soup_multipart_free (multipart);
++       soup_message_headers_free (headers);
++       g_bytes_unref (bytes);
++}
++
+ int
+ main (int argc, char **argv)
+ {
+@@ -593,6 +614,7 @@ main (int argc, char **argv)
+        g_test_add_data_func ("/multipart/async-small-reads", GINT_TO_POINTER (ASYNC_MULTIPART_SMALL_READS), test_multipart);
+        g_test_add_func ("/multipart/bounds-good", test_multipart_bounds_good);
+        g_test_add_func ("/multipart/bounds-bad", test_multipart_bounds_bad);
++       g_test_add_func ("/multipart/bounds-bad-2", test_multipart_bounds_bad_2);
+ 
+        ret = g_test_run ();
+ 
+-- 
+2.49.0
+
diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb
index ee20530b64..0da309ebd8 100644
--- a/meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb
+++ b/meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb
@@ -12,7 +12,35 @@ DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 libpsl"
 SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
 
 SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \
-           file://0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch"
+           file://0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch \
+           file://CVE-2024-52530.patch \
+           file://CVE-2024-52531-1.patch \
+           file://CVE-2024-52531-2.patch \
+           file://CVE-2024-52532-1.patch \
+           file://CVE-2024-52532-2.patch \
+           file://CVE-2024-52532-3.patch \
+           file://CVE-2025-32906-1.patch \
+           file://CVE-2025-32906-2.patch \
+           file://CVE-2025-32909.patch \
+           file://CVE-2025-46420.patch \
+           file://CVE-2025-32910-1.patch \
+           file://CVE-2025-32910-2.patch \
+           file://CVE-2025-32910-3.patch \
+           file://CVE-2025-32911_CVE-2025-32913-1.patch \
+           file://CVE-2025-32911_CVE-2025-32913-2.patch \
+           file://CVE-2025-32912-1.patch \
+           file://CVE-2025-32912-2.patch \
+           file://CVE-2025-32914.patch \
+           file://CVE-2025-4969.patch \
+           file://CVE-2025-32907.patch \
+           file://CVE-2025-32053.patch \
+           file://CVE-2025-32052.patch \
+           file://CVE-2025-32050.patch \
+           file://CVE-2025-46421.patch \
+           file://CVE-2025-4948.patch \
+           file://CVE-2025-4476.patch \
+           file://CVE-2025-2784.patch \
+"
 SRC_URI[sha256sum] = "e4b77c41cfc4c8c5a035fcdc320c7bc6cfb75ef7c5a034153df1413fa1d92f13"
 
 CVE_PRODUCT = "libsoup"
diff --git a/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-2784.patch b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-2784.patch
new file mode 100644
index 0000000000..b2e1c12d48
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-2784.patch
@@ -0,0 +1,137 @@
+From dd10ae267e33bcc35646610d7cc1841da77d05e7 Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <pgriffis@igalia.com>
+Date: Wed, 5 Feb 2025 14:39:42 -0600
+Subject: [PATCH] Fix CVE-2025-2784
+
+CVE: CVE-2025-2784
+Upstream-Status: Backport
+[https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/435/diffs?commit_id=242a10fbb12dbdc12d254bd8fc8669a0ac055304
+https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/442/diffs?commit_id=c415ad0b6771992e66c70edf373566c6e247089d]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ .../content-sniffer/soup-content-sniffer.c    | 10 ++--
+ tests/meson.build                             |  4 +-
+ tests/sniffing-test.c                         | 48 +++++++++++++++++++
+ 3 files changed, 56 insertions(+), 6 deletions(-)
+
+diff --git a/libsoup/content-sniffer/soup-content-sniffer.c b/libsoup/content-sniffer/soup-content-sniffer.c
+index aeee2e2..a5e18d5 100644
+--- a/libsoup/content-sniffer/soup-content-sniffer.c
++++ b/libsoup/content-sniffer/soup-content-sniffer.c
+@@ -638,8 +638,11 @@ sniff_text_or_binary (SoupContentSniffer *sniffer, GBytes *buffer)
+ }
+ 
+ static gboolean
+-skip_insignificant_space (const char *resource, int *pos, int resource_length)
++skip_insignificant_space (const char *resource, gsize *pos, gsize resource_length)
+ {
++        if (*pos >= resource_length)
++               return TRUE;
++
+        while ((resource[*pos] == '\x09') ||
+               (resource[*pos] == '\x20') ||
+               (resource[*pos] == '\x0A') ||
+@@ -659,7 +662,7 @@ sniff_feed_or_html (SoupContentSniffer *sniffer, GBytes *buffer)
+        gsize resource_length;
+        const char *resource = g_bytes_get_data (buffer, &resource_length);
+        resource_length = MIN (512, resource_length);
+-       int pos = 0;
++       gsize pos = 0;
+ 
+        if (resource_length < 3)
+                goto text_html;
+@@ -669,9 +672,6 @@ sniff_feed_or_html (SoupContentSniffer *sniffer, GBytes *buffer)
+                pos = 3;
+ 
+  look_for_tag:
+-       if (pos > resource_length)
+-               goto text_html;
+-
+        if (skip_insignificant_space (resource, &pos, resource_length))
+                goto text_html;
+ 
+diff --git a/tests/meson.build b/tests/meson.build
+index 7ef7ac5..95b13b8 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -95,7 +95,9 @@ tests = [
+   {'name': 'server-auth'},
+   {'name': 'server-mem-limit'},
+   {'name': 'server'},
+-  {'name': 'sniffing'},
++  {'name': 'sniffing',
++    'depends': [test_resources],
++  },
+   {'name': 'ssl',
+    'dependencies': [gnutls_dep],
+    'depends': mock_pkcs11_module,
+diff --git a/tests/sniffing-test.c b/tests/sniffing-test.c
+index 6116719..7857732 100644
+--- a/tests/sniffing-test.c
++++ b/tests/sniffing-test.c
+@@ -342,6 +342,52 @@ test_disabled (gconstpointer data)
+        g_uri_unref (uri);
+ }
+ 
++static const gsize MARKUP_LENGTH = strlen ("<!--") + strlen ("-->");
++
++static void
++do_skip_whitespace_test (void)
++{
++        SoupContentSniffer *sniffer = soup_content_sniffer_new ();
++        SoupMessage *msg = soup_message_new (SOUP_METHOD_GET, "http://example.org");
++        const char *test_cases[] = {
++                "",
++                "<rdf:RDF",
++                "<rdf:RDFxmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"",
++                "<rdf:RDFxmlns=\"http://purl.org/rss/1.0/\"",
++        };
++
++        soup_message_headers_set_content_type (soup_message_get_response_headers (msg), "text/html", NULL);
++
++        for (guint i = 0; i < G_N_ELEMENTS (test_cases); i++) {
++                const char *trailing_data = test_cases[i];
++                gsize leading_zeros = 512 - MARKUP_LENGTH - strlen (trailing_data);
++                gsize testsize = MARKUP_LENGTH + leading_zeros + strlen (trailing_data);
++                guint8 *data = g_malloc0 (testsize);
++                guint8 *p = data;
++                char *content_type;
++                GBytes *buffer;
++
++                // Format of <!--[0x00 * $leading_zeros]-->$trailing_data
++                memcpy (p, "<!--", strlen ("<!--"));
++                p += strlen ("<!--");
++                p += leading_zeros;
++                memcpy (p, "-->", strlen ("-->"));
++                p += strlen ("-->");
++                if (strlen (trailing_data))
++                        memcpy (p, trailing_data, strlen (trailing_data));
++                // Purposefully not NUL terminated.                
++
++                buffer = g_bytes_new_take (g_steal_pointer (&data), testsize);
++                content_type = soup_content_sniffer_sniff (sniffer, msg, buffer, NULL);
++
++                g_free (content_type);
++                g_bytes_unref (buffer);
++        }
++
++        g_object_unref (msg);
++        g_object_unref (sniffer);
++}
++
+ int
+ main (int argc, char **argv)
+ {
+@@ -517,6 +563,8 @@ main (int argc, char **argv)
+                              "/text_or_binary/home.gif",
+                              test_disabled);
+ 
++       g_test_add_func ("/sniffing/whitespace", do_skip_whitespace_test);
++
+        ret = g_test_run ();
+ 
+        g_uri_unref (base_uri);
+-- 
+2.34.1
+
diff --git a/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32050.patch b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32050.patch
new file mode 100644
index 0000000000..e5a4d747a1
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32050.patch
@@ -0,0 +1,29 @@
+From 30c86c9a284cf6f366ac87df0bca3e18a5de8671 Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <pgriffis@igalia.com>
+Date: Mon, 28 Oct 2024 12:29:48 -0500
+Subject: [PATCH] Fix using int instead of size_t for strcspn return
+
+CVE: CVE-2025-32050
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/9bb0a55de55c6940ced811a64fbca82fe93a9323]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-headers.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libsoup/soup-headers.c b/libsoup/soup-headers.c
+index 5fb32c2..52ef2ec 100644
+--- a/libsoup/soup-headers.c
++++ b/libsoup/soup-headers.c
+@@ -906,7 +906,7 @@ append_param_quoted (GString    *string,
+                     const char *name,
+                     const char *value)
+ {
+-       int len;
++       gsize len;
+ 
+        g_string_append (string, name);
+        g_string_append (string, "=\"");
+-- 
+2.34.1
+
diff --git a/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32051-1.patch b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32051-1.patch
new file mode 100644
index 0000000000..efeda48b11
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32051-1.patch
@@ -0,0 +1,29 @@
+From dc5db30989f385303c79ec3188c52e33f6f5886e Mon Sep 17 00:00:00 2001
+From: Ar Jun <pkillarjun@protonmail.com>
+Date: Sat, 16 Nov 2024 11:50:09 -0600
+Subject: [PATCH 1/2] Fix possible NULL deref in soup_uri_decode_data_uri
+
+CVE: CVE-2025-32051
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/0713ba4a719da938dc8facc89fca99cd0aa3069f]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-uri-utils.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libsoup/soup-uri-utils.c b/libsoup/soup-uri-utils.c
+index be2b79b..0251279 100644
+--- a/libsoup/soup-uri-utils.c
++++ b/libsoup/soup-uri-utils.c
+@@ -303,6 +303,8 @@ soup_uri_decode_data_uri (const char *uri,
+ 
+         uri_string = g_uri_to_string (soup_uri);
+         g_uri_unref (soup_uri);
++        if (!uri_string)
++                return NULL;
+ 
+         start = uri_string + 5;
+         comma = strchr (start, ',');
+-- 
+2.34.1
+
diff --git a/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32051-2.patch b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32051-2.patch
new file mode 100644
index 0000000000..24c184bb86
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32051-2.patch
@@ -0,0 +1,57 @@
+From 7d1557a60145927806c88d321e8322a9d9f49bb2 Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <pgriffis@igalia.com>
+Date: Fri, 22 Nov 2024 13:39:51 -0600
+Subject: [PATCH 2/2] soup_uri_decode_data_uri(): Handle URIs with a path
+ starting with //
+
+CVE: CVE-2025-32051
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/79cfd65c9bd8024cd45dd725c284766329873709]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-uri-utils.c | 8 ++++++++
+ tests/uri-parsing-test.c | 2 ++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/libsoup/soup-uri-utils.c b/libsoup/soup-uri-utils.c
+index 0251279..1ff11cd 100644
+--- a/libsoup/soup-uri-utils.c
++++ b/libsoup/soup-uri-utils.c
+@@ -286,6 +286,7 @@ soup_uri_decode_data_uri (const char *uri,
+         gboolean base64 = FALSE;
+         char *uri_string;
+         GBytes *bytes;
++        const char *path;
+ 
+         g_return_val_if_fail (uri != NULL, NULL);
+ 
+@@ -301,6 +302,13 @@ soup_uri_decode_data_uri (const char *uri,
+         if (content_type)
+                 *content_type = NULL;
+ 
++        /* g_uri_to_string() is picky about paths that start with `//` and will assert. */
++        path = g_uri_get_path (soup_uri);
++        if (path[0] == '/' && path[1] == '/') {
++                g_uri_unref (soup_uri);
++                return NULL;
++        }
++
+         uri_string = g_uri_to_string (soup_uri);
+         g_uri_unref (soup_uri);
+         if (!uri_string)
+diff --git a/tests/uri-parsing-test.c b/tests/uri-parsing-test.c
+index 1f16273..418391e 100644
+--- a/tests/uri-parsing-test.c
++++ b/tests/uri-parsing-test.c
+@@ -141,6 +141,8 @@ static struct {
+         { "data:text/plain;base64,aGVsbG8=", "hello", "text/plain" },
+         { "data:text/plain;base64,invalid=", "", "text/plain" },
+         { "data:,", "", CONTENT_TYPE_DEFAULT },
++        { "data:.///", NULL, NULL },
++        { "data:/.//", NULL, NULL },
+ };
+ 
+ static void
+-- 
+2.34.1
+
diff --git a/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32052.patch b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32052.patch
new file mode 100644
index 0000000000..78b712070b
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32052.patch
@@ -0,0 +1,31 @@
+From 779bcb279b1dc4eb8bcb22c5e727b1174630c3fc Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <pgriffis@igalia.com>
+Date: Sat, 16 Nov 2024 12:07:30 -0600
+Subject: [PATCH] Fix heap buffer overflow in soup_content_sniffer_sniff
+
+Co-Author: Ar Jun <pkillarjun@protonmail.com>
+
+CVE: CVE-2025-32052
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/f182429e5b1fc034050510da20c93256c4fa9652]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/content-sniffer/soup-content-sniffer.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libsoup/content-sniffer/soup-content-sniffer.c b/libsoup/content-sniffer/soup-content-sniffer.c
+index 23d5aaa..aeee2e2 100644
+--- a/libsoup/content-sniffer/soup-content-sniffer.c
++++ b/libsoup/content-sniffer/soup-content-sniffer.c
+@@ -529,7 +529,7 @@ sniff_unknown (SoupContentSniffer *sniffer, GBytes *buffer,
+                        guint index_pattern = 0;
+                        gboolean skip_row = FALSE;
+ 
+-                       while ((index_stream < resource_length) &&
++                       while ((index_stream < resource_length - 1) &&
+                               (index_pattern <= type_row->pattern_length)) {
+                                /* Skip insignificant white space ("WS" in the spec) */
+                                if (type_row->pattern[index_pattern] == ' ') {
+-- 
+2.34.1
+
diff --git a/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32053.patch b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32053.patch
new file mode 100644
index 0000000000..93fa69e06c
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32053.patch
@@ -0,0 +1,40 @@
+From 819dbc0fcf174b8182cdb279f7be15ea1cde649f Mon Sep 17 00:00:00 2001
+From: Ar Jun <pkillarjun@protonmail.com>
+Date: Mon, 18 Nov 2024 14:59:51 -0600
+Subject: [PATCH] Fix heap buffer overflow in
+ soup-content-sniffer.c:sniff_feed_or_html()
+
+CVE: CVE-2025-32053
+Upstream-Status: Backport
+[https://gitlab.gnome.org/GNOME/libsoup/-/commit/eaed42ca8d40cd9ab63764e3d63641180505f40a]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/content-sniffer/soup-content-sniffer.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libsoup/content-sniffer/soup-content-sniffer.c b/libsoup/content-sniffer/soup-content-sniffer.c
+index 2351c3f..23d5aaa 100644
+--- a/libsoup/content-sniffer/soup-content-sniffer.c
++++ b/libsoup/content-sniffer/soup-content-sniffer.c
+@@ -646,7 +646,7 @@ skip_insignificant_space (const char *resource, int *pos, int resource_length)
+               (resource[*pos] == '\x0D')) {
+                *pos = *pos + 1;
+ 
+-               if (*pos > resource_length)
++               if (*pos >= resource_length)
+                        return TRUE;
+        }
+ 
+@@ -709,7 +709,7 @@ sniff_feed_or_html (SoupContentSniffer *sniffer, GBytes *buffer)
+                do {
+                        pos++;
+ 
+-                       if (pos > resource_length)
++                       if ((pos + 1) > resource_length)
+                                goto text_html;
+                } while (resource[pos] != '>');
+ 
+-- 
+2.34.1
+
diff --git a/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32907-1.patch b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32907-1.patch
new file mode 100644
index 0000000000..026a38c39a
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32907-1.patch
@@ -0,0 +1,200 @@
+From 4741bc288ece52f5dbaebc568e72ce14da3e2757 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Tue, 15 Apr 2025 12:17:39 +0200
+Subject: [PATCH 1/2] soup-message-headers: Correct merge of ranges
+
+It had been skipping every second range, which generated an array
+of a lot of insane ranges, causing large memory usage by the server.
+
+Closes #428
+
+Part-of: <https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/452>
+
+CVE: CVE-2025-32907
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/452/commits]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-message-headers.c |   1 +
+ tests/meson.build              |   1 +
+ tests/server-mem-limit-test.c  | 144 +++++++++++++++++++++++++++++++++
+ 3 files changed, 146 insertions(+)
+ create mode 100644 tests/server-mem-limit-test.c
+
+diff --git a/libsoup/soup-message-headers.c b/libsoup/soup-message-headers.c
+index 95e2c31..d69d6e8 100644
+--- a/libsoup/soup-message-headers.c
++++ b/libsoup/soup-message-headers.c
+@@ -1210,6 +1210,7 @@ soup_message_headers_get_ranges_internal (SoupMessageHeaders  *hdrs,
+                        if (cur->start <= prev->end) {
+                                prev->end = MAX (prev->end, cur->end);
+                                g_array_remove_index (array, i);
++                               i--;
+                        }
+                }
+        }
+diff --git a/tests/meson.build b/tests/meson.build
+index 9bf88be..7ef7ac5 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -93,6 +93,7 @@ tests = [
+   {'name': 'samesite'},
+   {'name': 'session'},
+   {'name': 'server-auth'},
++  {'name': 'server-mem-limit'},
+   {'name': 'server'},
+   {'name': 'sniffing'},
+   {'name': 'ssl',
+diff --git a/tests/server-mem-limit-test.c b/tests/server-mem-limit-test.c
+new file mode 100644
+index 0000000..98f1c40
+--- /dev/null
++++ b/tests/server-mem-limit-test.c
+@@ -0,0 +1,144 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
++/*
++ * Copyright (C) 2025 Red Hat <www.redhat.com>
++ */
++
++#include "test-utils.h"
++
++#include <sys/resource.h>
++
++/*
++ This test limits memory usage to trigger too large buffer allocation crash.
++ As restoring the limits back to what it was does not always work, it's split
++ out of the server-test.c test with copied minimal server code.
++ */
++
++typedef struct {
++       SoupServer *server;
++       GUri *base_uri, *ssl_base_uri;
++       GSList *handlers;
++} ServerData;
++
++static void
++server_setup_nohandler (ServerData *sd, gconstpointer test_data)
++{
++       sd->server = soup_test_server_new (SOUP_TEST_SERVER_IN_THREAD);
++       sd->base_uri = soup_test_server_get_uri (sd->server, "http", NULL);
++       if (tls_available)
++               sd->ssl_base_uri = soup_test_server_get_uri (sd->server, "https", NULL);
++}
++
++static void
++server_add_handler (ServerData         *sd,
++                   const char         *path,
++                   SoupServerCallback  callback,
++                   gpointer            user_data,
++                   GDestroyNotify      destroy)
++{
++       soup_server_add_handler (sd->server, path, callback, user_data, destroy);
++       sd->handlers = g_slist_prepend (sd->handlers, g_strdup (path));
++}
++
++static void
++server_setup (ServerData *sd, gconstpointer test_data)
++{
++       server_setup_nohandler (sd, test_data);
++}
++
++static void
++server_teardown (ServerData *sd, gconstpointer test_data)
++{
++       GSList *iter;
++
++       for (iter = sd->handlers; iter; iter = iter->next)
++               soup_server_remove_handler (sd->server, iter->data);
++       g_slist_free_full (sd->handlers, g_free);
++
++       g_clear_pointer (&sd->server, soup_test_server_quit_unref);
++       g_clear_pointer (&sd->base_uri, g_uri_unref);
++       g_clear_pointer (&sd->ssl_base_uri, g_uri_unref);
++}
++
++static void
++server_file_callback (SoupServer        *server,
++                     SoupServerMessage *msg,
++                     const char        *path,
++                     GHashTable        *query,
++                     gpointer           data)
++{
++       void *mem;
++
++       g_assert_cmpstr (path, ==, "/file");
++       g_assert_cmpstr (soup_server_message_get_method (msg), ==, SOUP_METHOD_GET);
++
++       mem = g_malloc0 (sizeof (char) * 1024 * 1024);
++       /* fedora-scan CI claims a warning about possibly leaked `mem` variable, thus use
++          the copy and free it explicitly, to workaround the false positive; the g_steal_pointer()
++          did not help for the malloc-ed memory */
++       soup_server_message_set_response (msg, "application/octet-stream", SOUP_MEMORY_COPY, mem, sizeof (char) * 1024 *1024);
++       soup_server_message_set_status (msg, SOUP_STATUS_OK, NULL);
++       g_free (mem);
++}
++
++static void
++do_ranges_overlaps_test (ServerData *sd, gconstpointer test_data)
++{
++       SoupSession *session;
++       SoupMessage *msg;
++       GString *range;
++       GUri *uri;
++       const char *chunk = ",0,0,0,0,0,0,0,0,0,0,0";
++
++       g_test_bug ("428");
++
++       #ifdef G_OS_WIN32
++       g_test_skip ("Cannot run under windows");
++       return;
++       #endif
++
++       range = g_string_sized_new (99 * 1024);
++       g_string_append (range, "bytes=1024");
++       while (range->len < 99 * 1024)
++               g_string_append (range, chunk);
++
++       session = soup_test_session_new (NULL);
++       server_add_handler (sd, "/file", server_file_callback, NULL, NULL);
++
++       uri = g_uri_parse_relative (sd->base_uri, "/file", SOUP_HTTP_URI_FLAGS, NULL);
++
++       msg = soup_message_new_from_uri ("GET", uri);
++       soup_message_headers_append (soup_message_get_request_headers (msg), "Range", range->str);
++
++       soup_test_session_send_message (session, msg);
++
++       soup_test_assert_message_status (msg, SOUP_STATUS_PARTIAL_CONTENT);
++
++       g_object_unref (msg);
++
++       g_string_free (range, TRUE);
++       g_uri_unref (uri);
++
++       soup_test_session_abort_unref (session);
++}
++
++int
++main (int argc, char **argv)
++{
++       int ret;
++
++       test_init (argc, argv, NULL);
++
++       #ifndef G_OS_WIN32
++       struct rlimit new_rlimit = { 1024 * 1024 * 64, 1024 * 1024 * 64 };
++       /* limit memory usage, to trigger too large memory allocation abort */
++       g_assert_cmpint (setrlimit (RLIMIT_DATA, &new_rlimit), ==, 0);
++       #endif
++
++       g_test_add ("/server-mem/range-overlaps", ServerData, NULL,
++                   server_setup, do_ranges_overlaps_test, server_teardown);
++
++       ret = g_test_run ();
++
++       test_cleanup ();
++       return ret;
++}
+-- 
+2.34.1
+
diff --git a/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32907-2.patch b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32907-2.patch
new file mode 100644
index 0000000000..c1b6a1feba
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32907-2.patch
@@ -0,0 +1,68 @@
+From 85716d2769b3e1acda024d2c7cbfb68139c5d90b Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Tue, 13 May 2025 14:20:46 +0200
+Subject: [PATCH 2/2] server-mem-limit-test: Limit memory usage only when not
+ built witha sanitizer
+
+A build with -Db_sanitize=address crashes with failed mmap(), which is done
+inside libasan. The test requires 20.0TB of virtual memory when running with
+the sanitizer, which is beyond unsigned integer limits and may not trigger
+the bug anyway.
+
+Part-of: <https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/452>
+
+CVE: CVE-2025-32907
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/452/commits]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ meson.build                   |  4 ++++
+ tests/server-mem-limit-test.c | 13 +++++++++----
+ 2 files changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 73a9fa0..a9531a4 100644
+--- a/meson.build
++++ b/meson.build
+@@ -374,6 +374,10 @@ configinc = include_directories('.')
+ 
+ prefix = get_option('prefix')
+ 
++if get_option('b_sanitize') != 'none'
++  cdata.set_quoted('B_SANITIZE_OPTION', get_option('b_sanitize'))
++endif
++
+ cdata.set_quoted('PACKAGE_VERSION', soup_version)
+ cdata.set_quoted('LOCALEDIR', join_paths(prefix, get_option('localedir')))
+ cdata.set_quoted('GETTEXT_PACKAGE', libsoup_api_name)
+diff --git a/tests/server-mem-limit-test.c b/tests/server-mem-limit-test.c
+index 98f1c40..65dc875 100644
+--- a/tests/server-mem-limit-test.c
++++ b/tests/server-mem-limit-test.c
+@@ -126,14 +126,19 @@ main (int argc, char **argv)
+ {
+        int ret;
+ 
+-       test_init (argc, argv, NULL);
+-
+-       #ifndef G_OS_WIN32
+-       struct rlimit new_rlimit = { 1024 * 1024 * 64, 1024 * 1024 * 64 };
++       /* a build with an address sanitizer may crash on mmap() with the limit,
++          thus skip the limit set in such case, even it may not necessarily
++          trigger the bug if it regresses */
++       #if !defined(G_OS_WIN32) && !defined(B_SANITIZE_OPTION)
++       struct rlimit new_rlimit = { 1024UL * 1024UL * 1024UL * 2UL, 1024UL * 1024UL * 1024UL * 2UL };
+        /* limit memory usage, to trigger too large memory allocation abort */
+        g_assert_cmpint (setrlimit (RLIMIT_DATA, &new_rlimit), ==, 0);
++       #else
++       g_message ("server-mem-limit-test: Running without memory limit");
+        #endif
+ 
++       test_init (argc, argv, NULL);
++
+        g_test_add ("/server-mem/range-overlaps", ServerData, NULL,
+                    server_setup, do_ranges_overlaps_test, server_teardown);
+ 
+-- 
+2.34.1
+
diff --git a/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32908-1.patch b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32908-1.patch
new file mode 100644
index 0000000000..8ad0e16d45
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32908-1.patch
@@ -0,0 +1,89 @@
+From 56b8eb061a02c4e99644d6f1e62e601d0d814beb Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Tue, 15 Apr 2025 09:59:05 +0200
+Subject: [PATCH 1/2] soup-server-http2: Check validity of the constructed
+ connection URI
+
+The HTTP/2 pseudo-headers can contain invalid values, which the GUri rejects
+and returns NULL, but the soup-server did not check the validity and could
+abort the server itself later in the code.
+
+Closes #429
+
+CVE: CVE-2025-32908
+Upstream-Status: Backport
+[https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/451/diffs?commit_id=a792b23ab87cacbf4dd9462bf7b675fa678efbae]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ .../http2/soup-server-message-io-http2.c      |  4 +++
+ tests/http2-test.c                            | 28 +++++++++++++++++++
+ 2 files changed, 32 insertions(+)
+
+diff --git a/libsoup/server/http2/soup-server-message-io-http2.c b/libsoup/server/http2/soup-server-message-io-http2.c
+index 943ecfd..f1fe2d5 100644
+--- a/libsoup/server/http2/soup-server-message-io-http2.c
++++ b/libsoup/server/http2/soup-server-message-io-http2.c
+@@ -771,9 +771,13 @@ on_frame_recv_callback (nghttp2_session     *session,
+                 char *uri_string;
+                 GUri *uri;
+ 
++               if (msg_io->scheme == NULL || msg_io->authority == NULL || msg_io->path == NULL)
++                       return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
+                 uri_string = g_strdup_printf ("%s://%s%s", msg_io->scheme, msg_io->authority, msg_io->path);
+                 uri = g_uri_parse (uri_string, SOUP_HTTP_URI_FLAGS, NULL);
+                 g_free (uri_string);
++               if (uri == NULL)
++                       return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
+                 soup_server_message_set_uri (msg_io->msg, uri);
+                 g_uri_unref (uri);
+ 
+diff --git a/tests/http2-test.c b/tests/http2-test.c
+index ef097f4..df86d9b 100644
+--- a/tests/http2-test.c
++++ b/tests/http2-test.c
+@@ -1241,6 +1241,30 @@ do_connection_closed_test (Test *test, gconstpointer data)
+         g_uri_unref (uri);
+ }
+ 
++static void
++do_broken_pseudo_header_test (Test *test, gconstpointer data)
++{
++       char *path;
++       SoupMessage *msg;
++       GUri *uri;
++       GBytes *body = NULL;
++       GError *error = NULL;
++
++       uri = g_uri_parse_relative (base_uri, "/ag", SOUP_HTTP_URI_FLAGS, NULL);
++
++       /* an ugly cheat to construct a broken URI, which can be sent from other libs */
++       path = (char *) g_uri_get_path (uri);
++       path[1] = '%';
++
++       msg = soup_message_new_from_uri (SOUP_METHOD_GET, uri);
++       body = soup_test_session_async_send (test->session, msg, NULL, &error);
++       g_assert_error (error, G_IO_ERROR, G_IO_ERROR_PARTIAL_INPUT);
++       g_assert_null (body);
++       g_clear_error (&error);
++       g_object_unref (msg);
++       g_uri_unref (uri);
++}
++
+ static gboolean
+ unpause_message (SoupServerMessage *msg)
+ {
+@@ -1549,6 +1573,10 @@ main (int argc, char **argv)
+                     setup_session,
+                     do_connection_closed_test,
+                     teardown_session);
++        g_test_add ("/http2/broken-pseudo-header", Test, NULL,
++                    setup_session,
++                    do_broken_pseudo_header_test,
++                    teardown_session);
+ 
+        ret = g_test_run ();
+ 
+-- 
+2.34.1
+
diff --git a/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32908-2.patch b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32908-2.patch
new file mode 100644
index 0000000000..b53c7efb7b
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32908-2.patch
@@ -0,0 +1,53 @@
+From aad0dcf22ee9fdfefa6b72055268240cceccfe4c Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Mon, 28 Apr 2025 10:55:42 +0200
+Subject: [PATCH 2/2] soup-server-http2: Correct check of the validity of the
+ constructed connection URI
+
+RFC 5740: the CONNECT has unset the "scheme" and "path", thus allow them unset.
+
+The commit a792b23ab87cacbf4dd9462bf7b675fa678efbae also missed to decrement
+the `io->in_callback` in the early returns.
+
+Related to #429
+
+CVE: CVE-2025-32908
+Upstream-Status: Backport
+[https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/453/diffs?commit_id=527428a033df573ef4558ce1106e080fd9ec5c71]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ .../server/http2/soup-server-message-io-http2.c   | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/libsoup/server/http2/soup-server-message-io-http2.c b/libsoup/server/http2/soup-server-message-io-http2.c
+index f1fe2d5..913afb4 100644
+--- a/libsoup/server/http2/soup-server-message-io-http2.c
++++ b/libsoup/server/http2/soup-server-message-io-http2.c
+@@ -771,13 +771,18 @@ on_frame_recv_callback (nghttp2_session     *session,
+                 char *uri_string;
+                 GUri *uri;
+ 
+-               if (msg_io->scheme == NULL || msg_io->authority == NULL || msg_io->path == NULL)
+-                       return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
+-                uri_string = g_strdup_printf ("%s://%s%s", msg_io->scheme, msg_io->authority, msg_io->path);
++                if (msg_io->authority == NULL) {
++                        io->in_callback--;
++                        return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
++                }
++                /* RFC 5740: the CONNECT has unset the "scheme" and "path", but the GUri requires the scheme, thus let it be "(null)" */
++                uri_string = g_strdup_printf ("%s://%s%s", msg_io->scheme, msg_io->authority, msg_io->path == NULL ? "" : msg_io->path);
+                 uri = g_uri_parse (uri_string, SOUP_HTTP_URI_FLAGS, NULL);
+                 g_free (uri_string);
+-               if (uri == NULL)
+-                       return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
++                if (uri == NULL) {
++                        io->in_callback--;
++                        return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
++                }
+                 soup_server_message_set_uri (msg_io->msg, uri);
+                 g_uri_unref (uri);
+ 
+-- 
+2.34.1
+
diff --git a/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32914.patch b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32914.patch
new file mode 100644
index 0000000000..0ada9f3134
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-32914.patch
@@ -0,0 +1,111 @@
+From 5bfcf8157597f2d327050114fb37ff600004dbcf Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Tue, 15 Apr 2025 09:03:00 +0200
+Subject: [PATCH] multipart: Fix read out of buffer bounds under
+ soup_multipart_new_from_message()
+
+This is CVE-2025-32914, special crafted input can cause read out of buffer bounds
+of the body argument.
+
+Closes #436
+
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/5bfcf8157597f2d327050114fb37ff600004dbcf]
+CVE: CVE-2025-32914
+Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
+---
+ libsoup/soup-multipart.c |  2 +-
+ tests/multipart-test.c   | 58 ++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 59 insertions(+), 1 deletion(-)
+
+diff --git a/libsoup/soup-multipart.c b/libsoup/soup-multipart.c
+index 2421c91f8..102ce3722 100644
+--- a/libsoup/soup-multipart.c
++++ b/libsoup/soup-multipart.c
+@@ -173,7 +173,7 @@ soup_multipart_new_from_message (SoupMessageHeaders *headers,
+                        return NULL;
+                }
+ 
+-               split = strstr (start, "\r\n\r\n");
++               split = g_strstr_len (start, body_end - start, "\r\n\r\n");
+                if (!split || split > end) {
+                        soup_multipart_free (multipart);
+                        return NULL;
+diff --git a/tests/multipart-test.c b/tests/multipart-test.c
+index 2c0e7e969..f5b986889 100644
+--- a/tests/multipart-test.c
++++ b/tests/multipart-test.c
+@@ -471,6 +471,62 @@ test_multipart (gconstpointer data)
+        loop = NULL;
+ }
+ 
++static void
++test_multipart_bounds_good (void)
++{
++       #define TEXT "line1\r\nline2"
++       SoupMultipart *multipart;
++       SoupMessageHeaders *headers, *set_headers = NULL;
++       GBytes *bytes, *set_bytes = NULL;
++       const char *raw_data = "--123\r\nContent-Type: text/plain;\r\n\r\n" TEXT "\r\n--123--\r\n";
++       gboolean success;
++
++       headers = soup_message_headers_new (SOUP_MESSAGE_HEADERS_MULTIPART);
++       soup_message_headers_append (headers, "Content-Type", "multipart/mixed; boundary=\"123\"");
++
++       bytes = g_bytes_new (raw_data, strlen (raw_data));
++
++       multipart = soup_multipart_new_from_message (headers, bytes);
++
++       g_assert_nonnull (multipart);
++       g_assert_cmpint (soup_multipart_get_length (multipart), ==, 1);
++       success = soup_multipart_get_part (multipart, 0, &set_headers, &set_bytes);
++       g_assert_true (success);
++       g_assert_nonnull (set_headers);
++       g_assert_nonnull (set_bytes);
++       g_assert_cmpint (strlen (TEXT), ==, g_bytes_get_size (set_bytes));
++       g_assert_cmpstr ("text/plain", ==, soup_message_headers_get_content_type (set_headers, NULL));
++       g_assert_cmpmem (TEXT, strlen (TEXT), g_bytes_get_data (set_bytes, NULL), g_bytes_get_size (set_bytes));
++
++       soup_message_headers_unref (headers);
++       g_bytes_unref (bytes);
++
++       soup_multipart_free (multipart);
++
++       #undef TEXT
++}
++
++static void
++test_multipart_bounds_bad (void)
++{
++       SoupMultipart *multipart;
++       SoupMessageHeaders *headers;
++       GBytes *bytes;
++       const char *raw_data = "--123\r\nContent-Type: text/plain;\r\nline1\r\nline2\r\n--123--\r\n";
++
++       headers = soup_message_headers_new (SOUP_MESSAGE_HEADERS_MULTIPART);
++       soup_message_headers_append (headers, "Content-Type", "multipart/mixed; boundary=\"123\"");
++
++       bytes = g_bytes_new (raw_data, strlen (raw_data));
++
++       /* it did read out of raw_data/bytes bounds */
++       multipart = soup_multipart_new_from_message (headers, bytes);
++       g_assert_null (multipart);
++
++       soup_message_headers_unref (headers);
++       g_bytes_unref (bytes);
++}
++
+ int
+ main (int argc, char **argv)
+ {
+@@ -498,6 +554,8 @@ main (int argc, char **argv)
+        g_test_add_data_func ("/multipart/sync", GINT_TO_POINTER (SYNC_MULTIPART), test_multipart);
+        g_test_add_data_func ("/multipart/async", GINT_TO_POINTER (ASYNC_MULTIPART), test_multipart);
+        g_test_add_data_func ("/multipart/async-small-reads", GINT_TO_POINTER (ASYNC_MULTIPART_SMALL_READS), test_multipart);
++       g_test_add_func ("/multipart/bounds-good", test_multipart_bounds_good);
++       g_test_add_func ("/multipart/bounds-bad", test_multipart_bounds_bad);
+ 
+        ret = g_test_run ();
+ 
+-- 
+GitLab
+
diff --git a/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-4476.patch b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-4476.patch
new file mode 100644
index 0000000000..cd5619d620
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-4476.patch
@@ -0,0 +1,38 @@
+From e64c221f9c7d09b48b610c5626b3b8c400f0907c Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@redhat.com>
+Date: Thu, 8 May 2025 09:27:01 -0500
+Subject: [PATCH] auth-digest: fix crash in
+ soup_auth_digest_get_protection_space()
+
+We need to validate the Domain parameter in the WWW-Authenticate header.
+
+Unfortunately this crash only occurs when listening on default ports 80
+and 443, so there's no good way to test for this. The test would require
+running as root.
+
+Fixes #440
+
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/e64c221f9c7d09b48b610c5626b3b8c400f0907c]
+CVE: CVE-2025-4476
+Signed-off-by: Ashish Sharma <asharma@mvista.com>
+
+
+ libsoup/auth/soup-auth-digest.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libsoup/auth/soup-auth-digest.c b/libsoup/auth/soup-auth-digest.c
+index d8bb2910..292f2045 100644
+--- a/libsoup/auth/soup-auth-digest.c
++++ b/libsoup/auth/soup-auth-digest.c
+@@ -220,7 +220,7 @@ soup_auth_digest_get_protection_space (SoupAuth *auth, GUri *source_uri)
+                        if (uri &&
+                             g_strcmp0 (g_uri_get_scheme (uri), g_uri_get_scheme (source_uri)) == 0 &&
+                            g_uri_get_port (uri) == g_uri_get_port (source_uri) &&
+-                           !strcmp (g_uri_get_host (uri), g_uri_get_host (source_uri)))
++                           !g_strcmp0 (g_uri_get_host (uri), g_uri_get_host (source_uri)))
+                                dir = g_strdup (g_uri_get_path (uri));
+                        else
+                                dir = NULL;
+-- 
+GitLab
+
diff --git a/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-46421.patch b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-46421.patch
new file mode 100644
index 0000000000..72683d8fce
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-46421.patch
@@ -0,0 +1,139 @@
+From 85c5227eef7370832044eb918e8a99c0bcbab86f Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <pgriffis@igalia.com>
+Date: Wed, 5 Feb 2025 16:18:10 -0600
+Subject: [PATCH] session: Strip authentication credentails on cross-origin
+ redirect
+
+This should match the behavior of Firefox and Safari but not of Chromium.
+
+CVE: CVE-2025-46421
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/436/diffs?commit_id=3e5c26415811f19e7737238bb23305ffaf96f66b]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-session.c |  6 ++++
+ tests/auth-test.c      | 77 ++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 83 insertions(+)
+
+diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c
+index 631bec0..9f00b05 100644
+--- a/libsoup/soup-session.c
++++ b/libsoup/soup-session.c
+@@ -1230,6 +1230,12 @@ soup_session_redirect_message (SoupSession *session,
+                                                   SOUP_ENCODING_NONE);
+        }
+ 
++        /* Strip all credentials on cross-origin redirect. */
++        if (!soup_uri_host_equal (soup_message_get_uri (msg), new_uri)) {
++                soup_message_headers_remove_common (soup_message_get_request_headers (msg), SOUP_HEADER_AUTHORIZATION);
++                soup_message_set_auth (msg, NULL);
++        }
++
+         soup_message_set_request_host_from_uri (msg, new_uri);
+        soup_message_set_uri (msg, new_uri);
+        g_uri_unref (new_uri);
+diff --git a/tests/auth-test.c b/tests/auth-test.c
+index 484097f..7c3b551 100644
+--- a/tests/auth-test.c
++++ b/tests/auth-test.c
+@@ -1,6 +1,7 @@
+ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
+ 
+ #include "test-utils.h"
++#include "soup-uri-utils-private.h"
+ 
+ static const char *base_uri;
+ static GMainLoop *loop;
+@@ -1916,6 +1917,81 @@ do_missing_params_test (gconstpointer auth_header)
+        soup_test_server_quit_unref (server);
+ }
+ 
++static void
++redirect_server_callback (SoupServer        *server,
++                          SoupServerMessage *msg,
++                          const char        *path,
++                          GHashTable        *query,
++                          gpointer           user_data)
++{
++    static gboolean redirected = FALSE;
++
++    if (!redirected) {
++        char *redirect_uri = g_uri_to_string (user_data);
++        soup_server_message_set_redirect (msg, SOUP_STATUS_MOVED_PERMANENTLY, redirect_uri);
++        g_free (redirect_uri);
++        redirected = TRUE;
++        return;
++    }
++
++    g_assert_not_reached ();
++}
++
++static gboolean
++auth_for_redirect_callback (SoupMessage *msg, SoupAuth *auth, gboolean retrying, gpointer user_data)
++{
++    GUri *known_server_uri = user_data;
++
++    if (!soup_uri_host_equal (known_server_uri, soup_message_get_uri (msg)))
++        return FALSE;
++
++    soup_auth_authenticate (auth, "user", "good-basic");
++
++    return TRUE;
++}
++
++static void
++do_strip_on_crossorigin_redirect (void)
++{
++    SoupSession *session;
++    SoupMessage *msg;
++    SoupServer *server1, *server2;
++    SoupAuthDomain *auth_domain;
++    GUri *uri;
++    gint status;
++
++    server1 = soup_test_server_new (SOUP_TEST_SERVER_IN_THREAD);
++    server2 = soup_test_server_new (SOUP_TEST_SERVER_IN_THREAD);
++
++    /* Both servers have the same credentials. */
++    auth_domain = soup_auth_domain_basic_new ("realm", "auth-test", "auth-callback", server_basic_auth_callback, NULL);
++    soup_auth_domain_add_path (auth_domain, "/");
++    soup_server_add_auth_domain (server1, auth_domain);
++    soup_server_add_auth_domain (server2, auth_domain);
++    g_object_unref (auth_domain);
++
++    /* Server 1 asks for auth, then redirects to Server 2. */
++    soup_server_add_handler (server1, NULL,
++                    redirect_server_callback,
++                   soup_test_server_get_uri (server2, "http", NULL), (GDestroyNotify)g_uri_unref);
++    /* Server 2 requires auth. */
++    soup_server_add_handler (server2, NULL, server_callback, NULL, NULL);
++
++    session = soup_test_session_new (NULL);
++    uri = soup_test_server_get_uri (server1, "http", NULL);
++    msg = soup_message_new_from_uri ("GET", uri);
++    /* The client only sends credentials for the host it knows. */
++    g_signal_connect (msg, "authenticate", G_CALLBACK (auth_for_redirect_callback), uri);
++
++    status = soup_test_session_send_message (session, msg);
++
++    g_assert_cmpint (status, ==, SOUP_STATUS_UNAUTHORIZED);
++
++    g_uri_unref (uri);
++    soup_test_server_quit_unref (server1);
++    soup_test_server_quit_unref (server2);
++}
++
+ int
+ main (int argc, char **argv)
+ {
+@@ -1949,6 +2025,7 @@ main (int argc, char **argv)
+        g_test_add_func ("/auth/auth-uri", do_auth_uri_test);
+         g_test_add_func ("/auth/cancel-request-on-authenticate", do_cancel_request_on_authenticate);
+         g_test_add_func ("/auth/multiple-algorithms", do_multiple_digest_algorithms);
++        g_test_add_func ("/auth/strip-on-crossorigin-redirect", do_strip_on_crossorigin_redirect);
+         g_test_add_data_func ("/auth/missing-params/realm", "Digest qop=\"auth\"", do_missing_params_test);
+         g_test_add_data_func ("/auth/missing-params/nonce", "Digest realm=\"auth-test\", qop=\"auth,auth-int\", opaque=\"5ccc069c403ebaf9f0171e9517f40e41\"", do_missing_params_test);
+         g_test_add_data_func ("/auth/missing-params/nonce-md5-sess", "Digest realm=\"auth-test\", qop=\"auth,auth-int\", opaque=\"5ccc069c403ebaf9f0171e9517f40e41\" algorithm=\"MD5-sess\"", do_missing_params_test);
+-- 
+2.34.1
+
diff --git a/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-4948.patch b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-4948.patch
new file mode 100644
index 0000000000..07c85f5381
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-4948.patch
@@ -0,0 +1,97 @@
+From a23ce8f8e60e79990e26376c8b0d40841aed4b81 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Thu, 15 May 2025 17:49:11 +0200
+Subject: [PATCH] soup-multipart: Verify boundary limits for multipart body
+
+It could happen that the boundary started at a place which resulted into
+a negative number, which in an unsigned integer is a very large value.
+Check the body size is not a negative value before setting it.
+
+Closes https://gitlab.gnome.org/GNOME/libsoup/-/issues/449
+
+Part-of: <https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/463>
+
+CVE: CVE-2025-4948
+Upstream-Status: Backport
+[https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/463/diffs?commit_id=f2f28afe0b3b2b3009ab67d6874457ec6bac70c0]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ libsoup/soup-multipart.c |  2 +-
+ tests/multipart-test.c   | 40 ++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 41 insertions(+), 1 deletion(-)
+
+diff --git a/libsoup/soup-multipart.c b/libsoup/soup-multipart.c
+index e1c442e..27257e4 100644
+--- a/libsoup/soup-multipart.c
++++ b/libsoup/soup-multipart.c
+@@ -204,7 +204,7 @@ soup_multipart_new_from_message (SoupMessageHeaders *headers,
+                 */
+                part_body = g_bytes_new_from_bytes (body, // FIXME
+                                                    split - body_data,
+-                                                   end - 2 - split);
++                                                   end - 2 >= split ? end - 2 - split : 0);
+                g_ptr_array_add (multipart->bodies, part_body);
+ 
+                start = end;
+diff --git a/tests/multipart-test.c b/tests/multipart-test.c
+index 84852e2..2ae888c 100644
+--- a/tests/multipart-test.c
++++ b/tests/multipart-test.c
+@@ -548,6 +548,45 @@ test_multipart_bounds_bad_2 (void)
+        g_bytes_unref (bytes);
+ }
+ 
++static void
++test_multipart_too_large (void)
++{
++       const char *raw_body =
++               "-------------------\r\n"
++               "-\n"
++               "Cont\"\r\n"
++               "Content-Tynt----e:n\x8erQK\r\n"
++               "Content-Disposition:   name=  form-; name=\"file\"; filename=\"ype:i/  -d; ----\xae\r\n"
++               "Content-Typimag\x01/png--\\\n"
++               "\r\n"
++               "---:\n\r\n"
++               "\r\n"
++               "-------------------------------------\r\n"
++               "---------\r\n"
++               "----------------------";
++       GBytes *body;
++       GHashTable *params;
++       SoupMessageHeaders *headers;
++       SoupMultipart *multipart;
++
++       params = g_hash_table_new (g_str_hash, g_str_equal);
++       g_hash_table_insert (params, (gpointer) "boundary", (gpointer) "-----------------");
++       headers = soup_message_headers_new (SOUP_MESSAGE_HEADERS_MULTIPART);
++       soup_message_headers_set_content_type (headers, "multipart/form-data", params);
++       g_hash_table_unref (params);
++
++       body = g_bytes_new_static (raw_body, strlen (raw_body));
++       multipart = soup_multipart_new_from_message (headers, body);
++       soup_message_headers_unref (headers);
++       g_bytes_unref (body);
++
++       g_assert_nonnull (multipart);
++       g_assert_cmpint (soup_multipart_get_length (multipart), ==, 1);
++       g_assert_true (soup_multipart_get_part (multipart, 0, &headers, &body));
++       g_assert_cmpint (g_bytes_get_size (body), ==, 0);
++       soup_multipart_free (multipart);
++}
++
+ int
+ main (int argc, char **argv)
+ {
+@@ -578,6 +617,7 @@ main (int argc, char **argv)
+        g_test_add_func ("/multipart/bounds-good", test_multipart_bounds_good);
+        g_test_add_func ("/multipart/bounds-bad", test_multipart_bounds_bad);
+        g_test_add_func ("/multipart/bounds-bad-2", test_multipart_bounds_bad_2);
++       g_test_add_func ("/multipart/too-large", test_multipart_too_large);
+ 
+        ret = g_test_run ();
+ 
+-- 
+2.34.1
+
diff --git a/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-4969.patch b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-4969.patch
new file mode 100644
index 0000000000..70c5fd5593
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-3.4.4/CVE-2025-4969.patch
@@ -0,0 +1,76 @@
+From 07b94e27afafebf31ef3cd868866a1e383750086 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Mon, 19 May 2025 17:48:27 +0200
+Subject: [PATCH] soup-multipart: Verify array bounds before accessing its
+ members
+
+The boundary could be at a place which, calculated, pointed
+before the beginning of the array. Check the bounds, to avoid
+read out of the array bounds.
+
+Closes https://gitlab.gnome.org/GNOME/libsoup/-/issues/447
+
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/07b94e27afafebf31ef3cd868866a1e383750086]
+CVE: CVE-2025-4969
+Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
+---
+ libsoup/soup-multipart.c |  2 +-
+ tests/multipart-test.c   | 22 ++++++++++++++++++++++
+ 2 files changed, 23 insertions(+), 1 deletion(-)
+
+diff --git a/libsoup/soup-multipart.c b/libsoup/soup-multipart.c
+index 102ce37..e1c442e 100644
+--- a/libsoup/soup-multipart.c
++++ b/libsoup/soup-multipart.c
+@@ -104,7 +104,7 @@ find_boundary (const char *start, const char *end,
+                        continue;
+ 
+                /* Check that it's at start of line */
+-               if (!(b == start || (b[-1] == '\n' && b[-2] == '\r')))
++               if (!(b == start || (b - start >= 2 && b[-1] == '\n' && b[-2] == '\r')))
+                        continue;
+ 
+                /* Check for "--" or "\r\n" after boundary */
+diff --git a/tests/multipart-test.c b/tests/multipart-test.c
+index ab5f41c..84852e2 100644
+--- a/tests/multipart-test.c
++++ b/tests/multipart-test.c
+@@ -527,6 +527,27 @@ test_multipart_bounds_bad (void)
+        g_bytes_unref (bytes);
+ }
+ 
++static void
++test_multipart_bounds_bad_2 (void)
++{
++       SoupMultipart *multipart;
++       SoupMessageHeaders *headers;
++       GBytes *bytes;
++       const char *raw_data = "\n--123\r\nline\r\n--123--\r";
++
++       headers = soup_message_headers_new (SOUP_MESSAGE_HEADERS_MULTIPART);
++       soup_message_headers_append (headers, "Content-Type", "multipart/mixed; boundary=\"123\"");
++
++       bytes = g_bytes_new (raw_data, strlen (raw_data));
++
++       multipart = soup_multipart_new_from_message (headers, bytes);
++       g_assert_nonnull (multipart);
++
++       soup_multipart_free (multipart);
++       soup_message_headers_unref (headers);
++       g_bytes_unref (bytes);
++}
++
+ int
+ main (int argc, char **argv)
+ {
+@@ -556,6 +577,7 @@ main (int argc, char **argv)
+        g_test_add_data_func ("/multipart/async-small-reads", GINT_TO_POINTER (ASYNC_MULTIPART_SMALL_READS), test_multipart);
+        g_test_add_func ("/multipart/bounds-good", test_multipart_bounds_good);
+        g_test_add_func ("/multipart/bounds-bad", test_multipart_bounds_bad);
++       g_test_add_func ("/multipart/bounds-bad-2", test_multipart_bounds_bad_2);
+ 
+        ret = g_test_run ();
+ 
+-- 
+2.49.0
+
diff --git a/meta/recipes-support/libsoup/libsoup_3.4.4.bb b/meta/recipes-support/libsoup/libsoup_3.4.4.bb
index 63e9afa6fc..37319f007f 100644
--- a/meta/recipes-support/libsoup/libsoup_3.4.4.bb
+++ b/meta/recipes-support/libsoup/libsoup_3.4.4.bb
@@ -29,7 +29,22 @@ SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \
            file://CVE-2025-32906-1.patch \
            file://CVE-2025-32906-2.patch \
            file://CVE-2025-46420.patch \
-          "
+           file://CVE-2025-32914.patch \
+           file://CVE-2025-4476.patch \
+           file://CVE-2025-4969.patch \
+           file://CVE-2025-32908-1.patch \
+           file://CVE-2025-32908-2.patch \
+           file://CVE-2025-32907-1.patch \
+           file://CVE-2025-32907-2.patch \
+           file://CVE-2025-32053.patch \
+           file://CVE-2025-32052.patch \
+           file://CVE-2025-32051-1.patch \
+           file://CVE-2025-32051-2.patch \
+           file://CVE-2025-32050.patch \
+           file://CVE-2025-46421.patch \
+           file://CVE-2025-4948.patch \
+           file://CVE-2025-2784.patch \
+"
 SRC_URI[sha256sum] = "291c67725f36ed90ea43efff25064b69c5a2d1981488477c05c481a3b4b0c5aa"
 
 PROVIDES = "libsoup-3.0"
diff --git a/scripts/install-buildtools b/scripts/install-buildtools
index e4d472023d..b699b34270 100755
--- a/scripts/install-buildtools
+++ b/scripts/install-buildtools
@@ -57,8 +57,8 @@ logger = scriptutils.logger_create(PROGNAME, stream=sys.stdout)
 
 DEFAULT_INSTALL_DIR = os.path.join(os.path.split(scripts_path)[0],'buildtools')
 DEFAULT_BASE_URL = 'https://downloads.yoctoproject.org/releases/yocto'
-DEFAULT_RELEASE = 'yocto-5.0.7'
-DEFAULT_INSTALLER_VERSION = '5.0.7'
+DEFAULT_RELEASE = 'yocto-5.0.10'
+DEFAULT_INSTALLER_VERSION = '5.0.10'
 DEFAULT_BUILDDATE = '202110XX'
 
 # Python version sanity check