aarch64: constify BTI and GCS report functions

This patch consitifies the arguments of the functions used to report BTI
and GCS errors, and also renames the argument "ebfd" to "abfd" as this
naming is confusing and inconsistent with others places.

diff --git a/bfd/elfxx-aarch64.c b/bfd/elfxx-aarch64.c
index 551f74e337327c52c53a38da1a3218d1b6226d28..cb4566386ce99819ada498ee542dff19c49a3372 100644 (file)
--- a/bfd/elfxx-aarch64.c
+++ b/bfd/elfxx-aarch64.c
@@ -1098,7 +1098,8 @@ _bfd_aarch64_elf_link_fixup_gnu_properties
 
 /* Check AArch64 BTI report.  */
 void
-_bfd_aarch64_elf_check_bti_report (struct bfd_link_info *info, bfd *ebfd)
+_bfd_aarch64_elf_check_bti_report (const struct bfd_link_info *info,
+                                  const bfd *abfd)
 {
   struct elf_aarch64_obj_tdata *tdata = elf_aarch64_tdata (info->output_bfd);
 
@@ -1117,14 +1118,16 @@ _bfd_aarch64_elf_check_bti_report (struct bfd_link_info *info, bfd *ebfd)
     : _("%X%pB: error: BTI is required by -z force-bti, but this input object "
        "file lacks the necessary property note.\n");
 
-  info->callbacks->einfo (msg, ebfd);
+  info->callbacks->einfo (msg, abfd);
 }
 
+/* Check AArch64 GCS report.  */
 void
-_bfd_aarch64_elf_check_gcs_report (struct bfd_link_info *info, bfd *ebfd)
+_bfd_aarch64_elf_check_gcs_report (const struct bfd_link_info *info,
+                                  const bfd *abfd)
 {
   struct elf_aarch64_obj_tdata *tdata = elf_aarch64_tdata (info->output_bfd);
-  bool dynamic_obj = (ebfd->flags & DYNAMIC) != 0;
+  bool dynamic_obj = (abfd->flags & DYNAMIC) != 0;
 
   if (dynamic_obj)
     {
@@ -1161,5 +1164,5 @@ _bfd_aarch64_elf_check_gcs_report (struct bfd_link_info *info, bfd *ebfd)
       : _("%X%pB: error: GCS is required by -z gcs, but this input object file "
          "lacks the necessary property note.\n");
 
-  info->callbacks->einfo (msg, ebfd);
+  info->callbacks->einfo (msg, abfd);
 }

diff --git a/bfd/elfxx-aarch64.h b/bfd/elfxx-aarch64.h
index 09ed86f5e183e10e4531fcde15e4d26d046bbcd8..75255a726e293198f573d6d87f2c9ea099e12cfe 100644 (file)
--- a/bfd/elfxx-aarch64.h
+++ b/bfd/elfxx-aarch64.h
@@ -251,11 +251,11 @@ _bfd_aarch64_elf_merge_gnu_properties (struct bfd_link_info *, bfd *,
                                       uint32_t) ATTRIBUTE_HIDDEN;
 
 extern void
-_bfd_aarch64_elf_check_bti_report (struct bfd_link_info *, bfd *)
+_bfd_aarch64_elf_check_bti_report (const struct bfd_link_info *, const bfd *)
   ATTRIBUTE_HIDDEN;
 
 extern void
-_bfd_aarch64_elf_check_gcs_report (struct bfd_link_info *, bfd *)
+_bfd_aarch64_elf_check_gcs_report (const struct bfd_link_info *, const bfd *)
   ATTRIBUTE_HIDDEN;
 
 extern void