Re: [ob] user-regs.c build fix for arm-linux

Daniel Jacobowitz
2004-02-29T16:59:31Z

On Sat, Feb 28, 2004 at 01:49:48PM -0500, Andrew Cagney wrote:
> >On Sat, Feb 28, 2004 at 12:35:52PM -0500, Andrew Cagney wrote:
> >
> >>>>>+/* We call this gdb_user_regs instead of user_regs to avoid conflicts
> >>>>with
> >>>>>+ any struct user_regs in system headers (for instance, ARM
> >>>>GNU/Linux). >*/
> >>
> >>>
> >>>Please be more explicit.
> >
> >
> >What else would you like to know? What header it comes from?
>
> Er, yes? The comment should describe the exact cause of the problem.
> Otherwize there is no way to audit this stuff later.

Is this better?

--
Daniel Jacobowitz
MontaVista Software Debian GNU/Linux Developer

2004-02-29 Daniel Jacobowitz <drow@mvista.com>

* user-regs.c: Update copyright years.
(struct user_regs): Rename to gdb_user_regs.
(append_user_reg, builtin_user_regs, user_regs_init)
(user_reg_add, user_reg_map_name_to_regnum)
(usernum_to_user_reg): Update.

Index: gdb/user-regs.c
===================================================================
RCS file: /cvs/src/src/gdb/user-regs.c,v
retrieving revision 1.3
diff -u -p -r1.3 user-regs.c
--- gdb/user-regs.c 4 Aug 2003 22:24:44 -0000 1.3
+++ gdb/user-regs.c 29 Feb 2004 16:58:25 -0000
@@ -1,6 +1,6 @@
/* User visible, per-frame registers, for GDB, the GNU debugger.

- Copyright 2002 Free Software Foundation, Inc.
+ Copyright 2002, 2003, 2004 Free Software Foundation, Inc.

Contributed by Red Hat.

@@ -45,14 +45,20 @@ struct user_reg
struct user_reg *next;
};

-struct user_regs
+/* This structure is named gdb_user_regs instead of user_regs to avoid
+ conflicts with any "struct user_regs" in system headers. For instance,
+ on ARM GNU/Linux native builds, nm-linux.h includes <signal.h> includes
+ <sys/ucontext.h> includes <sys/procfs.h> includes <sys/user.h>, which
+ declares "struc user_regs". */
+
+struct gdb_user_regs
{
struct user_reg *first;
struct user_reg **last;
};

static void
-append_user_reg (struct user_regs *regs, const char *name,
+append_user_reg (struct gdb_user_regs *regs, const char *name,
user_reg_read_ftype *read, struct user_reg *reg)
{
/* The caller is responsible for allocating memory needed to store
@@ -68,7 +74,7 @@ append_user_reg (struct user_regs *regs,

/* An array of the builtin user registers. */

-static struct user_regs builtin_user_regs = { NULL, &builtin_user_regs.first };
+static struct gdb_user_regs builtin_user_regs = { NULL, &builtin_user_regs.first };

void
user_reg_add_builtin (const char *name, user_reg_read_ftype *read)
@@ -86,7 +92,7 @@ static void *
user_regs_init (struct gdbarch *gdbarch)
{
struct user_reg *reg;
- struct user_regs *regs = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct user_regs);
+ struct gdb_user_regs *regs = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct gdb_user_regs);
regs->last = &regs->first;
for (reg = builtin_user_regs.first; reg != NULL; reg = reg->next)
append_user_reg (regs, reg->name, reg->read,
@@ -98,7 +104,7 @@ void
user_reg_add (struct gdbarch *gdbarch, const char *name,
user_reg_read_ftype *read)
{
- struct user_regs *regs = gdbarch_data (gdbarch, user_regs_data);
+ struct gdb_user_regs *regs = gdbarch_data (gdbarch, user_regs_data);
if (regs == NULL)
{
/* ULGH, called during architecture initialization. Patch
@@ -137,7 +143,7 @@ user_reg_map_name_to_regnum (struct gdba

/* Search the user name space. */
{
- struct user_regs *regs = gdbarch_data (gdbarch, user_regs_data);
+ struct gdb_user_regs *regs = gdbarch_data (gdbarch, user_regs_data);
struct user_reg *reg;
int nr;
for (nr = 0, reg = regs->first; reg != NULL; reg = reg->next, nr++)
@@ -155,7 +161,7 @@ user_reg_map_name_to_regnum (struct gdba
static struct user_reg *
usernum_to_user_reg (struct gdbarch *gdbarch, int usernum)
{
- struct user_regs *regs = gdbarch_data (gdbarch, user_regs_data);
+ struct gdb_user_regs *regs = gdbarch_data (gdbarch, user_regs_data);
struct user_reg *reg;
for (reg = regs->first; reg != NULL; reg = reg->next)
{