From bc2b29908f99c56de320c765c932776cef1aa7c6 Mon Sep 17 00:00:00 2001 From: Pierre Muller Date: Tue, 21 Dec 2010 08:41:16 +0000 Subject: [PATCH] * peXXigen.c (_bfd_XXi_final_link_postscript): Use correct size for windows 64-bit TLS table size. --- bfd/ChangeLog | 5 +++++ bfd/peXXigen.c | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 39524f6ceb..c86371552b 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2010-12-21 Pierre Muller + + * peXXigen.c (_bfd_XXi_final_link_postscript): Use correct size + for windows 64-bit TLS table size. + 2010-12-16 DJ Delorie * reloc.c (BFD_RELOC_RX_ABS16_REV): Add. diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c index a5b7f68b90..825229aab9 100644 --- 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