From patchwork Fri Jul 7 12:01:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 117125 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp3254403vqx; Fri, 7 Jul 2023 06:07:37 -0700 (PDT) X-Google-Smtp-Source: APBJJlHEWOdgfVmSlgHV98exerqbs7qHoTOJM7KS3tTRuRR9LCOyk7/i3IsKloTmcUpeK/NXYkBa X-Received: by 2002:a05:6512:3049:b0:4f9:586b:dba1 with SMTP id b9-20020a056512304900b004f9586bdba1mr4495953lfb.4.1688735257049; Fri, 07 Jul 2023 06:07:37 -0700 (PDT) Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id o2-20020aa7d3c2000000b0051e04eb3321si1976840edr.519.2023.07.07.06.07.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 06:07:37 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=L3IQFc6O; arc=fail (signature failed); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D1848396C0D7 for ; Fri, 7 Jul 2023 12:11:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D1848396C0D7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1688731910; bh=pCjxrmyag7z8LKIKwQFuA5EGzG5lnxA9rZvj2PABQI8=; h=Date:To:Cc:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=L3IQFc6OAPQbQIbfPxqcQAXE7o0WrO1ELi9K2ayX7ugB4ovrNU9NT/N6tOpFuJeKM 9H7VwtleEnblRpiskbqpK4avhM09fcIvhr1GI2G5a49qww2g8pmvYj/QyG7bOk2TQf QXUbaRie+sV5x6b8k0f9u8PjV1FZeAK1+pXx4Ijw= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on2050.outbound.protection.outlook.com [40.107.13.50]) by sourceware.org (Postfix) with ESMTPS id 39800396A2CE for ; Fri, 7 Jul 2023 12:01:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 39800396A2CE ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UBDXBA95kzXzCCYlFgoLAg37KEKUWYmtRV0X2Qy54Jd1uyaUgbve++3nyb8xDWBCBX9HXou2M8E1nsrEEeRNbE76LfcmBKnTCdlzy1ADhXPvx0S6ZMri853kcKNIKR1CL7lF4kPc/8cMWlt8xdGRNp1tNvrZXY8NV51aaZ4tMAH1JCx83QlH2AFSS9pMGVFThanTmpqe7SfsBIlyGK8t+0W9I3eexCIJ3zgRpXTUjzsKOVccxVolsgApIoXBz/S3LzrN7dX3BA7bQqsVkCwQuCXAYq4MdJIkkEjvTu+CDR8kAJlTtex2xAng7HIgSWuP4ZljMkW9Igug97NxQIn2lA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=pCjxrmyag7z8LKIKwQFuA5EGzG5lnxA9rZvj2PABQI8=; b=TeDkp5s7mI5gjUsXYniU8Y5LfeWRHic0hbBSA+JBMoJ+GIuOxvAbshgxlLy/HcMCLj9ISSBz2YxGvZ3tUDgKeWIBfgI75bsqaXMJ62hpwVoLZcjupBjGmQozQQpEFvhWmyp7mf3JVz/bvMIsReTvm/PNVKv7wrFViivruUbcomrdnQnMFJdVi6Jr8tSzMadZ52n4socldq/jiMIIKRUJ2yQMr65rIuTskupjkI1fXjTQ9+hO2wp8w5ye7mi/qsWJY7sU5MRXHgSiQxY24LxrFIeXQPLB2RRogNO/Gc8rJtagRr0+DdRksFeu8DcJ7u19HIplYD4w0+V3twfuvp+rSA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Received: from DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) by VE1PR04MB7373.eurprd04.prod.outlook.com (2603:10a6:800:1ab::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6565.17; Fri, 7 Jul 2023 12:01:10 +0000 Received: from DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::9bd3:48c9:ff58:9880]) by DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::9bd3:48c9:ff58:9880%4]) with mapi id 15.20.6544.024; Fri, 7 Jul 2023 12:01:10 +0000 Message-ID: Date: Fri, 7 Jul 2023 14:01:07 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Content-Language: en-US To: Binutils Cc: Nick Clifton Subject: [PATCH] ld: fix build with old glibc / gcc X-ClientProxiedBy: FR0P281CA0130.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:97::17) To DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PR04MB8790:EE_|VE1PR04MB7373:EE_ X-MS-Office365-Filtering-Correlation-Id: 47745519-5c11-4e3c-fa8c-08db7ee1da45 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: R6FUOYlzsWfklYVIsmwP+Bkxg1fAxSutI010CUi2kbqfiRM0VyvE5x2xukgsld8dx1ebbC1mmpXsjPQfEGBO9mDgsQTifbUJj7Gw7BRPCD4SYQJ8pjRChiHcy0blMdp3X598FzN8U7cJ+dHjziL9n7LNrekVsbraZntHil4jeGcRVLYBtuakkTY9uxodfh0Rp2+1zXxKutxdOR2MgnsvfuhYT8dlRhTTcf3+iZMaAyavl5WIUsDKJkxrQilbeVgPSUJlY76AE5QRbfgOMPeccpdYz1vzwDCrKUQsClQ+sxajanmG70GijyiyHb1WZnp0F2xx6ux1PnOd4ZGRo+lT58TAb1m4p8P8uoEIKqeGmC7c7U26fwICzWQBv6JRZ5YINU1gpGyIR1ZLhl7VMFgBgyGph2BqqY/bt3EME0GUZPSMtePh24MzARR6IT/1Kiqf3Ygm0NOtjXRfXxZJu7urYcEH21MX2cw9B0P/t5fx7w2f0daQlmdt1TqepPP6Mme5jnmSuJ1PfNcxQqIcpxAhsalmTTWW9+/A8djVpI6B2eKnySGjU8BQQZz5+PTca2ao9ROft1LtUDFtkzuQmsQT7tf4u95YDzVMNTAwLFfHbiiTfC+pHOmh1q+VX2+fjncbLsZwl5WH9N31odwELKbW4Q== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU2PR04MB8790.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(346002)(396003)(366004)(376002)(136003)(39860400002)(451199021)(38100700002)(6666004)(5660300002)(478600001)(6486002)(2616005)(4326008)(26005)(8676002)(186003)(6512007)(66556008)(2906002)(8936002)(66476007)(6916009)(4744005)(6506007)(31696002)(316002)(66946007)(36756003)(86362001)(41300700001)(31686004)(43740500002)(45980500001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?1sW35ix6HZ14pfo7GxYs1jnXlg8m?= =?utf-8?q?a+Sm9jTTDuQLPb7kGOsTgIIX3mapyeX2tMPmZ5lH0iX0+bWmI+SGQE2l7lBubzzNf?= =?utf-8?q?2NN+iNPaQv3VpW8zuR6S+rLIYT4N0fhZN9qLAEtDTR2SyfPe2bKWn58t3WjNoJbp8?= =?utf-8?q?SWmg5hjAakOOacR8KawwryU4XLtPL9H3wiTGjXp573etsxuJTPV4YGILWKk9Ovuei?= =?utf-8?q?aFpCg5709nt7bV+au/uOr3tFp3vc0VAd7+9bg2FqxkKcf33gGIWMlxb7ESlFjyupw?= =?utf-8?q?xRXCdqvwSjadQAxvYGRBPQvMJP/eRxWDzPHTT4oicLhjiobhBcoZ0VZXLYUGpBgAh?= =?utf-8?q?YGi+X/k/Hc6vlKS46IDR1FNhHykFOr7z/ph6qMV/TF/r+I642zxv9oPXHmEMQxn1J?= =?utf-8?q?TvazHHjddLqkCAMNTRhu1ioOVSLwdzvSedbdPSVhaXVr6WS81i2P9arXDzU7A+szT?= =?utf-8?q?4EFBHr7JBpSbe+IKX3mzGYkChEKU+g1aN8/CNZWf4FV4P8wHJMWboZSchViZOoJzf?= =?utf-8?q?pgVYkarYddh7qE8nci08pY7gVm/ZIgeTLq/ojuQzfWgY4cWz2ie9Eohxy83HmVdp2?= =?utf-8?q?/mksOU4LaITUL+NMBHuGfhkMkVKhKMqxvGrAMvo0FXIGjSiAVYAyBnILvp6IHupEj?= =?utf-8?q?sKQ+dpGuIwsKeBFva1zVojIzx9xGPvKg9z679rJaPnh1Pi8aEKGti+7v/7KzmmdR+?= =?utf-8?q?KysSkNl00mCn6wkHzUspjXzC3tysUPJJLc+AWh8EseWuklkkIbK2Z13RXIvUFUktN?= =?utf-8?q?DiIV0JRKeLgvAG6KlvPu6apSE4zwSu+hEtTHqQb6Q/Kehrx4x/vYdysyUwb2jhG/8?= =?utf-8?q?AiNT7EsaFkMU/1DhK++6z6iEWaJHlq4IQDEas4QWKhNt21zBmXPV+XMC9Kmguf1mx?= =?utf-8?q?iYpauxtCRue13zAf9FYsYPuJ9qqPrTgVY2vNoQ4y0DvLTavkMpyPZ4oF0q04+GVDZ?= =?utf-8?q?O9xIuez3DcqqzFe9dkkn64C3KQM7vXO0HRyIPjBLtQfrA7Av5Qe3wSnBAx3krZW04?= =?utf-8?q?aVv/KL/MDvFppjWE+lyF/f9onr3oT/6O5+DYkEMSlREP1EIkxEguCQhsnoFdtCwdK?= =?utf-8?q?9khtCjuzhRWPgidt7Cn2TEfRMHJU/rtq6qB58yBfFXJmRBcoy5dZBrOxm2fdtWFc7?= =?utf-8?q?vub8Im+qndWGvLPjoAXvfoRebHJnlcjRTGNFl131rBd+XTo/G4J1U3nZ0h0S4WQBp?= =?utf-8?q?TE0/npUg82HD9xK7tKxuy26q5QL8jWQsD4VPXc+cvKcgwtzOMZKZPXXq7W0fipd7g?= =?utf-8?q?jDkeksAwUpO95GhPsMJBXrw5gqF4tRueHcTxRCsiqYNEuYJ0MB0XvVbl9Q1c9T71r?= =?utf-8?q?OTXbloUeZCtQEHXHHfj7paWCJXJxK5Jbhwh5rxsFkiqnjafjSwZf3934VwEC2Bh0/?= =?utf-8?q?ugmOTzLF3dSd4UBbk8G1xqjqDhhx9c3vvYW5+qXz9FQzqC9QNbJSqKByAt7BZh7Ex?= =?utf-8?q?H57HJNiP6WjH5fGyvq6fGMcCa+5IM9eYl5EE8cbtaI05TqL52efiw+olOHMNjAzZO?= =?utf-8?q?NJxQ+7XZzTt3?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 47745519-5c11-4e3c-fa8c-08db7ee1da45 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8790.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jul 2023 12:01:09.9070 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: PZyahnrsfuTErcWmx9pkV+vEz5r/3UDpiGRwnYYRXUcTuWsOfiRe9IB6tUxpIPa3FQxTFGG0IneRXt1n5Q9B2w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7373 X-Spam-Status: No, score=-3026.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FORGED_SPF_HELO, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jan Beulich via Binutils From: Jan Beulich Reply-To: Jan Beulich Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770767260460757946?= X-GMAIL-MSGID: =?utf-8?q?1770767260460757946?= "rename" conflicts with a function of that name, which gcc from that same timeframe then complains about. Use a name matching that of struct input_remap's respective field. --- Nick, I expect this also wants to go on the branch. --- a/ld/ldfile.c +++ b/ld/ldfile.c @@ -199,7 +199,7 @@ ldfile_add_remap_file (const char * file continue; } - char * rename = p; + char * renamed = p; /* Advance past the rename entry. */ while (*p && *p != '=' && *p != ' ' && *p != '\t' && *p != '\f' @@ -208,7 +208,7 @@ ldfile_add_remap_file (const char * file /* And terminate it. */ *p = '\0'; - ldfile_add_remap (pattern, rename); + ldfile_add_remap (pattern, renamed); } while (! feof (f));