aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-01-05 09:20:02 +0000
committerUlrich Drepper <drepper@redhat.com>1999-01-05 09:20:02 +0000
commit5dc230dce415a6db49bd7032ee27a725a932d6ce (patch)
tree9bd30c6b551858a43a8eb460b742eb1591d363ee
parentfb19a1ec9efc34ce5409374844eb2a2820d4c187 (diff)
downloadglibc-5dc230dce415a6db49bd7032ee27a725a932d6ce.zip
glibc-5dc230dce415a6db49bd7032ee27a725a932d6ce.tar.gz
glibc-5dc230dce415a6db49bd7032ee27a725a932d6ce.tar.bz2
Update.
1999-01-05 Philip Blundell <philb@gnu.org> * sysdeps/unix/sysv/linux/net/if_arp.h: Add new ARPHRD definitions from latest (2.2.0pre4) kernel. 1999-01-05 Scott Bambrough <scottb@corelcomputer.com> * sysdeps/unix/sysv/linux/arm/sys/user.h : New file. Fixes problem on ARM platforms with programs that include <sys/user.h> and <sys/ptrace.h>. Solution suggested by Geoff Keating earlier with fix for same problem on the PowerPC platform.
-rw-r--r--ChangeLog12
-rw-r--r--sysdeps/unix/sysv/linux/arm/sys/user.h68
-rw-r--r--sysdeps/unix/sysv/linux/net/if_arp.h4
3 files changed, 83 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 235133b..d20364b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+1999-01-05 Philip Blundell <philb@gnu.org>
+
+ * sysdeps/unix/sysv/linux/net/if_arp.h: Add new ARPHRD definitions
+ from latest (2.2.0pre4) kernel.
+
+1999-01-05 Scott Bambrough <scottb@corelcomputer.com>
+
+ * sysdeps/unix/sysv/linux/arm/sys/user.h : New file. Fixes problem
+ on ARM platforms with programs that include <sys/user.h> and
+ <sys/ptrace.h>. Solution suggested by Geoff Keating earlier with
+ fix for same problem on the PowerPC platform.
+
1999-01-04 Philip Blundell <philb@gnu.org>
* sysdeps/unix/sysv/linux/arm/register-dump.h: Correct widths of
diff --git a/sysdeps/unix/sysv/linux/arm/sys/user.h b/sysdeps/unix/sysv/linux/arm/sys/user.h
new file mode 100644
index 0000000..f06d3e4
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/arm/sys/user.h
@@ -0,0 +1,68 @@
+/* Copyright (C) 1998, 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
+
+#include <features.h>
+
+/* <sys/ptrace.h> and <linux/ptrace.h> both define the PTRACE_* macros.
+ This leads to compilation problems with programs which include both
+ user.h and ptrace.h (eg: GDB). Do not include <linux/ptrace.h> here. */
+#include <asm/ptrace.h>
+
+struct user_fp
+{
+ struct fp_reg
+ {
+ unsigned int sign1:1;
+ unsigned int unused:15;
+ unsigned int sign2:1;
+ unsigned int exponent:14;
+ unsigned int j:1;
+ unsigned int mantissa1:31;
+ unsigned int mantissa0:32;
+ } fpregs[8];
+ unsigned int fpsr:32;
+ unsigned int fpcr:32;
+};
+
+struct user
+{
+ struct pt_regs regs; /* General registers */
+ int u_fpvalid; /* True if math co-processor being used. */
+
+ unsigned long int u_tsize; /* Text segment size (pages). */
+ unsigned long int u_dsize; /* Data segment size (pages). */
+ unsigned long int u_ssize; /* Stack segment size (pages). */
+
+ unsigned long start_code; /* Starting virtual address of text. */
+ unsigned long start_stack; /* Starting virtual address of stack. */
+
+ long int signal; /* Signal that caused the core dump. */
+ int reserved; /* No longer used */
+ struct pt_regs *u_ar0; /* help gdb to find the general registers. */
+
+ unsigned long magic; /* uniquely identify a core file */
+ char u_comm[32]; /* User command that was responsible */
+ int u_debugreg[8];
+ struct user_fp u_fp; /* Floating point registers */
+ struct user_fp_struct *u_fp0; /* help gdb to find the FP registers. */
+};
+
+#endif /* sys/user.h */
diff --git a/sysdeps/unix/sysv/linux/net/if_arp.h b/sysdeps/unix/sysv/linux/net/if_arp.h
index efb0c84..9ba9fe1 100644
--- a/sysdeps/unix/sysv/linux/net/if_arp.h
+++ b/sysdeps/unix/sysv/linux/net/if_arp.h
@@ -1,5 +1,5 @@
/* Definitions for Address Resolution Protocol.
- Copyright (C) 1997 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1999 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -107,6 +107,8 @@ struct arphdr
#define ARPHRD_PIMREG 779 /* PIMSM register interface. */
#define ARPHRD_HIPPI 780 /* High Performance Parallel I'face. */
#define ARPHRD_ASH 781 /* (Nexus Electronics) Ash. */
+#define ARPHRD_ECONET 782 /* Acorn Econet. */
+#define ARPHRD_IRDA 783 /* Linux/IR. */
/* ARP ioctl request. */