From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/8818 Path: news.gmane.org!not-for-mail From: Szabolcs Nagy Newsgroups: gmane.linux.lib.musl.general Subject: Re: [PATCH] don't wrap __syscall invocation in parenthesis Date: Sat, 7 Nov 2015 14:29:43 +0100 Message-ID: <20151107132943.GE8500@port70.net> References: Reply-To: musl@lists.openwall.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1446903000 15660 80.91.229.3 (7 Nov 2015 13:30:00 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 7 Nov 2015 13:30:00 +0000 (UTC) To: musl@lists.openwall.com Original-X-From: musl-return-8831-gllmg-musl=m.gmane.org@lists.openwall.com Sat Nov 07 14:30:00 2015 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by plane.gmane.org with smtp (Exim 4.69) (envelope-from ) id 1Zv3Z7-0002SU-Eq for gllmg-musl@m.gmane.org; Sat, 07 Nov 2015 14:29:57 +0100 Original-Received: (qmail 26185 invoked by uid 550); 7 Nov 2015 13:29:55 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Original-Received: (qmail 26167 invoked from network); 7 Nov 2015 13:29:55 -0000 Mail-Followup-To: musl@lists.openwall.com Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.24 (2015-08-30) Xref: news.gmane.org gmane.linux.lib.musl.general:8818 Archived-At: * Petr Hosek [2015-11-06 23:51:21 +0000]: > This is a cleanup change, when __syscall is defined as a macro, its > expansion breaks in cases where the invocation is wrapped in parenthesis. > There are 2 such cases in the codebase and this patch fixes those. well that's the point of the parenthesis to stop macro expansion.. i think x32 breaks otherwise (because of the argument cast hacks) > From 21864f367028899b541290258711750313e226f5 Mon Sep 17 00:00:00 2001 > From: Petr Hosek > Date: Thu, 5 Nov 2015 07:57:23 -0800 > Subject: [PATCH] don't wrap __syscall invocation in parenthesis > > when __syscall is defined as a macro, its expansion breaks in > cases where the invocation is wrapped in parenthesis. > --- > src/fcntl/posix_fadvise.c | 2 +- > src/thread/__syscall_cp.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/src/fcntl/posix_fadvise.c b/src/fcntl/posix_fadvise.c > index d5360e0..fc1562e 100644 > --- a/src/fcntl/posix_fadvise.c > +++ b/src/fcntl/posix_fadvise.c > @@ -4,7 +4,7 @@ > > int posix_fadvise(int fd, off_t base, off_t len, int advice) > { > - return -(__syscall)(SYS_fadvise, fd, __SYSCALL_LL_O(base), > + return -__syscall(SYS_fadvise, fd, __SYSCALL_LL_O(base), > __SYSCALL_LL_E(len), advice); > } > > diff --git a/src/thread/__syscall_cp.c b/src/thread/__syscall_cp.c > index faf57b1..09878c6 100644 > --- a/src/thread/__syscall_cp.c > +++ b/src/thread/__syscall_cp.c > @@ -10,7 +10,7 @@ static long sccp(syscall_arg_t nr, > syscall_arg_t u, syscall_arg_t v, syscall_arg_t w, > syscall_arg_t x, syscall_arg_t y, syscall_arg_t z) > { > - return (__syscall)(nr, u, v, w, x, y, z); > + return __syscall(nr, u, v, w, x, y, z); > } > > weak_alias(sccp, __syscall_cp_c); > -- > 2.6.0.rc2.230.g3dd15c0 >