aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/m68k
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2016-06-20 14:31:40 +0200
committerFlorian Weimer <fweimer@redhat.com>2016-06-20 14:31:40 +0200
commitaca1daef298b43bd7b1987b31f5aabcf6c2f6021 (patch)
tree67cdaaf7a65f56676733a0459a2924b5b474d547 /sysdeps/m68k
parent92e1ab0eb58c57d5843fa982ff6c24f551f2f634 (diff)
downloadglibc-aca1daef298b43bd7b1987b31f5aabcf6c2f6021.tar
glibc-aca1daef298b43bd7b1987b31f5aabcf6c2f6021.tar.gz
glibc-aca1daef298b43bd7b1987b31f5aabcf6c2f6021.tar.bz2
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/m68k')
-rw-r--r--sysdeps/m68k/dl-tls.h3
-rw-r--r--sysdeps/m68k/nptl/tls.h12
2 files changed, 1 insertions, 14 deletions
diff --git a/sysdeps/m68k/dl-tls.h b/sysdeps/m68k/dl-tls.h
index f853b99874..d24ad90dbc 100644
--- a/sysdeps/m68k/dl-tls.h
+++ b/sysdeps/m68k/dl-tls.h
@@ -45,6 +45,3 @@ extern void *__tls_get_addr (tls_index *ti);
#define GET_ADDR_OFFSET (ti->ti_offset + TLS_DTV_OFFSET)
#define __TLS_GET_ADDR(__ti) (__tls_get_addr (__ti) - TLS_DTV_OFFSET)
-
-/* Value used for dtv entries for which the allocation is delayed. */
-#define TLS_DTV_UNALLOCATED ((void *) -1l)
diff --git a/sysdeps/m68k/nptl/tls.h b/sysdeps/m68k/nptl/tls.h
index f93228212b..4825c4c81a 100644
--- a/sysdeps/m68k/nptl/tls.h
+++ b/sysdeps/m68k/nptl/tls.h
@@ -26,17 +26,7 @@
# include <stdbool.h>
# include <stddef.h>
# include <stdint.h>
-
-/* Type for the dtv. */
-typedef union dtv
-{
- size_t counter;
- struct
- {
- void *val;
- bool is_static;
- } pointer;
-} dtv_t;
+# include <dl-dtv.h>
#else /* __ASSEMBLER__ */
# include <tcb-offsets.h>