--- glibc-2.17-c758a686/ports/sysdeps/aarch64/nptl/tls.h

+++ glibc-2.17-c758a686/ports/sysdeps/aarch64/nptl/tls.h

@@ -63,7 +63,7 @@ typedef struct

 # define TLS_INIT_TCB_SIZE	sizeof (tcbhead_t)

 /* Alignment requirements for the initial TCB.  */

-# define TLS_INIT_TCB_ALIGN	__alignof__ (tcbhead_t)

+# define TLS_INIT_TCB_ALIGN	__alignof__ (struct pthread)

 /* This is the size of the TCB.  */

 # define TLS_TCB_SIZE		sizeof (tcbhead_t)

@@ -72,7 +72,7 @@ typedef struct

 # define TLS_PRE_TCB_SIZE	sizeof (struct pthread)

 /* Alignment requirements for the TCB.  */

-# define TLS_TCB_ALIGN		__alignof__ (tcbhead_t)

+# define TLS_TCB_ALIGN		__alignof__ (struct pthread)

 /* Install the dtv pointer.  The pointer passed is to the element with

    index -1 which contain the length.  */