From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oi1-x22a.google.com (mail-oi1-x22a.google.com [IPv6:2607:f8b0:4864:20::22a]) by sourceware.org (Postfix) with ESMTPS id 4B255385783C for ; Fri, 28 Oct 2022 10:33:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4B255385783C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=rivosinc.com Received: by mail-oi1-x22a.google.com with SMTP id g130so5666290oia.13 for ; Fri, 28 Oct 2022 03:33:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20210112.gappssmtp.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=uXol2ZmTErdkPuATBGqPcuUgZ9OFdEvJAi6oJBcXVYs=; b=10i3GdOEmjethhS1kFKruZVKoZjgJQlCPXa2jqSh4GPc2zxT0lA2y3XXjctT63NwCN g6w9KNwq8xyaCRtXIHLeZFPErl0eDzWZcqnBi2hvpbveKGtXKQTnWcZ7R/e9qaIZcp3R pb4RsO8cCiObQ63IomAitWnf8hDB4R7LBYbCv3i6sj4FexT37/z60NM6Vk+BFciGnpYK /7BZUOK01NE33xPJconRwCibK0hm/djzXX8vtdxKXLtLYxLipws2dkZxbZ8R025ICVgf zaXIJ5kFtfyoa2uTYaPaYRku6kkEt5v1gqnMFsJeJQ4g8YjELVaDatHjlRZ7/WU9Ij21 M6WA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=uXol2ZmTErdkPuATBGqPcuUgZ9OFdEvJAi6oJBcXVYs=; b=cUI4618jeSP5F2xWmj0zxUjcbYFQ4LpbpVZY+5bpQBViNtG28UZtytZ+3wuAY8+UfV izRgNhVbQLwEcfVSenwAihj0vCRiNfrT1fIUuTMlD809t8mxIIYNPRAPpPPjYKe5PZJX edkz86w/j51v7yGd4H2Keca1jXO5SzFZ1nRS4ReREJGo3Luy70ZTnuqsxeNqn8ZaMi8w CwG6bdeGZZwO8xq1P230y2KGGogK0Iv65oPZkQ38gNpMjhII63FQvmI65lMenbfnqlWY YbsC0y0vIMKJlouChSrohSHRM3GQ7zRVZu9e2wdADRaBr06/6/LQ06xw3zcBtRi2noln u0DA== X-Gm-Message-State: ACrzQf0FlkWkfoO4qApalnc/7NmCSO57oirCuVI7LByH4xQRWmtuHOGK Nlk9B54IlaTn0JdiFFxeva31JT9T2828FoBAxTFjZaEx85g= X-Google-Smtp-Source: AMsMyM7U7UNYsTg9+++9nOuY9ptgAgufax+JGWtyOaOd9PShXSB860G0+tJff1nP7LP+xeC8O/H4blafV/pPMOHZYnc= X-Received: by 2002:a05:6808:211a:b0:354:b569:7a4d with SMTP id r26-20020a056808211a00b00354b5697a4dmr7662122oiw.107.1666953198640; Fri, 28 Oct 2022 03:33:18 -0700 (PDT) MIME-Version: 1.0 References: <4a280588-a85b-6ed3-634b-2b9cbc128f86@suse.com> In-Reply-To: <4a280588-a85b-6ed3-634b-2b9cbc128f86@suse.com> From: Nelson Chu Date: Fri, 28 Oct 2022 18:33:07 +0800 Message-ID: Subject: Re: [PATCH] RISC-V/gas: fix build with certain gcc versions To: Jan Beulich Cc: Binutils , Palmer Dabbelt , Andrew Waterman , Jim Wilson Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,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 List-Id: Thanks for fixing this! Please commit. Thanks Nelson On Fri, Oct 28, 2022 at 6:06 PM Jan Beulich wrote: > > 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);