From 9ab9195f183692346cff01bbe15e77774ef1d608 Mon Sep 17 00:00:00 2001 From: Elena Zannoni Date: Sat, 14 Feb 2004 15:46:33 +0000 Subject: [PATCH] 2004-02-14 Elena Zannoni * symfile.c (init_entry_point_info, entry_point_address): Move from here... * objfiles.c (init_entry_point_info, entry_point_address):..to here. * symfile.h (init_entry_point_info, entry_point_address): Remove prototypes. * objfiles.h (init_entry_point_info, entry_point_address):Add prototypes. * cris-tdep.c: Remove include of symfile.h. Add include of objfiles.h. * infcall.c: Ditto. * mcore-tdep.c: Ditto. * mn10300-tdep.c: Ditto. * sh64-tdep.c: Ditto. * v850-tdep.c: Ditto. * arm-tdep.c: Remove include of symfile.h. * blockframe.c: Ditto. * coffread.c: Ditto. * dbxread.c: Ditto. * dwarf2read.c: Ditto. * dwarfread.c: Ditto. * frv-tdep.c: Ditto. * ia64-tdep.c: Ditto. * mdebugread.c: Ditto. * mipsread.c: Ditto. * rs6000-tdep.c: Ditto. * s390-tdep.c: Ditto. * sh-tdep.c: Ditto. * xstormy16-tdep.c: Ditto. * gdbarch.sh: Remove include of symfile.h. * gdbarch.c: Regenerate. * solib-irix.c (enable_break): Use entry_point_address(). Add comment about include file. * xcoffread.c: Add comment about include file. * Makefile.in (arm-tdep.o, blockframe.o, coffread.o, cris-tdep.o) (dbxread.o, dwarf2read.o, dwarfread.o, frv-tdep.o, gdbarch.o) (ia64-tdep.o, infcall.o, mcore-tdep.o, mdebugread.o, mipsread.o) (mn10300-tdep.o, rs6000-nat.o, s390-tdep.o, sh64-tdep.o) (sh-tdep.o, v850-tdep.o, xstormy16-tdep.o): Update dependencies. --- gdb/ChangeLog | 42 ++++++++++++++++++++++++++++++++++++++++++ gdb/Makefile.in | 44 ++++++++++++++++++++++---------------------- gdb/arm-tdep.c | 1 - gdb/blockframe.c | 1 - gdb/coffread.c | 2 -- gdb/cris-tdep.c | 2 +- gdb/dbxread.c | 3 +-- gdb/dwarf2read.c | 1 - gdb/dwarfread.c | 1 - gdb/frv-tdep.c | 3 +-- gdb/gdbarch.c | 1 - gdb/gdbarch.sh | 1 - gdb/ia64-tdep.c | 1 - gdb/infcall.c | 6 +++--- gdb/mcore-tdep.c | 2 +- gdb/mdebugread.c | 1 - gdb/mipsread.c | 3 +-- gdb/mn10300-tdep.c | 2 +- gdb/objfiles.c | 34 ++++++++++++++++++++++++++++++++++ gdb/objfiles.h | 4 ++++ gdb/rs6000-tdep.c | 1 - gdb/s390-tdep.c | 3 +-- gdb/sh-tdep.c | 5 ++--- gdb/sh64-tdep.c | 2 +- gdb/solib-irix.c | 8 +++++--- gdb/symfile.c | 35 ----------------------------------- gdb/symfile.h | 4 ---- gdb/v850-tdep.c | 2 +- gdb/xcoffread.c | 1 + gdb/xstormy16-tdep.c | 1 - 30 files changed, 122 insertions(+), 95 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 63a7837d383..9ecfc14d15a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,45 @@ +2004-02-14 Elena Zannoni + + * symfile.c (init_entry_point_info, entry_point_address): Move + from here... + * objfiles.c (init_entry_point_info, entry_point_address):..to + here. + * symfile.h (init_entry_point_info, entry_point_address): Remove + prototypes. + * objfiles.h (init_entry_point_info, entry_point_address):Add + prototypes. + * cris-tdep.c: Remove include of symfile.h. Add include of + objfiles.h. + * infcall.c: Ditto. + * mcore-tdep.c: Ditto. + * mn10300-tdep.c: Ditto. + * sh64-tdep.c: Ditto. + * v850-tdep.c: Ditto. + * arm-tdep.c: Remove include of symfile.h. + * blockframe.c: Ditto. + * coffread.c: Ditto. + * dbxread.c: Ditto. + * dwarf2read.c: Ditto. + * dwarfread.c: Ditto. + * frv-tdep.c: Ditto. + * ia64-tdep.c: Ditto. + * mdebugread.c: Ditto. + * mipsread.c: Ditto. + * rs6000-tdep.c: Ditto. + * s390-tdep.c: Ditto. + * sh-tdep.c: Ditto. + * xstormy16-tdep.c: Ditto. + * gdbarch.sh: Remove include of symfile.h. + * gdbarch.c: Regenerate. + * solib-irix.c (enable_break): Use entry_point_address(). + Add comment about include file. + * xcoffread.c: Add comment about include file. + * Makefile.in (arm-tdep.o, blockframe.o, coffread.o, cris-tdep.o) + (dbxread.o, dwarf2read.o, dwarfread.o, frv-tdep.o, gdbarch.o) + (ia64-tdep.o, infcall.o, mcore-tdep.o, mdebugread.o, mipsread.o) + (mn10300-tdep.o, rs6000-nat.o, s390-tdep.o, sh64-tdep.o) + (sh-tdep.o, v850-tdep.o, xstormy16-tdep.o): Update dependencies. + 2004-02-13 Andrew Cagney * corelow.c (core_xfer_partial): Use "struct bfd_section". diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 2e3c3155699..fedce3d7382 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1599,7 +1599,7 @@ armnbsd-nat.o: armnbsd-nat.c $(defs_h) $(arm_tdep_h) $(inferior_h) \ armnbsd-tdep.o: armnbsd-tdep.c $(defs_h) $(osabi_h) $(arm_tdep_h) \ $(nbsd_tdep_h) $(solib_svr4_h) arm-tdep.o: arm-tdep.c $(defs_h) $(frame_h) $(inferior_h) $(gdbcmd_h) \ - $(gdbcore_h) $(symfile_h) $(gdb_string_h) $(dis_asm_h) $(regcache_h) \ + $(gdbcore_h) $(gdb_string_h) $(dis_asm_h) $(regcache_h) \ $(doublest_h) $(value_h) $(arch_utils_h) $(osabi_h) \ $(frame_unwind_h) $(frame_base_h) $(trad_frame_h) $(arm_tdep_h) \ $(gdb_sim_arm_h) $(elf_bfd_h) $(coff_internal_h) $(elf_arm_h) \ @@ -1622,7 +1622,7 @@ bfd-target.o: bfd-target.c $(defs_h) $(target_h) $(bfd_target_h) \ $(gdb_assert_h) $(gdb_string_h) block.o: block.c $(defs_h) $(block_h) $(symtab_h) $(symfile_h) \ $(gdb_obstack_h) $(cp_support_h) -blockframe.o: blockframe.c $(defs_h) $(symtab_h) $(bfd_h) $(symfile_h) \ +blockframe.o: blockframe.c $(defs_h) $(symtab_h) $(bfd_h) \ $(objfiles_h) $(frame_h) $(gdbcore_h) $(value_h) $(target_h) \ $(inferior_h) $(annotate_h) $(regcache_h) $(gdb_assert_h) \ $(dummy_frame_h) $(command_h) $(gdbcmd_h) $(block_h) @@ -1650,7 +1650,7 @@ coff-pe-read.o: coff-pe-read.c $(coff_pe_read_h) $(bfd_h) $(defs_h) \ $(gdbtypes_h) $(symtab_h) $(symfile_h) $(objfiles_h) coffread.o: coffread.c $(defs_h) $(symtab_h) $(gdbtypes_h) $(demangle_h) \ $(breakpoint_h) $(bfd_h) $(gdb_obstack_h) $(gdb_string_h) \ - $(coff_internal_h) $(libcoff_h) $(symfile_h) $(objfiles_h) \ + $(coff_internal_h) $(libcoff_h) $(objfiles_h) \ $(buildsym_h) $(gdb_stabs_h) $(stabsread_h) $(complaints_h) \ $(target_h) $(gdb_assert_h) $(block_h) $(dictionary_h) \ $(coff_pe_read_h) @@ -1691,7 +1691,7 @@ cp-valprint.o: cp-valprint.c $(defs_h) $(gdb_obstack_h) $(symtab_h) \ cris-tdep.o: cris-tdep.c $(defs_h) $(frame_h) $(symtab_h) $(inferior_h) \ $(gdbtypes_h) $(gdbcore_h) $(gdbcmd_h) $(target_h) $(value_h) \ $(opcode_cris_h) $(arch_utils_h) $(regcache_h) $(gdb_assert_h) \ - $(symfile_h) $(solib_h) $(solib_svr4_h) $(gdb_string_h) $(dis_asm_h) + $(objfiles_h) $(solib_h) $(solib_svr4_h) $(gdb_string_h) $(dis_asm_h) c-typeprint.o: c-typeprint.c $(defs_h) $(gdb_obstack_h) $(bfd_h) $(symtab_h) \ $(gdbtypes_h) $(expression_h) $(value_h) $(gdbcore_h) $(target_h) \ $(language_h) $(demangle_h) $(c_lang_h) $(typeprint_h) $(cp_abi_h) \ @@ -1709,7 +1709,7 @@ dbug-rom.o: dbug-rom.c $(defs_h) $(gdbcore_h) $(target_h) $(monitor_h) \ $(serial_h) $(regcache_h) $(m68k_tdep_h) dbxread.o: dbxread.c $(defs_h) $(gdb_string_h) $(gdb_obstack_h) \ $(gdb_stat_h) $(symtab_h) $(breakpoint_h) $(target_h) $(gdbcore_h) \ - $(libaout_h) $(symfile_h) $(objfiles_h) $(buildsym_h) $(stabsread_h) \ + $(libaout_h) $(objfiles_h) $(buildsym_h) $(stabsread_h) \ $(gdb_stabs_h) $(demangle_h) $(language_h) $(complaints_h) \ $(cp_abi_h) $(gdb_assert_h) $(aout_aout64_h) $(aout_stab_gnu_h) dcache.o: dcache.c $(defs_h) $(dcache_h) $(gdbcmd_h) $(gdb_string_h) \ @@ -1745,11 +1745,11 @@ dwarf2loc.o: dwarf2loc.c $(defs_h) $(ui_out_h) $(value_h) $(frame_h) \ $(regcache_h) $(objfiles_h) $(elf_dwarf2_h) $(dwarf2expr_h) \ $(dwarf2loc_h) $(gdb_string_h) dwarf2read.o: dwarf2read.c $(defs_h) $(bfd_h) $(symtab_h) $(gdbtypes_h) \ - $(symfile_h) $(objfiles_h) $(elf_dwarf2_h) $(buildsym_h) \ + $(objfiles_h) $(elf_dwarf2_h) $(buildsym_h) \ $(demangle_h) $(expression_h) $(filenames_h) $(macrotab_h) \ $(language_h) $(complaints_h) $(bcache_h) $(dwarf2expr_h) \ $(dwarf2loc_h) $(cp_support_h) $(gdb_string_h) $(gdb_assert_h) -dwarfread.o: dwarfread.c $(defs_h) $(symtab_h) $(gdbtypes_h) $(symfile_h) \ +dwarfread.o: dwarfread.c $(defs_h) $(symtab_h) $(gdbtypes_h) \ $(objfiles_h) $(elf_dwarf_h) $(buildsym_h) $(demangle_h) \ $(expression_h) $(language_h) $(complaints_h) $(gdb_string_h) elfread.o: elfread.c $(defs_h) $(bfd_h) $(gdb_string_h) $(elf_bfd_h) \ @@ -1791,7 +1791,7 @@ frame.o: frame.c $(defs_h) $(frame_h) $(target_h) $(value_h) $(inferior_h) \ $(command_h) $(gdbcmd_h) frame-unwind.o: frame-unwind.c $(defs_h) $(frame_h) $(frame_unwind_h) \ $(gdb_assert_h) $(dummy_frame_h) -frv-tdep.o: frv-tdep.c $(defs_h) $(gdb_string_h) $(inferior_h) $(symfile_h) \ +frv-tdep.o: frv-tdep.c $(defs_h) $(gdb_string_h) $(inferior_h) \ $(gdbcore_h) $(arch_utils_h) $(regcache_h) $(frame_h) \ $(frame_unwind_h) $(frame_base_h) $(trad_frame_h) $(dis_asm_h) \ $(gdb_assert_h) $(sim_regno_h) $(gdb_sim_frv_h) \ @@ -1807,7 +1807,7 @@ gcore.o: gcore.c $(defs_h) $(elf_bfd_h) $(infcall_h) $(inferior_h) \ $(gdb_assert_h) gdbarch.o: gdbarch.c $(defs_h) $(arch_utils_h) $(gdbcmd_h) $(inferior_h) \ $(symcat_h) $(floatformat_h) $(gdb_assert_h) $(gdb_string_h) \ - $(gdb_events_h) $(reggroups_h) $(osabi_h) $(symfile_h) \ + $(gdb_events_h) $(reggroups_h) $(osabi_h) \ $(gdb_obstack_h) gdb.o: gdb.c $(defs_h) $(main_h) $(gdb_string_h) $(interps_h) gdb-events.o: gdb-events.c $(defs_h) $(gdb_events_h) $(gdbcmd_h) @@ -1917,7 +1917,7 @@ ia64-aix-tdep.o: ia64-aix-tdep.c $(defs_h) ia64-linux-nat.o: ia64-linux-nat.c $(defs_h) $(gdb_string_h) $(inferior_h) \ $(target_h) $(gdbcore_h) $(regcache_h) $(gdb_wait_h) $(gregset_h) ia64-linux-tdep.o: ia64-linux-tdep.c $(defs_h) $(arch_utils_h) $(gdbcore_h) -ia64-tdep.o: ia64-tdep.c $(defs_h) $(inferior_h) $(symfile_h) $(gdbcore_h) \ +ia64-tdep.o: ia64-tdep.c $(defs_h) $(inferior_h) $(gdbcore_h) \ $(arch_utils_h) $(floatformat_h) $(regcache_h) $(reggroups_h) \ $(frame_h) $(frame_base_h) $(frame_unwind_h) $(doublest_h) \ $(value_h) $(gdb_assert_h) $(objfiles_h) $(elf_common_h) \ @@ -1925,7 +1925,7 @@ ia64-tdep.o: ia64-tdep.c $(defs_h) $(inferior_h) $(symfile_h) $(gdbcore_h) \ $(libunwind_ia64_h) infcall.o: infcall.c $(defs_h) $(breakpoint_h) $(target_h) $(regcache_h) \ $(inferior_h) $(gdb_assert_h) $(block_h) $(gdbcore_h) $(language_h) \ - $(symfile_h) $(gdbcmd_h) $(command_h) $(gdb_string_h) $(infcall_h) + $(objfiles_h) $(gdbcmd_h) $(command_h) $(gdb_string_h) $(infcall_h) infcmd.o: infcmd.c $(defs_h) $(gdb_string_h) $(symtab_h) $(gdbtypes_h) \ $(frame_h) $(inferior_h) $(environ_h) $(value_h) $(gdbcmd_h) \ $(symfile_h) $(gdbcore_h) $(target_h) $(language_h) $(symfile_h) \ @@ -2046,10 +2046,10 @@ maint.o: maint.c $(defs_h) $(command_h) $(gdbcmd_h) $(symtab_h) \ mcore-rom.o: mcore-rom.c $(defs_h) $(gdbcore_h) $(target_h) $(monitor_h) \ $(gdb_string_h) $(regcache_h) $(serial_h) mcore-tdep.o: mcore-tdep.c $(defs_h) $(frame_h) $(symtab_h) $(value_h) \ - $(gdbcmd_h) $(regcache_h) $(symfile_h) $(gdbcore_h) $(inferior_h) \ + $(gdbcmd_h) $(regcache_h) $(objfiles_h) $(gdbcore_h) $(inferior_h) \ $(arch_utils_h) $(gdb_string_h) $(disasm_h) $(dis_asm_h) mdebugread.o: mdebugread.c $(defs_h) $(symtab_h) $(gdbtypes_h) $(gdbcore_h) \ - $(symfile_h) $(objfiles_h) $(gdb_obstack_h) $(buildsym_h) \ + $(objfiles_h) $(gdb_obstack_h) $(buildsym_h) \ $(stabsread_h) $(complaints_h) $(demangle_h) $(gdb_assert_h) \ $(block_h) $(dictionary_h) $(coff_sym_h) $(coff_symconst_h) \ $(gdb_stat_h) $(gdb_string_h) $(bfd_h) $(coff_ecoff_h) $(libaout_h) \ @@ -2072,7 +2072,7 @@ mipsnbsd-tdep.o: mipsnbsd-tdep.c $(defs_h) $(gdbcore_h) $(regcache_h) \ $(target_h) $(value_h) $(osabi_h) $(nbsd_tdep_h) $(mipsnbsd_tdep_h) \ $(solib_svr4_h) mipsread.o: mipsread.c $(defs_h) $(gdb_string_h) $(bfd_h) $(symtab_h) \ - $(symfile_h) $(objfiles_h) $(buildsym_h) $(stabsread_h) \ + $(objfiles_h) $(buildsym_h) $(stabsread_h) \ $(coff_sym_h) $(coff_internal_h) $(coff_ecoff_h) $(libcoff_h) \ $(libecoff_h) $(elf_common_h) $(elf_mips_h) mips-tdep.o: mips-tdep.c $(defs_h) $(gdb_string_h) $(gdb_assert_h) \ @@ -2086,7 +2086,7 @@ mipsv4-nat.o: mipsv4-nat.c $(defs_h) $(inferior_h) $(gdbcore_h) $(target_h) \ $(regcache_h) $(gregset_h) mn10300-tdep.o: mn10300-tdep.c $(defs_h) $(frame_h) $(inferior_h) \ $(target_h) $(value_h) $(bfd_h) $(gdb_string_h) $(gdbcore_h) \ - $(symfile_h) $(regcache_h) $(arch_utils_h) $(gdb_assert_h) \ + $(objfiles_h) $(regcache_h) $(arch_utils_h) $(gdb_assert_h) \ $(dis_asm_h) monitor.o: monitor.c $(defs_h) $(gdbcore_h) $(target_h) $(gdb_string_h) \ $(command_h) $(serial_h) $(monitor_h) $(gdbcmd_h) $(inferior_h) \ @@ -2248,14 +2248,14 @@ rs6000-nat.o: rs6000-nat.c $(defs_h) $(inferior_h) $(target_h) $(gdbcore_h) \ $(gdb_stabs_h) $(regcache_h) $(arch_utils_h) $(language_h) \ $(ppc_tdep_h) $(exec_h) $(gdb_stat_h) rs6000-tdep.o: rs6000-tdep.c $(defs_h) $(frame_h) $(inferior_h) $(symtab_h) \ - $(target_h) $(gdbcore_h) $(gdbcmd_h) $(symfile_h) $(objfiles_h) \ + $(target_h) $(gdbcore_h) $(gdbcmd_h) $(objfiles_h) \ $(arch_utils_h) $(regcache_h) $(doublest_h) $(value_h) \ $(parser_defs_h) $(osabi_h) $(libbfd_h) $(coff_internal_h) \ $(libcoff_h) $(coff_xcoff_h) $(libxcoff_h) $(elf_bfd_h) \ $(solib_svr4_h) $(ppc_tdep_h) $(gdb_assert_h) $(dis_asm_h) s390-nat.o: s390-nat.c $(defs_h) $(tm_h) $(regcache_h) s390-tdep.o: s390-tdep.c $(arch_utils_h) $(frame_h) $(inferior_h) \ - $(symtab_h) $(target_h) $(gdbcore_h) $(gdbcmd_h) $(symfile_h) \ + $(symtab_h) $(target_h) $(gdbcore_h) $(gdbcmd_h) \ $(objfiles_h) $(tm_h) $(__bfd_bfd_h) $(floatformat_h) $(regcache_h) \ $(value_h) $(gdb_assert_h) $(dis_asm_h) scm-exp.o: scm-exp.c $(defs_h) $(symtab_h) $(gdbtypes_h) $(expression_h) \ @@ -2280,7 +2280,7 @@ ser-unix.o: ser-unix.c $(defs_h) $(serial_h) $(ser_unix_h) $(terminal_h) \ sh3-rom.o: sh3-rom.c $(defs_h) $(gdbcore_h) $(target_h) $(monitor_h) \ $(serial_h) $(srec_h) $(arch_utils_h) $(regcache_h) $(gdb_string_h) \ $(sh_tdep_h) -sh64-tdep.o: sh64-tdep.c $(defs_h) $(frame_h) $(symtab_h) $(symfile_h) \ +sh64-tdep.o: sh64-tdep.c $(defs_h) $(frame_h) $(symtab_h) $(objfiles_h) \ $(gdbtypes_h) $(gdbcmd_h) $(gdbcore_h) $(value_h) $(dis_asm_h) \ $(inferior_h) $(gdb_string_h) $(arch_utils_h) $(floatformat_h) \ $(regcache_h) $(doublest_h) $(osabi_h) $(elf_bfd_h) $(solib_svr4_h) \ @@ -2292,7 +2292,7 @@ shnbsd-tdep.o: shnbsd-tdep.c $(defs_h) $(gdbcore_h) $(regcache_h) $(value_h) \ $(shnbsd_tdep_h) sh-stub.o: sh-stub.c sh-tdep.o: sh-tdep.c $(defs_h) $(frame_h) $(frame_base_h) $(frame_unwind_h) \ - $(dwarf2_frame_h) $(symtab_h) $(symfile_h) $(gdbtypes_h) $(gdbcmd_h) \ + $(dwarf2_frame_h) $(symtab_h) $(gdbtypes_h) $(gdbcmd_h) \ $(gdbcore_h) $(value_h) $(dis_asm_h) $(inferior_h) $(gdb_string_h) \ $(gdb_assert_h) $(arch_utils_h) $(floatformat_h) $(regcache_h) \ $(doublest_h) $(osabi_h) $(sh_tdep_h) $(elf_bfd_h) $(solib_svr4_h) \ @@ -2463,7 +2463,7 @@ v850ice.o: v850ice.c $(defs_h) $(gdb_string_h) $(frame_h) $(symtab_h) \ $(inferior_h) $(breakpoint_h) $(symfile_h) $(target_h) $(objfiles_h) \ $(gdbcore_h) $(value_h) $(command_h) $(regcache_h) v850-tdep.o: v850-tdep.c $(defs_h) $(frame_h) $(inferior_h) $(target_h) \ - $(value_h) $(bfd_h) $(gdb_string_h) $(gdbcore_h) $(symfile_h) \ + $(value_h) $(bfd_h) $(gdb_string_h) $(gdbcore_h) $(objfiles_h) \ $(arch_utils_h) $(regcache_h) $(symtab_h) $(dis_asm_h) valarith.o: valarith.c $(defs_h) $(value_h) $(symtab_h) $(gdbtypes_h) \ $(expression_h) $(target_h) $(language_h) $(gdb_string_h) \ @@ -2509,14 +2509,14 @@ x86-64-tdep.o: x86-64-tdep.c $(defs_h) $(arch_utils_h) $(block_h) \ $(i387_tdep_h) xcoffread.o: xcoffread.c $(defs_h) $(bfd_h) $(gdb_string_h) $(gdb_stat_h) \ $(coff_internal_h) $(libcoff_h) $(coff_xcoff_h) $(libxcoff_h) \ - $(coff_rs6000_h) $(symtab_h) $(gdbtypes_h) $(symfile_h) \ + $(coff_rs6000_h) $(symtab_h) $(gdbtypes_h) $(symfile.h) \ $(objfiles_h) $(buildsym_h) $(stabsread_h) $(expression_h) \ $(complaints_h) $(gdb_stabs_h) $(aout_stab_gnu_h) xcoffsolib.o: xcoffsolib.c $(defs_h) $(bfd_h) $(xcoffsolib_h) $(inferior_h) \ $(gdbcmd_h) $(symfile_h) $(frame_h) $(gdb_regex_h) xmodem.o: xmodem.c $(defs_h) $(serial_h) $(target_h) $(xmodem_h) xstormy16-tdep.o: xstormy16-tdep.c $(defs_h) $(value_h) $(inferior_h) \ - $(symfile_h) $(arch_utils_h) $(regcache_h) $(gdbcore_h) \ + $(arch_utils_h) $(regcache_h) $(gdbcore_h) \ $(objfiles_h) $(dis_asm_h) # diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index 52b57f73de3..029dd529cc0 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -26,7 +26,6 @@ #include "inferior.h" #include "gdbcmd.h" #include "gdbcore.h" -#include "symfile.h" #include "gdb_string.h" #include "dis-asm.h" /* For register styles. */ #include "regcache.h" diff --git a/gdb/blockframe.c b/gdb/blockframe.c index 701d9865132..1375a9f8881 100644 --- a/gdb/blockframe.c +++ b/gdb/blockframe.c @@ -25,7 +25,6 @@ #include "defs.h" #include "symtab.h" #include "bfd.h" -#include "symfile.h" #include "objfiles.h" #include "frame.h" #include "gdbcore.h" diff --git a/gdb/coffread.c b/gdb/coffread.c index c2a931cf985..b0468e02340 100644 --- a/gdb/coffread.c +++ b/gdb/coffread.c @@ -35,8 +35,6 @@ #include "coff/internal.h" /* Internal format of COFF symbols in BFD */ #include "libcoff.h" /* FIXME secret internal data from BFD */ - -#include "symfile.h" #include "objfiles.h" #include "buildsym.h" #include "gdb-stabs.h" diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c index 2e55c9b88f2..731d5160131 100644 --- a/gdb/cris-tdep.c +++ b/gdb/cris-tdep.c @@ -36,7 +36,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "gdb_assert.h" /* To get entry_point_address. */ -#include "symfile.h" +#include "objfiles.h" #include "solib.h" /* Support for shared libraries. */ #include "solib-svr4.h" /* For struct link_map_offsets. */ diff --git a/gdb/dbxread.c b/gdb/dbxread.c index c1f7f8c7603..efbbf2ac695 100644 --- a/gdb/dbxread.c +++ b/gdb/dbxread.c @@ -1,6 +1,6 @@ /* Read dbx symbol tables and convert to internal format, for GDB. Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, - 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003. + 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004. Free Software Foundation, Inc. This file is part of GDB. @@ -49,7 +49,6 @@ #include "target.h" #include "gdbcore.h" /* for bfd stuff */ #include "libaout.h" /* FIXME Secret internal BFD stuff for a.out */ -#include "symfile.h" #include "objfiles.h" #include "buildsym.h" #include "stabsread.h" diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 8de89d37ab1..e09c3c15f6c 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -31,7 +31,6 @@ #include "bfd.h" #include "symtab.h" #include "gdbtypes.h" -#include "symfile.h" #include "objfiles.h" #include "elf/dwarf2.h" #include "buildsym.h" diff --git a/gdb/dwarfread.c b/gdb/dwarfread.c index 80484669263..c245108c08e 100644 --- a/gdb/dwarfread.c +++ b/gdb/dwarfread.c @@ -102,7 +102,6 @@ #include "defs.h" #include "symtab.h" #include "gdbtypes.h" -#include "symfile.h" #include "objfiles.h" #include "elf/dwarf.h" #include "buildsym.h" diff --git a/gdb/frv-tdep.c b/gdb/frv-tdep.c index e647ad8fc38..4e0c76bd9b3 100644 --- a/gdb/frv-tdep.c +++ b/gdb/frv-tdep.c @@ -1,5 +1,5 @@ /* Target-dependent code for the Fujitsu FR-V, for GDB, the GNU Debugger. - Copyright 2002, 2003 Free Software Foundation, Inc. + Copyright 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of GDB. @@ -21,7 +21,6 @@ #include "defs.h" #include "gdb_string.h" #include "inferior.h" -#include "symfile.h" /* for entry_point_address */ #include "gdbcore.h" #include "arch-utils.h" #include "regcache.h" diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index d46d2d530e3..2ed9973399c 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -49,7 +49,6 @@ #include "gdb-events.h" #include "reggroups.h" #include "osabi.h" -#include "symfile.h" /* For entry_point_address. */ #include "gdb_obstack.h" /* Static function declarations */ diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index 0c5a44038bb..ffe93cdd9ed 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -1294,7 +1294,6 @@ cat <obfd) & EXEC_P) + { + /* Executable file -- record its entry point so we'll recognize + the startup file because it contains the entry point. */ + objfile->ei.entry_point = bfd_get_start_address (objfile->obfd); + } + else + { + /* Examination of non-executable.o files. Short-circuit this stuff. */ + objfile->ei.entry_point = INVALID_ENTRY_POINT; + } + objfile->ei.deprecated_entry_file_lowpc = INVALID_ENTRY_LOWPC; + objfile->ei.deprecated_entry_file_highpc = INVALID_ENTRY_HIGHPC; + objfile->ei.entry_func_lowpc = INVALID_ENTRY_LOWPC; + objfile->ei.entry_func_highpc = INVALID_ENTRY_HIGHPC; + objfile->ei.main_func_lowpc = INVALID_ENTRY_LOWPC; + objfile->ei.main_func_highpc = INVALID_ENTRY_HIGHPC; +} + +/* Get current entry point address. */ + +CORE_ADDR +entry_point_address (void) +{ + return symfile_objfile ? symfile_objfile->ei.entry_point : 0; +} /* Create the terminating entry of OBJFILE's minimal symbol table. If OBJFILE->msymbols is zero, allocate a single entry from diff --git a/gdb/objfiles.h b/gdb/objfiles.h index ce40121cea6..2b8ca7d350f 100644 --- a/gdb/objfiles.h +++ b/gdb/objfiles.h @@ -532,6 +532,10 @@ extern struct objfile *object_files; extern struct objfile *allocate_objfile (bfd *, int); +extern void init_entry_point_info (struct objfile *); + +extern CORE_ADDR entry_point_address (void); + extern int build_objfile_section_table (struct objfile *); extern void terminate_minimal_symbol_table (struct objfile *objfile); diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c index 438b7a44491..6d487ab0b08 100644 --- a/gdb/rs6000-tdep.c +++ b/gdb/rs6000-tdep.c @@ -28,7 +28,6 @@ #include "target.h" #include "gdbcore.h" #include "gdbcmd.h" -#include "symfile.h" #include "objfiles.h" #include "arch-utils.h" #include "regcache.h" diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c index d85e640ae42..c97f8c5f7e0 100644 --- a/gdb/s390-tdep.c +++ b/gdb/s390-tdep.c @@ -1,6 +1,6 @@ /* Target-dependent code for GDB, the GNU debugger. - Copyright 2001, 2002, 2003 Free Software Foundation, Inc. + Copyright 2001, 2002, 2003, 2004 Free Software Foundation, Inc. Contributed by D.J. Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com) for IBM Deutschland Entwicklung GmbH, IBM Corporation. @@ -31,7 +31,6 @@ #include "target.h" #include "gdbcore.h" #include "gdbcmd.h" -#include "symfile.h" #include "objfiles.h" #include "tm.h" #include "../bfd/bfd.h" diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c index 1db65c66c5d..827876ee4eb 100644 --- a/gdb/sh-tdep.c +++ b/gdb/sh-tdep.c @@ -1,6 +1,6 @@ /* Target-dependent code for Renesas Super-H, for GDB. - Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 - Free Software Foundation, Inc. + Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + 2003, 2004 Free Software Foundation, Inc. This file is part of GDB. @@ -30,7 +30,6 @@ #include "frame-unwind.h" #include "dwarf2-frame.h" #include "symtab.h" -#include "symfile.h" #include "gdbtypes.h" #include "gdbcmd.h" #include "gdbcore.h" diff --git a/gdb/sh64-tdep.c b/gdb/sh64-tdep.c index 76ac673fe31..b02aff1aa81 100644 --- a/gdb/sh64-tdep.c +++ b/gdb/sh64-tdep.c @@ -28,7 +28,7 @@ #include "defs.h" #include "frame.h" #include "symtab.h" -#include "symfile.h" +#include "objfiles.h" #include "gdbtypes.h" #include "gdbcmd.h" #include "gdbcore.h" diff --git a/gdb/solib-irix.c b/gdb/solib-irix.c index 8400ad3a006..aaf8338bb25 100644 --- a/gdb/solib-irix.c +++ b/gdb/solib-irix.c @@ -1,5 +1,5 @@ /* Shared library support for IRIX. - Copyright 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 + Copyright 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc. This file was created using portions of irix5-nat.c originally @@ -26,6 +26,8 @@ #include "symtab.h" #include "bfd.h" +/* FIXME: ezannoni/2004-02-13 Verify that the include below is + really needed. */ #include "symfile.h" #include "objfiles.h" #include "gdbcore.h" @@ -355,10 +357,10 @@ static int enable_break (void) { if (symfile_objfile != NULL - && target_insert_breakpoint (symfile_objfile->ei.entry_point, + && target_insert_breakpoint (entry_point_address (), shadow_contents) == 0) { - breakpoint_addr = symfile_objfile->ei.entry_point; + breakpoint_addr = entry_point_address (); return 1; } diff --git a/gdb/symfile.c b/gdb/symfile.c index 7e16d457161..a44c3cc41e0 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -294,41 +294,6 @@ psymtab_to_symtab (struct partial_symtab *pst) return pst->symtab; } -/* Initialize entry point information for this objfile. */ - -void -init_entry_point_info (struct objfile *objfile) -{ - /* Save startup file's range of PC addresses to help blockframe.c - decide where the bottom of the stack is. */ - - if (bfd_get_file_flags (objfile->obfd) & EXEC_P) - { - /* Executable file -- record its entry point so we'll recognize - the startup file because it contains the entry point. */ - objfile->ei.entry_point = bfd_get_start_address (objfile->obfd); - } - else - { - /* Examination of non-executable.o files. Short-circuit this stuff. */ - objfile->ei.entry_point = INVALID_ENTRY_POINT; - } - objfile->ei.deprecated_entry_file_lowpc = INVALID_ENTRY_LOWPC; - objfile->ei.deprecated_entry_file_highpc = INVALID_ENTRY_HIGHPC; - objfile->ei.entry_func_lowpc = INVALID_ENTRY_LOWPC; - objfile->ei.entry_func_highpc = INVALID_ENTRY_HIGHPC; - objfile->ei.main_func_lowpc = INVALID_ENTRY_LOWPC; - objfile->ei.main_func_highpc = INVALID_ENTRY_HIGHPC; -} - -/* Get current entry point address. */ - -CORE_ADDR -entry_point_address (void) -{ - return symfile_objfile ? symfile_objfile->ei.entry_point : 0; -} - /* Remember the lowest-addressed loadable section we've seen. This function is called via bfd_map_over_sections. diff --git a/gdb/symfile.h b/gdb/symfile.h index 13f6555a07f..baa353e494c 100644 --- a/gdb/symfile.h +++ b/gdb/symfile.h @@ -180,8 +180,6 @@ extern void fill_in_vptr_fieldno (struct type *); extern void add_symtab_fns (struct sym_fns *); -extern void init_entry_point_info (struct objfile *); - extern void syms_from_objfile (struct objfile *, struct section_addr_info *, struct section_offsets *, int, int, int); @@ -254,8 +252,6 @@ extern int auto_solib_limit; /* From symfile.c */ -extern CORE_ADDR entry_point_address (void); - extern struct partial_symtab *allocate_psymtab (char *, struct objfile *); extern void discard_psymtab (struct partial_symtab *); diff --git a/gdb/v850-tdep.c b/gdb/v850-tdep.c index 692a0dd272a..c4c5978eed2 100644 --- a/gdb/v850-tdep.c +++ b/gdb/v850-tdep.c @@ -28,7 +28,7 @@ #include "bfd.h" #include "gdb_string.h" #include "gdbcore.h" -#include "symfile.h" +#include "objfiles.h" #include "arch-utils.h" #include "regcache.h" #include "symtab.h" diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c index 0f67a8df544..759dfcb1fb7 100644 --- a/gdb/xcoffread.c +++ b/gdb/xcoffread.c @@ -44,6 +44,7 @@ #include "symtab.h" #include "gdbtypes.h" +/* FIXME: ezannoni/2004-02-13 Verify if the include below is really needed. */ #include "symfile.h" #include "objfiles.h" #include "buildsym.h" diff --git a/gdb/xstormy16-tdep.c b/gdb/xstormy16-tdep.c index 6a64edecbdd..33c8b4ef0c3 100644 --- a/gdb/xstormy16-tdep.c +++ b/gdb/xstormy16-tdep.c @@ -22,7 +22,6 @@ #include "defs.h" #include "value.h" #include "inferior.h" -#include "symfile.h" #include "arch-utils.h" #include "regcache.h" #include "gdbcore.h" -- 2.39.2