* peXXigen.c (_bfd_XXi_final_link_postscript): Use correct size

	for windows 64-bit TLS table size.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 39524f6cebff7042d039e08a9e8daafb0ab6a885..c86371552b8c4fc2e5a55c13c33764bd2f752978 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-21  Pierre Muller  <muller@ics.u-strasbg.fr>
+
+       * peXXigen.c (_bfd_XXi_final_link_postscript): Use correct size
+       for windows 64-bit TLS table size.
+
 2010-12-16  DJ Delorie  <dj@redhat.com>
 
        * reloc.c (BFD_RELOC_RX_ABS16_REV): Add.

diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c
index a5b7f68b902d91229dcd820fbc09993955f29a97..825229aab930a158ca0d20c7d8d88955ebdb2ecd 100644 (file)
--- a/bfd/peXXigen.c
+++ b/bfd/peXXigen.c
@@ -2437,8 +2437,15 @@ _bfd_XXi_final_link_postscript (bfd * abfd, struct coff_final_link_info *pfinfo)
             abfd);
          result = FALSE;
        }
-
+     /* According to PECOFF sepcifications by Microsoft version 8.2
+       the TLS data directory consists of 4 pointers, followed
+       by two 4-byte integer. This implies that the total size
+       is different for 32-bit and 64-bit executables.  */ 
+#if !defined(COFF_WITH_pep) && !defined(COFF_WITH_pex64)
       pe_data (abfd)->pe_opthdr.DataDirectory[PE_TLS_TABLE].Size = 0x18;
+#else
+      pe_data (abfd)->pe_opthdr.DataDirectory[PE_TLS_TABLE].Size = 0x28;
+#endif
     }
 
 /* If there is a .pdata section and we have linked pdata finally, we