diff options
| author | Andreas Jaeger <aj@suse.de> | 2012-07-26 13:13:26 +0200 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.de> | 2012-07-26 13:13:26 +0200 |
| commit | b1b2aaf8eb9eed301ea8f65b96844568ca017f8b (patch) | |
| tree | 4737800f75320e53d5f23b0070ffb33868bbfb46 /ports | |
| parent | f8d44fdc72253347dae69fd2c4a231efba4fec98 (diff) | |
| download | glibc-b1b2aaf8eb9eed301ea8f65b96844568ca017f8b.tar.gz glibc-b1b2aaf8eb9eed301ea8f65b96844568ca017f8b.tar.xz glibc-b1b2aaf8eb9eed301ea8f65b96844568ca017f8b.zip | |
Merge Linux 3.5 ptrace changes
(__ptrace_eventcodes): Add new value PTRACE_EVENT_SECCOMP from Linux 3.5. (__ptrace_setoptions): Add new value PTRACE_O_TRACESECCOMP, adjust PTRACE_O_MASK.
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/ChangeLog.ia64 | 7 | ||||
| -rw-r--r-- | ports/ChangeLog.tile | 5 | ||||
| -rw-r--r-- | ports/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h | 14 | ||||
| -rw-r--r-- | ports/sysdeps/unix/sysv/linux/tile/sys/ptrace.h | 14 |
4 files changed, 30 insertions, 10 deletions
diff --git a/ports/ChangeLog.ia64 b/ports/ChangeLog.ia64 index e782f98238..31d86da3ee 100644 --- a/ports/ChangeLog.ia64 +++ b/ports/ChangeLog.ia64 @@ -1,3 +1,10 @@ +2012-07-26 Andreas Jaeger <aj@suse.de> + + * sysdeps/unix/sysv/linux/ia64/sys/ptrace.h (__ptrace_eventcodes): + Add new value PTRACE_EVENT_SECCOMP from Linux 3.5. + (__ptrace_setoptions): Add new value PTRACE_O_TRACESECCOMP, adjust + PTRACE_O_MASK. + 2012-07-25 Florian Weimer <fweimer@redhat.com> * sysdeps/unix/sysv/linux/ia64/nptl/libc.abilist: Add diff --git a/ports/ChangeLog.tile b/ports/ChangeLog.tile index fee4509ccf..9ef3f99ec3 100644 --- a/ports/ChangeLog.tile +++ b/ports/ChangeLog.tile @@ -1,5 +1,10 @@ 2012-07-26 Andreas Jaeger <aj@suse.de> + * sysdeps/unix/sysv/linux/tile/sys/ptrace.h (__ptrace_eventcodes): + Add new value PTRACE_EVENT_SECCOMP from Linux 3.5. + (__ptrace_setoptions): Add new value PTRACE_O_TRACESECCOMP, adjust + PTRACE_O_MASK. + * sysdeps/unix/sysv/linux/tile/bits/siginfo.h (siginfo_t): Add _sigsys. (si_call_addr, si_syscall, si_arch): Define new macro. diff --git a/ports/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h b/ports/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h index ae94464b20..ba72704e8b 100644 --- a/ports/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h +++ b/ports/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h @@ -1,5 +1,5 @@ /* `ptrace' debugger support interface. Linux/ia64 version. - Copyright (C) 2001, 2006, 2007, 2011 Free Software Foundation, Inc. + Copyright (C) 2001-2012 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 @@ -154,7 +154,8 @@ struct pt_all_user_regs }; /* Options set using PTRACE_SETOPTIONS. */ -enum __ptrace_setoptions { +enum __ptrace_setoptions +{ PTRACE_O_TRACESYSGOOD = 0x00000001, PTRACE_O_TRACEFORK = 0x00000002, PTRACE_O_TRACEVFORK = 0x00000004, @@ -162,17 +163,20 @@ enum __ptrace_setoptions { PTRACE_O_TRACEEXEC = 0x00000010, PTRACE_O_TRACEVFORKDONE = 0x00000020, PTRACE_O_TRACEEXIT = 0x00000040, - PTRACE_O_MASK = 0x0000007f + PTRACE_O_TRACESECCOMP = 0x00000080, + PTRACE_O_MASK = 0x000000ff }; /* Wait extended result codes for the above trace options. */ -enum __ptrace_eventcodes { +enum __ptrace_eventcodes +{ PTRACE_EVENT_FORK = 1, PTRACE_EVENT_VFORK = 2, PTRACE_EVENT_CLONE = 3, PTRACE_EVENT_EXEC = 4, PTRACE_EVENT_VFORK_DONE = 5, - PTRACE_EVENT_EXIT = 6 + PTRACE_EVENT_EXIT = 6, + PTRACE_EVENT_SECCOMP = 7 }; /* Perform process tracing functions. REQUEST is one of the values diff --git a/ports/sysdeps/unix/sysv/linux/tile/sys/ptrace.h b/ports/sysdeps/unix/sysv/linux/tile/sys/ptrace.h index 702f19e41f..820d94cda5 100644 --- a/ports/sysdeps/unix/sysv/linux/tile/sys/ptrace.h +++ b/ports/sysdeps/unix/sysv/linux/tile/sys/ptrace.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2011 Free Software Foundation, Inc. +/* Copyright (C) 2011-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011. @@ -107,7 +107,8 @@ enum __ptrace_request /* Options set using PTRACE_SETOPTIONS. */ -enum __ptrace_setoptions { +enum __ptrace_setoptions +{ PTRACE_O_TRACESYSGOOD = 0x00000001, PTRACE_O_TRACEFORK = 0x00000002, PTRACE_O_TRACEVFORK = 0x00000004, @@ -115,17 +116,20 @@ enum __ptrace_setoptions { PTRACE_O_TRACEEXEC = 0x00000010, PTRACE_O_TRACEVFORKDONE = 0x00000020, PTRACE_O_TRACEEXIT = 0x00000040, - PTRACE_O_MASK = 0x0000007f + PTRACE_O_TRACESECCOMP = 0x00000080, + PTRACE_O_MASK = 0x000000ff }; /* Wait extended result codes for the above trace options. */ -enum __ptrace_eventcodes { +enum __ptrace_eventcodes +{ PTRACE_EVENT_FORK = 1, PTRACE_EVENT_VFORK = 2, PTRACE_EVENT_CLONE = 3, PTRACE_EVENT_EXEC = 4, PTRACE_EVENT_VFORK_DONE = 5, - PTRACE_EVENT_EXIT = 6 + PTRACE_EVENT_EXIT = 6, + PTRACE_EVENT_SECCOMP = 7 }; /* Perform process tracing functions. REQUEST is one of the values |