Merge _sigsys changes from Linux 3.5

diff --git a/ChangeLog b/ChangeLog
index c80c8a9..4220e4f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2012-07-26  Andreas Jaeger  <aj@suse.de>
+
+       * 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.
+
 2012-07-25  Joseph Myers  <joseph@codesourcery.com>
 
        [BZ #13717]

diff --git a/ports/ChangeLog.alpha b/ports/ChangeLog.alpha
index 13933cf..65536e5 100644 (file)
--- a/ports/ChangeLog.alpha
+++ b/ports/ChangeLog.alpha
@@ -1,3 +1,9 @@
+2012-07-26  Andreas Jaeger  <aj@suse.de>
+
+       * sysdeps/unix/sysv/linux/alpha/bits/siginfo.h (siginfo_t): Add
+       _sigsys.
+       (si_call_addr, si_syscall, si_arch): Define new macro.
+
 2012-07-25  Florian Weimer  <fweimer@redhat.com>
 
        * sysdeps/unix/sysv/linux/alpha/nptl/libc.abilist: Add

diff --git a/ports/ChangeLog.tile b/ports/ChangeLog.tile
index 317909a..fee4509 100644 (file)
--- a/ports/ChangeLog.tile
+++ b/ports/ChangeLog.tile
@@ -1,3 +1,9 @@
+2012-07-26  Andreas Jaeger  <aj@suse.de>
+
+       * sysdeps/unix/sysv/linux/tile/bits/siginfo.h (siginfo_t): Add
+       _sigsys.
+       (si_call_addr, si_syscall, si_arch): Define new macro.
+
 2012-07-25  Florian Weimer  <fweimer@redhat.com>
 
        * sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/nptl/libc.abilist:

diff --git a/ports/sysdeps/unix/sysv/linux/alpha/bits/siginfo.h b/ports/sysdeps/unix/sysv/linux/alpha/bits/siginfo.h
index 4a465a5..4a8c8d5 100644 (file)
--- 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;
 
@@ -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
 
 
 /* Values for `si_code'.  Positive values are reserved for kernel-generated

diff --git a/ports/sysdeps/unix/sysv/linux/tile/bits/siginfo.h b/ports/sysdeps/unix/sysv/linux/tile/bits/siginfo.h
index 44ffcc0..6fa354a 100644 (file)
--- 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;
 
@@ -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
 
 
 /* Values for `si_code'.  Positive values are reserved for kernel-generated

diff --git a/sysdeps/unix/sysv/linux/bits/siginfo.h b/sysdeps/unix/sysv/linux/bits/siginfo.h
index d68a493..1304d5c 100644 (file)
--- 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.
 
    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;
 
@@ -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
 
 
 /* Values for `si_code'.  Positive values are reserved for kernel-generated

diff --git a/sysdeps/unix/sysv/linux/s390/bits/siginfo.h b/sysdeps/unix/sysv/linux/s390/bits/siginfo.h
index baa9891..159bafb 100644 (file)
--- 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 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
@@ -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;
 
@@ -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
 
 
 /* Values for `si_code'.  Positive values are reserved for kernel-generated

diff --git a/sysdeps/unix/sysv/linux/sparc/bits/siginfo.h b/sysdeps/unix/sysv/linux/sparc/bits/siginfo.h
index 4ce1bbf..babd70c 100644 (file)
--- 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.
 
    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;
 
@@ -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
 
 
 /* Values for `si_code'.  Positive values are reserved for kernel-generated

diff --git a/sysdeps/unix/sysv/linux/x86/bits/siginfo.h b/sysdeps/unix/sysv/linux/x86/bits/siginfo.h
index 2e05e65..b0f4a65 100644 (file)
--- 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;
 
@@ -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
 
 
 /* Values for `si_code'.  Positive values are reserved for kernel-generated