From c06c1eb6610b478a06df8116aefc975f376760f8 Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Thu, 23 Aug 2018 10:57:34 +0000 Subject: [PATCH] fix tls access on arm targets before armv6k commit 610c5a8524c3d6cd3ac5a5f1231422e7648a3791 changed the thread pointer setup so tp points at the end of the pthread struct on arm, but failed to update __aeabi_read_tp so it was off by 8. this broke tls access in code that is compiled with -mtp=soft, which is the default when target arch is pre armv6k or thumb1. maintainer's note: no release versions are affected. --- src/thread/arm/__aeabi_read_tp_c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/thread/arm/__aeabi_read_tp_c.c b/src/thread/arm/__aeabi_read_tp_c.c index 654bdc57..0c56d613 100644 --- a/src/thread/arm/__aeabi_read_tp_c.c +++ b/src/thread/arm/__aeabi_read_tp_c.c @@ -4,5 +4,5 @@ __attribute__((__visibility__("hidden"))) void *__aeabi_read_tp_c(void) { - return (void *)((uintptr_t)__pthread_self()-8+sizeof(struct pthread)); + return TP_ADJ(__pthread_self()); } -- 2.25.1