PR 6584

        * binary.cc (Binary_to_elf::sized_convert): Fix .data
	alignment.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 74eb045f570c588d614a9e866c41cb6fd040ff52..f534b6dac5402c82e91ed81df2d1afda04946355 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-05  Kris Van Hees  <kris.van.hees@oracle.com>
+
+       PR 6584
+        * binary.cc (Binary_to_elf::sized_convert): Fix .data
+       alignment.
+
 2008-05-30  Cary Coutant  <ccoutant@google.com>
 
        * archive.cc (Archive::include_all_members) Correct to step

diff --git a/gold/binary.cc b/gold/binary.cc
index bee5157f9b07f9d40122aa03beb5847d9516ced8..7eb7223e53654ac51b665426ff5bd3d214a94ac0 100644 (file)
--- a/gold/binary.cc
+++ b/gold/binary.cc
@@ -198,16 +198,16 @@ Binary_to_elf::sized_convert(const Task* task)
   this->write_section_header<size, big_endian>("", &shstrtab, elfcpp::SHT_NULL,
                                               0, 0, 0, 0, 0,
                                               0, 0, &pout);
-  // Having the section be named ".data" and having it be writable is
-  // because th GNU linker does it that way, and existing linker
-  // script expect it.
+  // Having the section be named ".data", having it be writable, and
+  // giving it an alignment of 1 is because the GNU linker does it
+  // that way, and existing linker script expect it.
   this->write_section_header<size, big_endian>(".data", &shstrtab,
                                               elfcpp::SHT_PROGBITS,
                                               (elfcpp::SHF_ALLOC
                                                | elfcpp::SHF_WRITE),
                                               data_offset,
                                               filesize, 0, 0,
-                                              align, 0, &pout);
+                                              1, 0, &pout);
   this->write_section_header<size, big_endian>(".symtab", &shstrtab,
                                               elfcpp::SHT_SYMTAB,
                                               0, symtab_offset, 4 * sym_size,