From patchwork Tue Oct 24 14:33:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Szabolcs Nagy X-Patchwork-Id: 23785 Received: (qmail 2982 invoked by alias); 24 Oct 2017 14:33:26 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 2949 invoked by uid 89); 24 Oct 2017 14:33:26 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 spammy=Holder X-HELO: EUR01-VE1-obe.outbound.protection.outlook.com Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Szabolcs.Nagy@arm.com; Message-ID: <59EF4F27.3020009@arm.com> Date: Tue, 24 Oct 2017 15:33:11 +0100 From: Szabolcs Nagy User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.8.0 MIME-Version: 1.0 To: GNU C Library CC: nd@arm.com, Joseph Myers Subject: [PATCH 7/7] arm: Remove lazy tlsdesc initialization related code References: <59EF4CEC.8020301@arm.com> In-Reply-To: <59EF4CEC.8020301@arm.com> X-ClientProxiedBy: DB6PR06CA0012.eurprd06.prod.outlook.com (2603:10a6:6:1::25) To HE1PR0802MB2492.eurprd08.prod.outlook.com (2603:10a6:3:df::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ef20d719-b308-4eda-c8d9-08d51aec2903 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4602075)(4627075)(201703031133081)(201702281549075)(48565401081)(2017052603199)(49563074); SRVR:HE1PR0802MB2492; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2492; 3:CPkAtvWXEDVMbykgZWEAxd+j2b2Ga2dZkqYs+cPWGeDE6OOFsGxHls50jMxYLVgg+pENeTbKRZTJEmCokXrQhCX/7/t28aoWEEsVsPzSRrk0JcmTZztRbTfzkvjSNvUdyqssLKHqUGll7/Ui7kRSSjtgv7mmHjzgR5sci/bEWeNacVpMjvWsA1wZpqbYdoL06YhrehwJjpZ6AFfY9iIdq4t1KZrH16bgfp5NBlHEc4TiDNZrfcKdf4e1bufcap3k; 25:u56g0JjGTHjSTgWGfU2E+0julibPzBSwGH+xxPVyLkdUw2pD5TEYX3yjpdz9CCQXECneUBNd3Owd8aMuK9Amx37BJ6i9zMZ9rKAbZjlyaRMS3+xDCyYrN74uOB9kCEtwAgnQPvlKdqx2BmZdmdT9hdXaMd7kRwrOEafWNvkqupkgTP9k2azviz4dA2hYMQu7Q/Vy2c83yOFVTOxEDrG8o+VmZuruUSF2iEx6RPjMGO/ijXk0cBVmoug3qbQMGK/pKin7MtDNAEskvxqUnONe+v7L65FCl/sJtzSxvVfsFer3ZTpO26GgRHxTaRfapYWc2MJ+ZpxI3ZNkrHwSd0k2dg==; 31:0lqgi45UuXNywEomJEAyqSlHNxQPI1U2kmEKcXFo9drvMVXAeD6aXZWJGA0Q3CgNOg4ASGKIfEwCwj86fLtczLs35DjLXJEsjboq07h872qSJxyV8sxZ9Fhl+d5Dl8lcEy8MqvWtevsFiqlw9xwyIkgEMvnE9pvspQl76NTP9XVuLMw0FY/coS07PSgyXTEbhLTTTohWzvH/Aoh0CBPrNCSE44X2Ph9iAl5ZS5BWGrk= X-MS-TrafficTypeDiagnostic: HE1PR0802MB2492: NoDisclaimer: True X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2492; 20:dVfwEEHUvkP+vozkJRZ4rrtnmWhEwa6PFhhuRq0OJ8KQFMCii678qdG0d6kJz2Zyzx103YBOvSIpyTohX5rheizAbmLy+MK+qx7u0w2/nqu7QLMLDbBvbttEYa9a9yebfDE53wbteuagD18VNwBmsQoaH4n5qEYRW6Kr4qjYJaY=; 4:fjTk0bkrb4OXF61TObCpO2S+KJjZqti08rMkkPsXVnjeaoNkoyqSeiLWFoIuiZOAJfiNG1KaF7QgJANUbzzMTwpKoxkTJUVNDN9uRTBhYReSbhTtpdAbqqJCb+WwMJAfgl+DAmlw0+FnvzH/I544JLJyNDyVMFa15n9q9Y2vBgN6oc1K0XFkwDS+ZjmvCf9xa2XPpotKzQ9gyJo0f3s2WpcHq4uw/Y39LVwN7QgiA/hEHsbAJdzJ+DI4WtIcqjqz5TiDw/pp8cRK5L5oegZeWkiJhUon/xlbgIolg7vtY/U= X-Exchange-Antispam-Report-Test: UriScan:(180628864354917); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(102415395)(6040450)(2401047)(5005006)(8121501046)(3231020)(100000703101)(100105400095)(3002001)(10201501046)(93006095)(93001095)(6055026)(6041248)(20161123555025)(20161123562025)(20161123564025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:HE1PR0802MB2492; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:HE1PR0802MB2492; X-Forefront-PRVS: 047001DADA X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6049001)(6009001)(376002)(346002)(39860400002)(189002)(199003)(305945005)(4326008)(316002)(97736004)(7736002)(568964002)(72206003)(5000100001)(59896002)(4001150100001)(270700001)(86362001)(6116002)(3846002)(80316001)(2906002)(5660300001)(4610100001)(189998001)(58126008)(81166006)(81156014)(84326002)(16576012)(8676002)(2476003)(68736007)(25786009)(8936002)(16526018)(16586007)(36756003)(64126003)(33656002)(105586002)(77096006)(6486002)(5890100001)(106356001)(53936002)(50986999)(76176999)(87266999)(83506002)(65816999)(65806001)(65956001)(66066001)(54356999)(101416001)(478600001)(2950100002)(6916009)(6666003); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR0802MB2492; H:[10.2.206.69]; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: arm.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR0802MB2492; 23:Ysfkt4zeDbHV65kzY9L7JezhN3OHUsjaDKKj0UT?= =?us-ascii?Q?h9zWBP0GBrtpkpqJp39IRFNTgN3mf+mL2GRM4nQIfGkbyjrwW0GyOjTzLsrj?= =?us-ascii?Q?Bo5h3Tt9nUGxXkvAVI4SW7nL/RXP4F8T/KE7aEUvHkTh7xlj32MlfmQ8igG3?= =?us-ascii?Q?Vz5kCEKLagb2J2fVBNzuDMTfsNpiDkUkXbpzJuYtScsROdoUARAGJEIN7TUX?= =?us-ascii?Q?N+ej13BoFoGjVVk/lZMXm5FkHRZnnsJwiVrb5DSxAZUOslOUDdXUeTApUcPf?= =?us-ascii?Q?rIYrsAlYdraGauyM/Uw8aZAix8TzCjavlaSBum27CQzxrcoWYIqrber4eR67?= =?us-ascii?Q?OUeSctD+8yaRdDpyOJRy1zvXSyKxZMywcydtVEZIfSQA8LV9x6/kBDP0lc1G?= =?us-ascii?Q?CKF4tSCDBexrZ4HhOJ3gQDOsdV+rzt5yRKJaDPu9qGKKJpmDSc3JLEkzKoGG?= =?us-ascii?Q?PzGcxwCTViA8+3yCZySHI7SurMrFTUH3L2Tmh4vxk+b1o1cLAO4JOO8RJQqD?= =?us-ascii?Q?mXS9JNp2wZ2IfkzFKNcUKOUY+YolcOQNLIdWKPsmZ4wFOZhaE4ltgcIXHzLz?= =?us-ascii?Q?Ga+aBTxh09rvm+0j0AQZwNbL/QGibd7attyUcBgls3rKuKc/PemDaKK4lGSQ?= =?us-ascii?Q?JtjyaQPogg9LshMzQgKCWPrtfwrryQajemTCcjh50YGocos7m34sHz0psUAz?= =?us-ascii?Q?tsx4fxETdE+vFEo1Xgb98Ylr5aeib00WI0zU+9qpMazYQHguVHcriytxQos3?= =?us-ascii?Q?WBfa3mhAEMysag3q7rPrI+ctWgSsLygi0SPpzZ7JuJmvK/1Ia/xZ1hdqb3ls?= =?us-ascii?Q?Op2wyTmd0elsXVB0C/ySfSFFzVPeGlETE6tWaLarNJhPkv+WHNyGkIVFHOWz?= =?us-ascii?Q?LYEvmTH+i+kbBBfIgcdHalaIylBdMEgohsuqEGjEFzmM0MGPS+HUFj8a/Cib?= =?us-ascii?Q?8sMEO2w4xNou491k4hiKE0Oz7tSR83cKU9uedvc39zr8pmOlQssoP0Kx4xzU?= =?us-ascii?Q?Tnil8ug6Ful1x1+nQLRgU2Qn7Rvls9M0Mj7C+FA95aEBqYI/PWPdX7z68dcB?= =?us-ascii?Q?N0u1VUo7OFSYvFyLK6TD/x3NS18YKHm0kErCWRTz6gHy0cu1n6vv6VydBYxC?= =?us-ascii?Q?HDdicqiOQDZeX6xAN1YtxH7KQB9nhbcYdHNKi0c+zEcJvUxhppzq2FlyLawS?= =?us-ascii?Q?pSg/QkYO7CkKrB7Ffz0xtKNozBvuwq1Bk35YE4rSxmzQRdeqsGaW4qISUm6k?= =?us-ascii?Q?IrWP53UBBoVJa44iS3sRIaIchm5UFatFYJ2Aw4Yg5bncDPnxWvAcEGFsKBmM?= =?us-ascii?Q?nVKj65L9h6tdhMhDi7aH8tX4m0kxpeIiJgAuV4CPnO6rPLqqiWSCrGoUoOBC?= =?us-ascii?Q?0GOe4UWRRgNUKymeOQDqd/G0gdWAdMUxdA0Z5LceMQNcxxGs5g5T9mc9fSD8?= =?us-ascii?Q?U9Gst/3RucQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2492; 6:sSMsP2dNmtJO/Rwv+Ctr2spRYFwpstErRRuX88UvyjPZMvicC6dLjc5PeiUIAXOMY2NwLd6dQDgOqwl6PMIXTMHyKMBHjg8eD6oTT64iES91axYBdrZTECI0FOznGIHl4awRMhrpArNeSrL9oNeyxRMdKcIVhu1nxLAuhGOAGtvc7ndImVqUNtsMcyGNoylxBPfxghmVFIM2F+2r66uxUlwJUdSMv+Rkx87A90d1U3hV5OsUs/oX2t/2Qx5tJF7lP/oojA9YO0uJ37rGU7n9iOWogr9gM0VuF299/lNubFybd7ZnuoHNc7UzCCa0ujAxw4LKGtHTEbKRBEK4TXHfLg==; 5:CvQP6JpUnjSGFVF9jlTXhyYJ8uIe+dmONyIuSQ9POfS34p+tYRTpyNaIA0l2HNWr55fAezsRZc7mW9q64TEPFsrKNRac1nvP+crawOwNZNgDFE6P6IR/jyZwizaLd4xHgJAMarTdqZiKfQi1cZCMlw==; 24:DViUletKqZLJk88csyLjzfbtC4uqX/9cgUHtCWWzV7QpvDLv4bHiW9J8vpD/JvmaoOeskNz0hQ1yPA6Im1ZwiH4canTa8W5Ml8ISvDRFW8o=; 7:j/XMFBjqzFp+KcDpXXxKB7awS7ByvxlmoxmxRWrlFGY05o/qbOVm2G2bhOXaC5T8tafnydaxgBa1GKQ2bKT9ef00c1eUEpXGZFIpEGwRuwPkVcc5xmIDDM8G1j7RMhv8x2lTL3MduM3IsLAPe7owGlEgbjZCD/xBXfSHsEp98Tdkuc1dwlRPdfjF6/m3kJm0MqKoXOpWcDVV9LlKaRPuRiCMS4ct/cqGgbTRfcPXe2Q= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Oct 2017 14:33:14.2073 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0802MB2492 2017-10-23 Szabolcs Nagy * sysdeps/arm/dl-machine.h (elf_machine_runtime_setup): Remove DT_TLSDESC_GOT initialization. * sysdeps/arm/dl-tlsdesc.S (_dl_tlsdesc_lazy_resolver): Remove. (_dl_tlsdesc_resolve_hold): Likewise. * sysdeps/aarch64/dl-tlsdesc.h (_dl_tlsdesc_lazy_resolver): Remove. (_dl_tlsdesc_resolve_hold): Likewise. * sysdeps/aarch64/tlsdesc.c (_dl_tlsdesc_lazy_resolver_fixup): Remove. (_dl_tlsdesc_resolve_hold_fixup): Likewise. From 1701d84d41369560d91baa319bd158bbd611afc1 Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Fri, 20 Oct 2017 17:53:44 +0100 Subject: [PATCH 7/7] arm: Remove lazy tlsdesc initialization related code Lazy tlsdesc initialization is no longer used in the dynamic linker so all related code can be removed. * sysdeps/arm/dl-machine.h (elf_machine_runtime_setup): Remove DT_TLSDESC_GOT initialization. * sysdeps/arm/dl-tlsdesc.S (_dl_tlsdesc_lazy_resolver): Remove. (_dl_tlsdesc_resolve_hold): Likewise. * sysdeps/aarch64/dl-tlsdesc.h (_dl_tlsdesc_lazy_resolver): Remove. (_dl_tlsdesc_resolve_hold): Likewise. * sysdeps/aarch64/tlsdesc.c (_dl_tlsdesc_lazy_resolver_fixup): Remove. (_dl_tlsdesc_resolve_hold_fixup): Likewise. --- sysdeps/arm/dl-machine.h | 4 -- sysdeps/arm/dl-tlsdesc.S | 84 --------------------------------- sysdeps/arm/dl-tlsdesc.h | 4 +- sysdeps/arm/tlsdesc.c | 119 +---------------------------------------------- 4 files changed, 2 insertions(+), 209 deletions(-) diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h index ec3a0274e3..fb5468a93b 100644 --- a/sysdeps/arm/dl-machine.h +++ b/sysdeps/arm/dl-machine.h @@ -127,10 +127,6 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile) got[2] = (Elf32_Addr) &_dl_runtime_resolve; } - if (l->l_info[ADDRIDX (DT_TLSDESC_GOT)] && lazy) - *(Elf32_Addr*)(D_PTR (l, l_info[ADDRIDX (DT_TLSDESC_GOT)]) + l->l_addr) - = (Elf32_Addr) &_dl_tlsdesc_lazy_resolver; - return lazy; } diff --git a/sysdeps/arm/dl-tlsdesc.S b/sysdeps/arm/dl-tlsdesc.S index e7bed02188..99d4b8327f 100644 --- a/sysdeps/arm/dl-tlsdesc.S +++ b/sysdeps/arm/dl-tlsdesc.S @@ -132,87 +132,3 @@ _dl_tlsdesc_dynamic: cfi_endproc .size _dl_tlsdesc_dynamic, .-_dl_tlsdesc_dynamic #endif /* SHARED */ - -/* lazy resolved for tls descriptors. */ - .hidden _dl_tlsdesc_lazy_resolver - .global _dl_tlsdesc_lazy_resolver - .type _dl_tlsdesc_lazy_resolver,#function - cfi_startproc - eabi_fnstart - .align 2 -_dl_tlsdesc_lazy_resolver: - /* r0 points at the tlsdesc, - r1 points at the GOT - r2 was pushed by the trampoline and used as a temp, - we need to pop it here. - We push the remaining call-clobbered registers here, and also - R1 -- to keep the stack correctly aligned. */ - /* Tell the unwinder that r2 has already been pushed. */ - eabi_save ({r2}) - cfi_adjust_cfa_offset (4) - cfi_rel_offset (r2, 0) - eabi_save ({r0,r1,r3,ip,lr}) - push {r0, r1, r3, ip, lr} - cfi_adjust_cfa_offset (20) - cfi_rel_offset (r0, 0) - cfi_rel_offset (r1, 4) - cfi_rel_offset (r3, 8) - cfi_rel_offset (ip, 12) - cfi_rel_offset (lr, 16) - bl _dl_tlsdesc_lazy_resolver_fixup - pop {r0, r1, r3, ip, lr} - cfi_adjust_cfa_offset (-20) - cfi_restore (lr) - cfi_restore (ip) - cfi_restore (r3) - cfi_restore (r1) - cfi_restore (r0) - pop {r2} - cfi_adjust_cfa_offset (-4) - cfi_restore (r2) - ldr r1, [r0, #4] - BX (r1) - eabi_fnend - cfi_endproc - .size _dl_tlsdesc_lazy_resolver, .-_dl_tlsdesc_lazy_resolver - -/* Holder for lazy tls descriptors being resolve in another thread. - - Our calling convention is to clobber r0, r1 and the processor - flags. All others that are modified must be saved */ - .hidden _dl_tlsdesc_resolve_hold - .global _dl_tlsdesc_resolve_hold - .type _dl_tlsdesc_resolve_hold,#function - cfi_startproc - eabi_fnstart - .align 2 -_dl_tlsdesc_resolve_hold: - /* r0 is saved so its original value can be used after the call and - r1 is saved only to keep the stack aligned. (r0 points to the tls - descriptor, it is passed to _dl_tlsdesc_resolve_hold_fixup which - is a void function that may clobber r0, later r0 is used to load - the new resolver.) */ - eabi_save ({r0,r1,r2,r3,ip,lr}) - push {r0, r1, r2, r3, ip, lr} - cfi_adjust_cfa_offset (24) - cfi_rel_offset (r0, 0) - cfi_rel_offset (r1, 4) - cfi_rel_offset (r2, 8) - cfi_rel_offset (r3, 12) - cfi_rel_offset (ip, 16) - cfi_rel_offset (lr, 20) - adr r1, _dl_tlsdesc_resolve_hold - bl _dl_tlsdesc_resolve_hold_fixup - pop {r0, r1, r2, r3, ip, lr} - cfi_adjust_cfa_offset (-24) - cfi_restore (lr) - cfi_restore (ip) - cfi_restore (r3) - cfi_restore (r2) - cfi_restore (r1) - cfi_restore (r0) - ldr r1, [r0, #4] - BX (r1) - eabi_fnend - cfi_endproc - .size _dl_tlsdesc_resolve_hold, .-_dl_tlsdesc_resolve_hold diff --git a/sysdeps/arm/dl-tlsdesc.h b/sysdeps/arm/dl-tlsdesc.h index 2770af0260..bb2c731e74 100644 --- a/sysdeps/arm/dl-tlsdesc.h +++ b/sysdeps/arm/dl-tlsdesc.h @@ -48,9 +48,7 @@ struct tlsdesc_dynamic_arg extern ptrdiff_t attribute_hidden _dl_tlsdesc_return(struct tlsdesc *), - _dl_tlsdesc_undefweak(struct tlsdesc *), - _dl_tlsdesc_resolve_hold(struct tlsdesc *), - _dl_tlsdesc_lazy_resolver(struct tlsdesc *); + _dl_tlsdesc_undefweak(struct tlsdesc *); # ifdef SHARED extern void *_dl_make_tlsdesc_dynamic (struct link_map *map, size_t ti_offset); diff --git a/sysdeps/arm/tlsdesc.c b/sysdeps/arm/tlsdesc.c index ad79506178..329f26e308 100644 --- a/sysdeps/arm/tlsdesc.c +++ b/sysdeps/arm/tlsdesc.c @@ -16,130 +16,13 @@ License along with the GNU C Library. If not, see . */ -#include #include -#include #include #include #include +#define _dl_tlsdesc_resolve_hold 0 #include -/* This function is used to lazily resolve TLS_DESC REL relocations - Besides the TLS descriptor itself, we get the module's got address - as the second parameter. */ - -void -attribute_hidden -_dl_tlsdesc_lazy_resolver_fixup (struct tlsdesc volatile *td, - Elf32_Addr *got) -{ - struct link_map *l = (struct link_map *)got[1]; - lookup_t result; - unsigned long value; - - if (_dl_tlsdesc_resolve_early_return_p - (td, (void*)(D_PTR (l, l_info[ADDRIDX (DT_TLSDESC_PLT)]) + l->l_addr))) - return; - - if (td->argument.value & 0x80000000) - { - /* A global symbol, this is the symbol index. */ - /* The code below was borrowed from _dl_fixup(). */ - const Elf_Symndx symndx = td->argument.value ^ 0x80000000; - const ElfW(Sym) *const symtab - = (const void *) D_PTR (l, l_info[DT_SYMTAB]); - const char *strtab = (const void *) D_PTR (l, l_info[DT_STRTAB]); - const ElfW(Sym) *sym = &symtab[symndx]; - - /* Look up the target symbol. If the normal lookup rules are not - used don't look in the global scope. */ - if (ELFW(ST_BIND) (sym->st_info) != STB_LOCAL - && __builtin_expect (ELFW(ST_VISIBILITY) (sym->st_other), 0) == 0) - { - const struct r_found_version *version = NULL; - - if (l->l_info[VERSYMIDX (DT_VERSYM)] != NULL) - { - const ElfW(Half) *vernum = - (const void *) D_PTR (l, l_info[VERSYMIDX (DT_VERSYM)]); - ElfW(Half) ndx = vernum[symndx] & 0x7fff; - version = &l->l_versions[ndx]; - if (version->hash == 0) - version = NULL; - } - - result = _dl_lookup_symbol_x - (strtab + sym->st_name, l, &sym, - l->l_scope, version, ELF_RTYPE_CLASS_PLT, - DL_LOOKUP_ADD_DEPENDENCY, NULL); - if (sym) - value = sym->st_value; - else - { - td->entry = _dl_tlsdesc_undefweak; - goto done; - } - } - else - { - /* We already found the symbol. The module (and therefore its load - address) is also known. */ - result = l; - value = sym->st_value; - } - } - else - { - /* A local symbol, this is the offset within our tls section. - */ - value = td->argument.value; - result = l; - } - -#ifndef SHARED - CHECK_STATIC_TLS (l, result); -#else - if (!TRY_STATIC_TLS (l, result)) - { - td->argument.pointer = _dl_make_tlsdesc_dynamic (result, value); - td->entry = _dl_tlsdesc_dynamic; - } - else -#endif - { - td->argument.value = value + result->l_tls_offset; - td->entry = _dl_tlsdesc_return; - } - - done: - _dl_tlsdesc_wake_up_held_fixups (); -} - -/* This function is used to avoid busy waiting for other threads to - complete the lazy relocation. Once another thread wins the race to - relocate a TLS descriptor, it sets the descriptor up such that this - function is called to wait until the resolver releases the - lock. */ - -void -attribute_hidden -_dl_tlsdesc_resolve_hold_fixup (struct tlsdesc volatile *td, - void *caller) -{ - /* Maybe we're lucky and can return early. */ - if (caller != td->entry) - return; - - /* Locking here will stop execution until the running resolver runs - _dl_tlsdesc_wake_up_held_fixups(), releasing the lock. - - FIXME: We'd be better off waiting on a condition variable, such - that we didn't have to hold the lock throughout the relocation - processing. */ - __rtld_lock_lock_recursive (GL(dl_load_lock)); - __rtld_lock_unlock_recursive (GL(dl_load_lock)); -} - /* Unmap the dynamic object, but also release its TLS descriptor table if there is one. */ -- 2.11.0