x86_64: Remove unused padding from tcbhead_t

This padding is difficult to use for preserving the internal
GLIBC_PRIVATE ABI.  The comment is misleading.  Current Address
Sanitizer uses heuristics to determine struct pthread size.
It does not depend on its precise layout.  It merely scans for
pointers allocated using malloc.

Due to the removal of the padding, the assert for its start
is no longer required.

Reviewed-by: Noah Goldstein <goldstein.w.n@gmail.com>

diff --git a/sysdeps/x86_64/nptl/tls.h b/sysdeps/x86_64/nptl/tls.h
index 876889bed4bf2bc97779f1ab0593403d33648aeb..837ffcc2bb5083257363f7a1f15741bc1bfddaef 100644 (file)
--- a/sysdeps/x86_64/nptl/tls.h
+++ b/sysdeps/x86_64/nptl/tls.h
@@ -62,28 +62,16 @@ typedef struct
   void *__private_ss;
   /* The marker for the current shadow stack.  */
   unsigned long long int ssp_base;
-  /* Must be kept even if it is no longer used by glibc since programs,
-     like AddressSanitizer, depend on the size of tcbhead_t.  */
-  __128bits __glibc_unused2[8][4] __attribute__ ((aligned (32)));
-
-  void *__padding[8];
 } tcbhead_t;
 
 # ifdef __ILP32__
 /* morestack.S in libgcc uses offset 0x40 to access __private_ss,   */
 _Static_assert (offsetof (tcbhead_t, __private_ss) == 0x40,
                "offset of __private_ss != 0x40");
-/* NB: ssp_base used to be "long int __glibc_reserved2", which was
-   changed from 32 bits to 64 bits.  Make sure that the offset of the
-   next field, __glibc_unused2, is unchanged.  */
-_Static_assert (offsetof (tcbhead_t, __glibc_unused2) == 0x60,
-               "offset of __glibc_unused2 != 0x60");
 # else
 /* morestack.S in libgcc uses offset 0x70 to access __private_ss,   */
 _Static_assert (offsetof (tcbhead_t, __private_ss) == 0x70,
                "offset of __private_ss != 0x70");
-_Static_assert (offsetof (tcbhead_t, __glibc_unused2) == 0x80,
-               "offset of __glibc_unused2 != 0x80");
 # endif
 
 #else /* __ASSEMBLER__ */