* config/tc-ppc.c (ppc_frob_symbol): Formatting, warning fix.

[deliverable/binutils-gdb.git] / gdb / x86-64-tdep.c

diff --git a/gdb/x86-64-tdep.c b/gdb/x86-64-tdep.c
index 111861aaafe6dba20caa57d5e27c80e5f53d2d68..a47f5e7e5afa86f7c7da93ce5abb09bff9883951 100644 (file)
--- a/gdb/x86-64-tdep.c
+++ b/gdb/x86-64-tdep.c
@@ -28,6 +28,7 @@
 #include "arch-utils.h"
 #include "regcache.h"
 #include "symfile.h"
+#include "objfiles.h"
 #include "x86-64-tdep.h"
 #include "dwarf2cfi.h"
 #include "gdb_assert.h"
@@ -798,8 +799,8 @@ x86_64_store_return_value (struct type *type, char *valbuf)
 }
 \f
 
-char *
-x86_64_register_nr2name (int reg_nr)
+const char *
+x86_64_register_name (int reg_nr)
 {
   if (reg_nr < 0 || reg_nr >= X86_64_NUM_REGS)
     return NULL;
@@ -807,7 +808,7 @@ x86_64_register_nr2name (int reg_nr)
 }
 
 int
-x86_64_register_name2nr (const char *name)
+x86_64_register_number (const char *name)
 {
   int reg_nr;
 
@@ -989,7 +990,7 @@ x86_64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
   set_gdbarch_long_double_format (gdbarch, &floatformat_i387_ext);
 
   set_gdbarch_num_regs (gdbarch, X86_64_NUM_REGS);
-  set_gdbarch_register_name (gdbarch, x86_64_register_nr2name);
+  set_gdbarch_register_name (gdbarch, x86_64_register_name);
   set_gdbarch_register_size (gdbarch, 8);
   set_gdbarch_register_raw_size (gdbarch, x86_64_register_raw_size);
   set_gdbarch_max_register_raw_size (gdbarch, 16);
@@ -1095,7 +1096,7 @@ x86_64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
 
 /* Write into the appropriate registers a function return value stored
    in VALBUF of type TYPE, given in virtual format.  */
-  set_gdbarch_store_return_value (gdbarch, x86_64_store_return_value);
+  set_gdbarch_deprecated_store_return_value (gdbarch, x86_64_store_return_value);
 \f
 
 /* Offset from address of function to start of its code.  */
@@ -1111,6 +1112,7 @@ x86_64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
                                  (gdbarch_breakpoint_from_pc_ftype *)
                                  x86_64_breakpoint_from_pc);
 
+  set_gdbarch_in_solib_call_trampoline (gdbarch, in_plt_section);
 
 /* Amount PC must be decremented by after a breakpoint.  This is often the
    number of bytes in BREAKPOINT but not always.  */