From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 61801 invoked by alias); 18 Aug 2019 09:37:26 -0000 Mailing-List: contact libc-stable-help@sourceware.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Subscribe: List-Archive: Sender: libc-stable-owner@sourceware.org Received: (qmail 61742 invoked by uid 89); 18 Aug 2019 09:37:24 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.100.3 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_HELO_PASS autolearn=ham version=3.3.1 spammy=redefine, picked X-Spam-Status: No, score=-26.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_HELO_PASS autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on sourceware.org X-Spam-Level: X-HELO: hall.aurel32.net Received: from hall.aurel32.net (HELO hall.aurel32.net) (195.154.113.88) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 18 Aug 2019 09:37:22 +0000 Received: from [2a01:e35:2fdd:a4e1:fe91:fc89:bc43:b814] (helo=ohm.rr44.fr) by hall.aurel32.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hzHcj-0004pB-FO; Sun, 18 Aug 2019 11:37:17 +0200 Received: from aurel32 by ohm.rr44.fr with local (Exim 4.92.1) (envelope-from ) id 1hzHcj-0005QZ-2z; Sun, 18 Aug 2019 11:37:17 +0200 Date: Tue, 01 Jan 2019 00:00:00 -0000 From: Aurelien Jarno To: libc-stable@sourceware.org Cc: Richard Henderson Subject: Re: [PATCH] alpha: Do not redefine __NR_shmat or __NR_osf_shmat Message-ID: <20190818093717.GA20730@aurel32.net> References: <20190815175258.4884-1-aurelien@aurel32.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190815175258.4884-1-aurelien@aurel32.net> User-Agent: Mutt/1.10.1 (2018-07-13) X-IsSubscribed: yes X-SW-Source: 2019-08/txt/msg00002.txt.bz2 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 > > 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 > + > + * 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 > > [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