fix build failures due to incorrect format specifier for uint64_t

diff --git a/bfd/elf-attrs.c b/bfd/elf-attrs.c
index 4689bedb38ecba6a1b6aa3b86b05b660642c3123..cfb43bb3cb83bd07b1a574206d306dad47ee7268 100644 (file)
--- a/bfd/elf-attrs.c
+++ b/bfd/elf-attrs.c
@@ -2743,7 +2743,7 @@ oav2_parse_subsection (bfd *abfd,
       goto error;
     }
 
-  const uint32_t subsection_len = bfd_get_32 (abfd, cursor);
+  const unsigned int subsection_len = bfd_get_32 (abfd, cursor);
   const bfd_byte *const end = cursor + subsection_len;
   total_read += F_SUBSECTION_LEN;
   cursor += F_SUBSECTION_LEN;

diff --git a/bfd/elfxx-aarch64.c b/bfd/elfxx-aarch64.c
index 8352545b7b96caa7e7f60ce70a4ebc0981c7d065..8458579cd8137be96b67f22db9347c063ee91943 100644 (file)
--- a/bfd/elfxx-aarch64.c
+++ b/bfd/elfxx-aarch64.c
@@ -1100,8 +1100,8 @@ _bfd_aarch64_oav2_attr_merge (const struct bfd_link_info *info,
       if (attr_info == NULL)
        {
          info->callbacks->einfo
-           (_("%pB: warning: cannot merge unknown tag 'Tag_unknown_%u' "
-              "(=0x%x) in subsection '%s'.\n"),
+           (_("%pB: warning: cannot merge unknown tag 'Tag_unknown_%" PRIu64 "'"
+              " (=0x%" PRIx32 ") in subsection '%s'\n"),
             abfd, rhs->tag, rhs->val.uint, subsec->name);
          res.reason = OAv2_MERGE_UNSUPPORTED;
          return res;

diff --git a/gas/config/obj-elf-attr.c b/gas/config/obj-elf-attr.c
index 1b91c11158cb0e6c07e2a4fdfe1328e0b1e5ab50..7a4493d673ceaa0867e88d86fea78838da52a34b 100644 (file)
--- a/gas/config/obj-elf-attr.c
+++ b/gas/config/obj-elf-attr.c
@@ -1004,17 +1004,19 @@ vendor_subsection_parse_args (unsigned int nargs, ...)
          if (high_ttype == SUBSECTION_OPTION_1
              && ! is_valid_comprehension (arg_out->val.u64))
            {
-             as_bad (
-               _("invalid value '%lu', expected values for <comprehension> "
-                 "are 0 (=`required') or 1 (=`optional')"), arg_out->val.u64);
+             as_bad
+               (_("invalid value '%" PRIu64 "', expected values for "
+                  "<comprehension> are 0 (=`required') or 1 (=`optional')"),
+                arg_out->val.u64);
              goto bad;
            }
          else if (high_ttype == SUBSECTION_OPTION_2
                && ! is_valid_encoding (arg_out->val.u64))
            {
-             as_bad (
-               _("invalid value '%lu', expected values for <encoding> are 0"
-                 " (=`ULEB128') or 1 (=`NTBS')"), arg_out->val.u64);
+             as_bad
+               (_("invalid value '%" PRIu64 "', expected values for <encoding>"
+                  " are 0 (=`ULEB128') or 1 (=`NTBS')"),
+                arg_out->val.u64);
              goto bad;
            }
        }
@@ -1069,7 +1071,8 @@ obj_attr_v2_record (obj_attr_tag_t key, arg_t *arg_val)
           && recorded_attr->val.uint != obj_attr->val.uint)
          || (arg_val->vtype == VALUE_STRING
              && strcmp (recorded_attr->val.string, obj_attr->val.string) != 0))
-       as_bad (_("attribute '%lu' cannot be redefined"), recorded_attr->tag);
+       as_bad (_("attribute '%" PRIu64 "' cannot be redefined"),
+               recorded_attr->tag);
       skip_recording = true;
     }
 

diff --git a/ld/testsuite/ld-aarch64/build-attributes/ba-aarch64-1-unknown-tag.d b/ld/testsuite/ld-aarch64/build-attributes/ba-aarch64-1-unknown-tag.d
index 8d3528730027ea4d26de2c2848f2f34363bac2d7..d09dba7f34525723a88273f1f33f9b67cd04f35d 100644 (file)
--- a/ld/testsuite/ld-aarch64/build-attributes/ba-aarch64-1-unknown-tag.d
+++ b/ld/testsuite/ld-aarch64/build-attributes/ba-aarch64-1-unknown-tag.d
@@ -5,7 +5,7 @@
 # source: ba-aarch64-1-bti-2.s
 # as: -defsym __property_bti__=1
 # ld: -shared -T bti-plt.ld
-#warning: \A[^\n]*ba-aarch64-1-unknown-tag\.o: warning: cannot merge unknown tag 'Tag_unknown_4' \(=0x1\) in subsection 'aeabi_feature_and_bits'\.
+#warning: \A[^\n]*ba-aarch64-1-unknown-tag\.o: warning: cannot merge unknown tag 'Tag_unknown_4' \(=0x1\) in subsection 'aeabi_feature_and_bits'
 # readelf: --arch-specific
 
 Subsections: