From: Aurelien Jarno <aurelien@aurel32.net>
To: libc-stable@sourceware.org
Cc: Richard Henderson <richard.henderson@linaro.org>
Subject: Re: [PATCH] alpha: Do not redefine __NR_shmat or __NR_osf_shmat
Date: Tue, 01 Jan 2019 00:00:00 -0000 [thread overview]
Message-ID: <20190818093717.GA20730@aurel32.net> (raw)
In-Reply-To: <20190815175258.4884-1-aurelien@aurel32.net>
I just realized that I forgot to change PATCH -> 2.28 COMMITTED before
sending the mail.
On 2019-08-15 19:52, Aurelien Jarno wrote:
> From: Richard Henderson <richard.henderson@linaro.org>
>
> Fixes build using v5.1-rc1 headers.
>
> The kernel has cleaned up how these are defined. Previous behavior
> was to define __NR_osf_shmat as 209 and not define __NR_shmat.
> Current behavior is to define __NR_shmat as 209 and then define
> __NR_osf_shmat as __NR_shmat.
>
> * sysdeps/unix/sysv/linux/alpha/kernel-features.h (__NR_shmat):
> Do not redefine.
> * sysdeps/unix/sysv/linux/alpha/sysdep.h (__NR_osf_shmat):
> Do not redefine.
>
> (cherry picked from commit d5ecee822e72a2fd156338ab2be2f2e70a1da55a)
> ---
> ChangeLog | 7 +++++++
> sysdeps/unix/sysv/linux/alpha/kernel-features.h | 6 ++++--
> sysdeps/unix/sysv/linux/alpha/sysdep.h | 4 +++-
> 3 files changed, 14 insertions(+), 3 deletions(-)
>
> diff --git a/ChangeLog b/ChangeLog
> index 026f1d6b9e4..9ef062f6c08 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,3 +1,10 @@
> +2019-08-15 Richard Henderson <rth@twiddle.net>
> +
> + * sysdeps/unix/sysv/linux/alpha/kernel-features.h (__NR_shmat):
> + Do not redefine.
> + * sysdeps/unix/sysv/linux/alpha/sysdep.h (__NR_osf_shmat):
> + Do not redefine.
> +
> 2019-07-15 Adhemerval Zanella <adhemerval.zanella@linaro.org>
>
> [BZ #24699]
> diff --git a/sysdeps/unix/sysv/linux/alpha/kernel-features.h b/sysdeps/unix/sysv/linux/alpha/kernel-features.h
> index 46178c5636a..fc8407c8abd 100644
> --- a/sysdeps/unix/sysv/linux/alpha/kernel-features.h
> +++ b/sysdeps/unix/sysv/linux/alpha/kernel-features.h
> @@ -26,8 +26,10 @@
> #undef __ASSUME_STATFS64
> #define __ASSUME_STATFS64 0
>
> -/* Alpha defines SysV ipc shmat syscall with a different name. */
> -#define __NR_shmat __NR_osf_shmat
> +/* Alpha used to define SysV ipc shmat syscall with a different name. */
> +#ifndef __NR_shmat
> +# define __NR_shmat __NR_osf_shmat
> +#endif
>
> #define __ASSUME_RECV_SYSCALL 1
> #define __ASSUME_SEND_SYSCALL 1
> diff --git a/sysdeps/unix/sysv/linux/alpha/sysdep.h b/sysdeps/unix/sysv/linux/alpha/sysdep.h
> index dcf2d1e3d7a..d61d4df5500 100644
> --- a/sysdeps/unix/sysv/linux/alpha/sysdep.h
> +++ b/sysdeps/unix/sysv/linux/alpha/sysdep.h
> @@ -51,7 +51,9 @@
> * Some syscalls no Linux program should know about:
> */
> #define __NR_osf_sigprocmask 48
> -#define __NR_osf_shmat 209
> +#ifndef __NR_osf_shmat
> +# define __NR_osf_shmat 209
> +#endif
> #define __NR_osf_getsysinfo 256
> #define __NR_osf_setsysinfo 257
>
> --
> 2.23.0.rc1
>
>
--
Aurelien Jarno GPG: 4096R/1DDD8C9B
aurelien@aurel32.net http://www.aurel32.net
prev parent reply other threads:[~2019-08-18 9:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-01 0:00 Aurelien Jarno
2019-01-01 0:00 ` Aurelien Jarno [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190818093717.GA20730@aurel32.net \
--to=aurelien@aurel32.net \
--cc=libc-stable@sourceware.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).