Merge {i386,amd64}_linux_read_description

[deliverable/binutils-gdb.git] / gdb / sparc-sol2-tdep.c

diff --git a/gdb/sparc-sol2-tdep.c b/gdb/sparc-sol2-tdep.c
index ca1077df8058c080cc3b4eac67252b7b22930331..4452c00c698b91b02b47741cc2e8da22b9a04941 100644 (file)
--- a/gdb/sparc-sol2-tdep.c
+++ b/gdb/sparc-sol2-tdep.c
@@ -1,6 +1,6 @@
 /* Target-dependent code for Solaris SPARC.
 
-   Copyright (C) 2003-2004, 2006-2012 Free Software Foundation, Inc.
+   Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -29,14 +29,14 @@
 #include "trad-frame.h"
 
 #include "gdb_assert.h"
-#include "gdb_string.h"
+#include <string.h>
 
 #include "sol2-tdep.h"
 #include "sparc-tdep.h"
 #include "solib-svr4.h"
 
 /* From <sys/regset.h>.  */
-const struct sparc_gregset sparc32_sol2_gregset =
+const struct sparc_gregmap sparc32_sol2_gregmap =
 {
   32 * 4,                      /* %psr */
   33 * 4,                      /* %pc */
@@ -48,7 +48,7 @@ const struct sparc_gregset sparc32_sol2_gregset =
   16 * 4,                      /* %l0 */
 };
 
-const struct sparc_fpregset sparc32_sol2_fpregset =
+const struct sparc_fpregmap sparc32_sol2_fpregmap =
 {
   0 * 4,                       /* %f0 */
   33 * 4,                      /* %fsr */