aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/elf.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 7257acd..a95fd4f 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-11 Mike Bland <mbland@google.com>
+
+ * elf.c (_bfd_elf_init_private_section_data): Don't change
+ section type if already set.
+
2006-05-10 Nick Clifton <nickc@redhat.com>
PR ld/2607
diff --git a/bfd/elf.c b/bfd/elf.c
index 120c4b0..fbd8432 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -5911,7 +5911,8 @@ _bfd_elf_init_private_section_data (bfd *ibfd,
output BFD section flags has been set to something different.
elf_fake_sections will set ELF section type based on BFD
section flags. */
- if (osec->flags == isec->flags || !osec->flags)
+ if (osec->flags == isec->flags
+ || (osec->flags == 0 && elf_section_type (osec) == SHT_NULL))
elf_section_type (osec) = elf_section_type (isec);
/* Set things up for objcopy and relocatable link. The output