bfd: add support for copying Object Attributes v2

The OAv2 section's content of the source file is copied to the
destination object file without any alteration of the attributes
or subsections (no deduplication nor sorting of subsections or
object attributes is performed).
For now, only ELF format is supported.

diff --git a/bfd/elf-attrs.c b/bfd/elf-attrs.c
index 1e21e1bf5a4fda58527adea6a70168581e6bed24..5b448e9a7de268b2dcd9a17eb55d2f47d9f8dee4 100644 (file)
--- a/bfd/elf-attrs.c
+++ b/bfd/elf-attrs.c
@@ -757,9 +757,9 @@ bfd_elf_add_obj_attr_int_string (bfd *abfd,
   return elf_add_obj_attr_int_string (abfd, vendor, tag, i, s, NULL);
 }
 
-/* Copy the object attributes from IBFD to OBFD.  */
-void
-_bfd_elf_copy_obj_attributes (bfd *ibfd, bfd *obfd)
+/* Copy object attributes v1 from IBFD to OBFD.  */
+static void
+oav1_copy_attributes (bfd *ibfd, bfd *obfd)
 {
   obj_attribute *in_attr;
   obj_attribute *out_attr;
@@ -767,16 +767,6 @@ _bfd_elf_copy_obj_attributes (bfd *ibfd, bfd *obfd)
   int i;
   obj_attr_vendor_t vendor;
 
-  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
-      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return;
-
-  obj_attr_version_t version = elf_obj_attr_version (ibfd);
-  elf_obj_attr_version (obfd) = version;
-
-  if (version == OBJ_ATTR_VERSION_NONE)
-    return;
-
   for (vendor = OBJ_ATTR_FIRST; vendor <= OBJ_ATTR_LAST; vendor++)
     {
       in_attr
@@ -826,6 +816,54 @@ _bfd_elf_copy_obj_attributes (bfd *ibfd, bfd *obfd)
     }
 }
 
+static obj_attr_subsection_v2_t *
+oav2_obj_attr_subsection_v2_copy (const obj_attr_subsection_v2_t *);
+
+/* Copy object attributes v2 from IBFD to OBFD.  */
+static void
+oav2_copy_attributes (bfd *ibfd, bfd *obfd)
+{
+  const obj_attr_subsection_list_t *in_attr_subsecs
+    = &elf_obj_attr_subsections (ibfd);
+  obj_attr_subsection_list_t *out_attr_subsecs
+    = &elf_obj_attr_subsections (obfd);
+
+  for (const obj_attr_subsection_v2_t *isubsec = in_attr_subsecs->first;
+       isubsec != NULL;
+       isubsec = isubsec->next)
+    {
+      obj_attr_subsection_v2_t *osubsec
+       = oav2_obj_attr_subsection_v2_copy (isubsec);
+      LINKED_LIST_APPEND (obj_attr_subsection_v2_t) (out_attr_subsecs, osubsec);
+    }
+}
+
+/* Copy the object attributes from IBFD to OBFD.  */
+void
+_bfd_elf_copy_obj_attributes (bfd *ibfd, bfd *obfd)
+{
+  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return;
+
+  obj_attr_version_t version = elf_obj_attr_version (ibfd);
+  elf_obj_attr_version (obfd) = version;
+
+  switch (version)
+    {
+    case OBJ_ATTR_VERSION_NONE:
+      break;
+    case OBJ_ATTR_V1:
+      oav1_copy_attributes (ibfd, obfd);
+      break;
+    case OBJ_ATTR_V2:
+      oav2_copy_attributes (ibfd, obfd);
+      break;
+    default:
+      abort ();
+    }
+}
+
 /* Determine whether a GNU object attribute tag takes an integer, a
    string or both.  */
 static int
@@ -1593,8 +1631,8 @@ _bfd_elf_obj_attr_subsection_v2_free (obj_attr_subsection_v2_t *subsec)
 /* Deep copy an object attribute subsection OTHER, and return a pointer to the
    copy.  */
 
-obj_attr_subsection_v2_t *
-_bfd_elf_obj_attr_subsection_v2_copy (const obj_attr_subsection_v2_t *other)
+static obj_attr_subsection_v2_t *
+oav2_obj_attr_subsection_v2_copy (const obj_attr_subsection_v2_t *other)
 {
   obj_attr_subsection_v2_t *new_subsec
     = bfd_elf_obj_attr_subsection_v2_init (xstrdup (other->name), other->scope,

diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h
index e177984dd31308cef093c3a8e3b97b7936fe87cb..21e7b656ee772bd13041f2ec3cc1ab83dc4266a4 100644 (file)
--- a/bfd/elf-bfd.h
+++ b/bfd/elf-bfd.h
@@ -3210,8 +3210,6 @@ extern obj_attr_subsection_v2_t *bfd_elf_obj_attr_subsection_v2_init
   (const char *, obj_attr_subsection_scope_v2_t, bool, obj_attr_encoding_v2_t);
 extern void _bfd_elf_obj_attr_subsection_v2_free (obj_attr_subsection_v2_t *)
   ATTRIBUTE_HIDDEN;
-extern obj_attr_subsection_v2_t *_bfd_elf_obj_attr_subsection_v2_copy
-  (const obj_attr_subsection_v2_t *) ATTRIBUTE_HIDDEN;
 extern int _bfd_elf_obj_attr_subsection_v2_cmp
   (const obj_attr_subsection_v2_t *, const obj_attr_subsection_v2_t *)
   ATTRIBUTE_HIDDEN;