* infptrace.c: Include <sys/file.h> if HAVE_SYS_FILE_H instead of

!NO_SYS_FILE.
[KERNEL_U_ADDR_BSD]: Don't include <a.out.h>.
[KERNEL_U_ADDR_BSD] (kernel_u_addr): Remove variable.
(_initialize_kernel_u_addr): Remove prototype and function.
* infttrace.c: Include <sys/file.h> if HAVE_SYS_FILE_H instead of
!NO_SYS_FILE.
* xcoffread.c: Likewise.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ddbd4e7d94673bf1ac361ac0b14d81c247d1fc12..f4f7c44adca73f0bea117e1a463c77a44c64e161 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,14 @@
+2004-08-05  Mark Kettenis  <kettenis@chello.nl>
+
+       * infptrace.c: Include <sys/file.h> if HAVE_SYS_FILE_H instead of
+       !NO_SYS_FILE.
+       [KERNEL_U_ADDR_BSD]: Don't include <a.out.h>.
+       [KERNEL_U_ADDR_BSD] (kernel_u_addr): Remove variable.
+       (_initialize_kernel_u_addr): Remove prototype and function.
+       * infttrace.c: Include <sys/file.h> if HAVE_SYS_FILE_H instead of
+       !NO_SYS_FILE.
+       * xcoffread.c: Likewise.
+
 2004-08-06  Mark Kettenis  <kettenis@gnu.org>
 
        * vax-nat.c: New file.

diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index c6c3fffc796985ff7c65cfae20b9229b6737d5de..4ab89d924fd5cf410d84b0f1ea64dd1f5f596b4b 100644 (file)
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-05  Mark Kettenis  <kettenis@chello.nl>
+
+       * gdbint.texinfo (Host Definition): Delete description of
+       NO_SYS_FILE.
+       (Native Debugging): Delete description of KERNEL_U_ADDR_BSD and
+       PTRACE_FP_BUG.
+
 2004-08-05  Andrew Cagney  <cagney@gnu.org>
 
        * gdbint.texinfo (Target Architecture Definition): Delete

diff --git a/gdb/doc/gdbint.texinfo b/gdb/doc/gdbint.texinfo
index b2e4352bf8124f1896ab77b93fec7dd9938836e5..4a247b6e03f1f0014c3bfcfbd7dbca4edb9625e8 100644 (file)
--- a/gdb/doc/gdbint.texinfo
+++ b/gdb/doc/gdbint.texinfo
@@ -2134,9 +2134,6 @@ The default name of @value{GDBN}'s initialization file (normally
 @item NO_STD_REGS
 This macro is deprecated.
 
-@item NO_SYS_FILE
-Define this if your system does not have a @code{<sys/file.h>}.
-
 @item SIGWINCH_HANDLER
 If your host defines @code{SIGWINCH}, you can define this to be the name
 of a function to be called if @code{SIGWINCH} is received.
@@ -4404,12 +4401,6 @@ needs to know this so that it can subtract this address from absolute
 addresses in the upage, that are obtained via ptrace or from core files.
 On systems that don't need this value, set it to zero.
 
-@item KERNEL_U_ADDR_BSD
-@findex KERNEL_U_ADDR_BSD
-Define this to cause @value{GDBN} to determine the address of @code{u} at
-runtime, by using Berkeley-style @code{nlist} on the kernel's image in
-the root directory.
-
 @item KERNEL_U_ADDR_HPUX
 @findex KERNEL_U_ADDR_HPUX
 Define this to cause @value{GDBN} to determine the address of @code{u} at
@@ -4427,10 +4418,6 @@ Defines the format for the name of a @file{/proc} device.  Should be
 defined in @file{nm.h} @emph{only} in order to override the default
 definition in @file{procfs.c}.
 
-@item PTRACE_FP_BUG
-@findex PTRACE_FP_BUG
-See @file{mach386-xdep.c}.
-
 @item PTRACE_ARG3_TYPE
 @findex PTRACE_ARG3_TYPE
 The type of the third argument to the @code{ptrace} system call, if it

diff --git a/gdb/infptrace.c b/gdb/infptrace.c
index c3b18569e215498ffbc968fc01da41b19ce919ed..11fe27103767a98db04879e6b85898911a566eb5 100644 (file)
--- a/gdb/infptrace.c
+++ b/gdb/infptrace.c
@@ -77,7 +77,7 @@
 #endif
 
 #include "gdbcore.h"
-#ifndef        NO_SYS_FILE
+#ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
 #endif
 #if 0
@@ -89,9 +89,6 @@
 
 #if !defined (FETCH_INFERIOR_REGISTERS)
 #include <sys/user.h>          /* Probably need to poke the user structure */
-#if defined (KERNEL_U_ADDR_BSD)
-#include <a.out.h>             /* For struct nlist */
-#endif /* KERNEL_U_ADDR_BSD.  */
 #endif /* !FETCH_INFERIOR_REGISTERS */
 
 #if !defined (CHILD_XFER_MEMORY)
@@ -103,7 +100,6 @@ static void fetch_register (int);
 static void store_register (int);
 #endif
 
-void _initialize_kernel_u_addr (void);
 void _initialize_infptrace (void);
 \f
 
@@ -322,29 +318,6 @@ detach (int signal)
 #define PTRACE_XFER_TYPE int
 #endif
 
-/* KERNEL_U_ADDR is the amount to subtract from u.u_ar0
-   to get the offset in the core file of the register values.  */
-#if defined (KERNEL_U_ADDR_BSD) && !defined (FETCH_INFERIOR_REGISTERS)
-/* Get kernel_u_addr using BSD-style nlist().  */
-CORE_ADDR kernel_u_addr;
-#endif /* KERNEL_U_ADDR_BSD.  */
-
-void
-_initialize_kernel_u_addr (void)
-{
-#if defined (KERNEL_U_ADDR_BSD) && !defined (FETCH_INFERIOR_REGISTERS)
-  struct nlist names[2];
-
-  names[0].n_un.n_name = "_u";
-  names[1].n_un.n_name = NULL;
-  if (nlist ("/vmunix", names) == 0)
-    kernel_u_addr = names[0].n_value;
-  else
-    internal_error (__FILE__, __LINE__,
-                   "Unable to get kernel u area address.");
-#endif /* KERNEL_U_ADDR_BSD.  */
-}
-
 #if !defined (FETCH_INFERIOR_REGISTERS)
 
 #if !defined (offsetof)

diff --git a/gdb/infttrace.c b/gdb/infttrace.c
index eb79159b83f546caac48fd62299b112a03545e6d..d62c4bd6803cd353af779be322dc1f2026b7c7e6 100644 (file)
--- a/gdb/infttrace.c
+++ b/gdb/infttrace.c
@@ -119,7 +119,7 @@
 #endif
 
 #include "gdbcore.h"
-#ifndef        NO_SYS_FILE
+#ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
 #endif
 

diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c
index 759dfcb1fb7b90c3b44e32d9d79d98a3a2154fe6..645bd4d225258856d1f4d0b9367d5ec3260976dd 100644 (file)
--- a/gdb/xcoffread.c
+++ b/gdb/xcoffread.c
@@ -31,7 +31,7 @@
 #include "gdb_string.h"
 
 #include <sys/param.h>
-#ifndef        NO_SYS_FILE
+#ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
 #endif
 #include "gdb_stat.h"