about summary refs log tree commit diff
path: root/nptl
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2012-11-02 18:43:27 -0700
committerH.J. Lu <hjl.tools@gmail.com>2012-11-02 18:43:27 -0700
commitf62c8abcfbf0d2e7f0a6c6c1dde53158e6fc4e59 (patch)
treeab3bc4ef52bcf81e57b10d0f72e614af61d3fa58 /nptl
parenta68d0680f89b5f3639b30ec7955671d97e101e87 (diff)
downloadglibc-f62c8abcfbf0d2e7f0a6c6c1dde53158e6fc4e59.tar.gz
glibc-f62c8abcfbf0d2e7f0a6c6c1dde53158e6fc4e59.tar.xz
glibc-f62c8abcfbf0d2e7f0a6c6c1dde53158e6fc4e59.zip
Compile x86 rtld with -mno-sse -mno-mmx
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog6
-rw-r--r--nptl/sysdeps/x86_64/tls.h11
2 files changed, 15 insertions, 2 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 1c0595be4a..4db686cacd 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-02  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/x86_64/tls.h: Don't include <xmmintrin.h>.
+	(__128bits): New struct typedef.
+	(tcbhead_t): Replace __m128 with __128bits.
+
 2012-10-30  Aurelien Jarno  <aurelien@aurel32.net>
 	    Joseph Myers  <joseph@codesourcery.com>
 
diff --git a/nptl/sysdeps/x86_64/tls.h b/nptl/sysdeps/x86_64/tls.h
index b651d1cfa8..bc60a511fb 100644
--- a/nptl/sysdeps/x86_64/tls.h
+++ b/nptl/sysdeps/x86_64/tls.h
@@ -27,7 +27,14 @@
 # include <stdlib.h>
 # include <sysdep.h>
 # include <kernel-features.h>
-# include <xmmintrin.h>
+
+/* Replacement type for __m128 since this file is included by ld.so,
+   which is compiled with -mno-sse.  It must not change the alignment
+   of rtld_savespace_sse.  */
+typedef struct
+{
+  int i[4];
+} __128bits;
 
 
 /* Type for the dtv.  */
@@ -64,7 +71,7 @@ typedef struct
   void *__private_tm[5];
   long int __unused2;
   /* Have space for the post-AVX register size.  */
-  __m128 rtld_savespace_sse[8][4] __attribute__ ((aligned (32)));
+  __128bits rtld_savespace_sse[8][4] __attribute__ ((aligned (32)));
 
   void *__padding[8];
 } tcbhead_t;