This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: Sync with Linux 3.5
- From: Marek Polacek <polacek at redhat dot com>
- To: Andreas Jaeger <aj at suse dot com>
- Cc: libc-alpha at sources dot redhat dot com
- Date: Wed, 25 Jul 2012 13:10:36 +0200
- Subject: Re: Sync with Linux 3.5
- References: <ho1uk0jlc3.fsf@byrd.suse.de>
On Wed, Jul 25, 2012 at 10:28:44AM +0200, Andreas Jaeger wrote:
> --- 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;
The formatting of } looks wrong here.
> --- 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;
Likewise.
> diff --git a/sysdeps/unix/sysv/linux/s390/sys/ptrace.h b/sysdeps/unix/sysv/linux/s390/sys/ptrace.h
> index 4bc7768..266a749 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.
>
> @@ -165,7 +165,8 @@ enum __ptrace_flags
> };
>
> /* Options set using PTRACE_SETOPTIONS. */
> -enum __ptrace_setoptions {
> +enum __ptrace_setoptions
Trailing whitespace.
> --- 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;
Wrong formatting.
> diff --git a/sysdeps/unix/sysv/linux/x86/bits/siginfo.h b/sysdeps/unix/sysv/linux/x86/bits/siginfo.h
> index 2e05e65..b679352 100644
> --- a/sysdeps/unix/sysv/linux/x86/bits/siginfo.h
> +++ b/sysdeps/unix/sysv/linux/x86/bits/siginfo.h
> @@ -115,6 +115,15 @@ 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;
> +
Likewise.
And, as Pedro says, s/PTRAVE/PTRACE/ in all files. Sorry for
nitpicking ;).
Marek