36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
diff --git a/sysdeps/aarch64/dl-machine.h b/sysdeps/aarch64/dl-machine.h
|
|
index 997c860..50b37b0 100644
|
|
--- a/sysdeps/aarch64/dl-machine.h
|
|
+++ b/sysdeps/aarch64/dl-machine.h
|
|
@@ -295,7 +295,7 @@ elf_machine_rela (struct link_map *map, const ElfW(Rela) *reloc,
|
|
# ifndef SHARED
|
|
CHECK_STATIC_TLS (map, sym_map);
|
|
# else
|
|
- if (!TRY_STATIC_TLS (map, sym_map))
|
|
+ if (1)
|
|
{
|
|
td->arg = _dl_make_tlsdesc_dynamic
|
|
(sym_map, sym->st_value + reloc->r_addend);
|
|
diff --git a/sysdeps/aarch64/nptl/tls.h b/sysdeps/aarch64/nptl/tls.h
|
|
index ae2e6c4..8b260a1 100644
|
|
--- a/sysdeps/aarch64/nptl/tls.h
|
|
+++ b/sysdeps/aarch64/nptl/tls.h
|
|
@@ -63,7 +63,7 @@ typedef struct
|
|
# define TLS_INIT_TCB_SIZE sizeof (tcbhead_t)
|
|
|
|
/* Alignment requirements for the initial TCB. */
|
|
-# define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t)
|
|
+# define TLS_INIT_TCB_ALIGN __alignof__ (struct pthread)
|
|
|
|
/* This is the size of the TCB. */
|
|
# define TLS_TCB_SIZE sizeof (tcbhead_t)
|
|
@@ -72,7 +72,7 @@ typedef struct
|
|
# define TLS_PRE_TCB_SIZE sizeof (struct pthread)
|
|
|
|
/* Alignment requirements for the TCB. */
|
|
-# define TLS_TCB_ALIGN __alignof__ (tcbhead_t)
|
|
+# define TLS_TCB_ALIGN __alignof__ (struct pthread)
|
|
|
|
/* Install the dtv pointer. The pointer passed is to the element with
|
|
index -1 which contain the length. */
|