From patchwork Tue Apr 13 08:21:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Szabolcs Nagy X-Patchwork-Id: 42974 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 3842D3968C05; Tue, 13 Apr 2021 08:22:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3842D3968C05 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1618302129; 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=xXPzMGQjWLruLZlEwNnn/oWT283RpgB+RgaQJkA2GacWQ+1Q0uLKvsPLUrK33yZYk d6PNWk6dV2kPJqIWj8Ogex9n1BahVxlQNB3jUrw7nbn73tE9K9UuLW6FULzG69RJ/C M6OOwVT15691L5imrlUTr6tekoCzdigNEtj/qCSU= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30044.outbound.protection.outlook.com [40.107.3.44]) by sourceware.org (Postfix) with ESMTPS id 703803968C01 for ; Tue, 13 Apr 2021 08:22:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 703803968C01 Received: from AM6PR08CA0028.eurprd08.prod.outlook.com (2603:10a6:20b:c0::16) by PA4PR08MB5903.eurprd08.prod.outlook.com (2603:10a6:102:e9::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.21; Tue, 13 Apr 2021 08:22:03 +0000 Received: from AM5EUR03FT007.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:c0:cafe::30) by AM6PR08CA0028.outlook.office365.com (2603:10a6:20b:c0::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Tue, 13 Apr 2021 08:22:03 +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 AM5EUR03FT007.mail.protection.outlook.com (10.152.16.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Tue, 13 Apr 2021 08:22:03 +0000 Received: ("Tessian outbound b610e7b4d771:v90"); Tue, 13 Apr 2021 08:22:03 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: e190c997b9ad551c X-CR-MTA-TID: 64aa7808 Received: from 1df9d9039700.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 834660C6-989C-4E33-82ED-40B0647F3EF3.1; Tue, 13 Apr 2021 08:21:55 +0000 Received: from EUR04-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 1df9d9039700.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 13 Apr 2021 08:21:55 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j4gl3jwEG26kk84xcWp8vLO6ZSCo1TIIbZYgI+RE6WjMxS3WzM0FafHP77RiLtwVRHLG36MteLOAbZBbWmonNTrG/WgFlK3w9dDrfpDkaf20fptGCQcchLid1BDyGEp+uQePQsTBylfC0jCOZ+A7p0suTrI3Yca9nHgRaA8Ec/sVrLVI0tVuw8SIXe+ju6oO867CGp5Ldb2WfTuyW6ObgA9XbXncQtBEdBpEHUwGAJdz5btgpz4sjb/0KOsiNGE7/Q8R/O/4ftvRZko6AbM4YrpdgjLP6kq1c8jtBSaan4T+Vc8Sm3Xtl9r0/oiftNC2cBZrKjV12iL7+XLAwys7gg== 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=di3otYMW+2IMl4Uozc8CpMaMe5+d8DDQFf6+8rtqo5iT/GM7ubRlg/bITO7fiTRNAHudY5eHCGqXPtVu7N35dRibiVkMA4ViaaB8tQsxvz9JJufRtHAOf2/Aof24G+16/aC5bBQzfX10D1+GlPVABVUDaQaSN0RYA4kHnwYSsIl1oC/NTWvCSsG9Zl2UvbN3SbIVO3ssF7gE/RHbY0rrCpZIelJK0yvt3ZXPvsp56lzBdlerch6IDZuvqrQFQc63i+gcN8PQ6tmN0vaqni+iC3QRabTzZ5B+5Nr7Qlna/x8xJIFtoV8a7PAEIOwQVvS+dBLZN0KiGQhaps7/ROkM1g== 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 PA4PR08MB6237.eurprd08.prod.outlook.com (2603:10a6:102:f3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.22; Tue, 13 Apr 2021 08:21:47 +0000 Received: from PA4PR08MB6320.eurprd08.prod.outlook.com ([fe80::c99f:671d:bb2c:f20b]) by PA4PR08MB6320.eurprd08.prod.outlook.com ([fe80::c99f:671d:bb2c:f20b%7]) with mapi id 15.20.4020.022; Tue, 13 Apr 2021 08:21:47 +0000 To: libc-alpha@sourceware.org Subject: [PATCH v2 13/14] elf: Remove lazy tlsdesc relocation related code Date: Tue, 13 Apr 2021 09:21:41 +0100 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-Originating-IP: [217.140.106.55] X-ClientProxiedBy: LNXP123CA0016.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:d2::28) 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.55) by LNXP123CA0016.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:d2::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.21 via Frontend Transport; Tue, 13 Apr 2021 08:21:47 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f7897c79-bdd5-46dc-1b00-08d8fe5537c4 X-MS-TrafficTypeDiagnostic: PA4PR08MB6237:|PA4PR08MB5903: 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: tzlIvXC9c9IJ5zl2GazIu/wWTeK8gKW4zNEMQwPD672fw6XMJVkCp1EE1WbWyxc4y7Rck33a5/lS4Vlfe9bF1KJGOZVw6Kjqjv0oWpXyxEI0ra1ycCO9yDuyUUTL0oJYxcHsIuGnLCBmSZc3/fn0jdUDN9lYhJ5mhko+5R4l8d1zjscA6Bzso2s58zYH1hyCqYkd4KKM4gRi+SrxlnKm4uu5ju8IV8PvbF8pDtyKIGfI96MSjFNJ19GWOApq4vgvjUeCWQRNzmn+Ol5M/w+MIBwI5OEb5BJGZ+KPPNkSLzvjL24sgbQO885Ld05as+LD9igr3JI6GpU/UAtyYkHOWwPbdwYvHSDr7ZrTbUrUBjiN1bkMu/ueVbPlx4DQPBv1NcUwIFCn3fJRHWIQpt0+q2ACa6W3Apk/g6Pi0JW4V8UuU6dBOj16dwWtebIHfKa4DUypUnFqsBdDdyKZuh06L5XiDiDTtxx/1emvkyNldK4uROXOGo3uHofdyT4hhNI6aB60OvOQlSB65p0+3uFzlp/w3IzP/eUZ3WyZg/komujmgI45+Jx9dgrJtJjRLhf0/BDiBRX89YG3rObFYA7O2qXJ+wuk/9YJK81IspTRc6dwRx5v696IwHu8g7lnsqfxcEJ1IF0cNDWqWx0GsNcWpKfIFZAcj3sjjVsVQZbXuFYQOTC78XZa9VzrcePcW8GU 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)(346002)(366004)(39860400002)(376002)(396003)(136003)(8936002)(86362001)(2906002)(6486002)(66946007)(16526019)(8676002)(38100700002)(38350700002)(316002)(478600001)(44832011)(6506007)(186003)(6666004)(66476007)(6916009)(2616005)(36756003)(5660300002)(66556008)(6512007)(83380400001)(956004)(69590400012)(52116002)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 6FVKaoYBdy5DiGVsCx9jn0E3R1lU5uAhYWG4Z8tMKcPVCbDx1WfyqIGq3iWTYA5H4WuSPfXPMIfvEA3mvbyEc5r1WIHg7liW0McTVqZ4RF6N51MpLAt92HRohZH08Q13A54bXzvishEo9qDI/uRJhuNIVmviAJCpoS8Xj7YBqGUsBGdZNu5hojNB2YXCB4AZTpr6eEYIofpdDyRcY1+GYjDvCRvYu6j+kQLKuYC9EYoR7H1IRcfdFUsEmFkeT0XHiaufk6RTOu6mXU+aqj+1lHiCKKjZ6SLVORKU0oixj4hza4eCEpS6f9By0CRGEz/VQrFeAoCiM7LaPrc6L49FM5IkA1p8sXDFIAsbyoZlAynlVYYYxnfmf7X4HYWUaJykg0DjJr8VJvRjV7jPWaBnF0icm6ajG9TyGshZb+nheaq+otQHL27NIkkcGheRC2ptPofgM9WNp/CI/CtsecCQmZVL9M51WyCytpXoiYoRgQpr83mpurohWQseVEkSSHvaVjktYLAgo8DG7QAChu2q4qNY711Ah5u05eke4ac3vMHatqRGJPk9aV+YGlIRQWQY0OVMFKHfQE6FeU3kWKPONdGYtxRXal/ip96KUMzcsG1KhdLQaGkr7I4aSB6tMToW0p34+UnaHcubQTyRhaIz2C6tKEZilnUz5l9ex2Q2eSVlqoKyMdel0MpGznjYMvvFyzqtg+ZNP/shkDl1QDuksQeJgJ62pUXjtJ0DENz/tGcfutg13BmGKxcJKYR+VteZhqt/T5MkNkVvDN0taYV4s5s7lKWsjN9BKSY1AzjSNXLxtQJeqWp9YKmo+kc3/zlswf/GqkYQZFIdgM7LOQHlA2rh9CKFP8pNR0GCf0gN8W5DlWrbhgWHvUMTLpoYqTU7pviaB6iOKZYWgpc2xmNoQ2aMkLqbvHD9Ak2moel5dcmXCrrSz7zhwBicaYaeFZ5BhLHiRHm5xRvaJasjgDYAsKnCM7EMlEHrP3dCY5zuCZt/RrHLydhUzTYq5NG29G0ya1m+zGhW67davUKDObgQ0oIlqzJFzeP9G/KbF4pqakaWh/j/52yAJCtCeItA5mNDJuN9e4lrpQ2Pj0fdBlsxJEjtwGyb/4dgeLgGxIu+jnyzrDGgAfCdgoCfk6ECZzpVhegoo0zMh5N+4x2Upl2vDqBwwsPZyIw8DthKTrPcB80P4Vwxtk/HjLxo0CpOtLEdF7Ris23y2igNqfU4Aw9L91e3xVjcQnGDeVZS+XrUlz7IJGBmvXG/4KCf3BjK9twGmcFAP1vvxTm65SvYgQLKL+dC5rMBPRX00YcfURCPgS0ReJM3u6tjAYo2f+06tJaU X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR08MB6237 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: AM5EUR03FT007.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 8a6dca6e-8f12-458d-cbfe-08d8fe552e24 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: v2A4ZA1Jf/lK2gcszSoL5zzMN6B7POkzrRbu3n8FFPyXYF8l44t1zDyjvCjYF99G3LPPCVz5WOyR+YRIWN8KqnXmRxzO1lncj/Bz30iCvvSheq5HdMroCM7LhhZTNbk2QoNvbMohkFx7HD4mxBGhUEsDyUsLzw5EnUYpoK6bkq8N+2W/Kv+4VhhYfFukFV11v7qUIk2cBHcO/49fMuAZ3WzQgrwzLWQmn33KmgF+g9asOrBBVGVEN4BCLSTSj4/Y4KU8hL+Xhs0eFAtOvvOe59ZJ0VpGO6UyDV4brBax6HVnbL9qaRU9qDdNBnoeyptyJ5i1uR+d/3zMeScrED1JvGtQYL+r1j1jCAlOplbsd+aOR06XNinTdHfHFuLl9a1S7mo3XQVcAPPhLaN0vjf77Rf/upoyK08NWHYwpC3SbzDUJuMPuAKR8A8g8REkH8E3cOm4uB02vVItXKK7XWMnNev8Wh5AMM5oY2sZTcAM1qT5vyHYHjYETPMFfr6mXEJt4Lvg6L5mFjYduTtG3e9LOjTaCixAaetP95oEbRvvFsky6naKDmNi71z7mbQH8luJX3r3vS1EaVpkk6FR1DhkYWReTYU7k9PrwaY40dTj2K61yvCQIztq66jCBHEP3rFSG3dLVn4/sk2dd0VzE2AKp9KlfiHJTCGAm1gZ2xUuLYLmnAOBtQua830EjhJzCpPH 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)(346002)(396003)(39860400002)(136003)(376002)(46966006)(36840700001)(478600001)(44832011)(316002)(82740400003)(336012)(6506007)(6666004)(8936002)(36756003)(81166007)(83380400001)(186003)(8676002)(16526019)(356005)(36860700001)(6916009)(956004)(70206006)(6512007)(82310400003)(2616005)(6486002)(69590400012)(70586007)(5660300002)(86362001)(26005)(47076005)(2906002); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2021 08:22:03.3619 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f7897c79-bdd5-46dc-1b00-08d8fe5537c4 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: AM5EUR03FT007.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR08MB5903 X-Spam-Status: No, score=-14.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, MSGID_FROM_MTA_HEADER, RCVD_IN_DNSWL_LOW, 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. Reviewed-by: Adhemerval Zanella --- 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