Make dwarf2_get_dwz_file take a dwarf2_per_bfd

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

diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
index d44c5b52c09f48afb8a635f99f458ca063f2e4a4..97486dea602231b3fbd90529c36c600633122e2b 100644 (file)
--- a/gdb/xtensa-tdep.c
+++ b/gdb/xtensa-tdep.c
@@ -35,8 +35,8 @@
 
 #include "dummy-frame.h"
 #include "dwarf2.h"
-#include "dwarf2-frame.h"
-#include "dwarf2loc.h"
+#include "dwarf2/frame.h"
+#include "dwarf2/loc.h"
 #include "frame-base.h"
 #include "frame-unwind.h"
 
@@ -1651,9 +1651,9 @@ xtensa_return_value (struct gdbarch *gdbarch,
 {
   /* Structures up to 16 bytes are returned in registers.  */
 
-  int struct_return = ((TYPE_CODE (valtype) == TYPE_CODE_STRUCT
-                       || TYPE_CODE (valtype) == TYPE_CODE_UNION
-                       || TYPE_CODE (valtype) == TYPE_CODE_ARRAY)
+  int struct_return = ((valtype->code () == TYPE_CODE_STRUCT
+                       || valtype->code () == TYPE_CODE_UNION
+                       || valtype->code () == TYPE_CODE_ARRAY)
                       && TYPE_LENGTH (valtype) > 16);
 
   if (struct_return)
@@ -1726,7 +1726,7 @@ xtensa_push_dummy_call (struct gdbarch *gdbarch,
          fprintf_unfiltered (gdb_stdlog, "%2d: %s %3s ", i,
                              host_address_to_string (arg),
                              pulongest (TYPE_LENGTH (arg_type)));
-         switch (TYPE_CODE (arg_type))
+         switch (arg_type->code ())
            {
            case TYPE_CODE_INT:
              fprintf_unfiltered (gdb_stdlog, "int");
@@ -1735,7 +1735,7 @@ xtensa_push_dummy_call (struct gdbarch *gdbarch,
              fprintf_unfiltered (gdb_stdlog, "struct");
              break;
            default:
-             fprintf_unfiltered (gdb_stdlog, "%3d", TYPE_CODE (arg_type));
+             fprintf_unfiltered (gdb_stdlog, "%3d", arg_type->code ());
              break;
            }
          fprintf_unfiltered (gdb_stdlog, " %s\n",
@@ -1760,7 +1760,7 @@ xtensa_push_dummy_call (struct gdbarch *gdbarch,
       struct value *arg = args[i];
       struct type *arg_type = check_typedef (value_type (arg));
 
-      switch (TYPE_CODE (arg_type))
+      switch (arg_type->code ())
        {
        case TYPE_CODE_INT:
        case TYPE_CODE_BOOL:
@@ -3253,8 +3253,9 @@ xtensa_dump_tdep (struct gdbarch *gdbarch, struct ui_file *file)
   error (_("xtensa_dump_tdep(): not implemented"));
 }
 
+void _initialize_xtensa_tdep ();
 void
-_initialize_xtensa_tdep (void)
+_initialize_xtensa_tdep ()
 {
   gdbarch_register (bfd_arch_xtensa, xtensa_gdbarch_init, xtensa_dump_tdep);
   xtensa_init_reggroups ();