From patchwork Mon Feb 15 12:03:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Szabolcs Nagy X-Patchwork-Id: 42044 X-Patchwork-Delegate: azanella@linux.vnet.ibm.com Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 240863951C9A; Mon, 15 Feb 2021 12:03:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 240863951C9A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1613390631; bh=GlFM7+eu7q7Mas5jSCHnPd865/l2fjscVEpXXLt/aRA=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=YLnk+fm6OHdxEPKdxb+rpOdCci3zMj2o4sT1WJ+xXzjrd27Wei3VLkR9F2q/q1Inv HxlWi2ST37Q0Ws2cgPjiHNOTwoM81DYcrL05FCgr6Ei0i5ALMdgcS5A9+tgI+Th0ON /OpnOkyjBdkEize06sgWr/6XNP1S36CtBUMfb714= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2044.outbound.protection.outlook.com [40.107.21.44]) by sourceware.org (Postfix) with ESMTPS id DD6623951C9A for ; Mon, 15 Feb 2021 12:03:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org DD6623951C9A Received: from AM5PR0301CA0024.eurprd03.prod.outlook.com (2603:10a6:206:14::37) by HE1PR0801MB2010.eurprd08.prod.outlook.com (2603:10a6:3:4b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.38; Mon, 15 Feb 2021 12:03:34 +0000 Received: from VE1EUR03FT047.eop-EUR03.prod.protection.outlook.com (2603:10a6:206:14:cafe::fe) by AM5PR0301CA0024.outlook.office365.com (2603:10a6:206:14::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.27 via Frontend Transport; Mon, 15 Feb 2021 12:03:32 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; sourceware.org; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;sourceware.org; dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT047.mail.protection.outlook.com (10.152.19.218) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.25 via Frontend Transport; Mon, 15 Feb 2021 12:03:32 +0000 Received: ("Tessian outbound 4d8113405d55:v71"); Mon, 15 Feb 2021 12:03:32 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: e0dab4479c766245 X-CR-MTA-TID: 64aa7808 Received: from 9f5e23bc5411.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id BF859FAC-3099-46C2-8C8E-D0A17FDE5016.1; Mon, 15 Feb 2021 12:03:26 +0000 Received: from EUR04-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 9f5e23bc5411.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 15 Feb 2021 12:03:26 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SPFZXvR/7mHjqLoBVmFIvXgwt+aGwrJ7MfLaPuBc5GQilW5CbeqxkBDOwOwW4CBCOJvlXpkdLaSeTwPa34XxClZzcU0ONSmnOoRnKt9NiCUnF0ys/j7uaddt9NJmWm1EMCrX2s65gTFPIBLw282dfCghFGRG6fAUpWMKwnHnBa6UUxLDVYqTyna0Q3OEbMo/Bc5jOOS6csRLcfG25iywv2lhFe0UADq6kyl23T2sZqpOggcjullsgkPyfkidNPTurbW5cPDSH/xW49wv0cWb24JDojie89UhtT+FysnMhwlP72e35t4xqets8oWH62pXwVyQ7v/wwYdLrFvwxOmHww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GlFM7+eu7q7Mas5jSCHnPd865/l2fjscVEpXXLt/aRA=; b=KE8aw0wRVAQDXR5iAUpwRgLEKZf42w6/J882P7R2JycJtwgWGVJtde9U9BOmBxcImo4hR+6jBzcVZ9AoepfneaBNMhhTmIB1hWq6BuTElrS0tD/tg+xqmjHvd7m1vQvWIu4QDeieEgFdTPEniPDkGWdtL8hcJ4Ewqn2+nZTy67lW2lRW+gun9O+xldZfPo4fNpPWnSYgAzx81SlFRQ9+qUQWAVYY6tGF5Z8RvCtzQe/sjFBc8HsNDmhteZJw17IyKVhhdvJb3G20PUTyUQN8c8qsl01S3SfoYktpvMkpXkAhIZzpNCObCoUJ5Hg0QMP2evZNptfgbGojhHlhLyg/8w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none Authentication-Results-Original: sourceware.org; dkim=none (message not signed) header.d=none;sourceware.org; dmarc=none action=none header.from=arm.com; Received: from PA4PR08MB6320.eurprd08.prod.outlook.com (2603:10a6:102:e5::9) by PA4PR08MB6208.eurprd08.prod.outlook.com (2603:10a6:102:e5::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.28; Mon, 15 Feb 2021 12:03:25 +0000 Received: from PA4PR08MB6320.eurprd08.prod.outlook.com ([fe80::60f0:3773:69b8:e336]) by PA4PR08MB6320.eurprd08.prod.outlook.com ([fe80::60f0:3773:69b8:e336%2]) with mapi id 15.20.3846.042; Mon, 15 Feb 2021 12:03:25 +0000 To: libc-alpha@sourceware.org Subject: [PATCH 15/15] elf: Remove lazy tlsdesc relocation related code Date: Mon, 15 Feb 2021 12:03:19 +0000 Message-Id: <99e61c835b6365a54ee282392cc3241b2b7de46d.1613390045.git.szabolcs.nagy@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-Originating-IP: [217.140.106.49] X-ClientProxiedBy: LO4P123CA0096.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:191::11) To PA4PR08MB6320.eurprd08.prod.outlook.com (2603:10a6:102:e5::9) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (217.140.106.49) by LO4P123CA0096.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:191::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.35 via Frontend Transport; Mon, 15 Feb 2021 12:03:25 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 3234b1ee-deb0-4616-2eca-08d8d1a9b743 X-MS-TrafficTypeDiagnostic: PA4PR08MB6208:|HE1PR0801MB2010: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:9508;OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: tzImqJ+oRs/Op+pNPxH9zLrv8+hGumEd1dgJJRcKCx1tcD4vB6cJaoWv3Patt7sRD2r1MgFQA2QY3klH36lBZNMJtRnoXwQ8fjB692LET4SzxVTrx6n8uEL0UKErSZtgAOvVzbq67GJZ2UjUbP6trmKbG7AvY0f2JYdF6m6KFOXj9qWnzwDxpEaMj0p9vMJn06iOXqJW7RGAn5CcN5hbiCVsce/ABDCsQ+WbZ/VmXAbtFdDLDW2tdl0pnTUxfy/Tm15g7zkz98whTTLJfeDNiMejowZGOEgo1brJwWW9Fgx6EoyYwPtOwJmuWSOl7jYEdByVAOJupGo4D1iFyHmrlPZILrXjQXjBH1/TUiJZUTwHqdq5aHChih4oWVpB0cn7MpM9jPqab0L7m+1+Kt6y0swfT5VagM5dppywWvSPAg45qVML11sUv1qZhwRxxEzawb8W8eLA96b36osGfsP7Tbf8f/KvN9Rwa1K1FJIK/+ZJe9aVoMJIWbJKUcfi3eYMvyeUXLsJMbMVDj3oa+Qti3bRmdyEfuNMkOBgRVI4OqvkQhxIxeWEjDvRew/87q5oCDzGQ6Gy0wjqmo0FwTkwGQ== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PA4PR08MB6320.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(396003)(346002)(136003)(376002)(39850400004)(2616005)(956004)(44832011)(66476007)(2906002)(16526019)(66946007)(66556008)(6916009)(186003)(36756003)(6486002)(478600001)(5660300002)(26005)(6666004)(86362001)(6506007)(69590400012)(316002)(83380400001)(8936002)(8676002)(52116002)(6512007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 5BtK4mIx+g3lWCljKd5+urm0aMH8MRV0H1qci0ote2xBJvR+Zep9eRDCksM7k0wK1FUyCK2qXm1hPjXbyjWuno1xOvtr6uJcJeqoDBeoFGaaDXXG9jft9qEreOOb9oREbzYrHmPaWD9ekthhHiGXCrolMWgiWjJky1pBrpZb/8On5iALc1jBk2s5vGqbw0pkFFmjQblVQQi96M9sncgCsNTihrdPDULI026Jsqes0rtXnr2IQt0x4uvPzZScoJKXBNLxLxdEMYR1vOsYAUPFFPvf5oC0FjxBi7EeXVYjei2Fz0XHKz81AHd4qMu/kw9kVVGqGd65IDaIN1vqB8jDNXt3ba4Ez/OWznas9HoW89HF5q0XYJjVk7NKPnNJyRjzyKXGQ5B7FFQj2NHzhS+j4qp0vDJuXx38HMKyucjAjJKPf3LLAVoVSbn5K6NTikkagRb2v2jdhA5T6ftv+UZu1s0Q0JTwspevpWXgcPSEc9YgnhRfhs8Ae23chVdkWGMSQoeVXFQ0uGFRAy/IJ/AL3O02o6BCCQhkOyYdfcdXbJtNOha1dHTT7rvUYGxc1souRwasrHTdFounfeWbRqjuEW4vayOk2O1iRghKuRUL/Xqv+fEdIlFClsvREsZY0eQim3JQsAAzMzRMOnz17dyGxDYr3LwZGzfMNBNbsl550G8jK5CRuAaRzX4eY32wZgA0QlQnyKrd1+TgJMxPrl0cBRtsmguTVd1uCXofjA7kujkr7GdVg9cygrNHeVrTewv975ecjTIpZ9MeHARhdo+FGxSVz26KM+Styt+eKWRiGp/G7/8LJGJQljJRzPRhWPOYvypCjFyaqfZ0j8xUhIG72DGQ7PNraO1tPJ0tqsFPRKB+pC59cxZdr0TzOjiMDscxoFxXrlmIv/ihRGeRhesy/WMpJZqqZVsPfzPfR8WHzXuI9D1+JzeAQxaRdy1nXxKScdqvmGtYOwof3Ap2mM8PzWBLSa74wb95Y96wJ5YeJqHw+ZVXGKMNqSHW3MgxsVujqs7YpB9mcxjfpueNW/VLmL0y0eeNt9fj4rZm4zCknGiEfgJoMwIc/dYN9jN9osVa6ZON5g2Otn8t4YZFOVouqCXrgNjoTkD8a0PUe3OZPVh7QfO7FQ9HTGOxV7NTVZvgMWHBxJ2LyrYkz2g3q27kzzIzJ5P5yEu76XX4rjuh8BfwkdKz1bsezTe8YPjVKZqD/AWVzVX5T1qNSZ21fM39luUhEhmBOwnVVDL+Yy02D2cEm+esbRk9MO8pq6dBIRS+QYZh2LsFBx83exhZ2eohJr0ZEDT5wn+H6KRLJY+2Pskz0ScX9OKNpf7eO2/tdHvx X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR08MB6208 Original-Authentication-Results: sourceware.org; dkim=none (message not signed) header.d=none; sourceware.org; dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT047.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 06b71157-db8d-4510-310e-08d8d1a9b2c2 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: swd/DJ9Wa9Jm2nrFNQKW6yxywWGr1CXzIqszA+wv1YUPyOZ5NxuzMoLU/Bintl4oahIk91X0TyvSdl9poC65S8qpQS8E1/lF+3isnRCsz0mPhNoubAXZWtAt2o6pMJK69Y9szxEFnHrgUmuVcEf162RtW1iwjFl+wMCZKYsYNDrdJsB48BLNlcsseWxrrAZbqkgMeOHsxx+tEP6k5ebmvezs7XwL0AFtHr608eW/77822lR0XpQ2WuVxdxzyYddy2exwJqmlhkWAI/NTFAghv0AJ7YM64sPBhQrYbUB2Ik8/9okqJyg6pkQswihqMv2NNMcTmeYjBOJT1uOrN/OplviaBO0rpMB6m39TRoMzxNYg0oaLV2s4j81w19+WLkY7Ln9OrzOCE8DYAyFQ3DVmuMQaDh+JkSrReRvRpnmHVzAVUuHUK7m5kMv2z8KiJ2q2iMYdkR8dEPPzmbGdyypHV3XlzyxrZmtVx2d003O8tncqsE24QqE5/s7qY6WjpfvkI9SYCqZEeWBmCoXdgLwEe+tOUReAOWYmYMmqZTzoLutlP/i76RVDlqc+rZoh1JfrjBkUcnXJgWPj9R6jJoU+upUzA2tsANaEOG1/kQfhoEmmsTp98jLkg1j+46ClQoQXWrxfdzpdNz5milBRlGHzQjQHXXTnpg9zG5zCR11JInLEGV2xdl/eoXxOWIPb8JWf X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFS:(4636009)(376002)(39850400004)(396003)(346002)(136003)(46966006)(36840700001)(82740400003)(81166007)(356005)(16526019)(186003)(6486002)(36860700001)(2906002)(44832011)(26005)(6512007)(69590400012)(478600001)(83380400001)(336012)(70206006)(316002)(6666004)(5660300002)(86362001)(956004)(47076005)(6506007)(8676002)(2616005)(70586007)(6916009)(82310400003)(36756003)(8936002); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2021 12:03:32.5907 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3234b1ee-deb0-4616-2eca-08d8d1a9b743 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR03FT047.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0801MB2010 X-Spam-Status: No, score=-13.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, MSGID_FROM_MTA_HEADER, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Szabolcs Nagy via Libc-alpha From: Szabolcs Nagy Reply-To: Szabolcs Nagy Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Remove generic tlsdesc code related to lazy tlsdesc processing since lazy tlsdesc relocation is no longer supported. This includes removing GL(dl_load_lock) from _dl_make_tlsdesc_dynamic which is only called at load time when that lock is already held. Added a documentation comment too. --- elf/tlsdeschtab.h | 53 +++++---------------------------------- sysdeps/aarch64/tlsdesc.c | 1 - sysdeps/arm/tlsdesc.c | 1 - sysdeps/i386/tlsdesc.c | 1 - sysdeps/x86_64/tlsdesc.c | 1 - 5 files changed, 6 insertions(+), 51 deletions(-) diff --git a/elf/tlsdeschtab.h b/elf/tlsdeschtab.h index 21695fd1e9..85bd0415e1 100644 --- a/elf/tlsdeschtab.h +++ b/elf/tlsdeschtab.h @@ -78,6 +78,10 @@ map_generation (struct link_map *map) return GL(dl_tls_generation) + 1; } +/* Returns the data pointer for a given map and tls offset that is used + to fill in one of the GOT entries referenced by a TLSDESC relocation + when using dynamic TLS. This requires allocation, returns NULL on + allocation failure. */ void * _dl_make_tlsdesc_dynamic (struct link_map *map, size_t ti_offset) { @@ -85,18 +89,12 @@ _dl_make_tlsdesc_dynamic (struct link_map *map, size_t ti_offset) void **entry; struct tlsdesc_dynamic_arg *td, test; - /* FIXME: We could use a per-map lock here, but is it worth it? */ - __rtld_lock_lock_recursive (GL(dl_load_lock)); - ht = map->l_mach.tlsdesc_table; if (! ht) { ht = htab_create (); if (! ht) - { - __rtld_lock_unlock_recursive (GL(dl_load_lock)); - return 0; - } + return 0; map->l_mach.tlsdesc_table = ht; } @@ -104,15 +102,11 @@ _dl_make_tlsdesc_dynamic (struct link_map *map, size_t ti_offset) test.tlsinfo.ti_offset = ti_offset; entry = htab_find_slot (ht, &test, 1, hash_tlsdesc, eq_tlsdesc); if (! entry) - { - __rtld_lock_unlock_recursive (GL(dl_load_lock)); - return 0; - } + return 0; if (*entry) { td = *entry; - __rtld_lock_unlock_recursive (GL(dl_load_lock)); return td; } @@ -122,44 +116,9 @@ _dl_make_tlsdesc_dynamic (struct link_map *map, size_t ti_offset) thread. */ td->gen_count = map_generation (map); td->tlsinfo = test.tlsinfo; - - __rtld_lock_unlock_recursive (GL(dl_load_lock)); return td; } # endif /* SHARED */ -/* The idea of the following two functions is to stop multiple threads - from attempting to resolve the same TLS descriptor without busy - waiting. Ideally, we should be able to release the lock right - after changing td->entry, and then using say a condition variable - or a futex wake to wake up any waiting threads, but let's try to - avoid introducing such dependencies. */ - -static int -__attribute__ ((unused)) -_dl_tlsdesc_resolve_early_return_p (struct tlsdesc volatile *td, void *caller) -{ - if (caller != atomic_load_relaxed (&td->entry)) - return 1; - - __rtld_lock_lock_recursive (GL(dl_load_lock)); - if (caller != atomic_load_relaxed (&td->entry)) - { - __rtld_lock_unlock_recursive (GL(dl_load_lock)); - return 1; - } - - atomic_store_relaxed (&td->entry, _dl_tlsdesc_resolve_hold); - - return 0; -} - -static void -__attribute__ ((unused)) -_dl_tlsdesc_wake_up_held_fixups (void) -{ - __rtld_lock_unlock_recursive (GL(dl_load_lock)); -} - #endif diff --git a/sysdeps/aarch64/tlsdesc.c b/sysdeps/aarch64/tlsdesc.c index 9b6a8b0ec4..3c1bcd8fe6 100644 --- a/sysdeps/aarch64/tlsdesc.c +++ b/sysdeps/aarch64/tlsdesc.c @@ -22,7 +22,6 @@ #include #include #include -#define _dl_tlsdesc_resolve_hold 0 #include /* Unmap the dynamic object, but also release its TLS descriptor table diff --git a/sysdeps/arm/tlsdesc.c b/sysdeps/arm/tlsdesc.c index 2f70adef5c..b3d1735af4 100644 --- a/sysdeps/arm/tlsdesc.c +++ b/sysdeps/arm/tlsdesc.c @@ -20,7 +20,6 @@ #include #include #include -#define _dl_tlsdesc_resolve_hold 0 #include /* Unmap the dynamic object, but also release its TLS descriptor table diff --git a/sysdeps/i386/tlsdesc.c b/sysdeps/i386/tlsdesc.c index 436a21f66b..364c7769ce 100644 --- a/sysdeps/i386/tlsdesc.c +++ b/sysdeps/i386/tlsdesc.c @@ -20,7 +20,6 @@ #include #include #include -#define _dl_tlsdesc_resolve_hold 0 #include /* Unmap the dynamic object, but also release its TLS descriptor table diff --git a/sysdeps/x86_64/tlsdesc.c b/sysdeps/x86_64/tlsdesc.c index ecf864d6ee..3bb80517a3 100644 --- a/sysdeps/x86_64/tlsdesc.c +++ b/sysdeps/x86_64/tlsdesc.c @@ -20,7 +20,6 @@ #include #include #include -#define _dl_tlsdesc_resolve_hold 0 #include /* Unmap the dynamic object, but also release its TLS descriptor table