PR gas/14201

[deliverable/binutils-gdb.git] / gdb / fbsd-nat.c

diff --git a/gdb/fbsd-nat.c b/gdb/fbsd-nat.c
index 2380e2e30e10882748d6ed2a09191efe68c25251..b3e4fabbb931ab9810646ee7f209bb91905c1218 100644 (file)
--- a/gdb/fbsd-nat.c
+++ b/gdb/fbsd-nat.c
@@ -1,7 +1,6 @@
 /* Native-dependent code for FreeBSD.
 
-   Copyright (C) 2002, 2003, 2004, 2007, 2008, 2009
-   Free Software Foundation, Inc.
+   Copyright (C) 2002-2004, 2007-2012 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -34,7 +33,7 @@
 #include "elf-bfd.h"
 #include "fbsd-nat.h"
 
-/* Return a the name of file that can be opened to get the symbols for
+/* Return the name of a file that can be opened to get the symbols for
    the child process identified by PID.  */
 
 char *
@@ -92,9 +91,7 @@ fbsd_read_mapping (FILE *mapfile, unsigned long *start, unsigned long *end,
    argument to FUNC.  */
 
 int
-fbsd_find_memory_regions (int (*func) (CORE_ADDR, unsigned long,
-                                      int, int, int, void *),
-                         void *obfd)
+fbsd_find_memory_regions (find_memory_region_ftype func, void *obfd)
 {
   pid_t pid = ptid_get_pid (inferior_ptid);
   char *mapfilename;
@@ -134,7 +131,7 @@ fbsd_find_memory_regions (int (*func) (CORE_ADDR, unsigned long,
                            exec ? 'x' : '-');
        }
 
-      /* Invoke the callback function to create the corefile segment. */
+      /* Invoke the callback function to create the corefile segment.  */
       func (start, size, read, write, exec, obfd);
     }
 
@@ -145,23 +142,23 @@ fbsd_find_memory_regions (int (*func) (CORE_ADDR, unsigned long,
 static int
 find_signalled_thread (struct thread_info *info, void *data)
 {
-  if (info->stop_signal != TARGET_SIGNAL_0
+  if (info->suspend.stop_signal != GDB_SIGNAL_0
       && ptid_get_pid (info->ptid) == ptid_get_pid (inferior_ptid))
     return 1;
 
   return 0;
 }
 
-static enum target_signal
+static enum gdb_signal
 find_stop_signal (void)
 {
   struct thread_info *info =
     iterate_over_threads (find_signalled_thread, NULL);
 
   if (info)
-    return info->stop_signal;
+    return info->suspend.stop_signal;
   else
-    return TARGET_SIGNAL_0;
+    return GDB_SIGNAL_0;
 }
 
 /* Create appropriate note sections for a corefile, returning them in
@@ -204,11 +201,12 @@ fbsd_make_corefile_notes (bfd *obfd, int *note_size)
 
   if (get_exec_file (0))
     {
-      char *fname = strrchr (get_exec_file (0), '/') + 1;
+      const char *fname = lbasename (get_exec_file (0));
       char *psargs = xstrdup (fname);
 
       if (get_inferior_args ())
-       psargs = reconcat (psargs, psargs, " ", get_inferior_args (), NULL);
+       psargs = reconcat (psargs, psargs, " ", get_inferior_args (),
+                          (char *) NULL);
 
       note_data = elfcore_write_prpsinfo (obfd, note_data, note_size,
                                          fname, psargs);