Skip to content

Commit 8f44516

Browse files
committed
aarch64: make it build again
Signed-off-by: Waldemar Kozaczuk <[email protected]>
1 parent a28717b commit 8f44516

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

arch/aarch64/arch-elf.cc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,9 @@ void object::prepare_initial_tls(void* buffer, size_t size,
7575
abort();
7676
}
7777

78+
void object::prepare_local_tls(std::vector<ptrdiff_t>& offsets)
79+
{
80+
abort();
81+
}
82+
7883
}

arch/aarch64/loader.ld

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,13 @@ SECTIONS
104104
/* do not align tdata, tbss with .tdata : ALIGN (64),
105105
or the linker will offset the TLS loads accordingly! */
106106
.tdata : { *(.tdata .tdata.* .gnu.linkonce.td.*) } : tls : text
107-
.tbss : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } : tls : text
107+
.tbss : {
108+
*(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon)
109+
_pie_static_tls_start = .;
110+
/* This is a reserve intended for executables' (pie or non-pie) TLS block */
111+
. = . + 64;
112+
_pie_static_tls_end = .;
113+
} : tls : text
108114
.tls_template_size = SIZEOF(.tdata) + SIZEOF(.tbss);
109115
.bss : { *(.dynbss .bss .bss.* .gnu.linkonce.b.*) } : text
110116

0 commit comments

Comments
 (0)