bfd_section_from_shdr: Support SHT_RELR sections
authorFangrui Song <maskray@google.com>
Wed, 8 Dec 2021 02:24:14 +0000 (18:24 -0800)
committerAlan Modra <amodra@gmail.com>
Wed, 8 Dec 2021 10:06:42 +0000 (20:36 +1030)
If a.so contains an SHT_RELR section, objcopy a.so will fail with:

    a.so: unknown type [0x13] section `.relr.dyn'

This change allows objcopy to work.

bfd/
    * elf.c (bfd_section_from_shdr): Support SHT_RELR.

bfd/elf.c

index cfdb94922f320a69db6262c9eb9b026ba82cff9a..5ffe36900e61a23c5e2d1c7aeaa9644023d92e93 100644 (file)
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -2359,16 +2359,22 @@ bfd_section_from_shdr (bfd *abfd, unsigned int shindex)
 
     case SHT_REL:
     case SHT_RELA:
+    case SHT_RELR:
       /* *These* do a lot of work -- but build no sections!  */
       {
        asection *target_sect;
        Elf_Internal_Shdr *hdr2, **p_hdr;
        unsigned int num_sec = elf_numsections (abfd);
        struct bfd_elf_section_data *esdt;
+       bfd_size_type size;
 
-       if (hdr->sh_entsize
-           != (bfd_size_type) (hdr->sh_type == SHT_REL
-                               ? bed->s->sizeof_rel : bed->s->sizeof_rela))
+       if (hdr->sh_type == SHT_REL)
+         size = bed->s->sizeof_rel;
+       else if (hdr->sh_type == SHT_RELA)
+         size = bed->s->sizeof_rela;
+       else
+         size = bed->s->arch_size / 8;
+       if (hdr->sh_entsize != size)
          goto fail;
 
        /* Check for a bogus link to avoid crashing.  */