PR15350, Fix compressed debug sections for PE targets

	PR 15350
	* bfd.c (bfd_update_compression_header): Write zlib header for
	formats other than ELF too.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 838d9ee0b4c98e301d14e4cb990f67e78dec0b80..af2ddfa5e0cfe181c03c089b230a962e69f8e259 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2019-12-29  Hannes Domani  <ssbssa@yahoo.de>
+           Alan Modra  <amodra@gmail.com>
+
+       PR 15350
+       * bfd.c (bfd_update_compression_header): Write zlib header for
+       formats other than ELF too.
+
 2019-12-26  Alan Modra  <amodra@gmail.com>
 
        * som.c (setup_sections): Don't overflow space_strings_size.  Use

diff --git a/bfd/bfd.c b/bfd/bfd.c
index a3c522cbf8eee615477cde2902a1eebbdadc80f3..b6821fa20f607f5dd815629627d266bab28e10eb 100644 (file)
--- a/bfd/bfd.c
+++ b/bfd/bfd.c
@@ -2540,59 +2540,57 @@ void
 bfd_update_compression_header (bfd *abfd, bfd_byte *contents,
                               asection *sec)
 {
-  if ((abfd->flags & BFD_COMPRESS) != 0)
+  if ((abfd->flags & BFD_COMPRESS) == 0)
+    abort ();
+
+  switch (bfd_get_flavour (abfd))
     {
-      if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
+    case bfd_target_elf_flavour:
+      if ((abfd->flags & BFD_COMPRESS_GABI) != 0)
        {
-         if ((abfd->flags & BFD_COMPRESS_GABI) != 0)
-           {
-             const struct elf_backend_data *bed
-               = get_elf_backend_data (abfd);
+         const struct elf_backend_data *bed = get_elf_backend_data (abfd);
 
-             /* Set the SHF_COMPRESSED bit.  */
-             elf_section_flags (sec) |= SHF_COMPRESSED;
+         /* Set the SHF_COMPRESSED bit.  */
+         elf_section_flags (sec) |= SHF_COMPRESSED;
 
-             if (bed->s->elfclass == ELFCLASS32)
-               {
-                 Elf32_External_Chdr *echdr
-                   = (Elf32_External_Chdr *) contents;
-                 bfd_put_32 (abfd, ELFCOMPRESS_ZLIB, &echdr->ch_type);
-                 bfd_put_32 (abfd, sec->size, &echdr->ch_size);
-                 bfd_put_32 (abfd, 1 << sec->alignment_power,
-                             &echdr->ch_addralign);
-                 /* bfd_log2 (alignof (Elf32_Chdr)) */
-                 bfd_set_section_alignment (sec, 2);
-               }
-             else
-               {
-                 Elf64_External_Chdr *echdr
-                   = (Elf64_External_Chdr *) contents;
-                 bfd_put_32 (abfd, ELFCOMPRESS_ZLIB, &echdr->ch_type);
-                 bfd_put_32 (abfd, 0, &echdr->ch_reserved);
-                 bfd_put_64 (abfd, sec->size, &echdr->ch_size);
-                 bfd_put_64 (abfd, 1 << sec->alignment_power,
-                             &echdr->ch_addralign);
-                 /* bfd_log2 (alignof (Elf64_Chdr)) */
-                 bfd_set_section_alignment (sec, 3);
-               }
+         if (bed->s->elfclass == ELFCLASS32)
+           {
+             Elf32_External_Chdr *echdr = (Elf32_External_Chdr *) contents;
+             bfd_put_32 (abfd, ELFCOMPRESS_ZLIB, &echdr->ch_type);
+             bfd_put_32 (abfd, sec->size, &echdr->ch_size);
+             bfd_put_32 (abfd, 1 << sec->alignment_power,
+                         &echdr->ch_addralign);
+             /* bfd_log2 (alignof (Elf32_Chdr)) */
+             bfd_set_section_alignment (sec, 2);
            }
          else
            {
-             /* Clear the SHF_COMPRESSED bit.  */
-             elf_section_flags (sec) &= ~SHF_COMPRESSED;
-
-             /* Write the zlib header.  It should be "ZLIB" followed by
-                the uncompressed section size, 8 bytes in big-endian
-                order.  */
-             memcpy (contents, "ZLIB", 4);
-             bfd_putb64 (sec->size, contents + 4);
-             /* No way to keep the original alignment, just use 1 always. */
-             bfd_set_section_alignment (sec, 0);
+             Elf64_External_Chdr *echdr = (Elf64_External_Chdr *) contents;
+             bfd_put_32 (abfd, ELFCOMPRESS_ZLIB, &echdr->ch_type);
+             bfd_put_32 (abfd, 0, &echdr->ch_reserved);
+             bfd_put_64 (abfd, sec->size, &echdr->ch_size);
+             bfd_put_64 (abfd, 1 << sec->alignment_power,
+                         &echdr->ch_addralign);
+             /* bfd_log2 (alignof (Elf64_Chdr)) */
+             bfd_set_section_alignment (sec, 3);
            }
+         break;
        }
+
+      /* Clear the SHF_COMPRESSED bit.  */
+      elf_section_flags (sec) &= ~SHF_COMPRESSED;
+      /* Fall through.  */
+
+    default:
+      /* Write the zlib header.  It should be "ZLIB" followed by
+        the uncompressed section size, 8 bytes in big-endian
+        order.  */
+      memcpy (contents, "ZLIB", 4);
+      bfd_putb64 (sec->size, contents + 4);
+      /* No way to keep the original alignment, just use 1 always. */
+      bfd_set_section_alignment (sec, 0);
+      break;
     }
-  else
-    abort ();
 }
 
 /*