MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Namespace the reg class to avoid clashes with OS headers

Browse Source 
Fix build issues on NetBSD where the reg symbol exists in public headers.

regformats/regdef.h:22:8: error: redefinition struct
 struct reg
        ^~~
/usr/include/amd64/reg.h:51:8: note: previous definition struct
 struct reg {
        ^~~

gdb/ChangeLog:

	* regformats/regdef.h: Put reg in gdb namespace.

gdbserver/ChangeLog:

	* regcache.cc (find_register_by_number): Update.
	* tdesc.cc (init_target_desc): Likewise.
	* tdesc.h (target_desc::reg_defs): Likewise.
This commit is contained in:
Kamil Rytarowski 2020-03-17 14:38:23 +01:00
parent fb516a6913
commit 5a82b8a12b
6 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gdb/ChangeLog
View File

@ -1,3 +1,7 @@
2020-03-17 Kamil Rytarowski <n54@gmx.com>
* regformats/regdef.h: Put reg in gdb namespace.
2020-03-17 Kamil Rytarowski <n54@gmx.com> 2020-03-17 Kamil Rytarowski <n54@gmx.com>
* i386-bsd-nat.c (gdb_ptrace): New. * i386-bsd-nat.c (gdb_ptrace): New.

4
gdb/regformats/regdef.h
View File

@ -19,6 +19,8 @@
#ifndef REGFORMATS_REGDEF_H #ifndef REGFORMATS_REGDEF_H
#define REGFORMATS_REGDEF_H #define REGFORMATS_REGDEF_H
namespace gdb {
struct reg struct reg
{ {
reg (int _offset) reg (int _offset)
@ -60,4 +62,6 @@ struct reg
} }
}; };
} /* namespace gdb */
#endif /* REGFORMATS_REGDEF_H */ #endif /* REGFORMATS_REGDEF_H */

6
gdbserver/ChangeLog
View File

@ -1,3 +1,9 @@
2020-03-17 Kamil Rytarowski <n54@gmx.com>
* regcache.cc (find_register_by_number): Update.
* tdesc.cc (init_target_desc): Likewise.
* tdesc.h (target_desc::reg_defs): Likewise.
2020-03-12 Tom Tromey <tom@tromey.com> 2020-03-12 Tom Tromey <tom@tromey.com>
* configure: Rebuild. * configure: Rebuild.

2
gdbserver/regcache.cc
View File

@ -198,7 +198,7 @@ regcache_cpy (struct regcache *dst, struct regcache *src)
/* Return a reference to the description of register N. */ /* Return a reference to the description of register N. */
static const struct reg & static const struct gdb::reg &
find_register_by_number (const struct target_desc *tdesc, int n) find_register_by_number (const struct target_desc *tdesc, int n)
{ {
return tdesc->reg_defs[n]; return tdesc->reg_defs[n];

2
gdbserver/tdesc.cc
View File

@ -75,7 +75,7 @@ init_target_desc (struct target_desc *tdesc,
gdb_assert (regnum == 0 || regnum >= tdesc->reg_defs.size ()); gdb_assert (regnum == 0 || regnum >= tdesc->reg_defs.size ());
if (regnum != 0) if (regnum != 0)
tdesc->reg_defs.resize (regnum, reg (offset)); tdesc->reg_defs.resize (regnum, gdb::reg (offset));
tdesc->reg_defs.emplace_back (treg->name.c_str (), offset, tdesc->reg_defs.emplace_back (treg->name.c_str (), offset,
treg->bitsize); treg->bitsize);

2
gdbserver/tdesc.h
View File

@ -31,7 +31,7 @@ struct target_desc : tdesc_element
{ {
/* A vector of elements of register definitions that /* A vector of elements of register definitions that
describe the inferior's register set. */ describe the inferior's register set. */
std::vector<struct reg> reg_defs; std::vector<struct gdb::reg> reg_defs;
/* The register cache size, in bytes. */ /* The register cache size, in bytes. */
int registers_size; int registers_size;