diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2012-03-23 11:06:57 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2012-03-23 11:06:57 -0700 |
| commit | 1532c7ac9aedd769f81aef9bf1653dab041b272b (patch) | |
| tree | cc2bbd859d45b30e7fb6ae4f7b92fb68e4655b85 | |
| parent | 3ff4252677ff55a0dd4ded5b5cbccda25812ba12 (diff) | |
| download | glibc-1532c7ac9aedd769f81aef9bf1653dab041b272b.tar.gz glibc-1532c7ac9aedd769f81aef9bf1653dab041b272b.tar.xz glibc-1532c7ac9aedd769f81aef9bf1653dab041b272b.zip | |
Make sure x86_64 GOT entry slot is always 8 bytes
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/x86_64/dl-tlsdesc.h | 18 |
2 files changed, 20 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index ed16915738..79003da74c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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> Paul Pluzhnikov <ppluzhnikov@google.com> diff --git a/sysdeps/x86_64/dl-tlsdesc.h b/sysdeps/x86_64/dl-tlsdesc.h index 82a010922d..06ede02148 100644 --- a/sysdeps/x86_64/dl-tlsdesc.h +++ b/sysdeps/x86_64/dl-tlsdesc.h @@ -29,14 +29,24 @@ /* Type used to represent a TLS descriptor in the GOT. */ struct tlsdesc { - ptrdiff_t (*entry)(struct tlsdesc *on_rax); - void *arg; + /* Anonymous union is used here to ensure that GOT entry slot is always + 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 { - unsigned long int ti_module; - unsigned long int ti_offset; + uint64_t ti_module; + uint64_t ti_offset; } tls_index; /* Type used as the argument in a TLS descriptor for a symbol that |