about summary refs log tree commit diff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2011-11-21 15:23:45 -0800
committerH.J. Lu <hjl.tools@gmail.com>2012-05-27 07:30:55 -0700
commit62b791c64012301f9d8ff158ded991d3689b81f4 (patch)
treeea58efc1741c9368cc42568a714b12a156ee9724
parenta7b081177799872970922b882cd6aec1a54dbf2b (diff)
downloadglibc-62b791c64012301f9d8ff158ded991d3689b81f4.tar.gz
glibc-62b791c64012301f9d8ff158ded991d3689b81f4.tar.xz
glibc-62b791c64012301f9d8ff158ded991d3689b81f4.zip
Add x32 support to dl-tlsdesc.h.
-rw-r--r--ChangeLog.x325
-rw-r--r--sysdeps/x86_64/dl-tlsdesc.h10
2 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog.x32 b/ChangeLog.x32
index 820c7eecd2..4a9637a185 100644
--- a/ChangeLog.x32
+++ b/ChangeLog.x32
@@ -1,5 +1,10 @@
 2011-11-21  H.J. Lu  <hongjiu.lu@intel.com>
 
+	* sysdeps/x86_64/dl-tlsdesc.h (tlsdesc): Pad for x32.
+	(dl_tls_index): Replace long with long long.
+
+2011-11-21  H.J. Lu  <hongjiu.lu@intel.com>
+
 	* sysdeps/x86_64/dl-trampoline.S: Check if RTLD_SAVESPACE_SSE
 	is 32byte aligned.
 
diff --git a/sysdeps/x86_64/dl-tlsdesc.h b/sysdeps/x86_64/dl-tlsdesc.h
index 9e64aab5a7..dcff33e600 100644
--- a/sysdeps/x86_64/dl-tlsdesc.h
+++ b/sysdeps/x86_64/dl-tlsdesc.h
@@ -31,13 +31,19 @@
 struct tlsdesc
 {
   ptrdiff_t (*entry)(struct tlsdesc *on_rax);
+#ifndef __LP64__
+  int pad1;
+#endif
   void *arg;
+#ifndef __LP64__
+  int pad2;
+#endif
 };
 
 typedef struct dl_tls_index
 {
-  unsigned long int ti_module;
-  unsigned long int ti_offset;
+  unsigned long long int ti_module;
+  unsigned long long int ti_offset;
 } tls_index;
 
 /* Type used as the argument in a TLS descriptor for a symbol that