gdb/ChangeLog:

	* config/alpha/nm-osf.h (PTRACE_XFER_TYPE): Remove.
	* config/mips/nm-linux.h (PTRACE_ARG3_TYPE, PTRACE_XFER_TYPE): Remove.
	* config/sparc/nm-linux.h (PTRACE_ARG3_TYPE, PTRACE_XFER_TYPE): Remove.
	* config/powerpc/nm-ppc64-linux.h: Remove file.
	* config/powerpc/ppc64-linux.mh (NATDEPFILES): Set to nm-linux.h.
	* inferior.h (PTRACE_ARG3_TYPE): Do not define.
	(call_ptrace): Change type of third argument to PTRACE_TYPE_ARG3.
	* infptrace.c (call_ptrace): Likewise.
	* m68klinux-nat.c (PTRACE_XFER_TYPE): Do not define.
	(fetch_register): Replace PTRACE_ARG3_TYPE by PTRACE_TYPE_ARG3
	and PTRACE_XFER_TYPE by PTRACE_TYPE_RET.
	(store_register): Likewise.

gdb/doc/ChangeLog:

	* gdbint.texi (Native Conditionals): Remove PTRACE_ARG3_TYPE.

5 files changed, 1 insertions, 43 deletions

diff --git a/gdb/config/alpha/nm-osf.h b/gdb/config/alpha/nm-osf.h
index bcc2d39ab60..ad102b7a53f 100644
--- a/gdb/config/alpha/nm-osf.h
+++ b/gdb/config/alpha/nm-osf.h
@@ -29,10 +29,6 @@
 
 #define U_REGS_OFFSET 0
 
-/* ptrace transfers longs, the ptrace man page is lying.  */
-
-#define PTRACE_XFER_TYPE long
-
 /* Given a pointer to either a gregset_t or fpregset_t, return a
    pointer to the first register.  */
 #define ALPHA_REGSET_BASE(regsetp)     ((regsetp)->regs)
diff --git a/gdb/config/mips/nm-linux.h b/gdb/config/mips/nm-linux.h
index 1f875edada9..80423166305 100644
--- a/gdb/config/mips/nm-linux.h
+++ b/gdb/config/mips/nm-linux.h
@@ -33,11 +33,6 @@
 
 #define U_REGS_OFFSET 0
 
-/* ptrace transfers longs, and expects addresses as longs.  */
-
-#define PTRACE_ARG3_TYPE long
-#define PTRACE_XFER_TYPE long
-
 #define REGISTER_U_ADDR(addr, blockend, regno) \
   (addr) = mips_register_addr ((regno),(blockend))
 
diff --git a/gdb/config/powerpc/nm-ppc64-linux.h b/gdb/config/powerpc/nm-ppc64-linux.h
deleted file mode 100644
index 8bac9925477..00000000000
--- a/gdb/config/powerpc/nm-ppc64-linux.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* IBM PowerPC64 native-dependent macros for GDB, the GNU debugger.
-   Copyright 2003, 2007 Free Software Foundation, Inc.
-
-This file is part of GDB.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#ifndef NM_PPC64_LINUX_H
-
-#include "config/powerpc/nm-linux.h"
-
-#define PTRACE_ARG3_TYPE void *
-#define PTRACE_XFER_TYPE long
-
-#endif /* NM_PPC64_LINUX_H */
diff --git a/gdb/config/powerpc/ppc64-linux.mh b/gdb/config/powerpc/ppc64-linux.mh
index 6cee59098ba..4e06c7b4b1d 100644
--- a/gdb/config/powerpc/ppc64-linux.mh
+++ b/gdb/config/powerpc/ppc64-linux.mh
@@ -2,7 +2,7 @@
 
 XM_CLIBS=
 
-NAT_FILE= nm-ppc64-linux.h
+NAT_FILE= nm-linux.h
 NATDEPFILES= inf-ptrace.o fork-child.o \
 	ppc-linux-nat.o proc-service.o linux-thread-db.o \
 	gcore.o linux-nat.o linux-fork.o
diff --git a/gdb/config/sparc/nm-linux.h b/gdb/config/sparc/nm-linux.h
index 24d4ac0fd0b..abdeb524d8b 100644
--- a/gdb/config/sparc/nm-linux.h
+++ b/gdb/config/sparc/nm-linux.h
@@ -25,12 +25,6 @@
 
 #include "config/nm-linux.h"
 
-/* Type of the third argument to the `ptrace' system call.  */
-#define PTRACE_ARG3_TYPE long
-
-/* Type of the fourth argument to the `ptrace' system call.  */
-#define PTRACE_XFER_TYPE long
-
 /* Override copies of {fetch,store}_inferior_registers in `infptrace.c'.  */
 #define FETCH_INFERIOR_REGISTERS