From 1532c7ac9aedd769f81aef9bf1653dab041b272b Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 23 Mar 2012 11:06:57 -0700 Subject: [PATCH] Make sure x86_64 GOT entry slot is always 8 bytes --- ChangeLog | 6 ++++++ sysdeps/x86_64/dl-tlsdesc.h | 18 ++++++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index ed16915..79003da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-03-23 H.J. Lu + + * 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 Paul Pluzhnikov diff --git a/sysdeps/x86_64/dl-tlsdesc.h b/sysdeps/x86_64/dl-tlsdesc.h index 82a0109..06ede02 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 -- 2.7.4