From 9cb6e8783c61f9d7008e442b348f5f24b8d6a1cb Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 3 Sep 1999 07:15:09 +0000
Subject: Update.

1999-08-30  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* io/ftwtest-sh: Set LC_ALL and LANG to fix locale
	dependencies in sort.

1999-09-01  H.J. Lu  <hjl@gnu.org>

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

	* sysdeps/unix/sysv/linux/alpha/sys/procfs.h: Include
	<sys/user.h> instead of <asm/user.h>.
---
 ChangeLog                                  | 12 +++++++
 io/ftwtest-sh                              |  6 ++++
 sysdeps/unix/sysv/linux/alpha/sys/procfs.h |  4 +--
 sysdeps/unix/sysv/linux/alpha/sys/user.h   | 50 ++++++++++++++++++++++++++++++
 4 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 sysdeps/unix/sysv/linux/alpha/sys/user.h

diff --git a/ChangeLog b/ChangeLog
index 5e9cfc6..ce18ae5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+1999-08-30  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+	* io/ftwtest-sh: Set LC_ALL and LANG to fix locale
+	dependencies in sort.
+
+1999-09-01  H.J. Lu  <hjl@gnu.org>
+
+	* sysdeps/unix/sysv/linux/alpha/sys/user.h: New file.
+
+	* sysdeps/unix/sysv/linux/alpha/sys/procfs.h: Include
+	<sys/user.h> instead of <asm/user.h>.
+
 1999-09-02  Ulrich Drepper  <drepper@cygnus.com>
 
 	* elf/elf.h: Update PARISC-specific flags and symbolic names.
diff --git a/io/ftwtest-sh b/io/ftwtest-sh
index dadbfa0..389c412 100644
--- a/io/ftwtest-sh
+++ b/io/ftwtest-sh
@@ -16,6 +16,12 @@ if test `id | sed "s/uid=\([0-9]*\).*/\1/"` = 0; then
   exit 0
 fi
 
+# Since we use `sort' we must make sure to use the same locale everywhere.
+LC_ALL=C
+export LC_ALL
+LANG=C
+export LANG
+
 # First create our scenario:
 tmp=`echo ${TMPDIR:-/tmp} | sed 's|\(.\)/*$|\1|'`
 tmpdir=$tmp/ftwtest.d
diff --git a/sysdeps/unix/sysv/linux/alpha/sys/procfs.h b/sysdeps/unix/sysv/linux/alpha/sys/procfs.h
index 7bd6e69..7d40596 100644
--- a/sysdeps/unix/sysv/linux/alpha/sys/procfs.h
+++ b/sysdeps/unix/sysv/linux/alpha/sys/procfs.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 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
@@ -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
diff --git a/sysdeps/unix/sysv/linux/alpha/sys/user.h b/sysdeps/unix/sysv/linux/alpha/sys/user.h
new file mode 100644
index 0000000..fe6acb2
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/alpha/sys/user.h
@@ -0,0 +1,50 @@
+/* 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	int 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	int start_code;			/* text starting address */
+  unsigned long	int start_data;			/* data starting address */
+  unsigned long	int start_stack;		/* stack starting address */
+  long int signal;				/* signal causing core dump */
+  struct regs *u_ar0;				/* help gdb find registers */
+  unsigned long	int 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 */
-- 
cgit v1.1