The branch stable/13 has been updated by kib:
URL:
https://cgit.FreeBSD.org/src/commit/?id=4bcc2e90a09330711bcc32f1f6d100c5d7989152
commit 4bcc2e90a09330711bcc32f1f6d100c5d7989152
Author: Konstantin Belousov <k...@freebsd.org>
AuthorDate: 2021-04-07 06:25:34 +0000
Commit: Konstantin Belousov <k...@freebsd.org>
CommitDate: 2021-04-23 11:14:07 +0000
rtld: define TLS_DTV_OFFSET on all architectures
(cherry picked from commit 99c2ce7ef12f0852f25155d1d6718beccafbae0e)
---
libexec/rtld-elf/aarch64/rtld_machdep.h | 2 ++
libexec/rtld-elf/amd64/rtld_machdep.h | 2 ++
libexec/rtld-elf/arm/rtld_machdep.h | 2 ++
libexec/rtld-elf/i386/rtld_machdep.h | 2 ++
libexec/rtld-elf/mips/rtld_machdep.h | 2 ++
5 files changed, 10 insertions(+)
diff --git a/libexec/rtld-elf/aarch64/rtld_machdep.h
b/libexec/rtld-elf/aarch64/rtld_machdep.h
index 0824219c00c2..bdd5620867ba 100644
--- a/libexec/rtld-elf/aarch64/rtld_machdep.h
+++ b/libexec/rtld-elf/aarch64/rtld_machdep.h
@@ -93,4 +93,6 @@ extern void *__tls_get_addr(tls_index *ti);
#define md_abi_variant_hook(x)
+#define TLS_DTV_OFFSET 0
+
#endif
diff --git a/libexec/rtld-elf/amd64/rtld_machdep.h
b/libexec/rtld-elf/amd64/rtld_machdep.h
index 86027a04788f..30c82dcb0625 100644
--- a/libexec/rtld-elf/amd64/rtld_machdep.h
+++ b/libexec/rtld-elf/amd64/rtld_machdep.h
@@ -73,6 +73,8 @@ void *__tls_get_addr(tls_index *ti) __exported;
#define md_abi_variant_hook(x)
+#define TLS_DTV_OFFSET 0
+
size_t calculate_first_tls_offset(size_t size, size_t align, size_t offset);
size_t calculate_tls_offset(size_t prev_offset, size_t prev_size, size_t size,
size_t align, size_t offset);
diff --git a/libexec/rtld-elf/arm/rtld_machdep.h
b/libexec/rtld-elf/arm/rtld_machdep.h
index 57420c65593f..b333b1f153eb 100644
--- a/libexec/rtld-elf/arm/rtld_machdep.h
+++ b/libexec/rtld-elf/arm/rtld_machdep.h
@@ -86,4 +86,6 @@ extern void arm_abi_variant_hook(Elf_Auxinfo **);
#define md_abi_variant_hook(x)
#endif
+#define TLS_DTV_OFFSET 0
+
#endif
diff --git a/libexec/rtld-elf/i386/rtld_machdep.h
b/libexec/rtld-elf/i386/rtld_machdep.h
index 5116f9707337..78154a1992d4 100644
--- a/libexec/rtld-elf/i386/rtld_machdep.h
+++ b/libexec/rtld-elf/i386/rtld_machdep.h
@@ -74,6 +74,8 @@ void *__tls_get_addr(tls_index *ti) __exported;
#define md_abi_variant_hook(x)
+#define TLS_DTV_OFFSET 0
+
size_t calculate_first_tls_offset(size_t size, size_t align, size_t offset);
size_t calculate_tls_offset(size_t prev_offset, size_t prev_size, size_t size,
size_t align, size_t offset);
diff --git a/libexec/rtld-elf/mips/rtld_machdep.h
b/libexec/rtld-elf/mips/rtld_machdep.h
index b1556c93c3d6..d2498dbb9aa4 100644
--- a/libexec/rtld-elf/mips/rtld_machdep.h
+++ b/libexec/rtld-elf/mips/rtld_machdep.h
@@ -80,4 +80,6 @@ extern void *__tls_get_addr(tls_index *ti);
#define md_abi_variant_hook(x)
+#define TLS_DTV_OFFSET 0
+
#endif
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
