Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Andreas Jaeger committed Jul 26, 2012
1 parent f8d44fd commit b1b2aaf
Show file tree
Hide file tree
Showing 9 changed files with 74 additions and 30 deletions.
11 changes: 11 additions & 0 deletions ChangeLog
View file
@@ -1,5 +1,16 @@
2012-07-26 Andreas Jaeger <aj@suse.de>

* sysdeps/unix/sysv/linux/s390/sys/ptrace.h: Add __THROW for
ptrace.

* sysdeps/unix/sysv/linux/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/s390/bits/ptrace.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/ptrace.h: Likewise.
* sysdeps/unix/sysv/linux/powerpc/bits/ptrace.h: Likewise.

* sysdeps/unix/sysv/linux/sys/epoll.h (EPOLLWAKEUP): Add new
value.

Expand Down
7 changes: 7 additions & 0 deletions ports/ChangeLog.ia64
View file
@@ -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
Expand Down
5 changes: 5 additions & 0 deletions ports/ChangeLog.tile
View file
@@ -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.
Expand Down
14 changes: 9 additions & 5 deletions ports/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h
View file
@@ -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
Expand Down Expand Up @@ -154,25 +154,29 @@ 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,
PTRACE_O_TRACECLONE = 0x00000008,
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
Expand Down
14 changes: 9 additions & 5 deletions ports/sysdeps/unix/sysv/linux/tile/sys/ptrace.h
View file
@@ -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.
Expand Down Expand Up @@ -107,25 +107,29 @@ 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,
PTRACE_O_TRACECLONE = 0x00000008,
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
Expand Down
14 changes: 9 additions & 5 deletions sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h
View file
@@ -1,5 +1,5 @@
/* `ptrace' debugger support interface. Linux 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
Expand Down Expand Up @@ -126,25 +126,29 @@ enum __ptrace_flags
};

/* Options set using PTRACE_SETOPTIONS. */
enum __ptrace_setoptions {
enum __ptrace_setoptions
{
PTRACE_O_TRACESYSGOOD = 0x00000001,
PTRACE_O_TRACEFORK = 0x00000002,
PTRACE_O_TRACEVFORK = 0x00000004,
PTRACE_O_TRACECLONE = 0x00000008,
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
Expand Down
16 changes: 10 additions & 6 deletions sysdeps/unix/sysv/linux/s390/sys/ptrace.h
View file
@@ -1,5 +1,5 @@
/* `ptrace' debugger support interface. Linux version.
Copyright (C) 2000, 2006, 2007, 2011 Free Software Foundation, Inc.
Copyright (C) 2000-2012 Free Software Foundation, Inc.
Contributed by Denis Joseph Barrow (djbarrow@de.ibm.com).
This file is part of the GNU C Library.
Expand Down Expand Up @@ -165,25 +165,29 @@ enum __ptrace_flags
};

/* Options set using PTRACE_SETOPTIONS. */
enum __ptrace_setoptions {
enum __ptrace_setoptions
{
PTRACE_O_TRACESYSGOOD = 0x00000001,
PTRACE_O_TRACEFORK = 0x00000002,
PTRACE_O_TRACEVFORK = 0x00000004,
PTRACE_O_TRACECLONE = 0x00000008,
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
Expand All @@ -195,7 +199,7 @@ enum __ptrace_eventcodes {
appear (those that are used for the particular request) as:
pid_t PID, void *ADDR, int DATA, void *ADDR2
after REQUEST. */
extern long int ptrace (enum __ptrace_request __request, ...);
extern long int ptrace (enum __ptrace_request __request, ...) __THROW;

__END_DECLS

Expand Down
15 changes: 9 additions & 6 deletions sysdeps/unix/sysv/linux/sparc/sys/ptrace.h
View file
@@ -1,6 +1,5 @@
/* `ptrace' debugger support interface. Linux/SPARC version.
Copyright (C) 1996, 1997, 1998, 1999, 2000, 2006, 2007, 2011
Free Software Foundation, Inc.
Copyright (C) 1996-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
Expand Down Expand Up @@ -210,25 +209,29 @@ enum __ptrace_flags
};

/* Options set using PTRACE_SETOPTIONS. */
enum __ptrace_setoptions {
enum __ptrace_setoptions
{
PTRACE_O_TRACESYSGOOD = 0x00000001,
PTRACE_O_TRACEFORK = 0x00000002,
PTRACE_O_TRACEVFORK = 0x00000004,
PTRACE_O_TRACECLONE = 0x00000008,
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
Expand Down
8 changes: 5 additions & 3 deletions sysdeps/unix/sysv/linux/sys/ptrace.h
View file
@@ -1,5 +1,5 @@
/* `ptrace' debugger support interface. Linux version.
Copyright (C) 1996-1999,2000,2006,2007,2011 Free Software Foundation, Inc.
Copyright (C) 1996-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
Expand Down Expand Up @@ -165,7 +165,8 @@ 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. */
Expand All @@ -176,7 +177,8 @@ enum __ptrace_eventcodes
PTRACE_EVENT_CLONE = 3,
PTRACE_EVENT_EXEC = 4,
PTRACE_EVENT_VFORK_DONE = 5,
PTRACE_EVENT_EXIT = 6
PTRACE_EVENT_EXIT = 6,
PTRAVE_EVENT_SECCOMP = 7
};

/* Perform process tracing functions. REQUEST is one of the values
Expand Down

0 comments on commit b1b2aaf

Please sign in to comment.