Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

Remove symfile_objfile macro

Browse Source 
This removes the symfile_objfile macro, in favor of just spelling out
the member access.

gdb/ChangeLog
2020-10-29  Tom Tromey  <tom@tromey.com>

	* windows-tdep.c (windows_solib_create_inferior_hook): Update.
	* target.c (info_target_command): Update.
	* symfile.c (syms_from_objfile_1, finish_new_objfile)
	(symbol_file_clear, reread_symbols): Update.
	* symfile-mem.c (add_symbol_file_from_memory_command): Update.
	* stabsread.c (scan_file_globals): Update.
	* solib.c (update_solib_list): Update.
	* solib-svr4.c (elf_locate_base, open_symbol_file_object)
	(svr4_fetch_objfile_link_map, enable_break)
	(svr4_relocate_main_executable)
	(svr4_iterate_over_objfiles_in_search_order): Update.
	* solib-frv.c (lm_base, enable_break)
	(frv_relocate_main_executable): Update.
	(main_got, frv_fdpic_find_canonical_descriptor): Update.
	(frv_fetch_objfile_link_map): Update.
	* solib-dsbt.c (lm_base, dsbt_relocate_main_executable): Update.
	* solib-darwin.c (darwin_solib_create_inferior_hook): Update.
	* solib-aix.c (solib_aix_solib_create_inferior_hook): Update.
	* remote.c (remote_target::get_offsets): Update.
	(remote_target::start_remote)
	(extended_remote_target::post_attach): Update.
	* objfiles.c (entry_point_address_query): Update.
	* nto-procfs.c (nto_procfs_target::create_inferior): Update.
	* minsyms.c (get_symbol_leading_char): Update.
	* frame.c (inside_main_func): Update.
	* progspace.h (symfile_objfile): Remove macro.
This commit is contained in:
Tom Tromey
2020-10-29 15:04:33 -06:00
parent 19f6550ebb
commit a42d7dd873
18 changed files with 124 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gdb/symfile.c
View File

@@ -929,10 +929,10 @@ syms_from_objfile_1 (struct objfile *objfile,
/* Since no error yet, throw away the old symbol table. */
if (symfile_objfile != NULL)
if (current_program_space->symfile_object_file != NULL)
{
symfile_objfile->unlink ();
gdb_assert (symfile_objfile == NULL);
current_program_space->symfile_object_file->unlink ();
gdb_assert (current_program_space->symfile_object_file == NULL);
}
/* Currently we keep symbols from the add-symbol-file command.
@@ -995,7 +995,7 @@ finish_new_objfile (struct objfile *objfile, symfile_add_flags add_flags)
if (add_flags & SYMFILE_MAINLINE)
{
/* OK, make it the "real" symbol file. */
symfile_objfile = objfile;
current_program_space->symfile_object_file = objfile;
clear_symtab_users (add_flags);
}
@@ -1216,9 +1216,9 @@ symbol_file_clear (int from_tty)
{
if ((have_full_symbols () || have_partial_symbols ())
&& from_tty
&& (symfile_objfile
&& (current_program_space->symfile_object_file
? !query (_("Discard symbol table from `%s'? "),
objfile_name (symfile_objfile))
objfile_name (current_program_space->symfile_object_file))
: !query (_("Discard symbol table? "))))
error (_("Not confirmed."));
@@ -1230,7 +1230,7 @@ symbol_file_clear (int from_tty)
clear_symtab_users (0);
gdb_assert (symfile_objfile == NULL);
gdb_assert (current_program_space->symfile_object_file == NULL);
if (from_tty)
printf_filtered (_("No symbol file now.\n"));
}
@@ -2555,7 +2555,7 @@ reread_symbols (void)
/* What the hell is sym_new_init for, anyway? The concept of
distinguishing between the main file and additional files
in this way seems rather dubious. */
if (objfile == symfile_objfile)
if (objfile == current_program_space->symfile_object_file)
{
(*objfile->sf->sym_new_init) (objfile);
}