From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150080.outbound.protection.outlook.com [40.107.15.80]) by sourceware.org (Postfix) with ESMTPS id 377743858C53 for ; Fri, 5 Aug 2022 10:31:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 377743858C53 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AFhOZ2s7iaV31j8vsXtwwcc2ZKM5jzmPh4NscjdBTU146dl2sfYHPl5wYBKQ05RwmQFd/ERZo7hhdncXN/Yv3kpoe6DdsnfiQArGi7HDrTB2uEfHD77yz/8SsjezmRZuST5E3zDC5lDbzE/QE9K4Z0HngbAN6wK7szM/2ZMoMuygqeaGLRmpGPQfLXamjepmYHotA4LUQa0dVEKI29l+lFmFumQ+rsfeiv7GySDb6aeyi+XhWADQ+Zax3rwuDPVNLGdAiNPtJb/yjAb5dz1xmjMg675+FeABZOnHeFSXaIIGSmlIkNt3246wq+MOMjLcQ3ij1YOAu3AlJWrqh5eECw== 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=XiviDKDkEq1o5TfEzK+TwoqsJCS9s6KV5O6jJuHsIGk=; b=W6Q+xiZFH7oiSe6HI4+5R3I4HJPbmP0qvqeQ4Fhu5yeIS//5zmhMLOMPDeseQb0t0OPfkZmIHtSfmuSY6eCfSZOaBXp7rIOdtB7fhPelUTgB9rDwvftr2nNKehZlqw2j2HJO3WfjN4gqhM9SIA8QzP6TnQtmAncetx7wldM3IBEgVYOa0Ozz0D1nqqnMehchupNiNId7u+IHUUuKBa6WRMx/fJeR7AREkh0OwUFodsntUwkkLh7Fmmzh/MNtaeqdOrDYyX+7Us3tcovnPE7aQ/k2KP310JcSZuK8Mt3oH9673qUhP1TqO1ZZT/DSGoDmkWUsDCrS8MjNIMbXZmDFpA== 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 VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by AS8PR04MB8593.eurprd04.prod.outlook.com (2603:10a6:20b:424::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.16; Fri, 5 Aug 2022 10:31:36 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::d475:4e1c:e4df:495b]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::d475:4e1c:e4df:495b%3]) with mapi id 15.20.5504.015; Fri, 5 Aug 2022 10:31:36 +0000 Message-ID: Date: Fri, 5 Aug 2022 12:31:34 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Content-Language: en-US To: Binutils , Nick Clifton From: Jan Beulich Subject: [PATCH] binutils/Dwarf: avoid "shadowing" of glibc function name Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: AM6P195CA0038.EURP195.PROD.OUTLOOK.COM (2603:10a6:209:87::15) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 618edcd4-d386-434c-8e43-08da76cdac98 X-MS-TrafficTypeDiagnostic: AS8PR04MB8593:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oeJ9Vm+Ec0pS5DaLRi8KCBxnj0X6IX5VbjWNesEz18tmsRquLQnuJescmL0UiOm6uSG5n6kpVl51hfzSzecDP1EXYijkNyQykvUlUbVw8zVeHqoFL+DPStlrDlQtPXmZXIJNgIwM45TU58m4lFkPqmQ2gls/BypOrnsrwsRhtaqKxHkjYX8ByBy/hGsLNg9WgdaJDp2MhBqraiBc9RZsnnjUMVWK7TpXVAGnbEWkRrkJuo6WLs9Yx8Kp9kDd+9yINDMKf5fqLs9hOXMiSY+fS8OFSh7U8tREyD19zhxX2ipjEGmjLkVUJrB67PnLz5iada9OYCdtOOAFVxkGZAYKm1BB6QzywojE0No7A5y30/WSePTNRS2Hpo2xuBKIVcVp0KM0f8SX91y7mz8CKtkmomRUW3f/9g6MUfdUEUwmUIr/4CsTh1BADOlt64FlhNZpbO4RSVcAkLfWVOEVlAE2SGLyPQrLL0t1d4nCAXtrr6r3eJR3yxG4KLjxM8rn2GlGa9xKQQ/UQZYoIlsQzv1JqBE6cNMzVmyvYuZvO4EoR1V63TaRv2aa1XmRtQP4GRG7tyY3ZoaHk9Kmhn0yETnanGC+ljxRMmgX070drC1fODe8DCK56eIjmiyhRngvnZgG5T5HOFdFe9joSqmQHcJmaGvd0YK62pmkzgHWSdOYYy5GG/e00ACzcFvO+MVJ4TdYGIBc8MACVX3d/LdELZ6fLt1ltKffYJ7xTARrnWthX+smJa4wf4a9DJx5pYeTJG3tUspQf32Aqoh60SrQkY/sllRsSWLehD83OSJwZK2B7Jg1ZhtZGeIgSQAsYpf19w9ybER0TFGAcED0z6dhKT1QDA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VE1PR04MB6560.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(396003)(376002)(346002)(366004)(39860400002)(136003)(6486002)(38100700002)(41300700001)(478600001)(36756003)(186003)(2616005)(6506007)(6512007)(26005)(31686004)(316002)(110136005)(2906002)(8936002)(86362001)(5660300002)(66946007)(31696002)(66476007)(8676002)(83380400001)(66556008)(43740500002)(45980500001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MmkwQnQ1NDB3K2xyRlBJejZucnNUTHd2TVgxZDJxOXhBUVdyYjVRMnNJS3Vq?= =?utf-8?B?UlA5Y1NvTWNrUmVZR3hoMHlkVVhZbnhlSWVaelh3OHN3N2ZEajc5RmM1dlFh?= =?utf-8?B?NWRqM21oZDcrQnowTWh6NkNhVTBTNUY4VGd6Z2VxKzI3clhvMmdKYjMvQ3Zu?= =?utf-8?B?YllyblJLV3plbTROY05mVEtOWlphUFNSb1BSUXU5WDg5Wkw5bDRKVysxWHlt?= =?utf-8?B?ZVc3dXpCdU1FOFY0ejlscVoxR1Z1a3dtT2tOTEhoTjZwM2VseVJ5OGw1bmNU?= =?utf-8?B?dUNqMjU5UW1CM0NwZ0VJSTcxTEdwR0lrcUZFUjJvdWlZWmxTcThLNE1vRk5z?= =?utf-8?B?QmtUMnJTbGNhUk8rYU05UUxBMlFnUEs2Q0V1NWVCcnBGcVBhbDViTzV1YnE2?= =?utf-8?B?RzFKTi9palRadjdYVWZ6bWx1dXVQUFpEYmxpSkQrWW1aWHhYV2VIYVpEb2Jz?= =?utf-8?B?RG82MjFiUmFhWE5ObUFJRVU2L2UrY2NzeTVGYmJBbXpiSHd2RzdUOTJEMDNs?= =?utf-8?B?RkhweGtpdWhxOVlYSjR0ODFudWVya25RMFB4K3VFT2dXS0N0TGxoR2xlY2dX?= =?utf-8?B?dk9MYk41T3dWQUpjRkpGRk9hbW1HamdWaitlWFpkSk5xdjhsOXUxalBIK1FH?= =?utf-8?B?UTJabnRYVU9FVEJZT0k3ZzdJRUZ6WEMvaXRqZmdDaXVrV29SVytCOGdCYzVp?= =?utf-8?B?aXh5czloNWJFbDVtN1ZXWUMvTWtaWC9LWHRuRDVicWdTQ2liT0tuYUtHT3Zj?= =?utf-8?B?V1o1bmt4TVNiY0FJWFdZUWdMKzBDV29YK2dVQVdXaW1LamxRY2dSM2pmNFhj?= =?utf-8?B?S2ErazY1WW1OTmcySUxhdFdIQ0VKMFFQUUgvS2wvSXdYaEJNamNXQVMrc0tL?= =?utf-8?B?T3VWUzRPeHNCTEw1TVkrQzZjVEpYNHFJS1YvaVdabmk1b3ZJc1VEQmpXaGNQ?= =?utf-8?B?cHl2L1kvVEtkQjh6R3dSbnVuSDNlMk1qOUNPU2hLV1BRSkszNXM0U29BYnZh?= =?utf-8?B?UElrVTY3aEhGNnRIZmFIMDlvQ1ZrbGtRT1RyaGltZUpJalRvRHUyZ0UrOVNI?= =?utf-8?B?T3ljbjlsSDBsS0laNmRqR0JsYWMyUG9BVDJoemhvVjM5Tmg2eEFOWGp5UDY1?= =?utf-8?B?U0x0YnBEa01FNUxYL3V0SVVMVkUvVk9ydHN0Wmd1TDlhbjFWWWQ2RUoxd3lp?= =?utf-8?B?WDBpUGFKLzNYUkxCUnYwVkZ3NDlVZ3N1SWZOTjBvRUcyd3d0NlBIUzNaeVdK?= =?utf-8?B?a3FjSE1ybmVyMk5uZmlPOGM1REpFK0JYTHlrTkRjYUdhOFk4ZWF6azVRRHg3?= =?utf-8?B?YW83WDNSU2JNUU1sSUxZZzhGZjI2cWlaZG96bDRxaTk5cm1ONUlXWXV4aTFa?= =?utf-8?B?cXcza25oS25xVzBoOTBoU1JpUGxjNVFyTG01Lzg5dm1PM1ZYZUpEZndpZGV6?= =?utf-8?B?UEU5S2c4OW9jMTlmSEsyb01uUGNXSFRCZmlLWWhpTWVXVldBeHZKWkFNYU0y?= =?utf-8?B?RzdkRjg1amM2dlRLNnRyYnpRTEZMR2JkZ1ZQenZlYkdEWWE1SnpPdDJTRnBU?= =?utf-8?B?K3M3TGxzRnFUajQwdHJmNGxaM3BxQThNazdHOFpCVDhQcmlxS0c1VzdXU2hO?= =?utf-8?B?UXBFZ243RGljeDRObk9yb05TSW5hNGxpUlFpYlJoenBQL29lQk43V2VMSzRL?= =?utf-8?B?RWlQS0RCK2JCK1Nxdm9uZFNWQUNVdDRoUWhSMHpoZUxGZU45VU9STndhOWNx?= =?utf-8?B?TERHSmtXRnZrWkh6aHQxblZxSURjb1NuQ0tJZTFFcnIyMTlscWltOUtLRHgx?= =?utf-8?B?TkZBNXp6ZUpMVm01UGprV0UwV09EREpWMTJicFEyaW81Lzc5UFhGSE1WYUt6?= =?utf-8?B?cEZHc2FveFJ2Qmp3d2YxVHIrVnBwdzh6VnFpcmhEdzVzS3gwSTFiZGRkdkJy?= =?utf-8?B?VWhwbmZEYjFtMWIvdHVyWmJOWXlBWC9DMWNqYmhOL25tWi9KSXVFN1owZmhY?= =?utf-8?B?R0h5Tkc2SXpTcW1VZU5JVm1rZTROSHJjelBLQVVudlJ1K3pCTDkrcXdXMExK?= =?utf-8?B?cUZ5UnZ0c05WNHJURURxanZJNS9tRkpYZER5clpSN3hMb0FjV0dGM3dlOVgr?= =?utf-8?Q?LGSxakS/7nW/N+15/jmi36Up3?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 618edcd4-d386-434c-8e43-08da76cdac98 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2022 10:31:36.4117 (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: YLrmwcybNC5IDkuwFzkkxCk125Bl1XblessOJyGjq1qVl/5Bk1G1z3UVBJyMVzNv5Ct8Ohi/BSJFWsIRGq2IbQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8593 X-Spam-Status: No, score=-3030.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham 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-List-Received-Date: Fri, 05 Aug 2022 10:31:41 -0000 As before: Old enough glibc has an (unguarded) declaration of index() in string.h, which triggers a "shadows a global declaration" warning. --- I'm going to commit this shortly. Nick - I think this will want going on the 2.39 branch as well, unless you've closed that already. --- a/binutils/dwarf.c +++ b/binutils/dwarf.c @@ -2773,7 +2773,7 @@ read_and_display_attr_value (unsigned lo case DW_FORM_rnglistx: if (!do_loc) { - dwarf_vma base, index; + dwarf_vma base, idx; const char *suffix = strrchr (section->name, '.'); bool dwo = suffix && strcmp (suffix, ".dwo") == 0; @@ -2781,29 +2781,29 @@ read_and_display_attr_value (unsigned lo { if (dwo) { - index = fetch_indexed_value (uvalue, loclists_dwo, 0); - index += (offset_size == 8) ? 20 : 12; + idx = fetch_indexed_value (uvalue, loclists_dwo, 0); + idx += (offset_size == 8) ? 20 : 12; } else if (debug_info_p == NULL) { - index = fetch_indexed_value (uvalue, loclists, 0); + idx = fetch_indexed_value (uvalue, loclists, 0); } else { /* We want to compute: - index = fetch_indexed_value (uvalue, loclists, debug_info_p->loclists_base); - index += debug_info_p->loclists_base; + idx = fetch_indexed_value (uvalue, loclists, debug_info_p->loclists_base); + idx += debug_info_p->loclists_base; Fortunately we already have that sum cached in the loc_offsets array. */ - index = debug_info_p->loc_offsets [uvalue]; + idx = debug_info_p->loc_offsets [uvalue]; } } else if (form == DW_FORM_rnglistx) { if (dwo) { - index = fetch_indexed_value (uvalue, rnglists_dwo, 0); - index += (offset_size == 8) ? 20 : 12; + idx = fetch_indexed_value (uvalue, rnglists_dwo, 0); + idx += (offset_size == 8) ? 20 : 12; } else { @@ -2813,8 +2813,8 @@ read_and_display_attr_value (unsigned lo base = debug_info_p->rnglists_base; /* We do not have a cached value this time, so we perform the computation manually. */ - index = fetch_indexed_value (uvalue, rnglists, base); - index += base; + idx = fetch_indexed_value (uvalue, rnglists, base); + idx += base; } } else @@ -2827,13 +2827,13 @@ read_and_display_attr_value (unsigned lo base = debug_info_p->addr_base; base += uvalue * pointer_size; - index = fetch_indexed_addr (base, pointer_size); + idx = fetch_indexed_addr (base, pointer_size); } /* We have already displayed the form name. */ printf (_("%c(index: 0x%s): %s"), delimiter, dwarf_vmatoa ("x", uvalue), - dwarf_vmatoa ("x", index)); + dwarf_vmatoa ("x", idx)); } break;