aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@airs.com>1996-06-24 22:00:22 +0000
committerIan Lance Taylor <ian@airs.com>1996-06-24 22:00:22 +0000
commit2e0567eb0d6e8c2c21eb6b68fea20648a878ccd4 (patch)
treebf7b3c3672d01b922f056e6ba92194444a338388
parent67c8c9014191526995d1e815a089298b1203e84f (diff)
downloadgdb-2e0567eb0d6e8c2c21eb6b68fea20648a878ccd4.zip
gdb-2e0567eb0d6e8c2c21eb6b68fea20648a878ccd4.tar.gz
gdb-2e0567eb0d6e8c2c21eb6b68fea20648a878ccd4.tar.bz2
* elf.c (elf_fake_sections): Don't set sh_addr of a non SEC_ALLOC
section to 0 if user_set_vma is set. * elflink.h (elf_bfd_final_link): Likewise.
-rw-r--r--bfd/ChangeLog15
-rw-r--r--bfd/elflink.h3
2 files changed, 17 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 7b8e946..aed4639 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,18 @@
+Mon Jun 24 17:58:12 1996 Jouke Numan <jnuman@bazis.nl>
+
+ * elf.c (elf_fake_sections): Don't set sh_addr of a non SEC_ALLOC
+ section to 0 if user_set_vma is set.
+ * elflink.h (elf_bfd_final_link): Likewise.
+
+Sun Jun 23 20:42:51 1996 Doug Evans <dje@canuck.cygnus.com>
+
+ Partially undo patch of Jun 20.
+ * coffcode.h (coff_set_alignment_hook): Use COFF_IMAGE_WITH_PE.
+ (coff_compute_section_file_positions): Likewise.
+ (coff_write_object_contents): Likewise. Re-add deleted code, but
+ use #ifdef COFF_WITH_PE, not COFF_OBJ_WITH_PE.
+ * peicode.h (pe_bfd_copy_private_bfd_data): Re-add #ifdef.
+
Fri Jun 21 17:38:15 1996 Joel Sherrill <joel@merlin.gcs.redstone.army.mil>
* config.bfd: Add support for *-*-rtems* configurations.
diff --git a/bfd/elflink.h b/bfd/elflink.h
index 7fb51a7..8a9e579 100644
--- a/bfd/elflink.h
+++ b/bfd/elflink.h
@@ -1896,7 +1896,8 @@ elf_bfd_final_link (abfd, info)
zero. This is done in elf_fake_sections as well, but forcing
the VMA to 0 here will ensure that relocs against these
sections are handled correctly. */
- if ((o->flags & SEC_ALLOC) == 0)
+ if ((o->flags & SEC_ALLOC) == 0
+ && ! o->user_set_vma)
o->vma = 0;
}