OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Constify arguments of gdb_bfd_lookup_symbol and related functions 

Fixes this error:

/home/pedro/gdb/mygit/src/gdb/solib-frv.c: In function ‘int enable_break2()’:
/home/pedro/gdb/mygit/src/gdb/solib-frv.c:622:72: error: invalid conversion from ‘const void*’ to ‘void*’ [-fpermissive]
       addr = gdb_bfd_lookup_symbol (tmp_bfd, cmp_name, "_dl_debug_addr");
                                                                        ^
In file included from /home/pedro/gdb/mygit/src/gdb/solib-frv.c:23:0:
/home/pedro/gdb/mygit/src/gdb/solib.h:82:18: error:   initializing argument 3 of ‘CORE_ADDR gdb_bfd_lookup_symbol(bfd*, int (*)(asymbol*, void*), void*)’ [-fpermissive]
 extern CORE_ADDR gdb_bfd_lookup_symbol (bfd *abfd,
                  ^

The call in question is:

      addr = gdb_bfd_lookup_symbol (tmp_bfd, cmp_name, "_dl_debug_addr");

gdb/ChangeLog:

	* solib-dsbt.c (cmp_name): Constify arguments.
	* solib-frv.c (cmp_name): Likewise.
	* solib-svr4.c (svr4_create_solib_event_breakpoints): Likewise.
	* solib.c (gdb_bfd_lookup_symbol_from_symtab): Likewise.
	(bfd_lookup_symbol_from_dyn_symtab): Likewise.
	(gdb_bfd_lookup_symbol): Likewise.
	* solib.h (gdb_bfd_lookup_symbol): Likewise.
	(gdb_bfd_lookup_symbol_from_symtab): Likewise.
This commit is contained in:
Simon Marchi 2015-10-13 12:40:01 -04:00 committed by Simon Marchi
parent 01f573ad8a
commit 3953f15ce4
6 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gdb/ChangeLog
View File

@ -1,3 +1,14 @@
2015-10-13 Simon Marchi <thundersim@gmail.com>
* solib-dsbt.c (cmp_name): Constify arguments.
* solib-frv.c (cmp_name): Likewise.
* solib-svr4.c (svr4_create_solib_event_breakpoints): Likewise.
* solib.c (gdb_bfd_lookup_symbol_from_symtab): Likewise.
(bfd_lookup_symbol_from_dyn_symtab): Likewise.
(gdb_bfd_lookup_symbol): Likewise.
* solib.h (gdb_bfd_lookup_symbol): Likewise.
(gdb_bfd_lookup_symbol_from_symtab): Likewise.
2015-10-12 Andrew Burgess <andrew.burgess@embecosm.com>
* stack.c (parse_frame_specification): Remove message parameter,

2
gdb/solib-dsbt.c
View File

@ -777,7 +777,7 @@ enable_break_failure_warning (void)
/* Helper function for gdb_bfd_lookup_symbol. */
static int
cmp_name (asymbol *sym, void *data)
cmp_name (const asymbol *sym, const void *data)
{
return (strcmp (sym->name, (const char *) data) == 0);
}

2
gdb/solib-frv.c
View File

@ -484,7 +484,7 @@ enable_break_failure_warning (void)
/* Helper function for gdb_bfd_lookup_symbol. */
static int
cmp_name (asymbol *sym, void *data)
cmp_name (const asymbol *sym, const void *data)
{
return (strcmp (sym->name, (const char *) data) == 0);
}

4
gdb/solib-svr4.c
View File

@ -2220,7 +2220,7 @@ svr4_create_solib_event_breakpoints (struct gdbarch *gdbarch,
/* Helper function for gdb_bfd_lookup_symbol. */
static int
cmp_name_and_sec_flags (asymbol *sym, void *data)
cmp_name_and_sec_flags (const asymbol *sym, const void *data)
{
return (strcmp (sym->name, (const char *) data) == 0
&& (sym->section->flags & (SEC_CODE | SEC_DATA)) != 0);
@ -2480,7 +2480,7 @@ enable_break (struct svr4_info *info, int from_tty)
for (bkpt_namep = solib_break_names; *bkpt_namep != NULL; bkpt_namep++)
{
sym_addr = gdb_bfd_lookup_symbol (tmp_bfd, cmp_name_and_sec_flags,
(void *) *bkpt_namep);
*bkpt_namep);
if (sym_addr != 0)
break;
}

14
gdb/solib.c
View File

@ -1533,8 +1533,9 @@ solib_global_lookup (struct objfile *objfile,
CORE_ADDR
gdb_bfd_lookup_symbol_from_symtab (bfd *abfd,
int (*match_sym) (asymbol *, void *),
void *data)
int (*match_sym) (const asymbol *,
const void *),
const void *data)
{
long storage_needed = bfd_get_symtab_upper_bound (abfd);
CORE_ADDR symaddr = 0;
@ -1592,8 +1593,9 @@ gdb_bfd_lookup_symbol_from_symtab (bfd *abfd,
static CORE_ADDR
bfd_lookup_symbol_from_dyn_symtab (bfd *abfd,
int (*match_sym) (asymbol *, void *),
void *data)
int (*match_sym) (const asymbol *,
const void *),
const void *data)
{
long storage_needed = bfd_get_dynamic_symtab_upper_bound (abfd);
CORE_ADDR symaddr = 0;
@ -1630,8 +1632,8 @@ bfd_lookup_symbol_from_dyn_symtab (bfd *abfd,
CORE_ADDR
gdb_bfd_lookup_symbol (bfd *abfd,
int (*match_sym) (asymbol *, void *),
void *data)
int (*match_sym) (const asymbol *, const void *),
const void *data)
{
CORE_ADDR symaddr = gdb_bfd_lookup_symbol_from_symtab (abfd, match_sym, data);

12
gdb/solib.h
View File

@ -80,15 +80,17 @@ extern int libpthread_name_p (const char *name);
/* Look up symbol from both symbol table and dynamic string table. */
extern CORE_ADDR gdb_bfd_lookup_symbol (bfd *abfd,
int (*match_sym) (asymbol *, void *),
void *data);
int (*match_sym) (const asymbol *,
const void *),
const void *data);
/* Look up symbol from symbol table. */
extern CORE_ADDR gdb_bfd_lookup_symbol_from_symtab (bfd *abfd,
int (*match_sym) (asymbol *,
void *),
void *data);
int (*match_sym)
(const asymbol *,
const void *),
const void *data);
/* Enable or disable optional solib event breakpoints as appropriate. */