From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by sourceware.org (Postfix) with ESMTPS id 5A8D7387702B for ; Tue, 17 Mar 2020 23:57:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 5A8D7387702B Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gmx.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=n54@gmx.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1584489469; bh=Rfc0a4lXRaVEQrU3mbAI7TPnc1zmagcxLbq3Ed1j6tU=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Gsc7hvUj2RROHZuATxpyN0Gzq6JuO8G6KAEFplceYse8sCmDT1D/3Az59eTunwZr5 HXP+l83PFSEJkMGMkRsPyVawbrDGZfTORUYihUI01TC+43pA9IRG9tDzSfs6JyNSu7 2JouYrQuy7Tz1U8Ccz5TkY/lXXLekz2DVSw31oJE= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([89.79.191.25]) by mail.gmx.com (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MDQic-1j7AoV2ayU-00AU7F; Wed, 18 Mar 2020 00:57:49 +0100 From: Kamil Rytarowski To: gdb-patches@sourceware.org Subject: [PATCH v2] Rename the read symbol to xread Date: Wed, 18 Mar 2020 00:57:10 +0100 Message-Id: <20200317235710.3898-1-n54@gmx.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:I/1HU1/7upN152G08Qh14w4pwLA8wz8PrnYVpZhGwdmB/DtopiA RhmjippY2SSjo2uQ15u6DOXgTHMQLssfWB2jo6yhNh2ED2e+m5dwPtFmzzpI/CuEg8Xb3ct zlWTWtpwBlsAm3zC7U0qpp5GpE11Gs46Zf37h0cDt2AdXiFsoke0B44ebSkF1qtdpCEee+J Cn9n9e2pMWnVU5LyWd+Ow== X-UI-Out-Filterresults: notjunk:1;V03:K0:ytvLtA3KRp4=:klC7KUfYiFVv5dc1cV7daI GwurhzhQMjF6UdjGjHTDfxXHxAN5g/LB/vSsGiMlNlD3SCyxFf82jwmPa/R+X/a7nguxNYNBz x058LyV+FD6fG4V51BF3g35sqoHtLrrkZ4m9Lf33PvJdBLjWxtMQMohnyynMELQG4+56sCMK9 V258Bf8Torx9cMQ6HlDlJe0DX2V/g49YhzsjvNiDVEJsEYiK+yLGkTzuChMTdLUDTuDJ77P0v 8EDCfYpXKvjmWDNVLzGC031qb81jH/0KSUJ60gj8mKEwYRJQN48gYthV49lLI9ggC9RdsTKSi oVCv3HXC+J7MByNezjxY0k3sukmvEbWcfGacHKJtUapNUHeS5coNymL3cUbKCqV6ZJ82uJpG1 Ib3CtYk520InaTuDO27WJlcHszire6sunr/Hr3Pd0hVkV0UUadGabbooQ9Pyq1LUZvWyUFpy+ 1UJfGhxZUeQW3LteFhvSNKuumeWqzkF4O8JN9rqxbWbrtM7XsH7C103MbMbmJKkgc33byuXK5 8LE2S/3jEKF8QVJlPrJI6zOns00NK3qSqEDcj9Jt9R8+r0sJCYfj3mN+YzHHsWjbyVDn0WuUW KUO3u5mLwyYTTUc9CtBFjrSemldOPam3Sx9Mg/Dc50kA9Sc3VkaVeyEV6OPTqoyelJIiUzF9g imoojDYYwF/V6Sh4Z1PZp8m4mLeUZuta7dOOEO5rLic0ZWqSpMAVKeoPIe7AXS7Mep3iWq7Ig P7aO8qwifSbLSmOXgd8p4QKGbZIkCkqNJgcDP7lcyZTiFPi0zkiGXjz50j4SMpYvJb4j42L1L Yi9mQkXjZ+rc/IXfodmmgwTCUNarm7q2y6uMhfx3Yj2rBWAzHCXkhaL6GgstEiceLbVZxsalb Ro8bVDqgccmw2IaDbIY3ACyeiJs8duuFIeOw4umEQe7MFzP4Nd/jglTU/8h0WyaWjMiW2zin4 pGLrm2QBXBzn/NCMjbH46+1A8YxySWt1Vljn04n8+gq0jEsn4Ooxr41gIhaTPDEtSxGFGcn00 jdystFFB0YmKrx4MgWZsJITwcLdfFoHBA3tmCjSJ4LrGKMreb7dV/7LtRFDhJr01HQrQCoFNH Fu3qanuz56pbcN5OQQ//0Q3/y9EFevIG/mcswZpF3Ig5FuPOdlSQwsjI8NzJ83jEy1rUebXWj mJ4p2T/ODZGNKfOwNHFq49jWaZ02X2cBpEZCPm2sUkmPoN219DCVWjUdrRdcA7iUgMRS8= X-Spam-Status: No, score=-25.4 required=5.0 tests=DKIM_SIGNED, DKIM_VALID, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Mar 2020 23:57:55 -0000 This avoids clashes with macro read in the NetBSD headers. =2D-- gdb/user-regs.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/gdb/user-regs.c b/gdb/user-regs.c index a232b1eb000..cb922313b0c 100644 =2D-- a/gdb/user-regs.c +++ b/gdb/user-regs.c @@ -41,7 +41,10 @@ struct user_reg { const char *name; - struct value *(*read) (struct frame_info * frame, const void *baton); + /* Avoid the "read" symbol name as it conflicts with a preprocessor sym= bol + in the NetBSD header for Stack Smashing Protection, that wraps the r= ead(2) + syscall. */ + struct value *(*xread) (struct frame_info * frame, const void *baton); const void *baton; struct user_reg *next; }; @@ -60,7 +63,7 @@ struct gdb_user_regs static void append_user_reg (struct gdb_user_regs *regs, const char *name, - user_reg_read_ftype *read, const void *baton, + user_reg_read_ftype *xread, const void *baton, struct user_reg *reg) { /* The caller is responsible for allocating memory needed to store @@ -68,7 +71,7 @@ append_user_reg (struct gdb_user_regs *regs, const char = *name, register list stored in the common heap or a specific obstack. */ gdb_assert (reg !=3D NULL); reg->name =3D name; - reg->read =3D read; + reg->xread =3D xread; reg->baton =3D baton; reg->next =3D NULL; (*regs->last) =3D reg; @@ -82,10 +85,10 @@ static struct gdb_user_regs builtin_user_regs =3D { }; void -user_reg_add_builtin (const char *name, user_reg_read_ftype *read, +user_reg_add_builtin (const char *name, user_reg_read_ftype *xread, const void *baton) { - append_user_reg (&builtin_user_regs, name, read, baton, + append_user_reg (&builtin_user_regs, name, xread, baton, XNEW (struct user_reg)); } @@ -103,14 +106,14 @@ user_regs_init (struct gdbarch *gdbarch) regs->last =3D ®s->first; for (reg =3D builtin_user_regs.first; reg !=3D NULL; reg =3D reg->next) - append_user_reg (regs, reg->name, reg->read, reg->baton, + append_user_reg (regs, reg->name, reg->xread, reg->baton, GDBARCH_OBSTACK_ZALLOC (gdbarch, struct user_reg)); return regs; } void user_reg_add (struct gdbarch *gdbarch, const char *name, - user_reg_read_ftype *read, const void *baton) + user_reg_read_ftype *xread, const void *baton) { struct gdb_user_regs *regs =3D (struct gdb_user_regs *) gdbarch_data (gdbarch, user_regs_data); @@ -122,7 +125,7 @@ user_reg_add (struct gdbarch *gdbarch, const char *nam= e, regs =3D (struct gdb_user_regs *) user_regs_init (gdbarch); deprecated_set_gdbarch_data (gdbarch, user_regs_data, regs); } - append_user_reg (regs, name, read, baton, + append_user_reg (regs, name, xread, baton, GDBARCH_OBSTACK_ZALLOC (gdbarch, struct user_reg)); } @@ -214,7 +217,7 @@ value_of_user_reg (int regnum, struct frame_info *fram= e) struct user_reg *reg =3D usernum_to_user_reg (gdbarch, regnum - maxregs= ); gdb_assert (reg !=3D NULL); - return reg->read (frame, reg->baton); + return reg->xread (frame, reg->baton); } static void =2D- 2.25.0