OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[LynxOS] Include sys/ptrace.h instead of ptrace.h.

Browse Source 
This is one of the changes needed in order to build gdbserver on
LynxOS 5.x.

Really interesting: On LynxOS 4.x, there is a #warning when sys/ptrace.h
is used (explaining that ptrace.h will be used instead), whereas this
file was removed from LynxOS 5.x. The contents of sys/ptrace.h on 4.x
(or at least the meat of it):

    #if defined(__GNUC__) || defined(__GNUG__)
    #if !defined(__NO_INCLUDE_WARN__)
    #warning Using <ptrace.h> instead of <sys/ptrace.h>
    #endif /* defined(__NO_INCLUDE_WARN__) */
    #endif /* defined(__GNUC__) || defined(__GNUG__) */

    #include <ptrace.h>

The fix I went for, for now, is to just include <sys/ptrace.h>
unconditionally.  I could have done some configury, but we already
have to build with -D__NO_INCLUDE_WARN__ to avoid the warnings
anyway, and that's unvoidable, due to system includes themselves
including the "wrong" header file.

Since <sys/ptrace.h> seems to be the choice that was made for LynxOS,
and since it works to include it on LynxOS 4.x, I think that's the simplest
solution.

gdb/gdbserver/ChangeLog:

        * lynx-low.c, lynx-ppc-low.c: Include <sys/ptrace.h> instead of
        <ptrace.h>
This commit is contained in:
Joel Brobecker 2010-09-13 19:10:19 +00:00
parent 7d288aaabf
commit 1adfc54d0c
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/gdbserver/ChangeLog
View File

@ -1,3 +1,8 @@
2010-09-13 Joel Brobecker <brobecker@adacore.com>
* lynx-low.c, lynx-ppc-loc.c: Include <sys/ptrace.h> instead of
<ptrace.h>
2010-09-09 Nathan Sidwell <nathan@codesourcery.com>
* configure.ac: Add --enable-inprocess-agent option.

2
gdb/gdbserver/lynx-low.c
View File

@ -20,7 +20,7 @@
#include "lynx-low.h"
#include <limits.h>
#include <ptrace.h>
#include <sys/ptrace.h>
#include <sys/piddef.h> /* Provides PIDGET, TIDGET, BUILDPID, etc. */
#include <unistd.h>
#include <sys/ioctl.h>

2
gdb/gdbserver/lynx-ppc-low.c
View File

@ -21,7 +21,7 @@
#include <stdint.h>
#include <stddef.h>
#include <limits.h>
#include <ptrace.h>
#include <sys/ptrace.h>
/* The following two typedefs are defined in a .h file which is not
in the standard include path (/sys/include/family/ppc/ucontext.h),