qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make sure x86_64 GOT entry slot is always 8 bytes

This commit is contained in:
H.J. Lu 2012-03-23 11:06:57 -07:00
parent 3ff4252677
commit 1532c7ac9a
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2012-03-23 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/x86_64/dl-tlsdesc.h (tlsdesc): Use anonymous union
to pad to uint64_t for each field.
(dl_tls_index): Replace unsigned long with uint64_t.
2012-03-23 Daniel Jacobowitz <dmj@google.com> 2012-03-23 Daniel Jacobowitz <dmj@google.com>
Paul Pluzhnikov <ppluzhnikov@google.com> Paul Pluzhnikov <ppluzhnikov@google.com>

18
sysdeps/x86_64/dl-tlsdesc.h
View File

@ -29,14 +29,24 @@
/* Type used to represent a TLS descriptor in the GOT. */ /* Type used to represent a TLS descriptor in the GOT. */
struct tlsdesc struct tlsdesc
{ {
ptrdiff_t (*entry)(struct tlsdesc *on_rax); /* Anonymous union is used here to ensure that GOT entry slot is always
void *arg; 8 bytes for both x32 and x86-64. */
union
{
ptrdiff_t (*entry) (struct tlsdesc *on_rax);
uint64_t entry_slot;
};
union
{
void *arg;
uint64_t arg_slot;
};
}; };
typedef struct dl_tls_index typedef struct dl_tls_index
{ {
unsigned long int ti_module; uint64_t ti_module;
unsigned long int ti_offset; uint64_t ti_offset;
} tls_index; } tls_index;
/* Type used as the argument in a TLS descriptor for a symbol that /* Type used as the argument in a TLS descriptor for a symbol that