diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2006-09-29 14:03:13 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2006-09-29 14:03:13 +0000 |
| commit | d6e2601562c38769f4192523e6598e1005818549 (patch) | |
| tree | c49ef0ecbf5054fcd823b7acc39c2759d0204235 /libc/sysdeps/unix/sysv/linux/ia64 | |
| parent | 6f98bd87b527a819e1ccd4bbd0156cbd0c8fd7cd (diff) | |
| download | eglibc2-d6e2601562c38769f4192523e6598e1005818549.tar.gz | |
Merge changes between r76 and r285 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@286 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/sysdeps/unix/sysv/linux/ia64')
| -rw-r--r-- | libc/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h | 3 | ||||
| -rw-r--r-- | libc/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h | 28 |
2 files changed, 20 insertions, 11 deletions
diff --git a/libc/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h b/libc/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h index ef66d465d..ed8c2da9e 100644 --- a/libc/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h +++ b/libc/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h @@ -218,7 +218,8 @@ extern int vmsplice (int __fdout, const struct iovec *__iov, size_t __count, unsigned int __flags); /* Splice two files together. */ -extern int splice (int __fdin, int __fdout, size_t __len, unsigned int __flags) +extern int splice (int __fdin, __off64_t *__offin, int __fdout, + __off64_t *__offout, size_t __len, unsigned int __flags) __THROW; /* In-kernel implementation of tee for pipe buffers. */ diff --git a/libc/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h b/libc/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h index 986c4b2d3..ff77627a8 100644 --- a/libc/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h +++ b/libc/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h @@ -1,5 +1,5 @@ /* `ptrace' debugger support interface. Linux/ia64 version. - Copyright (C) 2001 Free Software Foundation, Inc. + Copyright (C) 2001, 2006 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 @@ -75,14 +75,6 @@ enum __ptrace_request PTRACE_SINGLEBLOCK = 12, #define PT_STEPBLOCK PTRACE_SINGLEBLOCK - /* Get siginfo for process. */ - PTRACE_GETSIGINFO = 13, -#define PT_GETSIGINFO PTRACE_GETSIGINFO - - /* Set new siginfo for process. */ - PTRACE_SETSIGINFO = 14, -#define PT_GETSIGINFO PTRACE_GETSIGINFO - /* Attach to a process that is already running. */ PTRACE_ATTACH = 16, #define PT_ATTACH PTRACE_ATTACH @@ -100,8 +92,24 @@ enum __ptrace_request #define PT_SETREGS PTRACE_SETREGS /* Continue and stop at the next (return from) syscall. */ - PTRACE_SYSCALL = 24 + PTRACE_SYSCALL = 24, #define PT_SYSCALL PTRACE_SYSCALL + + /* Set ptrace filter options. */ + PTRACE_SETOPTIONS = 0x4200, +#define PT_SETOPTIONS PTRACE_SETOPTIONS + + /* Get last ptrace message. */ + PTRACE_GETEVENTMSG = 0x4201, +#define PT_GETEVENTMSG PTRACE_GETEVENTMSG + + /* Get siginfo for process. */ + PTRACE_GETSIGINFO = 0x4202, +#define PT_GETSIGINFO PTRACE_GETSIGINFO + + /* Set new siginfo for process. */ + PTRACE_SETSIGINFO = 0x4203 +#define PT_SETSIGINFO PTRACE_SETSIGINFO }; /* pt_all_user_regs is used for PTRACE_GETREGS/PTRACE_SETREGS. */ |