Use canonicalize_file_name unconditionally

[deliverable/binutils-gdb.git] / gdb / amd64fbsd-tdep.c

diff --git a/gdb/amd64fbsd-tdep.c b/gdb/amd64fbsd-tdep.c
index d04908bfe35fc1d8cebc933efecfd562ba79d6fd..13e14adf79f82a7ec9f7393751e7a6adc2cf1908 100644 (file)
--- a/gdb/amd64fbsd-tdep.c
+++ b/gdb/amd64fbsd-tdep.c
@@ -1,6 +1,6 @@
 /* Target-dependent code for FreeBSD/amd64.
 
-   Copyright (C) 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -24,27 +24,25 @@
 #include "regcache.h"
 #include "osabi.h"
 
-#include "gdb_assert.h"
-#include "gdb_string.h"
-
 #include "amd64-tdep.h"
 #include "bsd-uthread.h"
+#include "fbsd-tdep.h"
 #include "solib-svr4.h"
 
 /* Support for signal handlers.  */
 
-/* Assuming NEXT_FRAME is for a frame following a BSD sigtramp
-   routine, return the address of the associated sigcontext structure.  */
+/* Assuming THIS_FRAME is for a BSD sigtramp routine, return the
+   address of the associated sigcontext structure.  */
 
 static CORE_ADDR
-amd64fbsd_sigcontext_addr (struct frame_info *next_frame)
+amd64fbsd_sigcontext_addr (struct frame_info *this_frame)
 {
   CORE_ADDR sp;
 
   /* The `struct sigcontext' (which really is an `ucontext_t' on
      FreeBSD/amd64) lives at a fixed offset in the signal frame.  See
      <machine/sigframe.h>.  */
-  sp = frame_unwind_register_unsigned (next_frame, AMD64_RSP_REGNUM);
+  sp = frame_unwind_register_unsigned (this_frame, AMD64_RSP_REGNUM);
   return sp + 16;
 }
 \f
@@ -67,7 +65,7 @@ static int amd64fbsd_r_reg_offset[] =
   8 * 8,                       /* %rdi */
   10 * 8,                      /* %rbp */
   20 * 8,                      /* %rsp */
-  7 * 8,                       /* %r8 ... */
+  7 * 8,                       /* %r8 ...  */
   6 * 8,
   5 * 8,
   4 * 8,
@@ -100,7 +98,7 @@ int amd64fbsd_sc_reg_offset[] =
   24 + 0 * 8,                  /* %rdi */
   24 + 8 * 8,                  /* %rbp */
   24 + 22 * 8,                 /* %rsp */
-  24 + 4 * 8,                  /* %r8 ... */
+  24 + 4 * 8,                  /* %r8 ...  */
   24 + 5 * 8,
   24 + 9 * 8,
   24 + 10 * 8,
@@ -129,11 +127,11 @@ static int amd64fbsd_jmp_buf_reg_offset[] =
   -1,                          /* %rdi */
   3 * 8,                       /* %rbp */
   2 * 8,                       /* %rsp */
-  -1,                          /* %r8 ... */
+  -1,                          /* %r8 ...  */
   -1,
   -1,
   -1,                          /* ... %r11 */
-  4 * 8,                       /* %r12 ... */
+  4 * 8,                       /* %r12 ...  */
   5 * 8,
   6 * 8,
   7 * 8,                       /* ... %r15 */
@@ -180,11 +178,14 @@ amd64fbsd_collect_uthread (const struct regcache *regcache,
     }
 }
 
-void
+static void
 amd64fbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 {
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
 
+  /* Generic FreeBSD support. */
+  fbsd_init_abi (info, gdbarch);
+
   /* Obviously FreeBSD is BSD-based.  */
   i386bsd_init_abi (info, gdbarch);