From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 3160 invoked by alias); 25 Jul 2012 13:54:43 -0000 Received: (qmail 3130 invoked by uid 22791); 25 Jul 2012 13:54:38 -0000 X-SWARE-Spam-Status: No, hits=-6.3 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,RCVD_IN_DNSWL_HI X-Spam-Check-By: sourceware.org Received: from cantor2.suse.de (HELO mx2.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 25 Jul 2012 13:54:21 +0000 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id E808189994; Wed, 25 Jul 2012 15:54:19 +0200 (CEST) From: Andreas Jaeger To: libc-alpha@sources.redhat.com, libc-ports@sources.redhat.com Subject: Sync with Linux 3.5 v2 Date: Wed, 25 Jul 2012 13:54:00 -0000 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Mailing-List: contact libc-ports-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: libc-ports-owner@sourceware.org X-SW-Source: 2012-07/txt/msg00048.txt.bz2 Here's an updated patch (thanks Marek, Pedro and Joseph for the review), it now includes changes to ports as well. In Linux 3.5 ia64 and MIPS do not have the the sigsys changes since they are not using the generic siginfo.h file, therefore I did not patch these file. Ok? Andreas For Changelog.alpha: 2012-07-25 Andreas Jaeger * sysdeps/unix/sysv/linux/alpha/bits/siginfo.h (siginfo_t): Add _sigsys. (si_call_addr, si_syscall, si_arch): Define new macro. For Changelog.hppa: 2012-07-25 Andreas Jaeger * sysdeps/unix/sysv/linux/hppa/sys/epoll.h (EPOLLWAKEUP): Add new value. For Changelog.tile: 2012-07-25 Andreas Jaeger * 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. For Changelog.ia64: 2012-07-25 Andreas Jaeger * 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 Andreas Jaeger * 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. * sysdeps/unix/sysv/linux/bits/siginfo.h (siginfo_t): Add _sigsys. (si_call_addr, si_syscall, si_arch): Define new macro. * sysdeps/unix/sysv/linux/s390/bits/siginfo.h (siginfo_t): Add _sigsys. (si_call_addr, si_syscall, si_arch): Define new marcro. * sysdeps/unix/sysv/linux/sparc/bits/siginfo.h (siginfo_t): Add _sigsys. (si_call_addr, si_syscall, si_arch): Define new macro. * sysdeps/unix/sysv/linux/x86/bits/siginfo.h (struct): Add _sigsys. (si_call_addr, si_syscall, si_arch): Define new macro. diff --git a/ports/sysdeps/unix/sysv/linux/alpha/bits/siginfo.h b/ports/sys= deps/unix/sysv/linux/alpha/bits/siginfo.h index 4a465a5..4a8c8d5 100644 --- a/ports/sysdeps/unix/sysv/linux/alpha/bits/siginfo.h +++ b/ports/sysdeps/unix/sysv/linux/alpha/bits/siginfo.h @@ -97,6 +97,14 @@ typedef struct int si_band; /* Band event for SIGPOLL. */ int si_fd; } _sigpoll; + + /* SIGSYS. */ + struct + { + void *_call_addr; /* Calling user insn. */ + int _syscall; /* Triggering system call number. */ + unsigned int _arch; /* AUDIT_ARCH_* of syscall. */ + } _sigsys; } _sifields; } siginfo_t; =20 @@ -115,6 +123,9 @@ typedef struct # define si_addr _sifields._sigfault.si_addr # define si_band _sifields._sigpoll.si_band # define si_fd _sifields._sigpoll.si_fd +# define si_call_addr _sifields._sigsys._call_addr +# define si_syscall _sifields._sigsys._syscall +# define si_arch _sifields._sigsys._arch =20 =20 /* Values for `si_code'. Positive values are reserved for kernel-generated diff --git a/ports/sysdeps/unix/sysv/linux/hppa/sys/epoll.h b/ports/sysdeps= /unix/sysv/linux/hppa/sys/epoll.h index 0adf090..e06d566 100644 --- a/ports/sysdeps/unix/sysv/linux/hppa/sys/epoll.h +++ b/ports/sysdeps/unix/sysv/linux/hppa/sys/epoll.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2002-2009, 2012 Free Software Foundation, Inc. +/* Copyright (C) 2002-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. =20 The GNU C Library is free software; you can redistribute it and/or @@ -64,6 +64,8 @@ enum EPOLL_EVENTS #define EPOLLHUP EPOLLHUP EPOLLRDHUP =3D 0x2000, #define EPOLLRDHUP EPOLLRDHUP + EPOLLWAKEUP =3D 1u << 29, +#define EPOLLWAKEUP EPOLLWAKEUP EPOLLONESHOT =3D 1u << 30, #define EPOLLONESHOT EPOLLONESHOT EPOLLET =3D 1u << 31 diff --git a/ports/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h b/ports/sysdep= s/unix/sysv/linux/ia64/sys/ptrace.h index ae94464..1c2d5e6 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. =20 The GNU C Library is free software; you can redistribute it and/or @@ -154,25 +154,28 @@ struct pt_all_user_regs }; =20 /* Options set using PTRACE_SETOPTIONS. */ -enum __ptrace_setoptions { +enum __ptrace_setoptions +{ PTRACE_O_TRACESYSGOOD =3D 0x00000001, PTRACE_O_TRACEFORK =3D 0x00000002, PTRACE_O_TRACEVFORK =3D 0x00000004, PTRACE_O_TRACECLONE =3D 0x00000008, PTRACE_O_TRACEEXEC =3D 0x00000010, PTRACE_O_TRACEVFORKDONE =3D 0x00000020, - PTRACE_O_TRACEEXIT =3D 0x00000040, - PTRACE_O_MASK =3D 0x0000007f + PTRACE_O_TRACESECCOMP =3D 0x00000080, + PTRACE_O_MASK =3D 0x000000ff }; =20 /* Wait extended result codes for the above trace options. */ -enum __ptrace_eventcodes { +enum __ptrace_eventcodes +{ PTRACE_EVENT_FORK =3D 1, PTRACE_EVENT_VFORK =3D 2, PTRACE_EVENT_CLONE =3D 3, PTRACE_EVENT_EXEC =3D 4, PTRACE_EVENT_VFORK_DONE =3D 5, - PTRACE_EVENT_EXIT =3D 6 + PTRACE_EVENT_EXIT =3D 6, + PTRACE_EVENT_SECCOMP =3D 7 }; =20 /* Perform process tracing functions. REQUEST is one of the values diff --git a/ports/sysdeps/unix/sysv/linux/tile/bits/siginfo.h b/ports/sysd= eps/unix/sysv/linux/tile/bits/siginfo.h index 44ffcc0..6fa354a 100644 --- a/ports/sysdeps/unix/sysv/linux/tile/bits/siginfo.h +++ b/ports/sysdeps/unix/sysv/linux/tile/bits/siginfo.h @@ -104,6 +104,14 @@ typedef struct long int si_band; /* Band event for SIGPOLL. */ int si_fd; } _sigpoll; + + /* SIGSYS. */ + struct + { + void *_call_addr; /* Calling user insn. */ + int _syscall; /* Triggering system call number. */ + unsigned int _arch; /* AUDIT_ARCH_* of syscall. */ + } _sigsys; } _sifields; } siginfo_t; =20 @@ -123,6 +131,9 @@ typedef struct # define si_trapno _sifields._sigfault.si_trapno # define si_band _sifields._sigpoll.si_band # define si_fd _sifields._sigpoll.si_fd +# define si_call_addr _sifields._sigsys._call_addr +# define si_syscall _sifields._sigsys._syscall +# define si_arch _sifields._sigsys._arch =20 =20 /* Values for `si_code'. Positive values are reserved for kernel-generated diff --git a/ports/sysdeps/unix/sysv/linux/tile/sys/ptrace.h b/ports/sysdep= s/unix/sysv/linux/tile/sys/ptrace.h index 702f19e..820d94c 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 , 2011. =20 @@ -107,7 +107,8 @@ enum __ptrace_request =20 =20 /* Options set using PTRACE_SETOPTIONS. */ -enum __ptrace_setoptions { +enum __ptrace_setoptions +{ PTRACE_O_TRACESYSGOOD =3D 0x00000001, PTRACE_O_TRACEFORK =3D 0x00000002, PTRACE_O_TRACEVFORK =3D 0x00000004, @@ -115,17 +116,20 @@ enum __ptrace_setoptions { PTRACE_O_TRACEEXEC =3D 0x00000010, PTRACE_O_TRACEVFORKDONE =3D 0x00000020, PTRACE_O_TRACEEXIT =3D 0x00000040, - PTRACE_O_MASK =3D 0x0000007f + PTRACE_O_TRACESECCOMP =3D 0x00000080, + PTRACE_O_MASK =3D 0x000000ff }; =20 /* Wait extended result codes for the above trace options. */ -enum __ptrace_eventcodes { +enum __ptrace_eventcodes +{ PTRACE_EVENT_FORK =3D 1, PTRACE_EVENT_VFORK =3D 2, PTRACE_EVENT_CLONE =3D 3, PTRACE_EVENT_EXEC =3D 4, PTRACE_EVENT_VFORK_DONE =3D 5, - PTRACE_EVENT_EXIT =3D 6 + PTRACE_EVENT_EXIT =3D 6, + PTRACE_EVENT_SECCOMP =3D 7 }; =20 /* Perform process tracing functions. REQUEST is one of the values diff --git a/sysdeps/unix/sysv/linux/bits/siginfo.h b/sysdeps/unix/sysv/lin= ux/bits/siginfo.h index d68a493..1304d5c 100644 --- a/sysdeps/unix/sysv/linux/bits/siginfo.h +++ b/sysdeps/unix/sysv/linux/bits/siginfo.h @@ -1,5 +1,5 @@ /* siginfo_t, sigevent and constants. Linux version. - Copyright (C) 1997-2002, 2003, 2011, 2012 Free Software Foundation, Inc. + Copyright (C) 1997-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. =20 The GNU C Library is free software; you can redistribute it and/or @@ -103,6 +103,14 @@ typedef struct long int si_band; /* Band event for SIGPOLL. */ int si_fd; } _sigpoll; + + /* SIGSYS. */ + struct + { + void *_call_addr; /* Calling user insn. */ + int _syscall; /* Triggering system call number. */ + unsigned int _arch; /* AUDIT_ARCH_* of syscall. */ + } _sigsys; } _sifields; } siginfo_t; =20 @@ -121,6 +129,9 @@ typedef struct # define si_addr _sifields._sigfault.si_addr # define si_band _sifields._sigpoll.si_band # define si_fd _sifields._sigpoll.si_fd +# define si_call_addr _sifields._sigsys._call_addr +# define si_syscall _sifields._sigsys._syscall +# define si_arch _sifields._sigsys._arch =20 =20 /* Values for `si_code'. Positive values are reserved for kernel-generated diff --git a/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h b/sysdeps/unix/sy= sv/linux/powerpc/sys/ptrace.h index d43a135..b26a86a 100644 --- 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. =20 The GNU C Library is free software; you can redistribute it and/or @@ -126,7 +126,8 @@ enum __ptrace_flags }; =20 /* Options set using PTRACE_SETOPTIONS. */ -enum __ptrace_setoptions { +enum __ptrace_setoptions +{ PTRACE_O_TRACESYSGOOD =3D 0x00000001, PTRACE_O_TRACEFORK =3D 0x00000002, PTRACE_O_TRACEVFORK =3D 0x00000004, @@ -134,17 +135,20 @@ enum __ptrace_setoptions { PTRACE_O_TRACEEXEC =3D 0x00000010, PTRACE_O_TRACEVFORKDONE =3D 0x00000020, PTRACE_O_TRACEEXIT =3D 0x00000040, - PTRACE_O_MASK =3D 0x0000007f + PTRACE_O_TRACESECCOMP =3D 0x00000080, + PTRACE_O_MASK =3D 0x000000ff }; =20 /* Wait extended result codes for the above trace options. */ -enum __ptrace_eventcodes { +enum __ptrace_eventcodes +{ PTRACE_EVENT_FORK =3D 1, PTRACE_EVENT_VFORK =3D 2, PTRACE_EVENT_CLONE =3D 3, PTRACE_EVENT_EXEC =3D 4, PTRACE_EVENT_VFORK_DONE =3D 5, - PTRACE_EVENT_EXIT =3D 6 + PTRACE_EVENT_EXIT =3D 6, + PTRACE_EVENT_SECCOMP =3D 7 }; =20 /* Perform process tracing functions. REQUEST is one of the values diff --git a/sysdeps/unix/sysv/linux/s390/bits/siginfo.h b/sysdeps/unix/sys= v/linux/s390/bits/siginfo.h index baa9891..159bafb 100644 --- a/sysdeps/unix/sysv/linux/s390/bits/siginfo.h +++ b/sysdeps/unix/sysv/linux/s390/bits/siginfo.h @@ -1,5 +1,5 @@ /* siginfo_t, sigevent and constants. S/390 version. - Copyright (C) 2001, 2002, 2003, 2009, 2011, 2012 Free Software Foundati= on, Inc. + Copyright (C) 2001-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. =20 The GNU C Library is free software; you can redistribute it and/or @@ -104,6 +104,14 @@ typedef struct long int si_band; /* Band event for SIGPOLL. */ int si_fd; } _sigpoll; + + /* SIGSYS. */ + struct + { + void *_call_addr; /* Calling user insn. */ + int _syscall; /* Triggering system call number. */ + unsigned int _arch; /* AUDIT_ARCH_* of syscall. */ + } _sigsys; } _sifields; } siginfo_t; =20 @@ -123,6 +131,9 @@ typedef struct # define si_trapno _sifields._sigfault.si_trapno # define si_band _sifields._sigpoll.si_band # define si_fd _sifields._sigpoll.si_fd +# define si_call_addr _sifields._sigsys._call_addr +# define si_syscall _sifields._sigsys._syscall +# define si_arch _sifields._sigsys._arch =20 =20 /* Values for `si_code'. Positive values are reserved for kernel-generated diff --git a/sysdeps/unix/sysv/linux/s390/sys/ptrace.h b/sysdeps/unix/sysv/= linux/s390/sys/ptrace.h index 4bc7768..e9181cb 100644 --- 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. =20 @@ -165,7 +165,8 @@ enum __ptrace_flags }; =20 /* Options set using PTRACE_SETOPTIONS. */ -enum __ptrace_setoptions { +enum __ptrace_setoptions +{ PTRACE_O_TRACESYSGOOD =3D 0x00000001, PTRACE_O_TRACEFORK =3D 0x00000002, PTRACE_O_TRACEVFORK =3D 0x00000004, @@ -173,17 +174,20 @@ enum __ptrace_setoptions { PTRACE_O_TRACEEXEC =3D 0x00000010, PTRACE_O_TRACEVFORKDONE =3D 0x00000020, PTRACE_O_TRACEEXIT =3D 0x00000040, - PTRACE_O_MASK =3D 0x0000007f + PTRACE_O_TRACESECCOMP =3D 0x00000080, + PTRACE_O_MASK =3D 0x000000ff }; =20 /* Wait extended result codes for the above trace options. */ -enum __ptrace_eventcodes { +enum __ptrace_eventcodes +{ PTRACE_EVENT_FORK =3D 1, PTRACE_EVENT_VFORK =3D 2, PTRACE_EVENT_CLONE =3D 3, PTRACE_EVENT_EXEC =3D 4, PTRACE_EVENT_VFORK_DONE =3D 5, - PTRACE_EVENT_EXIT =3D 6 + PTRACE_EVENT_EXIT =3D 6, + PTRACE_EVENT_SECCOMP =3D 7 }; =20 /* 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; =20 __END_DECLS =20 diff --git a/sysdeps/unix/sysv/linux/sparc/bits/siginfo.h b/sysdeps/unix/sy= sv/linux/sparc/bits/siginfo.h index 4ce1bbf..babd70c 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/siginfo.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/siginfo.h @@ -1,5 +1,5 @@ /* siginfo_t, sigevent and constants. Linux/SPARC version. - Copyright (C) 1997-2002, 2003, 2011, 2012 Free Software Foundation, Inc. + Copyright (C) 1997-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. =20 The GNU C Library is free software; you can redistribute it and/or @@ -104,6 +104,14 @@ typedef struct int si_band; /* Band event for SIGPOLL. */ int si_fd; } _sigpoll; + + /* SIGSYS. */ + struct + { + void *_call_addr; /* Calling user insn. */ + int _syscall; /* Triggering system call number. */ + unsigned int _arch; /* AUDIT_ARCH_* of syscall. */ + } _sigsys; } _sifields; } siginfo_t; =20 @@ -123,6 +131,9 @@ typedef struct # define si_trapno _sifields._sigfault.si_trapno # define si_band _sifields._sigpoll.si_band # define si_fd _sifields._sigpoll.si_fd +# define si_call_addr _sifields._sigsys._call_addr +# define si_syscall _sifields._sigsys._syscall +# define si_arch _sifields._sigsys._arch =20 =20 /* Values for `si_code'. Positive values are reserved for kernel-generated diff --git a/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h b/sysdeps/unix/sysv= /linux/sparc/sys/ptrace.h index e335362..4ec5bec 100644 --- 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. =20 The GNU C Library is free software; you can redistribute it and/or @@ -210,7 +209,8 @@ enum __ptrace_flags }; =20 /* Options set using PTRACE_SETOPTIONS. */ -enum __ptrace_setoptions { +enum __ptrace_setoptions +{ PTRACE_O_TRACESYSGOOD =3D 0x00000001, PTRACE_O_TRACEFORK =3D 0x00000002, PTRACE_O_TRACEVFORK =3D 0x00000004, @@ -218,17 +218,20 @@ enum __ptrace_setoptions { PTRACE_O_TRACEEXEC =3D 0x00000010, PTRACE_O_TRACEVFORKDONE =3D 0x00000020, PTRACE_O_TRACEEXIT =3D 0x00000040, - PTRACE_O_MASK =3D 0x0000007f + PTRACE_O_TRACESECCOMP =3D 0x00000080, + PTRACE_O_MASK =3D 0x000000ff }; =20 /* Wait extended result codes for the above trace options. */ -enum __ptrace_eventcodes { +enum __ptrace_eventcodes +{ PTRACE_EVENT_FORK =3D 1, PTRACE_EVENT_VFORK =3D 2, PTRACE_EVENT_CLONE =3D 3, PTRACE_EVENT_EXEC =3D 4, PTRACE_EVENT_VFORK_DONE =3D 5, - PTRACE_EVENT_EXIT =3D 6 + PTRACE_EVENT_EXIT =3D 6, + PTRACE_EVENT_SECCOMP =3D 7 }; =20 /* Perform process tracing functions. REQUEST is one of the values diff --git a/sysdeps/unix/sysv/linux/sys/epoll.h b/sysdeps/unix/sysv/linux/= sys/epoll.h index a55ebad..6c2f10a 100644 --- a/sysdeps/unix/sysv/linux/sys/epoll.h +++ b/sysdeps/unix/sysv/linux/sys/epoll.h @@ -61,6 +61,8 @@ enum EPOLL_EVENTS #define EPOLLHUP EPOLLHUP EPOLLRDHUP =3D 0x2000, #define EPOLLRDHUP EPOLLRDHUP + EPOLLWAKEUP =3D 1u << 29, +#define EPOLLWAKEUP EPOLLWAKEUP EPOLLONESHOT =3D 1u << 30, #define EPOLLONESHOT EPOLLONESHOT EPOLLET =3D 1u << 31 diff --git a/sysdeps/unix/sysv/linux/sys/ptrace.h b/sysdeps/unix/sysv/linux= /sys/ptrace.h index eadb4d0..7a7998a 100644 --- 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, I= nc. + Copyright (C) 1996-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. =20 The GNU C Library is free software; you can redistribute it and/or @@ -165,7 +165,8 @@ enum __ptrace_setoptions PTRACE_O_TRACEEXEC =3D 0x00000010, PTRACE_O_TRACEVFORKDONE =3D 0x00000020, PTRACE_O_TRACEEXIT =3D 0x00000040, - PTRACE_O_MASK =3D 0x0000007f + PTRACE_O_TRACESECCOMP =3D 0x00000080, + PTRACE_O_MASK =3D 0x000000ff }; =20 /* Wait extended result codes for the above trace options. */ @@ -176,7 +177,8 @@ enum __ptrace_eventcodes PTRACE_EVENT_CLONE =3D 3, PTRACE_EVENT_EXEC =3D 4, PTRACE_EVENT_VFORK_DONE =3D 5, - PTRACE_EVENT_EXIT =3D 6 + PTRACE_EVENT_EXIT =3D 6, + PTRAVE_EVENT_SECCOMP =3D 7 }; =20 /* Perform process tracing functions. REQUEST is one of the values diff --git a/sysdeps/unix/sysv/linux/x86/bits/siginfo.h b/sysdeps/unix/sysv= /linux/x86/bits/siginfo.h index 2e05e65..b0f4a65 100644 --- a/sysdeps/unix/sysv/linux/x86/bits/siginfo.h +++ b/sysdeps/unix/sysv/linux/x86/bits/siginfo.h @@ -115,6 +115,14 @@ typedef struct long int si_band; /* Band event for SIGPOLL. */ int si_fd; } _sigpoll; + + /* SIGSYS. */ + struct + { + void *_call_addr; /* Calling user insn. */ + int _syscall; /* Triggering system call number. */ + unsigned int _arch; /* AUDIT_ARCH_* of syscall. */ + } _sigsys; } _sifields; } siginfo_t __SI_ALIGNMENT; =20 @@ -133,6 +141,9 @@ typedef struct # define si_addr _sifields._sigfault.si_addr # define si_band _sifields._sigpoll.si_band # define si_fd _sifields._sigpoll.si_fd +# define si_call_addr _sifields._sigsys._call_addr +# define si_syscall _sifields._sigsys._syscall +# define si_arch _sifields._sigsys._arch =20 =20 /* Values for `si_code'. Positive values are reserved for kernel-generated --=20 Andreas Jaeger aj@{suse.com,opensuse.org} Twitter/Identica: jaegerandi SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=C3=BCrnberg, Germany GF: Jeff Hawn,Jennifer Guild,Felix Imend=C3=B6rffer,HRB16746 (AG N=C3=BC= rnberg) GPG fingerprint =3D 93A3 365E CE47 B889 DF7F FED1 389A 563C C272 A126