From c0ccb908a0d28944b8715c2d229ee55e8cdace59 Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Fri, 6 Aug 2004 20:47:25 +0000 Subject: [PATCH] * infptrace.c: Include if HAVE_SYS_FILE_H instead of !NO_SYS_FILE. [KERNEL_U_ADDR_BSD]: Don't include . [KERNEL_U_ADDR_BSD] (kernel_u_addr): Remove variable. (_initialize_kernel_u_addr): Remove prototype and function. * infttrace.c: Include if HAVE_SYS_FILE_H instead of !NO_SYS_FILE. * xcoffread.c: Likewise. --- gdb/ChangeLog | 11 +++++++++++ gdb/doc/ChangeLog | 7 +++++++ gdb/doc/gdbint.texinfo | 13 ------------- gdb/infptrace.c | 29 +---------------------------- gdb/infttrace.c | 2 +- gdb/xcoffread.c | 2 +- 6 files changed, 21 insertions(+), 43 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ddbd4e7d946..f4f7c44adca 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,14 @@ +2004-08-05 Mark Kettenis + + * infptrace.c: Include if HAVE_SYS_FILE_H instead of + !NO_SYS_FILE. + [KERNEL_U_ADDR_BSD]: Don't include . + [KERNEL_U_ADDR_BSD] (kernel_u_addr): Remove variable. + (_initialize_kernel_u_addr): Remove prototype and function. + * infttrace.c: Include if HAVE_SYS_FILE_H instead of + !NO_SYS_FILE. + * xcoffread.c: Likewise. + 2004-08-06 Mark Kettenis * vax-nat.c: New file. diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index c6c3fffc796..4ab89d924fd 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,10 @@ +2004-08-05 Mark Kettenis + + * 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 * gdbint.texinfo (Target Architecture Definition): Delete diff --git a/gdb/doc/gdbint.texinfo b/gdb/doc/gdbint.texinfo index b2e4352bf81..4a247b6e03f 100644 --- 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{}. - @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 c3b18569e21..11fe2710376 100644 --- 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 #endif #if 0 @@ -89,9 +89,6 @@ #if !defined (FETCH_INFERIOR_REGISTERS) #include /* Probably need to poke the user structure */ -#if defined (KERNEL_U_ADDR_BSD) -#include /* 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); @@ -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 eb79159b83f..d62c4bd6803 100644 --- 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 #endif diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c index 759dfcb1fb7..645bd4d2252 100644 --- a/gdb/xcoffread.c +++ b/gdb/xcoffread.c @@ -31,7 +31,7 @@ #include "gdb_string.h" #include -#ifndef NO_SYS_FILE +#ifdef HAVE_SYS_FILE_H #include #endif #include "gdb_stat.h" -- 2.30.2