From patchwork Fri Oct 28 10:06:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12211 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp733476wru; Fri, 28 Oct 2022 03:06:54 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7WP7Ck1eWz00QqCXLdTnmMdaPbmd9G2yH0dNRovL5Gt8DMIg2pTVYhK8nUT0b5tHCWanQr X-Received: by 2002:a17:906:8473:b0:77b:efa8:50e4 with SMTP id hx19-20020a170906847300b0077befa850e4mr45844399ejc.250.1666951614108; Fri, 28 Oct 2022 03:06:54 -0700 (PDT) Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id fk6-20020a056402398600b0045c3592301dsi1692572edb.191.2022.10.28.03.06.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Oct 2022 03:06:54 -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="vmf2/n4s"; 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 A6816385734F for ; Fri, 28 Oct 2022 10:06:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A6816385734F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666951612; bh=FCr167RmmKbCvjZyfrNRbiAQoWDLjIaoFydF3MPJauE=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=vmf2/n4sFApOf5Pku5W/0bBzLB84puB9wbnmGMbTDHoN9NDEzyAOLP2y+1+8MCPsG 7Yh6JOCevxqyrVTVXcQGEkgmccfgTUbNss2qeuG1anxUpiW7AaotoL30nphybtxTXT OrXgk2m/Tu83eF3dtgz343wuRO+WS2VAJlXom/tM= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60065.outbound.protection.outlook.com [40.107.6.65]) by sourceware.org (Postfix) with ESMTPS id 149353858D20 for ; Fri, 28 Oct 2022 10:06:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 149353858D20 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UZnyiYjRxcmX4e6KTGY3ElKksjU4uYx2kCGWtxmV0FButuzuLlPokWfcDJlOf5a9lmHKYlNCg7yh7VQoz4UaITtyjkRGqwZpvzjyzYOuKOUPux7HujNqlbjNb3p2LQvgfekpM4Y9Zm6+afZTKHtIg1Bc4PncS5IlREXyw3Oin5sbobqeFm7BY6TV4Yu4RWJQxt++DK45QjyKUwalQM3Z9oQjVgpRMhaC5hEsFnIg/WpFc1in5/ORxok0TDgvma7QeIqi1h/oLa94yijbicvozdK81IT3p9m9iz3ErarNXK+VozACCr3NAGpJTOZ2T9xQuVpD8agX8d0EiKx7Yv38+w== 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=FCr167RmmKbCvjZyfrNRbiAQoWDLjIaoFydF3MPJauE=; b=fDdJzH9dnj9g5Y7F5nUX9OlwfGhpmHZaiZ8Wza0ISGrwqYSHf2ozWHIClhaeFeWHdOAlIcEM++XIlLP7zGrD3T/hVnR7SkhgqBGbV9hQthzlaAyUn1VHl8nJxa3g1bgIs4yMd1KLgzP8dVaUSMa+/c3XrOAY/oOHj83xEVypQ7qfSyUFqcaJ74P2k5SX5+f8gYKDcMW+hHyI5yxLyVc36M0X45Lax0U7JHwHBFp3knxQmcv5/gNxk0llPvrqvAmbCBxHBwgixq7umJvldA3LOmESrcGGH6rsEirTttXZwhvziJXCXxOPC+LYOsJMvl7V3u49HZ8yRYAdmgDV8DB2OA== 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 DU0PR04MB9297.eurprd04.prod.outlook.com (2603:10a6:10:354::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.28; Fri, 28 Oct 2022 10:06:37 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::4da2:ea8b:e71e:b8d8]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::4da2:ea8b:e71e:b8d8%4]) with mapi id 15.20.5746.021; Fri, 28 Oct 2022 10:06:36 +0000 Message-ID: <4a280588-a85b-6ed3-634b-2b9cbc128f86@suse.com> Date: Fri, 28 Oct 2022 12:06:35 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.4.0 Content-Language: en-US To: Binutils Subject: [PATCH] RISC-V/gas: fix build with certain gcc versions X-ClientProxiedBy: FR3P281CA0002.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1d::12) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|DU0PR04MB9297:EE_ X-MS-Office365-Filtering-Correlation-Id: 8f474896-6016-4ef5-6f62-08dab8cc1980 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /BS+r6FbCvgX9Po3xJ/ZVrewISunCvSemCSfiedML8unLGTuFPspBaJ7ipAtnqG+nQXDKSaUCjEjlFLj9OxD7JOC8EJCjqyrnkkw/FjdBLCDW6GLQwyJ+VTepYJYoVV6+ICgu6OlnQpRrs0SMiYL37njbJ+vAHjbGFlNGfxvyqEh+buALRkvKN+i0+ccEsZifUMnCdylShwDfGXf/wErgp4SZlt/Y0nbbjbiMsh57+PHIE0rT2A5QmqRYxrkPyuJs+usltnet0aNgtWbd1g65LgOuppBgZ3f3+F9ZFB2L9qHsXAHj6xllsl6uRKgauZYLF0jsZlc78DzYnjOG+2awgynsS7h8tltTV6HVglHSn4XJ/hZhcWXE3nypMWGR/wEK/nDc9jplBRo+6A6Piii2N6XqwzhByDaQBom3SYp6Zl54cSSpn1SRMmvhswS4JW2Qf8na4cMCIy4godoxVeVBqTya+RyOl8daYQ+1ZCFR0b/g8yJRCl1yUhuMOd+e2lc+Tts0O5mnlH1P1cyWoTfyumMYlrGplVT5mZiPoHucnCNjvUTausxdfuLlHV8hD6rjwpfHTvlsvwHmmkEyEkLz2m6WIbiNVLyc5LfSm64l9TPKdCUxmRsT2IJvbhr88l4GHWLZD/Ss1MdsJDrGYFBORud1CxPSH7yzkKPcgSlWt6t87jGVnU+zESJxWqSPQk3mbsvh9jEclimM8EGWJWUv+DpIQ5b3vO8EwQgtibmOoI9ix0DukKTsJajDXsi1L0wzpRAf/QblAIBloble4q+kCUfkHhvzBCXZxkClSJ5t5c= 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:(13230022)(39860400002)(376002)(396003)(136003)(346002)(366004)(451199015)(6506007)(31686004)(2616005)(6512007)(26005)(2906002)(4326008)(54906003)(5660300002)(31696002)(186003)(36756003)(6916009)(6486002)(478600001)(66556008)(66946007)(316002)(66476007)(8676002)(41300700001)(8936002)(86362001)(38100700002)(45980500001)(43740500002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?or3dapSdvXdbG2Wmra+jaQVxjTzX?= =?utf-8?q?8jcctIUkmmafTqOFmRl3IjMjimJvyF1M00bzQ/PbFyrGj6Mx0+jJQX+lTRPiD2z5W?= =?utf-8?q?OMZiNLEyIFsAgqcxhF3vTaSPGwPXpWs6J3GW5TqTGLThhdU5aI7JvX/XDx2WhzjzP?= =?utf-8?q?gLQjG1x/3bhZ3lJg4L17yCLqpd0jHtLYHxcwguJKUUh0NAPOdelHz0nWu7FsIeE7g?= =?utf-8?q?PfcCwVXuchn47Wp34cYMXrNggcWPVe48sOWY82vSoNpwMtuu24UbrpZCS9fwGOWH5?= =?utf-8?q?27TiKRG8/1TLq8Zw2oj0f3Fi+QxwzeTGQcAcPkVhyCoJWTD4xgHa8uvQwTiIRBluq?= =?utf-8?q?Twx7RW9BpMTULz99SlCEjMZxbtxdARbq9MBEPVe+XphFri1ZDNR+NxOD6rcBO1wML?= =?utf-8?q?YoLLrHHSBRxWaZmmmFPhH5/ig2tnYb7o0BM7W5QhR2/52/s3dmemVu0WRzF0d4CFV?= =?utf-8?q?TFmkwKxWxyQoo1aT3VCKJDolweODq0/ZWfZxzxfFC+iOIsfSkriAEM3WqzKz5HDRF?= =?utf-8?q?btV5bYVZk3HmrMZFZumTwXrluW8I7kWfxQ1qnc5LpmjlEN39n1CtLi/f1km3eLK43?= =?utf-8?q?vZKDkSI8V4cG9TBzjGhibqk09jW1CifqOYicgaPIz3H+AqaGWfO0Js/X2oghUhQ4P?= =?utf-8?q?sCSVtJvH+0Ls4KW+ZNlwLtmHhK5KN8f8bS9Wn7mHaOk3GqTLjHvo+GqfvMNoR5X9i?= =?utf-8?q?5k0vfV6WbnIrVR0uLT+QE254KcMirPa+gkWCveilCnZ4m5n1lJBWcMZUyGa5fFtMz?= =?utf-8?q?ODKRA340urZu9ode00QAGLMqrw+FSCWpD0/Pibo7HrRVo6fCzGg9/kRpkgO/NlDzy?= =?utf-8?q?BIPjfDWwHSdlpFlb4QzUQjkMlWO18z2elU4XUgGSxZAfGlaDg9rh69/ecsGpjC0De?= =?utf-8?q?7tO2ikasjgcqyDhCOVuQLsu6UfqXgnW0EPPuHeWKFYUxAd/ux4Z3fYjW5hsfyrC8A?= =?utf-8?q?3H4+TiQpxp1eVXAUmP1n0uKJozb/IXP9gk4TljZiKYktei4YvUXLPkIQVvcITRxEO?= =?utf-8?q?yGJVVHdJ8z8U0Z4YHrOBgcm+PidUH1uAHmnEsWybiuniwZtyFEnoIKtNxKDwhB7oR?= =?utf-8?q?/osmpbjBLhUs9uZ0hyUOXVCWwU3o63T/+CEDdkq6mjm3pCrxCDAoXcB4lm9KT7/Xo?= =?utf-8?q?jEgqOnEwKivhywcv1w5tr1R1EV1ZpUU8sRx6WQkoS4MEkzTe8qkwSGaYv/U9PIKjw?= =?utf-8?q?ebErbmbXdNWg5hZZ/vMezmk2v8tIyfgYoHaZjNL0gU2zvFs4nrEOsRpUSkFYN1dEX?= =?utf-8?q?nyDppX3C8zCtE5Jo21ZUIV4DODT2qgeuFEVTDItManuTwClu5+A2jMI1LyXdWqmtV?= =?utf-8?q?tE7QuK4V1DkbJXnlS1bjXZlfwAxTrpGkSwCZwLnNM7vKPC9Ns4vu+qUugwonpoE4J?= =?utf-8?q?GiclCX44McGLC05pvI1ACwSiicE+mnzrftv1RhB+M0klDjPmkxgYFXIxVTsn8OczM?= =?utf-8?q?OUkxUxbbysJqsUfmQq+zo+R6wsp47bAPnKcCjUXtPsMj79QtOWQKHxGoEy1hJCHUu?= =?utf-8?q?A0xjGEo4YjTD?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8f474896-6016-4ef5-6f62-08dab8cc1980 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2022 10:06:36.8283 (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: LdlYZCSCA43qI1VQK1Am5U4oScjRYZX/CRM80/rchjwHwJmIXzPdO910hxC9jgeXmTPbe87mv1Qwhzzp8DFixA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR04MB9297 X-Spam-Status: No, score=-3029.6 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 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-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?1747925455753194828?= X-GMAIL-MSGID: =?utf-8?q?1747925455753194828?= Some versions of gcc warn by default about shadowed outer-scope declarations. This affects frag_align_code, which is declared in frags.h. Rename the offending function parameter. While there also switch to using true/false at the function call sites. --- a/gas/config/tc-riscv.c +++ b/gas/config/tc-riscv.c @@ -549,7 +549,7 @@ make_mapping_symbol (enum riscv_seg_msta void riscv_mapping_state (enum riscv_seg_mstate to_state, int max_chars, - bool frag_align_code) + bool fr_align_code) { enum riscv_seg_mstate from_state = seg_info (now_seg)->tc_segment_info_data.map_state; @@ -574,7 +574,7 @@ riscv_mapping_state (enum riscv_seg_msta } else if (seg_arch_symbol != 0 && to_state == MAP_INSN - && !frag_align_code + && !fr_align_code && strcmp (riscv_rps_as.subset_list->arch_str, S_GET_NAME (seg_arch_symbol) + 2) != 0) { @@ -3540,7 +3540,7 @@ md_assemble (char *str) return; } - riscv_mapping_state (MAP_INSN, 0, 0/* frag_align_code */); + riscv_mapping_state (MAP_INSN, 0, false/* fr_align_code */); const struct riscv_ip_error error = riscv_ip (str, &insn, &imm_expr, &imm_reloc, op_hash); @@ -4219,7 +4219,7 @@ riscv_frag_align_code (int n) fix_new_exp (frag_now, nops - frag_now->fr_literal, 0, &ex, false, BFD_RELOC_RISCV_ALIGN); - riscv_mapping_state (MAP_INSN, worst_case_bytes, 1/* frag_align_code */); + riscv_mapping_state (MAP_INSN, worst_case_bytes, true/* fr_align_code */); /* We need to start a new frag after the alignment which may be removed by the linker, to prevent the assembler from computing static offsets. @@ -4293,10 +4293,10 @@ riscv_init_frag (fragS * fragP, int max_ case rs_fill: case rs_align: case rs_align_test: - riscv_mapping_state (MAP_DATA, max_chars, 0/* frag_align_code */); + riscv_mapping_state (MAP_DATA, max_chars, false/* fr_align_code */); break; case rs_align_code: - riscv_mapping_state (MAP_INSN, max_chars, 1/* frag_align_code */); + riscv_mapping_state (MAP_INSN, max_chars, true/* fr_align_code */); break; default: break; @@ -4570,7 +4570,7 @@ s_riscv_insn (int x ATTRIBUTE_UNUSED) save_c = *input_line_pointer; *input_line_pointer = '\0'; - riscv_mapping_state (MAP_INSN, 0, 0/* frag_align_code */); + riscv_mapping_state (MAP_INSN, 0, false/* fr_align_code */); struct riscv_ip_error error = riscv_ip (str, &insn, &imm_expr, &imm_reloc, insn_type_hash);