diff options
author | Florian Weimer <fweimer@redhat.com> | 2016-06-20 14:31:40 +0200 |
---|---|---|
committer | Florian Weimer <fweimer@redhat.com> | 2016-06-20 14:31:40 +0200 |
commit | aca1daef298b43bd7b1987b31f5aabcf6c2f6021 (patch) | |
tree | 67cdaaf7a65f56676733a0459a2924b5b474d547 /sysdeps/x86_64 | |
parent | 92e1ab0eb58c57d5843fa982ff6c24f551f2f634 (diff) | |
download | glibc-aca1daef298b43bd7b1987b31f5aabcf6c2f6021.zip glibc-aca1daef298b43bd7b1987b31f5aabcf6c2f6021.tar.gz glibc-aca1daef298b43bd7b1987b31f5aabcf6c2f6021.tar.bz2 |
elf: Consolidate machine-agnostic DTV definitions in <dl-dtv.h>
Identical definitions of dtv_t and TLS_DTV_UNALLOCATED were
repeated for all architectures using DTVs.
Diffstat (limited to 'sysdeps/x86_64')
-rw-r--r-- | sysdeps/x86_64/dl-tls.h | 3 | ||||
-rw-r--r-- | sysdeps/x86_64/nptl/tls.h | 13 |
2 files changed, 1 insertions, 15 deletions
diff --git a/sysdeps/x86_64/dl-tls.h b/sysdeps/x86_64/dl-tls.h index 0f101e6..cf6c107 100644 --- a/sysdeps/x86_64/dl-tls.h +++ b/sysdeps/x86_64/dl-tls.h @@ -27,6 +27,3 @@ typedef struct dl_tls_index extern void *__tls_get_addr (tls_index *ti); - -/* Value used for dtv entries for which the allocation is delayed. */ -#define TLS_DTV_UNALLOCATED ((void *) -1l) diff --git a/sysdeps/x86_64/nptl/tls.h b/sysdeps/x86_64/nptl/tls.h index 2b061a0..1bf9586 100644 --- a/sysdeps/x86_64/nptl/tls.h +++ b/sysdeps/x86_64/nptl/tls.h @@ -28,6 +28,7 @@ # include <sysdep.h> # include <libc-internal.h> # include <kernel-features.h> +# include <dl-dtv.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 @@ -38,18 +39,6 @@ typedef struct } __128bits; -/* Type for the dtv. */ -typedef union dtv -{ - size_t counter; - struct - { - void *val; - bool is_static; - } pointer; -} dtv_t; - - typedef struct { void *tcb; /* Pointer to the TCB. Not necessarily the |