From patchwork Sun Jan 21 22:57:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mark Wielaard X-Patchwork-Id: 84531 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 62387385E02B for ; Sun, 21 Jan 2024 22:57:38 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from gnu.wildebeest.org (gnu.wildebeest.org [45.83.234.184]) by sourceware.org (Postfix) with ESMTPS id 78FD53858D3C for ; Sun, 21 Jan 2024 22:57:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 78FD53858D3C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=klomp.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=klomp.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 78FD53858D3C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=45.83.234.184 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705877837; cv=none; b=YYvIwg5A+Pp9FiUcQirdszfSrsz36tMFAC9dU7uCfIkSV7c/c1VUyjmpuwb3qkuLq7qKQb2VCCrw/sST2OFj4pfUQxKDVvP+IRRbUqz09Nw1oPr8ZreUVlK8oIRh2LA7P8ddzHHYaa8QCbj9Us9RKY1CwT9NtzfqM2ap4vrUMvM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705877837; c=relaxed/simple; bh=fwHBdmu/2aRFYKRg5J08lk08eiopbI6p1cpHzlDp/dk=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=RTDmrP11hA5W4L+lOWVObKQsuEi8RgtDwtKEb3CCLDm1jUIM3fQ41ixGYHYMjtuBUj1Ei4AZh1DUEDleR6050SvXHJG6WSfkI50XYMKxkOD8D/VZbATPXEAoqYnGbe3ThriVOlYdZ6S9QaX0sB/El0P7oali6cEXkdK190zVeLE= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from csb.redhat.com (deer0x03.wildebeest.org [172.31.17.133]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id 7E555302BBEA; Sun, 21 Jan 2024 23:57:14 +0100 (CET) Received: by csb.redhat.com (Postfix, from userid 10916) id 58F93CEF2C; Sun, 21 Jan 2024 23:57:14 +0100 (CET) From: Mark Wielaard To: gdb-patches@sourceware.org Cc: Mark Wielaard Subject: [PATCH] sim: Fix -Werror=shadow=local issue in m32c/gdb-if.c Date: Sun, 21 Jan 2024 23:57:09 +0100 Message-Id: <20240121225709.575321-1-mark@klomp.org> X-Mailer: git-send-email 2.39.3 MIME-Version: 1.0 X-Spam-Status: No, score=-9.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_NONE, 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: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org m32c/cpu.h defines mem as enum value, which causes GCC 14 to emit sim/m32c/gdb-if.c: In function ‘sim_read’: sim/m32c/gdb-if.c:162:33: error: declaration of ‘mem’ shadows a previous local [-Werror=shadow=local] 162 | sim_read (SIM_DESC sd, uint64_t mem, void *buf, uint64_t length) | ~~~~~~~~~^~~ In file included from ../../binutils-gdb/sim/m32c/gdb-if.c:38: sim/m32c/cpu.h:83:3: note: shadowed declaration is here 83 | mem, | ^~~ Fix this by renaming mem to memory in m32c/gdb-if.c --- sim/m32c/gdb-if.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sim/m32c/gdb-if.c b/sim/m32c/gdb-if.c index a1a96b450f3..ae268c5c045 100644 --- a/sim/m32c/gdb-if.c +++ b/sim/m32c/gdb-if.c @@ -159,24 +159,24 @@ sim_create_inferior (SIM_DESC sd, struct bfd * abfd, } uint64_t -sim_read (SIM_DESC sd, uint64_t mem, void *buf, uint64_t length) +sim_read (SIM_DESC sd, uint64_t memory, void *buf, uint64_t length) { check_desc (sd); - if (mem == 0) + if (memory == 0) return 0; - mem_get_blk ((int) mem, buf, length); + mem_get_blk ((int) memory, buf, length); return length; } uint64_t -sim_write (SIM_DESC sd, uint64_t mem, const void *buf, uint64_t length) +sim_write (SIM_DESC sd, uint64_t memory, const void *buf, uint64_t length) { check_desc (sd); - mem_put_blk ((int) mem, buf, length); + mem_put_blk ((int) memory, buf, length); return length; }