Fix linker script alignment of TLS sections

binutils-2.20/ld/scripttempl/naclelf.sc

Index: binutils-2.20/ld/scripttempl/naclelf.sc
===================================================================
--- a/binutils-2.20/ld/scripttempl/naclelf.sc
+++ b/binutils-2.20/ld/scripttempl/naclelf.sc
@@ -458,13 +458,13 @@
   /* The total size of the TLS template area must be a multiple of 0x20,
    * but it's size calculation is hardcoded in bfd_elf_final_link function
    * so the only thing we can do is align segments here properly */
-  .tdata	: ${RELOCATING+ALIGN(0x20)} {
+  .tdata	${RELOCATING+ALIGN(0x20)}${RELOCATING-0} : ALIGN(0x10) {

[krasin, 2011/10/12 19:56:07]

The line itself looks fine (modulo my linker script illiteration). My concern is
that it would be absolutely impossible to avoid a regression in the future.

I'm fine to write a test myself, though.

     ${RELOCATING+PROVIDE (__tls_template_start = .);}
     *(.tdata${RELOCATING+ .tdata.* .gnu.linkonce.td.*})
     ${RELOCATING+. = ALIGN(0x20);}
     ${RELOCATING+PROVIDE (__tls_template_tdata_end = .);}
   }
-  .tbss		: ${RELOCATING+ALIGN(0x20)} {
+  .tbss		${RELOCATING+ALIGN(0x20)}${RELOCATING-0} : ALIGN(0x10) {

[krasin, 2011/10/12 19:56:07]

I'm not sure, if this line is required. bss is put right after tdata and the
code in src/untrusted/nacl/tls.c does not care about alignment tbss. At the same
time, since .tdata size is a multiply of 0x20 and it's aligned by 0x10, .tbss
will be automatically aligned by 0x10.

     *(.tbss${RELOCATING+ .tbss.* .gnu.linkonce.tb.*})${RELOCATING+ *(.tcommon)}
     ${RELOCATING+. = ALIGN(0x20);}
   }