Fix Alpha native GDB build

[deliverable/binutils-gdb.git] / gdb / nios2-linux-tdep.c

diff --git a/gdb/nios2-linux-tdep.c b/gdb/nios2-linux-tdep.c
index 8cada5472a12973b9b6d0690307e1925c70a995e..e7f4ecf16e2ce100bcb294ceea9a9fef7fd62de7 100644 (file)
--- a/gdb/nios2-linux-tdep.c
+++ b/gdb/nios2-linux-tdep.c
@@ -1,5 +1,5 @@
 /* Target-dependent code for GNU/Linux on Nios II.
-   Copyright (C) 2012-2017 Free Software Foundation, Inc.
+   Copyright (C) 2012-2018 Free Software Foundation, Inc.
    Contributed by Mentor Graphics, Inc.
 
    This file is part of GDB.
@@ -30,8 +30,6 @@
 #include "glibc-tdep.h"
 #include "nios2-tdep.h"
 
-#include "features/nios2-linux.c"
-
 /* Core file and register set support.  */
 
 /* Map from the normal register enumeration order to the order that
@@ -69,10 +67,9 @@ nios2_supply_gregset (const struct regset *regset,
     if (regnum == -1 || regnum == regno)
       {
        if (reg_offsets[regno] != -1)
-         regcache_raw_supply (regcache, regno,
-                              gregs + 4 * reg_offsets[regno]);
+         regcache->raw_supply (regno, gregs + 4 * reg_offsets[regno]);
        else
-         regcache_raw_supply (regcache, regno, zero_buf);
+         regcache->raw_supply (regno, zero_buf);
       }
 }
 
@@ -90,8 +87,7 @@ nios2_collect_gregset (const struct regset *regset,
     if (regnum == -1 || regnum == regno)
       {
        if (reg_offsets[regno] != -1)
-         regcache_raw_collect (regcache, regno,
-                               gregs + 4 * reg_offsets[regno]);
+         regcache->raw_collect (regno, gregs + 4 * reg_offsets[regno]);
       }
 }
 
@@ -249,6 +245,4 @@ _initialize_nios2_linux_tdep (void)
        arch_info = arch_info->next)
     gdbarch_register_osabi (bfd_arch_nios2, arch_info->mach,
                            GDB_OSABI_LINUX, nios2_linux_init_abi);
-
-  initialize_tdesc_nios2_linux ();
 }