From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS17314 8.43.84.0/22 X-Spam-Status: No, score=-3.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER,PDS_RDNS_DYNAMIC_FP,RCVD_IN_DNSWL_HI, RDNS_DYNAMIC,SPF_HELO_PASS,SPF_PASS,UNPARSEABLE_RELAY shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 6DB7D1F8C6 for ; Wed, 11 Aug 2021 11:01:21 +0000 (UTC) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 780503844007 for ; Wed, 11 Aug 2021 11:01:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 780503844007 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1628679680; bh=PTbB4vvTwr7FqD2+rIm5lTd5b++BkIo0399G8h7yogg=; h=Date:To:Subject:References:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=XMz/AwVXd3U1whEUHDlNiPtqAHNMsQfK2HT21f88bSLvJZn78Xo7NIszOv9PQzgTM 2m2m3kdtxdv4R7sTsuhHuxoaobBPq7AtaTlX5xsXu/tQafCVpqsvl+tcEMU0Jzm2uJ at6XT9P1Q6EyHLwzB2XE+QIX/dg0ZCr4sWdehNIw= Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-eopbgr130082.outbound.protection.outlook.com [40.107.13.82]) by sourceware.org (Postfix) with ESMTPS id 47BB33858D35 for ; Wed, 11 Aug 2021 11:00:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 47BB33858D35 Received: from DBBPR09CA0022.eurprd09.prod.outlook.com (2603:10a6:10:c0::34) by AM0PR08MB3329.eurprd08.prod.outlook.com (2603:10a6:208:57::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.19; Wed, 11 Aug 2021 11:00:47 +0000 Received: from DB5EUR03FT012.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:c0:cafe::f) by DBBPR09CA0022.outlook.office365.com (2603:10a6:10:c0::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.15 via Frontend Transport; Wed, 11 Aug 2021 11:00:47 +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 DB5EUR03FT012.mail.protection.outlook.com (10.152.20.161) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.16 via Frontend Transport; Wed, 11 Aug 2021 11:00:47 +0000 Received: ("Tessian outbound d9f41274f41a:v101"); Wed, 11 Aug 2021 11:00:46 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: d68432dce12cbfd9 X-CR-MTA-TID: 64aa7808 Received: from adcb64d63bfd.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id BFEE3C03-B2A4-4CAC-8C8E-89A01EFBEB44.1; Wed, 11 Aug 2021 11:00:39 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id adcb64d63bfd.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 11 Aug 2021 11:00:39 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EdYUHH8ce/vsTsO03t4FKH++5r4vU4iSO6DzpGgtpzpVgZA0hP/1SjBMwEOtUGwY6Tb9X2Js/ypzVwG8fYIk8TYfdmNGE3WedPbI2Y9tD/zRc7FYA3Wr8TedR9CW1oBnZE32SQ+OvngEB3bX9D+KnwCJu3kJS6KiAxq7s8nKumb/1Jc3r+oH1lg4sy5XyaWT1lm4tFP1O6f3mxBmr0T3eIp7OYRuJHeDjc5KmHajGV96j92whmeatXLYG7iEVwbG+/n7keqMdrDovJyWrTuy7BG6KoNfXj+YEAiboBW1z3Z9cwLal56el7OrNimygZRzbvvjLWiB08IVCp9Z9QEAqg== 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=PTbB4vvTwr7FqD2+rIm5lTd5b++BkIo0399G8h7yogg=; b=hlDiwYxk9AOgVzv5/A8jwVF+/DHZEldjbokVWd5Ha9WyWSbVdibOvSzUkZYY2JQrJlfTwh8avZqUXZn9RMKiJySkUYolRlMWCqo3XbYsp3qTQyCjggZ0LEhbBcaGKKVK136bi+EOzL70nc2I7xLWyB6o1C5qYWni+H81rwX7FM5iKNU0Q46c/d4IXsovLcP8Vh44f/C0Eo50MVX0yPwNETqYqcXfzk4Ekr+tJllNB1ERf/Iozy1XY4pNnbymV9GJBtk7hz6NmBYK3L7woGVmvd1WKIzIvXkgSgxricseyanvx5aRZbVc8tbHy3Wa2xJERvY7yOmSuWpvqt0+gWYlkQ== 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: google.com; dkim=none (message not signed) header.d=none;google.com; dmarc=none action=none header.from=arm.com; Received: from PA4PR08MB6320.eurprd08.prod.outlook.com (2603:10a6:102:e5::9) by PAXPR08MB6735.eurprd08.prod.outlook.com (2603:10a6:102:138::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.13; Wed, 11 Aug 2021 11:00:38 +0000 Received: from PA4PR08MB6320.eurprd08.prod.outlook.com ([fe80::cd22:a583:c97c:72a6]) by PA4PR08MB6320.eurprd08.prod.outlook.com ([fe80::cd22:a583:c97c:72a6%7]) with mapi id 15.20.4415.013; Wed, 11 Aug 2021 11:00:38 +0000 Date: Wed, 11 Aug 2021 12:00:31 +0100 To: Fangrui Song Subject: Re: [PATCH v2] aarch64: Make elf_machine_{load_address,dynamic} robust [BZ #28203] Message-ID: <20210811110030.GK20410@arm.com> References: <20210809172530.502327-1-maskray@google.com> Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20210809172530.502327-1-maskray@google.com> User-Agent: Mutt/1.9.4 (2018-02-28) X-ClientProxiedBy: SN6PR08CA0016.namprd08.prod.outlook.com (2603:10b6:805:66::29) To PA4PR08MB6320.eurprd08.prod.outlook.com (2603:10a6:102:e5::9) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from arm.com (217.140.106.49) by SN6PR08CA0016.namprd08.prod.outlook.com (2603:10b6:805:66::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.13 via Frontend Transport; Wed, 11 Aug 2021 11:00:36 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0dfa425f-0611-4c87-5933-08d95cb745ea X-MS-TrafficTypeDiagnostic: PAXPR08MB6735:|AM0PR08MB3329: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:3968;OLM:3968; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: 9Tzc03A2Mia0gDHb13rLw465e9PBbmWCRA6cC/19iDaP9u+ax3g/n/RH3obKZho6O4ECgwX85dkqIFTpOdrC1ZPSut0SxCjBRs++fH9zVqcakqMKl+pgAmTDVdupQPWI7RUqsscJNeNAfSzPTOYTa2PbVZxqjVHLm3UYy1lgofc24ayuyWnk3QpmTMIPPhF9WWOZfb9arqmg9q7vRZpnbKYZq2IQEpBZE39Wq7JYE65PN2mkgyjXmokyUwMvKni/nsoA3Hl9aVDsJMJcgVbnvvx2SRQTXURWO7juufRgXbHHyjd6iI5QQB3leYUS6V9QQsmaHJNuAf14WA4hsuqyLOdG+woNq1cuQWD3dsCweKA/YdOXUui/Nswlv9SzWebCnPl0J8j+NepGYkK/f+TRdrJ6n5aHAQD4MvECikrXnJO3gWAYfDDPBvjAsHCLlBgyC1QKSPJRXqnptkb+MpVqNlDSeA4tHkisaJ+IRhaURVZ1j2EM7pos6SehgWvPFhpdUlehHPmR2CHq8XlrxTdvsxOQ7K/PZA58rIoPmsrNKxZz49k08YCpavolYmPPwSCfenEx5Ur20h4gYaKh3lJKOcLsv2fHf5+uQwL/C1iS9J3peNnyCOrr2ARv25SSO4njwTWZbtsaIXbFqaNsp1h27KP1JvKCc9lmfimz77Xm1SSai64Ymmacl+5vxM/Kb1b/q+ty0gtTDqu/wHtSKrtOYRRibv++KqINJpRVALoYRTJw24dSAfVBJL72EftgTNkiOw1FL6BQ8njf3aiQ/59oCFF4gn1pt7oqwnAhM5Ydc5DBcSRO7sM7XgumWRWXbWF3 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)(376002)(396003)(39860400002)(366004)(136003)(346002)(86362001)(956004)(2616005)(966005)(36756003)(8936002)(2906002)(6666004)(33656002)(44832011)(26005)(478600001)(6916009)(4326008)(83380400001)(66476007)(186003)(52116002)(66556008)(5660300002)(316002)(8886007)(54906003)(7696005)(38350700002)(1076003)(38100700002)(55016002)(8676002)(66946007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?eTNRTFdKbFA0SzZJamtlMXNuaUwyRmhIWXk0ODM1ZVlNS0R2Y0RGZEM2Zk1z?= =?utf-8?B?bVVjaDJ6eitsaGZBak1VdUZaV2pNVmV2Vk1JOUF5WnExTnRpdDUwSkowVjZz?= =?utf-8?B?OVJrdGxHTnJIMTdpdVFqOWFCVllBV2ZrUnIwYXhJeld5ajdmWGVOM2ZYZHEr?= =?utf-8?B?VzNua1JDL0RSK2JxdzAzSm1WQk4xd3lDRDQzZXlseFRPV3JrUitLZTlBemhF?= =?utf-8?B?UWZWYjZIU1VOQnlKc2grMTIraEl3R0RCd3UzcWlHMmNYalcvL1U3L3FjeFRH?= =?utf-8?B?N2RKczJwb3ZzTzRqNWxLNUp0eGJSQW50aHFsWU1kREFMNEZ3d1RyZDdpWlNQ?= =?utf-8?B?NGlMVEdKL1QxVWxOOEN0TDNDaDRRNGNFUWl0UHY3ci9sYUFMdGU3dGxSaDMv?= =?utf-8?B?Wm9sV2o5TzZNMFVOREhxb3BZbFV5ekZSVUJZaVBTQ3BydWZrbjQzT002b0tY?= =?utf-8?B?cEFUQTBOaWZGbG1YSkFscEw2UXVoNUxpQThxcVd2T3VzbFBGSG9nbVpCOWxy?= =?utf-8?B?VVpWZWFNT3lVR1hNVEh1S21UKzdzeE4rRGIvMERYWXNZbWhLeDA2SXM3Z3lF?= =?utf-8?B?K05LN3FDcEFkbUV6a0FKNVZXU0dKRFJHREl0VDg5V1VsMGd0cGhzcTBZRmx0?= =?utf-8?B?TVdidnYwSWtnNXhvYkFMcFNmdXJWZGpDU2dQUE9WQmhiL0V2aGYyQ2JxMmdP?= =?utf-8?B?K0dxUjA2SS9MNVNPVEl4TktLWU9PNlRBRzhtVnozOTVWR0V6MUFIR2Q2SnA0?= =?utf-8?B?S2hOY01wK0tDemJkdWFYYldhcXpvbWRqWEFILzkyQ0N1WXlOSVUrOTVSU1FM?= =?utf-8?B?bjJrU2ZWRXFHVEJCWE9ZbjhXUG1GMmQzU0E3Y3U1RVlVNSswbG5TeUlMMENX?= =?utf-8?B?ZzRUbCtiVW93YkM1TnpuaUhUT0NRZFpkQ1Z0L3FFZUpuMXBhS2IwMjJCeHND?= =?utf-8?B?Zkxzc1hkZXcvaDlwakVtNTVSNWtJL1RZc2V0aVRsa21sNXZMZys4ZmdrQ2pu?= =?utf-8?B?S3orWVViZWdjRUl4Z1JYaXBOMkxjSDlSZ2txeXl2RCtJdC9oeElQYmV0LzQr?= =?utf-8?B?ZHJ5Q1lCUW5RZ0gwOW1vV213WlZMZHIwVmRZMDI3SVdkcTNudGlEOXcxZEF1?= =?utf-8?B?YitzUk9KQUw5anpCUHBJUjNXa1l0R3IzZ0lzSExjd1NVUE55RHo0Qm9RcWR6?= =?utf-8?B?dnIvRWRUNmpWWkN6RGs5RE90WE9iamQ2MGQrL0s5WFVTMTdxQngwN3VyUGtk?= =?utf-8?B?b1NjbmdISitNZS9PU1RyY2hFYmx0Qzh1NTdPSHlmeHJOMmVxYWg0cmYwN09F?= =?utf-8?B?UVdwNVhjWDFBQWx0SEVJSGJsWEZkNGRYSEJUZ2RWQ3o3d1J6V3MxeVRFaWk2?= =?utf-8?B?UUFma2ozL1RyMXNlbmdGeXJOOEcza0Vmdlp1cmh5U2E2a1JrYXQrTzNRZW10?= =?utf-8?B?WmZCTE5qK04xRkFRcFFhT0ZqT1Zsd2NDTWVqMkt4K0dNVi8xbWdxa1QySXp2?= =?utf-8?B?MGNZNForKzByZXg4Q3RaMFg3N1RtTDZ3NzFzMnBjRmNqa25HUjFCK3dUNUFa?= =?utf-8?B?SlVTV3NSbnBjSjc1U2FkZ2xwK013cjR5a0NFWlJVTG15TUJlRGIweVF5TUdB?= =?utf-8?B?YVJpeDlKQityV1hlTm82STNDUWpBZWJmNjF1NmJqK2pmVDcyTTR6VFk2ODJv?= =?utf-8?B?TllzaEVHL0pxc2RDcmJXaWVsUlZIYWx2ODRhcWRXdm5yTG94Z2ltQUViMWx6?= =?utf-8?Q?4ESaTv3ndw4LMvlfcYGYg2FFq1rKqeNgDCHo9P/?= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB6735 Original-Authentication-Results: google.com; dkim=none (message not signed) header.d=none;google.com; dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT012.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 50db63eb-5a57-487d-b4f0-08d95cb74098 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3lAIq8WGBSQl+EVpto3YoQwGNr6WCSJnmTkrmSuwfUyL4sOKt5/+gyyDM0SnAUqWQHIEjT5sz0oM3F46HDdJdeje9W/Sw73kuIaj5Gm/sVpVVB6z2K1Q3B5AGQbXSIG5DI5ERfjdinkHkwCN9ylWvoTb4lTvgiRnhq/0cebAPMLMS/LSM6RR9MmYZYUY+V6ueeV0I0LpCUASiwBHUVe1D39fJS4IngDQAxcix/LWl8pX583DLjUrEHb53Vpht3Np9xpGViXZZVSEOVC6UYfmBTpPUPbikyM0GsGVcc12ahX7W+xildzgdald6dSTn09Skx1Y/XaEypmBjDPFHKS5YVIh8OknkjCFAcyYfkql4CiiuYkUF6L0WcJrxELQauaNXBnBhswcG91SspwgicXLus3ZexvCgc4FqpAlHyQybSMNG3eSQqih3c49bHae6zqTXPXV0ko2f57O12i6OnGsDoknvXo/RylSVI60tX+5JhD2EX3SVg7OEy7qKCNx7MWn9mR7YQqKSJE5SlwV+cUvnkYtU+y0ONwKJ/+yUod7n99lp6QNrvkn5wNjCVQjG23Viwt+G6BO7Hk6lDezx6T46mObDdm7D8KMWsgEsEdUVHgGsAZT/0+tVl9Xqgj0Kao0abLPDc3owNujhUBlU7XlCWRJ3ipdA4rhycMOhI6VTPpo6aC5EojEPFqwd2fWCMZw7yLtUOzc+VgGV0b9nkGobkiDPCzyComXyJXdYQAI4XXS+We1m1FpA3mNhzxQad4XCf6VsnDm5kpHs6+EN/8vCA/9EgN5teNi+QGqP9PoZ5NyUUXbeISsZ7vgbU7qS7tS 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)(39850400004)(136003)(376002)(346002)(396003)(46966006)(36840700001)(2616005)(336012)(956004)(33656002)(36860700001)(82740400003)(478600001)(26005)(356005)(4326008)(44832011)(54906003)(6666004)(316002)(81166007)(70206006)(8886007)(966005)(86362001)(70586007)(47076005)(36756003)(7696005)(83380400001)(2906002)(55016002)(5660300002)(1076003)(8936002)(107886003)(82310400003)(6862004)(186003)(8676002); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2021 11:00:47.1312 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0dfa425f-0611-4c87-5933-08d95cb745ea 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: DB5EUR03FT012.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB3329 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: , From: Szabolcs Nagy via Libc-alpha Reply-To: Szabolcs Nagy Cc: libc-alpha@sourceware.org Errors-To: libc-alpha-bounces+e=80x24.org@sourceware.org Sender: "Libc-alpha" The 08/09/2021 10:25, Fangrui Song via Libc-alpha wrote: > The AArch64 ABI is largely platform agnostic and does not specify > _GLOBAL_OFFSET_TABLE_[0] ([1]). glibc ld.so turns out to be probably the > only user of _GLOBAL_OFFSET_TABLE_[0] and GNU ld defines the value > to the link-time address _DYNAMIC. [2] > > In 2012, __ehdr_start was implemented in GNU ld and gold in binutils > 2.23. Using adrp+add / (-mcmodel=tiny) adr to access > __ehdr_start/_DYNAMIC gives us a robust way to get the load address and > the link-time address of _DYNAMIC. > > With https://sourceware.org/pipermail/libc-alpha/2021-August/129864.html, > this patch, and disabling traditional TLSGD tests (neither Clang nor > LLD's aarch64 port supports), LLD linked glibc has the same number of > `make check` failures. > > [1]: From a psABI maintainer, https://bugs.llvm.org/show_bug.cgi?id=49672#c2 > [2]: LLD's aarch64 port does not set _GLOBAL_OFFSET_TABLE_[0] to the > link-time address _DYNAMIC. > LLD is widely used on aarch64 Android and ChromeOS devices. Software > just works without the need for _GLOBAL_OFFSET_TABLE_[0]. This is OK to commit. Reviewed-by: Szabolcs Nagy > > --- > Changes from v1 > * Use C instead of asm. -mcmodel=tiny adr is possible. > * Adjust commit message > --- > sysdeps/aarch64/dl-machine.h | 24 +++++++++--------------- > 1 file changed, 9 insertions(+), 15 deletions(-) > > diff --git a/sysdeps/aarch64/dl-machine.h b/sysdeps/aarch64/dl-machine.h > index d29d827ab3..3e10cb462f 100644 > --- a/sysdeps/aarch64/dl-machine.h > +++ b/sysdeps/aarch64/dl-machine.h > @@ -37,28 +37,22 @@ elf_machine_matches_host (const ElfW(Ehdr) *ehdr) > return ehdr->e_machine == EM_AARCH64; > } > > -/* Return the link-time address of _DYNAMIC. Conveniently, this is the > - first element of the GOT. */ > -static inline ElfW(Addr) __attribute__ ((unused)) > -elf_machine_dynamic (void) > -{ > - extern const ElfW(Addr) _GLOBAL_OFFSET_TABLE_[] attribute_hidden; > - return _GLOBAL_OFFSET_TABLE_[0]; > -} > - > /* Return the run-time load address of the shared object. */ > > static inline ElfW(Addr) __attribute__ ((unused)) > elf_machine_load_address (void) > { > - /* To figure out the load address we use the definition that for any symbol: > - dynamic_addr(symbol) = static_addr(symbol) + load_addr > + extern const ElfW(Ehdr) __ehdr_start attribute_hidden; > + return (ElfW(Addr)) &__ehdr_start; > +} > > - _DYNAMIC sysmbol is used here as its link-time address stored in > - the special unrelocated first GOT entry. */ > +/* Return the link-time address of _DYNAMIC. */ > > - extern ElfW(Dyn) _DYNAMIC[] attribute_hidden; > - return (ElfW(Addr)) &_DYNAMIC - elf_machine_dynamic (); > +static inline ElfW(Addr) __attribute__ ((unused)) > +elf_machine_dynamic (void) > +{ > + extern ElfW(Dyn) _DYNAMIC[] attribute_hidden; > + return (ElfW(Addr)) _DYNAMIC - elf_machine_load_address (); > } > > /* Set up the loaded object described by L so its unrelocated PLT > -- > 2.32.0.605.g8dce9f2422-goog >