From: Nick Clifton <nickc@redhat.com>
Date: Sat, 25 Oct 2008 09:54:01 +0000 (+0000)
Subject:         PR 6945
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fb6cee9639dd5333e46da33c437af90c55302ba9;p=binutils-gdb.git

    PR 6945
        * ldlang.c (lang_size_sections_1): Do not update the VMAs of
        output sections when performing a relocatable link on COFF
        objects.
---

diff --git a/ld/ChangeLog b/ld/ChangeLog
index ab23982c8b7..3fec7a592e8 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-25  Nick Clifton  <nickc@redhat.com>
+
+	PR 6945
+	* ldlang.c (lang_size_sections_1): Do not update the VMAs of
+	output sections when performing a relocatable link on COFF
+	objects.
+
 2008-10-22  Nick Clifton  <nickc@redhat.com>
 
 	* emultempl/armelf.em (arm_elf_after_open): Move check for using a
diff --git a/ld/ldlang.c b/ld/ldlang.c
index 322ce5bc5d8..9fd26a99e29 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -4626,7 +4626,12 @@ lang_size_sections_1
 			     os->name, (unsigned long) (newdot - savedot));
 		  }
 
-		bfd_set_section_vma (0, os->bfd_section, newdot);
+		/* PR 6945: Do not update the vma's of output sections
+		   when performing a relocatable link on COFF objects.  */
+		if (! link_info.relocatable
+		    || (bfd_get_flavour (link_info.output_bfd)
+			!= bfd_target_coff_flavour))
+		  bfd_set_section_vma (0, os->bfd_section, newdot);
 
 		os->bfd_section->output_offset = 0;
 	      }