bfd: sframe: use better wording for error messages

Fix PR ld/33849.

Change the messages to display the owner BFD, together with the section
name.  E.g., when mixing SFrame V2 and V3, the linker will now emit
something like:

 error in test.o (.sframe); unexpected SFrame format version 2

Reviewed-by: Jens Remus <jremus@linux.ibm.com>
bfd/
	PR ld/33849
	* elf-sframe.c (_bfd_elf_merge_section_sframe): Improve error
	messages.

diff --git a/bfd/elf-sframe.c b/bfd/elf-sframe.c
index 241186f8f2de9a28fca4aa6e1b04920b58e92a11..e84b757ca371e9368beec3e538ea067b75f61f72 100644 (file)
--- a/bfd/elf-sframe.c
+++ b/bfd/elf-sframe.c
@@ -467,8 +467,8 @@ _bfd_elf_merge_section_sframe (bfd *abfd,
       != sframe_encoder_get_abi_arch (sfe_ctx))
     {
       _bfd_error_handler
-       (_("input SFrame sections with different abi prevent .sframe"
-         " generation"));
+       (_("error in %pB (%pA); unexpected ABI in SFrame section"),
+        sec->owner, sec);
       return false;
     }
 
@@ -478,8 +478,8 @@ _bfd_elf_merge_section_sframe (bfd *abfd,
   if (dctx_version != SFRAME_VERSION_3 || dctx_version != ectx_version)
     {
       _bfd_error_handler
-       (_("input SFrame sections with different format versions prevent"
-         " .sframe generation"));
+       (_("error in %pB (%pA); unexpected SFrame format version %" PRIu8),
+        sec->owner, sec, dctx_version);
       return false;
     }
 
@@ -491,8 +491,8 @@ _bfd_elf_merge_section_sframe (bfd *abfd,
       != SFRAME_V2_GNU_AS_LD_ENCODING_FLAGS)
     {
       _bfd_error_handler
-       (_("SFrame sections with unexpected data encoding prevent"
-         " .sframe generation"));
+       (_("error in %pB (%pA); unexpected SFrame data encoding"),
+        sec->owner, sec);
       return false;
     }