A patch for alpha header files.

[hjl@varesearch.com (H.J. Lu)]

<asm/user.h> on alpha will include <linux/ptrace.h> which has a
conflict with <sys/ptrace.h>. This patch removes <linux/ptrace.h>.


-- 
H.J. Lu (hjl@gnu.org)
--
Wed Sep  1 09:35:59 1999  H.J. Lu  <hjl@gnu.org>

	* sysdeps/unix/sysv/linux/alpha/sys/user.h: New.

	* sysdeps/unix/sysv/linux/alpha/sys/procfs.h: Include
	<sys/user.h> instead of <asm/user.h>.

Index: sysdeps/unix/sysv/linux/alpha/sys/procfs.h
===================================================================
RCS file: /work/cvs/gnu/glibc-2.1/sysdeps/unix/sysv/linux/alpha/sys/procfs.h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 procfs.h
--- sysdeps/unix/sysv/linux/alpha/sys/procfs.h	1997/02/25 17:48:06	1.1.1.1
+++ sysdeps/unix/sysv/linux/alpha/sys/procfs.h	1999/09/01 16:34:16
@@ -28,7 +28,7 @@
 #include <signal.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <asm/user.h>
+#include <sys/user.h>
 #include <asm/elf.h>
 
 __BEGIN_DECLS
--- /dev/null	Tue May  5 13:32:27 1998
+++ sysdeps/unix/sysv/linux/alpha/sys/user.h	Wed Sep  1 09:39:22 1999
@@ -0,0 +1,49 @@
+/* Copyright (C) 1999 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_USER_H
+#define _SYS_USER_H	1
+
+/* The whole purpose of this file is for gdb/strace and gdb/strace
+   only. Don't read too much into it. Don't use it for anything other
+   than gdb/strace unless you know what you are doing. */
+
+#include <asm/page.h>
+#include <asm/reg.h>
+
+struct user {
+	unsigned long	regs[EF_SIZE/8+32];	/* integer and fp regs */
+	size_t		u_tsize;		/* text size (pages) */
+	size_t		u_dsize;		/* data size (pages) */
+	size_t		u_ssize;		/* stack size (pages) */
+	unsigned long	start_code;		/* text starting address */
+	unsigned long	start_data;		/* data starting address */
+	unsigned long	start_stack;		/* stack starting address */
+	long int	signal;			/* signal causing core dump */
+	struct regs *	u_ar0;			/* help gdb find registers */
+	unsigned long	magic;			/* identifies a core file */
+	char		u_comm[32];		/* user command name */
+};
+
+#define NBPG			PAGE_SIZE
+#define UPAGES			1
+#define HOST_TEXT_START_ADDR	(u.start_code)
+#define HOST_DATA_START_ADDR	(u.start_data)
+#define HOST_STACK_END_ADDR	(u.start_stack + u.u_ssize * NBPG)
+
+#endif	/* _SYS_USER_H */