summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom de Vries <tdevries@suse.de>2022-08-07 16:03:00 +0200
committerTom de Vries <tdevries@suse.de>2022-08-07 16:03:00 +0200
commit411c7e044fa99089d3030f2c61525c4d415f7b45 (patch)
tree00a07d232628a0bed533e1d87dfc2ce7bdf15eb2
parentc7cd10637c40a72564bc813f3f16a4ba4b13d21b (diff)
When building with gcc 4.8.5, I run into: ... user-regs.c:85:1: error: could not convert \ ‘{0l, (& builtin_user_regs.gdb_user_regs::first)}’ from \ ‘<brace-enclosed initializer list>’ to ‘gdb_user_regs’ }; ^ ... Fix this by removing the initialization and handling regs.last == nullptr in append_user_reg. Tested on x86_64-linux.
-rw-r--r--gdb/user-regs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/gdb/user-regs.c b/gdb/user-regs.c
index 4bc4685387..05bb04ef2e 100644
--- a/gdb/user-regs.c
+++ b/gdb/user-regs.c
@@ -74,15 +74,15 @@ append_user_reg (struct gdb_user_regs *regs, const char *name,
reg->xread = xread;
reg->baton = baton;
reg->next = NULL;
+ if (regs->last == nullptr)
+ regs->last = &regs->first;
(*regs->last) = reg;
regs->last = &(*regs->last)->next;
}
/* An array of the builtin user registers. */
-static struct gdb_user_regs builtin_user_regs = {
- NULL, &builtin_user_regs.first
-};
+static struct gdb_user_regs builtin_user_regs;
void
user_reg_add_builtin (const char *name, user_reg_read_ftype *xread,