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/s390 | |
parent | 92e1ab0eb58c57d5843fa982ff6c24f551f2f634 (diff) | |
download | glibc-aca1daef298b43bd7b1987b31f5aabcf6c2f6021.tar.gz glibc-aca1daef298b43bd7b1987b31f5aabcf6c2f6021.tar.xz glibc-aca1daef298b43bd7b1987b31f5aabcf6c2f6021.zip |
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/s390')
-rw-r--r-- | sysdeps/s390/dl-tls.h | 3 | ||||
-rw-r--r-- | sysdeps/s390/nptl/tls.h | 14 |
2 files changed, 1 insertions, 16 deletions
diff --git a/sysdeps/s390/dl-tls.h b/sysdeps/s390/dl-tls.h index 503048a622..ce2d020aba 100644 --- a/sysdeps/s390/dl-tls.h +++ b/sysdeps/s390/dl-tls.h @@ -102,6 +102,3 @@ extern void *__tls_get_addr_internal (tls_index *ti); + (unsigned long) __builtin_thread_pointer (); }) #endif - -/* Value used for dtv entries for which the allocation is delayed. */ -#define TLS_DTV_UNALLOCATED ((void *) -1l) diff --git a/sysdeps/s390/nptl/tls.h b/sysdeps/s390/nptl/tls.h index e4c3ec7830..0fec5863ca 100644 --- a/sysdeps/s390/nptl/tls.h +++ b/sysdeps/s390/nptl/tls.h @@ -27,19 +27,7 @@ # include <stdlib.h> # include <list.h> # include <kernel-features.h> - - -/* Type for the dtv. */ -typedef union dtv -{ - size_t counter; - struct - { - void *val; - bool is_static; - } pointer; -} dtv_t; - +# include <dl-dtv.h> typedef struct { |