[PATCH] Small header cleanup for PPC

[Franz Sirl <Franz dot Sirl-kernel at lauterbach dot com>]

Hi,

while compiling CVS gdb and strace I noticed a few small problems with the 
ppc header files, the attached patch fixes that.

No problems with current prerelease otherwise, works fine with both 
gcc-2.95.3 (slightly patched) and gcc-3.0.

Franz.


	* sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h: New file.
	* sysdeps/unix/sysv/linux/powerpc/Dist: Add sys/ptrace.h.
	* sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h: Delete wrong stuff.
	* sysdeps/unix/sysv/linux/powerpc/sys/procfs.h: Correct typedefs.

Index: sysdeps/unix/sysv/linux/powerpc/Dist
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/powerpc/Dist,v
retrieving revision 1.13
diff -u -p -r1.13 Dist
--- sysdeps/unix/sysv/linux/powerpc/Dist	2000/09/18 00:39:22	1.13
+++ sysdeps/unix/sysv/linux/powerpc/Dist	2001/04/05 20:45:51
@@ -5,4 +5,5 @@ kernel_stat.h
 kernel_termios.h
 oldgetrlimit64.c
 sys/procfs.h
+sys/ptrace.h
 sys/user.h
Index: sysdeps/unix/sysv/linux/powerpc/sys/procfs.h
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h,v
retrieving revision 1.6
diff -u -p -r1.6 procfs.h
--- sysdeps/unix/sysv/linux/powerpc/sys/procfs.h	2000/02/11 20:22:43	1.6
+++ sysdeps/unix/sysv/linux/powerpc/sys/procfs.h	2001/04/05 20:45:51
@@ -122,8 +122,8 @@ struct elf_prpsinfo
 typedef void *psaddr_t;
 
 /* Register sets.  Linux has different names.  */
-typedef gregset_t prgregset_t;
-typedef fpregset_t prfpregset_t;
+typedef elf_gregset_t prgregset_t;
+typedef elf_fpregset_t prfpregset_t;
 
 /* We don't have any differences between processes and threads,
    therefore habe only ine PID type.  */
Index: sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h,v
retrieving revision 1.3
diff -u -p -r1.3 ucontext.h
--- sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h	1999/10/12 00:49:48	1.3
+++ sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h	2001/04/05 20:45:51
@@ -28,29 +28,6 @@
 
 typedef struct sigcontext mcontext_t;
 
-/* We need explicit types for the general and floating-point register
-   sets.  */
-
-/* Type for general register.  */
-typedef int greg_t;
-
-/* Number of general registers.  */
-#define NGREG	32
-
-/* Container for all general registers.  */
-typedef greg_t gregset_t[NGREG];
-
-
-/* Type for general register.  */
-typedef int fpreg_t;
-
-/* Number of general registers.  */
-#define NFPREG	32
-
-/* Container for all general registers.  */
-typedef fpreg_t fpregset_t[NFPREG];
-
-
 /* Userlevel context.  */
 typedef struct ucontext
   {
--- /dev/null	Thu Jan  1 01:00:00 1970
+++ sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h	Thu Apr  5 22:51:00 2001
@@ -0,0 +1,99 @@
+/* `ptrace' debugger support interface.  Linux version.
+   Copyright (C) 2001 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#ifndef _SYS_PTRACE_H
+#define _SYS_PTRACE_H	1
+
+#include <features.h>
+
+__BEGIN_DECLS
+
+/* Type of the REQUEST argument to `ptrace.'  */
+enum __ptrace_request
+{
+  /* Indicate that the process making this request should be traced.
+     All signals received by this process can be intercepted by its
+     parent, and its parent can use the other `ptrace' requests.  */
+  PTRACE_TRACEME = 0,
+#define PT_TRACE_ME PTRACE_TRACEME
+
+  /* Return the word in the process's text space at address ADDR.  */
+  PTRACE_PEEKTEXT = 1,
+#define PT_READ_I PTRACE_PEEKTEXT
+
+  /* Return the word in the process's data space at address ADDR.  */
+  PTRACE_PEEKDATA = 2,
+#define PT_READ_D PTRACE_PEEKDATA
+
+  /* Return the word in the process's user area at offset ADDR.  */
+  PTRACE_PEEKUSER = 3,
+#define PT_READ_U PTRACE_PEEKUSER
+
+  /* Write the word DATA into the process's text space at address ADDR.  */
+  PTRACE_POKETEXT = 4,
+#define PT_WRITE_I PTRACE_POKETEXT
+
+  /* Write the word DATA into the process's data space at address ADDR.  */
+  PTRACE_POKEDATA = 5,
+#define PT_WRITE_D PTRACE_POKEDATA
+
+  /* Write the word DATA into the process's user area at offset ADDR.  */
+  PTRACE_POKEUSER = 6,
+#define PT_WRITE_U PTRACE_POKEUSER
+
+  /* Continue the process.  */
+  PTRACE_CONT = 7,
+#define PT_CONTINUE PTRACE_CONT
+
+  /* Kill the process.  */
+  PTRACE_KILL = 8,
+#define PT_KILL PTRACE_KILL
+
+  /* Single step the process.
+     This is not supported on all machines.  */
+  PTRACE_SINGLESTEP = 9,
+#define PT_STEP PTRACE_SINGLESTEP
+
+  /* Attach to a process that is already running. */
+  PTRACE_ATTACH = 16,
+#define PT_ATTACH PTRACE_ATTACH
+
+  /* Detach from a process attached to with PTRACE_ATTACH.  */
+  PTRACE_DETACH = 17,
+#define PT_DETACH PTRACE_DETACH
+
+  /* Continue and stop at the next (return from) syscall.  */
+  PTRACE_SYSCALL = 24
+#define PT_SYSCALL PTRACE_SYSCALL
+};
+
+/* Perform process tracing functions.  REQUEST is one of the values
+   above, and determines the action to be taken.
+   For all requests except PTRACE_TRACEME, PID specifies the process to be
+   traced.
+
+   PID and the other arguments described above for the various requests should
+   appear (those that are used for the particular request) as:
+     pid_t PID, void *ADDR, int DATA, void *ADDR2
+   after REQUEST.  */
+extern long int ptrace (enum __ptrace_request __request, ...) __THROW;
+
+__END_DECLS
+
+#endif /* _SYS_PTRACE_H */