don't use a specific file for sparc64 defines, move them to tm-sp64.h.

also, i change the GDB_TARGET_IS_SPARC64 back to old behavior, is not
that hard to back port things from gdb-current.

4 files changed, 14 insertions, 33 deletions

diff --git a/gnu/usr.bin/binutils/gdb/config/sparc/nm-obsd64.h b/gnu/usr.bin/binutils/gdb/config/sparc/nm-obsd64.h
deleted file mode 100644
index 71391ece1c0..00000000000
--- a/gnu/usr.bin/binutils/gdb/config/sparc/nm-obsd64.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef NM_OBSD64_H
-#define NM_OBSD64_H
-
-/* Get generic OpenBSD native definitions. */
-#include "nm-obsd.h"
-
-/* Before storing, read all the registers. (see inftarg.c) */
-#define CHILD_PREPARE_TO_STORE() \
-    read_register_bytes (0, NULL, REGISTER_BYTES)
-
-/* Compensate for stack bias. */
-
-#define TARGET_READ_SP() \
-    sparc64_read_sp()
-
-#define TARGET_READ_FP() \
-    sparc64_read_fp()
-
-#define TARGET_WRITE_SP(val) \
-    sparc64_write_sp(val)
-
-#define TARGET_WRITE_FP(val) \
-    sparc64_write_fp(val)
-
-#endif /* NM_OBSD64_H */
diff --git a/gnu/usr.bin/binutils/gdb/config/sparc/obsd64.mh b/gnu/usr.bin/binutils/gdb/config/sparc/obsd64.mh
index ab7e67b734a..dbd811c2240 100644
--- a/gnu/usr.bin/binutils/gdb/config/sparc/obsd64.mh
+++ b/gnu/usr.bin/binutils/gdb/config/sparc/obsd64.mh
@@ -1,6 +1,6 @@
 # Host: UltraSparc, running OpenBSD
 XDEPFILES= ser-tcp.o
 XM_FILE= xm-obsd.h
-NAT_FILE= nm-obsd64.h
+NAT_FILE= nm-obsd.h
 NAT_CLIBS= -lkvm
 NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o kcore-nbsd.o sp64nbsd-nat.o solib.o
diff --git a/gnu/usr.bin/binutils/gdb/config/sparc/tm-sp64.h b/gnu/usr.bin/binutils/gdb/config/sparc/tm-sp64.h
index 6c2e866103c..740b032e509 100644
--- a/gnu/usr.bin/binutils/gdb/config/sparc/tm-sp64.h
+++ b/gnu/usr.bin/binutils/gdb/config/sparc/tm-sp64.h
@@ -20,9 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#ifndef GDB_TARGET_IS_SPARC64
-#define GDB_TARGET_IS_SPARC64 1
-#endif
+#define GDB_TARGET_IS_SPARC64
 
 #include "sparc/tm-sparc.h"
 
@@ -283,3 +281,15 @@ extern int
 get_longjmp_target PARAMS ((CORE_ADDR *));
 
 #define GET_LONGJMP_TARGET(ADDR) get_longjmp_target(ADDR)
+
+#define TARGET_READ_SP() \
+    sparc64_read_sp()
+
+#define TARGET_READ_FP() \
+    sparc64_read_fp()
+
+#define TARGET_WRITE_SP(val) \
+    sparc64_write_sp(val)
+
+#define TARGET_WRITE_FP(val) \
+    sparc64_write_fp(val)
diff --git a/gnu/usr.bin/binutils/gdb/config/sparc/tm-sparc.h b/gnu/usr.bin/binutils/gdb/config/sparc/tm-sparc.h
index 740f192cb5a..b42865769a6 100644
--- a/gnu/usr.bin/binutils/gdb/config/sparc/tm-sparc.h
+++ b/gnu/usr.bin/binutils/gdb/config/sparc/tm-sparc.h
@@ -71,10 +71,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
        || function_stab_type == N_STSYM \
        || function_stab_type == N_GSYM))
 
-#ifndef GDB_TARGET_IS_SPARC64
-#define GDB_TARGET_IS_SPARC64 0
-#endif
-
 /* Offset from address of function to start of its code.
    Zero on most machines.  */