From 174ad59a8eff83977a367d2cbb358c00fc470ee9 Mon Sep 17 00:00:00 2001 From: Andreas Arnez Date: Wed, 10 Sep 2014 12:02:43 +0000 Subject: [PATCH] Drop target method 'fbsd_make_corefile_notes' Now that all users of the target method 'fbsd_make_corefile_notes' have been converted to the version in fbsd-tdep.c, the old method is removed. gdb/ChangeLog: * fbsd-nat.c (find_signalled_thread, find_stop_signal) (fbsd_collect_regset_section_cb, fbsd_make_corefile_notes): Remove. * fbsd-nat.h (fbsd_make_corefile_notes): Remove prototype. --- gdb/ChangeLog | 7 +++++ gdb/fbsd-nat.c | 76 -------------------------------------------------- gdb/fbsd-nat.h | 6 ---- 3 files changed, 7 insertions(+), 82 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b8a2ff9470e..817b02a83ee 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2014-09-30 Andreas Arnez + + * fbsd-nat.c (find_signalled_thread, find_stop_signal) + (fbsd_collect_regset_section_cb, fbsd_make_corefile_notes): + Remove. + * fbsd-nat.h (fbsd_make_corefile_notes): Remove prototype. + 2014-09-30 Andreas Arnez * xtensa-tdep.c (xtensa_regset_from_core_section): Remove. diff --git a/gdb/fbsd-nat.c b/gdb/fbsd-nat.c index e9db30e6ce9..3bccc77a0bb 100644 --- a/gdb/fbsd-nat.c +++ b/gdb/fbsd-nat.c @@ -137,79 +137,3 @@ fbsd_find_memory_regions (struct target_ops *self, do_cleanups (cleanup); return 0; } - -static int -find_signalled_thread (struct thread_info *info, void *data) -{ - if (info->suspend.stop_signal != GDB_SIGNAL_0 - && ptid_get_pid (info->ptid) == ptid_get_pid (inferior_ptid)) - return 1; - - return 0; -} - -static enum gdb_signal -find_stop_signal (void) -{ - struct thread_info *info = - iterate_over_threads (find_signalled_thread, NULL); - - if (info) - return info->suspend.stop_signal; - else - return GDB_SIGNAL_0; -} - -/* Create appropriate note sections for a corefile, returning them in - allocated memory. */ - -char * -fbsd_make_corefile_notes (struct target_ops *self, bfd *obfd, int *note_size) -{ - const struct regcache *regcache = get_current_regcache (); - struct gdbarch *gdbarch = get_regcache_arch (regcache); - gregset_t gregs; - fpregset_t fpregs; - char *note_data = NULL; - Elf_Internal_Ehdr *i_ehdrp; - const struct regset *regset; - size_t size; - - /* Put a "FreeBSD" label in the ELF header. */ - i_ehdrp = elf_elfheader (obfd); - i_ehdrp->e_ident[EI_OSABI] = ELFOSABI_FREEBSD; - - gdb_assert (gdbarch_regset_from_core_section_p (gdbarch)); - - size = sizeof gregs; - regset = gdbarch_regset_from_core_section (gdbarch, ".reg", size); - gdb_assert (regset && regset->collect_regset); - regset->collect_regset (regset, regcache, -1, &gregs, size); - - note_data = elfcore_write_prstatus (obfd, note_data, note_size, - ptid_get_pid (inferior_ptid), - find_stop_signal (), &gregs); - - size = sizeof fpregs; - regset = gdbarch_regset_from_core_section (gdbarch, ".reg2", size); - gdb_assert (regset && regset->collect_regset); - regset->collect_regset (regset, regcache, -1, &fpregs, size); - - note_data = elfcore_write_prfpreg (obfd, note_data, note_size, - &fpregs, sizeof (fpregs)); - - if (get_exec_file (0)) - { - const char *fname = lbasename (get_exec_file (0)); - char *psargs = xstrdup (fname); - - if (get_inferior_args ()) - psargs = reconcat (psargs, psargs, " ", get_inferior_args (), - (char *) NULL); - - note_data = elfcore_write_prpsinfo (obfd, note_data, note_size, - fname, psargs); - } - - return note_data; -} diff --git a/gdb/fbsd-nat.h b/gdb/fbsd-nat.h index a3f51d65ceb..531fe4f042f 100644 --- a/gdb/fbsd-nat.h +++ b/gdb/fbsd-nat.h @@ -32,10 +32,4 @@ extern char *fbsd_pid_to_exec_file (struct target_ops *self, int pid); extern int fbsd_find_memory_regions (struct target_ops *self, find_memory_region_ftype func, void *obfd); -/* Create appropriate note sections for a corefile, returning them in - allocated memory. */ - -extern char *fbsd_make_corefile_notes (struct target_ops *self, - bfd *obfd, int *note_size); - #endif /* fbsd-nat.h */ -- 2.30.2