public inbox for libc-stable@sourceware.org
 help / color / mirror / Atom feed
* [PATCH] powerpc: Rename argN to _argN in LOADARGS_N [BZ #25902]
       [not found]                     ` <87tv10za12.fsf@linux.ibm.com>
@ 2020-05-01  2:18                       ` H.J. Lu
  2020-05-01 23:11                         ` Please test: [2.31/2.30] " H.J. Lu
  0 siblings, 1 reply; 4+ messages in thread
From: H.J. Lu @ 2020-05-01  2:18 UTC (permalink / raw)
  To: Tulio Magno Quites Machado Filho, Libc-stable Mailing List
  Cc: Matheus Castanho, GNU C Library

[-- Attachment #1: Type: text/plain, Size: 598 bytes --]

On Thu, Apr 30, 2020 at 7:03 PM Tulio Magno Quites Machado Filho
<tuliom@ascii.art.br> wrote:
>
> "H.J. Lu via Libc-alpha" <libc-alpha@sourceware.org> writes:
>
> > See:
> >
> > https://sourceware.org/bugzilla/show_bug.cgi?id=25902
> >
> > with a patch.   But I can't test it natively.
>
> Tested.  LGTM.
>
> Could you push it, please?

This is I am checking in.  I will backport it to 2.30/2.31 branches
together with

commit ff026950e280bc3e9487b41b460fb31bc5b57721
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Thu Apr 30 10:42:43 2020 -0700

    Add a C wrapper for prctl [BZ #25896]

-- 
H.J.

[-- Attachment #2: 0001-powerpc-Rename-argN-to-_argN-in-LOADARGS_N-BZ-25902.patch --]
[-- Type: text/x-patch, Size: 3257 bytes --]

From 14f43dd34dcf1ba29386c01cd0b286dffb37412d Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Thu, 30 Apr 2020 15:49:47 -0700
Subject: [PATCH] powerpc: Rename argN to _argN in LOADARGS_N [BZ #25902]

LOADARGS_N in powerpc/sysdep.h uses argN as local variables.  It breaks
when argN is also a function argument.  Rename argN to _argN to avoid
conflict.
---
 sysdeps/unix/sysv/linux/powerpc/sysdep.h | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/sysdeps/unix/sysv/linux/powerpc/sysdep.h b/sysdeps/unix/sysv/linux/powerpc/sysdep.h
index fd79bbcf3c..b2bca598b9 100644
--- a/sysdeps/unix/sysv/linux/powerpc/sysdep.h
+++ b/sysdeps/unix/sysv/linux/powerpc/sysdep.h
@@ -100,53 +100,53 @@
 #define LOADARGS_0(name, dummy) \
 	r0 = name
 #define LOADARGS_1(name, __arg1) \
-	long int arg1 = (long int) (__arg1); \
+	long int _arg1 = (long int) (__arg1); \
 	LOADARGS_0(name, 0); \
 	extern void __illegally_sized_syscall_arg1 (void); \
 	if (__builtin_classify_type (__arg1) != 5 \
 	    && sizeof (__arg1) > SYSCALL_ARG_SIZE) \
 	  __illegally_sized_syscall_arg1 (); \
-	r3 = arg1
+	r3 = _arg1
 #define LOADARGS_2(name, __arg1, __arg2) \
-	long int arg2 = (long int) (__arg2); \
+	long int _arg2 = (long int) (__arg2); \
 	LOADARGS_1(name, __arg1); \
 	extern void __illegally_sized_syscall_arg2 (void); \
 	if (__builtin_classify_type (__arg2) != 5 \
 	    && sizeof (__arg2) > SYSCALL_ARG_SIZE) \
 	  __illegally_sized_syscall_arg2 (); \
-	r4 = arg2
+	r4 = _arg2
 #define LOADARGS_3(name, __arg1, __arg2, __arg3) \
-	long int arg3 = (long int) (__arg3); \
+	long int _arg3 = (long int) (__arg3); \
 	LOADARGS_2(name, __arg1, __arg2); \
 	extern void __illegally_sized_syscall_arg3 (void); \
 	if (__builtin_classify_type (__arg3) != 5 \
 	    && sizeof (__arg3) > SYSCALL_ARG_SIZE) \
 	  __illegally_sized_syscall_arg3 (); \
-	r5 = arg3
+	r5 = _arg3
 #define LOADARGS_4(name, __arg1, __arg2, __arg3, __arg4) \
-	long int arg4 = (long int) (__arg4); \
+	long int _arg4 = (long int) (__arg4); \
 	LOADARGS_3(name, __arg1, __arg2, __arg3); \
 	extern void __illegally_sized_syscall_arg4 (void); \
 	if (__builtin_classify_type (__arg4) != 5 \
 	    && sizeof (__arg4) > SYSCALL_ARG_SIZE) \
 	  __illegally_sized_syscall_arg4 (); \
-	r6 = arg4
+	r6 = _arg4
 #define LOADARGS_5(name, __arg1, __arg2, __arg3, __arg4, __arg5) \
-	long int arg5 = (long int) (__arg5); \
+	long int _arg5 = (long int) (__arg5); \
 	LOADARGS_4(name, __arg1, __arg2, __arg3, __arg4); \
 	extern void __illegally_sized_syscall_arg5 (void); \
 	if (__builtin_classify_type (__arg5) != 5 \
 	    && sizeof (__arg5) > SYSCALL_ARG_SIZE) \
 	  __illegally_sized_syscall_arg5 (); \
-	r7 = arg5
+	r7 = _arg5
 #define LOADARGS_6(name, __arg1, __arg2, __arg3, __arg4, __arg5, __arg6) \
-	long int arg6 = (long int) (__arg6); \
+	long int _arg6 = (long int) (__arg6); \
 	LOADARGS_5(name, __arg1, __arg2, __arg3, __arg4, __arg5); \
 	extern void __illegally_sized_syscall_arg6 (void); \
 	if (__builtin_classify_type (__arg6) != 5 \
 	    && sizeof (__arg6) > SYSCALL_ARG_SIZE) \
 	  __illegally_sized_syscall_arg6 (); \
-	r8 = arg6
+	r8 = _arg6
 
 #define ASM_INPUT_0 "0" (r0)
 #define ASM_INPUT_1 ASM_INPUT_0, "1" (r3)
-- 
2.26.2


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Please test: [2.31/2.30] [PATCH] powerpc: Rename argN to _argN in LOADARGS_N [BZ #25902]
  2020-05-01  2:18                       ` [PATCH] powerpc: Rename argN to _argN in LOADARGS_N [BZ #25902] H.J. Lu
@ 2020-05-01 23:11                         ` H.J. Lu
  2020-05-04 16:00                           ` Matheus Castanho
  0 siblings, 1 reply; 4+ messages in thread
From: H.J. Lu @ 2020-05-01 23:11 UTC (permalink / raw)
  To: Tulio Magno Quites Machado Filho, Libc-stable Mailing List
  Cc: Matheus Castanho, GNU C Library

[-- Attachment #1: Type: text/plain, Size: 921 bytes --]

On Thu, Apr 30, 2020 at 7:18 PM H.J. Lu <hjl.tools@gmail.com> wrote:
>
> On Thu, Apr 30, 2020 at 7:03 PM Tulio Magno Quites Machado Filho
> <tuliom@ascii.art.br> wrote:
> >
> > "H.J. Lu via Libc-alpha" <libc-alpha@sourceware.org> writes:
> >
> > > See:
> > >
> > > https://sourceware.org/bugzilla/show_bug.cgi?id=25902
> > >
> > > with a patch.   But I can't test it natively.
> >
> > Tested.  LGTM.
> >
> > Could you push it, please?
>
> This is I am checking in.  I will backport it to 2.30/2.31 branches
> together with
>
> commit ff026950e280bc3e9487b41b460fb31bc5b57721
> Author: H.J. Lu <hjl.tools@gmail.com>
> Date:   Thu Apr 30 10:42:43 2020 -0700
>
>     Add a C wrapper for prctl [BZ #25896]
>

I need to update both  powerpc32/sysdep.h and powerpc64/sysdep.h
on 2.30 and 2.31 branches, instead of just powerpc/sysdep.h.   Can
someone please test this patch on 2.30 and 2.31 branches on PPC?

Thanks.

-- 
H.J.

[-- Attachment #2: 0001-powerpc-Rename-argN-to-_argN-in-LOADARGS_N-BZ-25902.patch --]
[-- Type: application/x-patch, Size: 5975 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: Please test: [2.31/2.30] [PATCH] powerpc: Rename argN to _argN in LOADARGS_N [BZ #25902]
  2020-05-01 23:11                         ` Please test: [2.31/2.30] " H.J. Lu
@ 2020-05-04 16:00                           ` Matheus Castanho
  2020-05-04 19:11                             ` H.J. Lu
  0 siblings, 1 reply; 4+ messages in thread
From: Matheus Castanho @ 2020-05-04 16:00 UTC (permalink / raw)
  To: H.J. Lu, Tulio Magno Quites Machado Filho, Libc-stable Mailing List
  Cc: GNU C Library

On 5/1/20 8:11 PM, H.J. Lu wrote:
> On Thu, Apr 30, 2020 at 7:18 PM H.J. Lu <hjl.tools@gmail.com> wrote:
>>
>> On Thu, Apr 30, 2020 at 7:03 PM Tulio Magno Quites Machado Filho
>> <tuliom@ascii.art.br> wrote:
>>>
>>> "H.J. Lu via Libc-alpha" <libc-alpha@sourceware.org> writes:
>>>
>>>> See:
>>>>
>>>> https://sourceware.org/bugzilla/show_bug.cgi?id=25902
>>>>
>>>> with a patch.   But I can't test it natively.
>>>
>>> Tested.  LGTM.
>>>
>>> Could you push it, please?
>>
>> This is I am checking in.  I will backport it to 2.30/2.31 branches
>> together with
>>
>> commit ff026950e280bc3e9487b41b460fb31bc5b57721
>> Author: H.J. Lu <hjl.tools@gmail.com>
>> Date:   Thu Apr 30 10:42:43 2020 -0700
>>
>>     Add a C wrapper for prctl [BZ #25896]
>>
> 
> I need to update both  powerpc32/sysdep.h and powerpc64/sysdep.h
> on 2.30 and 2.31 branches, instead of just powerpc/sysdep.h.   Can
> someone please test this patch on 2.30 and 2.31 branches on PPC?
> 

- Cherry-picked "ff026950e2 Add a C wrapper for prctl [BZ #25896]" on
top of current release/2.30/master and release/2.31/master
- Fixed minor merge conflicts
- Applied the patch you sent

Tested on ppc, ppc64 and ppc64le. Both branches built fine and all tests
passed on all arch variants.

Thanks.

> Thanks.
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: Please test: [2.31/2.30] [PATCH] powerpc: Rename argN to _argN in LOADARGS_N [BZ #25902]
  2020-05-04 16:00                           ` Matheus Castanho
@ 2020-05-04 19:11                             ` H.J. Lu
  0 siblings, 0 replies; 4+ messages in thread
From: H.J. Lu @ 2020-05-04 19:11 UTC (permalink / raw)
  To: Matheus Castanho
  Cc: Tulio Magno Quites Machado Filho, Libc-stable Mailing List,
	GNU C Library

On Mon, May 4, 2020 at 9:00 AM Matheus Castanho <msc@linux.ibm.com> wrote:
>
> On 5/1/20 8:11 PM, H.J. Lu wrote:
> > On Thu, Apr 30, 2020 at 7:18 PM H.J. Lu <hjl.tools@gmail.com> wrote:
> >>
> >> On Thu, Apr 30, 2020 at 7:03 PM Tulio Magno Quites Machado Filho
> >> <tuliom@ascii.art.br> wrote:
> >>>
> >>> "H.J. Lu via Libc-alpha" <libc-alpha@sourceware.org> writes:
> >>>
> >>>> See:
> >>>>
> >>>> https://sourceware.org/bugzilla/show_bug.cgi?id=25902
> >>>>
> >>>> with a patch.   But I can't test it natively.
> >>>
> >>> Tested.  LGTM.
> >>>
> >>> Could you push it, please?
> >>
> >> This is I am checking in.  I will backport it to 2.30/2.31 branches
> >> together with
> >>
> >> commit ff026950e280bc3e9487b41b460fb31bc5b57721
> >> Author: H.J. Lu <hjl.tools@gmail.com>
> >> Date:   Thu Apr 30 10:42:43 2020 -0700
> >>
> >>     Add a C wrapper for prctl [BZ #25896]
> >>
> >
> > I need to update both  powerpc32/sysdep.h and powerpc64/sysdep.h
> > on 2.30 and 2.31 branches, instead of just powerpc/sysdep.h.   Can
> > someone please test this patch on 2.30 and 2.31 branches on PPC?
> >
>
> - Cherry-picked "ff026950e2 Add a C wrapper for prctl [BZ #25896]" on
> top of current release/2.30/master and release/2.31/master
> - Fixed minor merge conflicts
> - Applied the patch you sent
>
> Tested on ppc, ppc64 and ppc64le. Both branches built fine and all tests
> passed on all arch variants.

Thanks.

> Thanks.
>
> > Thanks.
> >



-- 
H.J.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2020-05-04 19:12 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <20200429205217.2435607-1-hjl.tools@gmail.com>
     [not found] ` <87wo5xa0yt.fsf@mid.deneb.enyo.de>
     [not found]   ` <20200430130333.GA254612@gmail.com>
     [not found]     ` <39a57354-4ca8-53f5-bb89-dadf25f3671a@linaro.org>
     [not found]       ` <CAMe9rOq22oFZs7AEEFQpfOBo4XmTLjS9fWmPChKOpSCZ8a00FQ@mail.gmail.com>
     [not found]         ` <871ro49atj.fsf@mid.deneb.enyo.de>
     [not found]           ` <b89cd048-16f3-76e5-4251-bdc724b1e49b@linaro.org>
     [not found]             ` <CAMe9rOpr0ibwUSdxDNGi9x=EGWJCbiG_S04+tg_hrcZuiukSTQ@mail.gmail.com>
     [not found]               ` <c2a821bf-fd2a-0ed9-2ad9-c4bd1231b2a7@linux.ibm.com>
     [not found]                 ` <CAMe9rOq60aAKujxFF=bSyN5yPZVWSa-KWKWXKHpB8uOKu5V-7w@mail.gmail.com>
     [not found]                   ` <CAMe9rOp7NKcP8VMrmsUf38Eay-szCMmziw5yqWMDvJt9TViphg@mail.gmail.com>
     [not found]                     ` <87tv10za12.fsf@linux.ibm.com>
2020-05-01  2:18                       ` [PATCH] powerpc: Rename argN to _argN in LOADARGS_N [BZ #25902] H.J. Lu
2020-05-01 23:11                         ` Please test: [2.31/2.30] " H.J. Lu
2020-05-04 16:00                           ` Matheus Castanho
2020-05-04 19:11                             ` H.J. Lu

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).