* Re: [PATCH] alpha: Do not redefine __NR_shmat or __NR_osf_shmat
2019-01-01 0:00 [PATCH] alpha: Do not redefine __NR_shmat or __NR_osf_shmat Aurelien Jarno
@ 2019-01-01 0:00 ` Aurelien Jarno
0 siblings, 0 replies; 2+ messages in thread
From: Aurelien Jarno @ 2019-01-01 0:00 UTC (permalink / raw)
To: libc-stable; +Cc: Richard Henderson
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH] alpha: Do not redefine __NR_shmat or __NR_osf_shmat
@ 2019-01-01 0:00 Aurelien Jarno
2019-01-01 0:00 ` Aurelien Jarno
0 siblings, 1 reply; 2+ messages in thread
From: Aurelien Jarno @ 2019-01-01 0:00 UTC (permalink / raw)
To: libc-stable; +Cc: Richard Henderson
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-08-18 9:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-01 0:00 [PATCH] alpha: Do not redefine __NR_shmat or __NR_osf_shmat Aurelien Jarno
2019-01-01 0:00 ` Aurelien Jarno
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).