Fix file-alignment for objcopy for pe-coff

2014-08-22  Kai Tietz  <ktietz@redhat.com>

	PR binutils/11822
	* coffcode.h (coff_compute_section_file_positions): Keep
	FileAlignment valid as set.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 6c98ed34d5737e2fd05220520e51251eb4d95fe2..04b44653f29c61785e0506f9aa334f07b951f227 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2014-08-22  Kai Tietz  <ktietz@redhat.com>
+
+       PR binutils/11822
+       * coffcode.h (coff_compute_section_file_positions): Keep
+       FileAlignment valid as set.
+
 2014-08-22  Alan Modra  <amodra@gmail.com>
 
        * elf-eh-frame.c (struct cie): Delete "output_sec" field.

diff --git a/bfd/coffcode.h b/bfd/coffcode.h
index 89ca23466126878fb3388628bf04320d2cc2b1c3..6678b88bbd58781c70f87dde955faa821031dd66 100644 (file)
--- a/bfd/coffcode.h
+++ b/bfd/coffcode.h
@@ -3134,7 +3134,8 @@ coff_compute_section_file_positions (bfd * abfd)
 #ifdef COFF_IMAGE_WITH_PE
   int page_size;
 
-  if (coff_data (abfd)->link_info)
+  if (coff_data (abfd)->link_info
+      || (pe_data (abfd) && pe_data (abfd)->pe_opthdr.FileAlignment))
     {
       page_size = pe_data (abfd)->pe_opthdr.FileAlignment;