* 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.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 7b8e9461e90ef3144a106637688d537c33c9cdf0..aed46393cdd6b6b7f5733529263ebd8196b6c2e7 100644 (file)
--- 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 7fb51a7bb4e12d204f16cdaf97ad16691f3af6c0..8a9e579802065253ca11e8cc6e10cc0b9b90295a 100644 (file)
--- 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;
     }