d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct a warning where the r_debug_state() dummy function used to trigger

Browse Source 
a breakpoint in the kernel didn't use the proper argument list.  To avoid
having to include the userland link.h header everyhwere that sys/linker.h
is used, make r_debug_state() a static function in link_elf.c as well.
This commit is contained in:
John Baldwin 2000-10-06 05:20:02 +00:00
parent ff0c1daf6b
commit ca29467e9a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=66719
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/kern/link_elf.c
View File

@ -128,19 +128,22 @@ static int relocate_file(elf_file_t ef);
static int link_elf_preload_parse_symbols(elf_file_t ef);
#ifdef DDB
static void r_debug_state(struct r_debug *dummy_one,
struct link_map *dummy_two);
/*
* A list of loaded modules for GDB to use for loading symbols.
*/
struct r_debug r_debug;
#define GDB_STATE(s) r_debug.r_state = s; r_debug_state();
#define GDB_STATE(s) r_debug.r_state = s; r_debug_state(NULL, NULL);
/*
* Function for the debugger to set a breakpoint on to gain control.
*/
void
r_debug_state(void)
r_debug_state(struct r_debug *dummy_one __unused,
struct link_map *dummy_two __unused)
{
}
@ -216,7 +219,7 @@ link_elf_init(void* arg)
r_debug.r_brk = r_debug_state;
r_debug.r_state = RT_CONSISTENT;
r_debug_state(); /* say hello to gdb! */
r_debug_state(NULL, NULL); /* say hello to gdb! */
#endif
}

9
sys/kern/link_elf_obj.c
View File

@ -128,19 +128,22 @@ static int relocate_file(elf_file_t ef);
static int link_elf_preload_parse_symbols(elf_file_t ef);
#ifdef DDB
static void r_debug_state(struct r_debug *dummy_one,
struct link_map *dummy_two);
/*
* A list of loaded modules for GDB to use for loading symbols.
*/
struct r_debug r_debug;
#define GDB_STATE(s) r_debug.r_state = s; r_debug_state();
#define GDB_STATE(s) r_debug.r_state = s; r_debug_state(NULL, NULL);
/*
* Function for the debugger to set a breakpoint on to gain control.
*/
void
r_debug_state(void)
r_debug_state(struct r_debug *dummy_one __unused,
struct link_map *dummy_two __unused)
{
}
@ -216,7 +219,7 @@ link_elf_init(void* arg)
r_debug.r_brk = r_debug_state;
r_debug.r_state = RT_CONSISTENT;
r_debug_state(); /* say hello to gdb! */
r_debug_state(NULL, NULL); /* say hello to gdb! */
#endif
}

4
sys/sys/linker.h
View File

@ -189,10 +189,6 @@ extern caddr_t preload_search_info(caddr_t _mod, int _inf);
extern void preload_delete_name(const char *_name);
extern void preload_bootstrap_relocate(vm_offset_t _offset);
#ifdef DDB
extern void r_debug_state(void);
#endif
#ifdef KLD_DEBUG
extern int kld_debug;