From 2949684c162a4413e42249d6b2ad554cb468b5be Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Mon, 14 May 2012 20:58:24 -0700
Subject: Add x32 support to tcbhead_t

---
 nptl/ChangeLog            | 6 ++++++
 nptl/sysdeps/x86_64/tls.h | 7 +------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index bf7e11aa9c..cfc679cbe8 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/x86_64/tls.h: Don't include <bits/wordsize.h>.
+	(tcbhead_t): Remove __x86_64__ check.  Align rtld_savespace_sse
+	to 32 bytes.
+
 2012-05-14  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* sysdeps/pthread/pthread.h (__PTHREAD_RWLOCK_INT_FLAGS_SHARED):
diff --git a/nptl/sysdeps/x86_64/tls.h b/nptl/sysdeps/x86_64/tls.h
index 77f04f2029..f838916058 100644
--- a/nptl/sysdeps/x86_64/tls.h
+++ b/nptl/sysdeps/x86_64/tls.h
@@ -27,7 +27,6 @@
 # include <stdlib.h>
 # include <sysdep.h>
 # include <kernel-features.h>
-# include <bits/wordsize.h>
 # include <xmmintrin.h>
 
 
@@ -60,18 +59,14 @@ typedef struct
 # else
   int __unused1;
 # endif
-# if __WORDSIZE == 64
   int rtld_must_xmm_save;
-# endif
   /* Reservation of some values for the TM ABI.  */
   void *__private_tm[5];
-# if __WORDSIZE == 64
   long int __unused2;
   /* Have space for the post-AVX register size.  */
-  __m128 rtld_savespace_sse[8][4];
+  __m128 rtld_savespace_sse[8][4] __attribute__ ((aligned (32)));
 
   void *__padding[8];
-# endif
 } tcbhead_t;
 
 #else /* __ASSEMBLER__ */
-- 
cgit 1.4.1