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.

diff --git a/ChangeLog b/ChangeLog
index 4220e4f..6be197e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
 

diff --git a/ports/ChangeLog.ia64 b/ports/ChangeLog.ia64
index e782f98..31d86da 100644 (file)
--- 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 fee4509..9ef3f99 100644 (file)
--- 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 ae94464..ba72704 100644 (file)
--- 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 702f19e..820d94c 100644 (file)
--- 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

diff --git a/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h b/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h
index d43a135..b26a86a 100644 (file)
--- a/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h
+++ b/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h
@@ -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
@@ -126,7 +126,8 @@ 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,
@@ -134,17 +135,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/sysdeps/unix/sysv/linux/s390/sys/ptrace.h b/sysdeps/unix/sysv/linux/s390/sys/ptrace.h
index 4bc7768..e9181cb 100644 (file)
--- a/sysdeps/unix/sysv/linux/s390/sys/ptrace.h
+++ b/sysdeps/unix/sysv/linux/s390/sys/ptrace.h
@@ -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.
 
@@ -165,7 +165,8 @@ 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,
@@ -173,17 +174,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
@@ -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
 

diff --git a/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h b/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h
index e335362..4ec5bec 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h
+++ b/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h
@@ -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
@@ -210,7 +209,8 @@ 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,
@@ -218,17 +218,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/sysdeps/unix/sysv/linux/sys/ptrace.h b/sysdeps/unix/sysv/linux/sys/ptrace.h
index eadb4d0..7a7998a 100644 (file)
--- a/sysdeps/unix/sysv/linux/sys/ptrace.h
+++ b/sysdeps/unix/sysv/linux/sys/ptrace.h
@@ -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
@@ -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.  */
@@ -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