From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oa1-x33.google.com (mail-oa1-x33.google.com [IPv6:2001:4860:4864:20::33]) by sourceware.org (Postfix) with ESMTPS id 9B6703858D3C for ; Thu, 5 May 2022 17:28:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9B6703858D3C Received: by mail-oa1-x33.google.com with SMTP id 586e51a60fabf-d6e29fb3d7so4869431fac.7 for ; Thu, 05 May 2022 10:28:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=WCGcHWOdq3QP+6v7jz0zRYcTN5BJkK46lW2KLpiD75I=; b=LHKk7+2ZSL+0rW9MBtNwBhAU6+Mk56x6IFyE5LWzDx4OHjEkrOuqjvx0jbKe0G4Mma zvgSvcLQDq0v1R8oX15NyLPegAownDI+mTB1sAmjgkQgn9ICY2qcYScmXZCSWhuOOHhp 65REM9r1qFVRuF+1moO13G7o4mkjgkWN/5JQdxRyX7It/1iIxxGHSfaQGCzIRod+e2GV pxzf3TGUbYNbPwpnMYZNaWzltzvGgYKFCwa6wH6za5nGTuAhQ3pCsv3HbuB7fKyONEfJ NrGGc4y8u7UWrC0VNjqZisuYGS3yR7ILWgWzYkPuYZOY7kdkUD7k72hD+V2fuEM/Y39d 7Fwg== X-Gm-Message-State: AOAM531JEhDRw34KyvKYfCw6x7Pt1s7Ss1VZ2AmmG30TdeA01pLHXL5D PHxYOzOiTB6uXXpkEx4VzVjTzsacP7jfjw== X-Google-Smtp-Source: ABdhPJxObvg3cEuxn1dDVt5WEQ/eiL7C2U1gnArckfsIBQM0IR7c7xCVcIbeOGskMJqE7xs/9SkNmw== X-Received: by 2002:a05:6870:a901:b0:da:cf13:4023 with SMTP id eq1-20020a056870a90100b000dacf134023mr2726406oab.90.1651771723891; Thu, 05 May 2022 10:28:43 -0700 (PDT) Received: from ?IPV6:2804:431:c7cb:726:f51f:3382:ab1c:b594? ([2804:431:c7cb:726:f51f:3382:ab1c:b594]) by smtp.gmail.com with ESMTPSA id j64-20020acaeb43000000b00325cda1ffb2sm831611oih.49.2022.05.05.10.28.42 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 05 May 2022 10:28:43 -0700 (PDT) Message-ID: <53b87991-27c5-dabb-c83e-6b35f6823b0f@linaro.org> Date: Thu, 5 May 2022 14:28:40 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 Subject: Re: [PATCH v4 1/3] ia64: Always define IA64_USE_NEW_STUB as a flag macro Content-Language: en-US To: Florian Weimer , libc-alpha@sourceware.org References: From: Adhemerval Zanella In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-14.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 May 2022 17:28:46 -0000 On 05/05/2022 12:06, Florian Weimer via Libc-alpha wrote: > And keep the previous definition if it exists. This allows > disabling IA64_USE_NEW_STUB while keeping USE_DL_SYSINFO defined. LGTM, thanks. Reviewed-by: Adhemerval Zanella > --- > v4: Unchanged. > v3: Fix “statup” typo. Do not use libpthread and librt in conditional. > > sysdeps/unix/sysv/linux/ia64/brk.c | 5 ++--- > sysdeps/unix/sysv/linux/ia64/sysdep.h | 23 +++++++++++++---------- > 2 files changed, 15 insertions(+), 13 deletions(-) > > diff --git a/sysdeps/unix/sysv/linux/ia64/brk.c b/sysdeps/unix/sysv/linux/ia64/brk.c > index 65142aeae9..d2135b74fc 100644 > --- a/sysdeps/unix/sysv/linux/ia64/brk.c > +++ b/sysdeps/unix/sysv/linux/ia64/brk.c > @@ -16,7 +16,6 @@ > License along with the GNU C Library; if not, see > . */ > > -#include > -/* brk is used by statup before TCB is properly set. */ > -#undef USE_DL_SYSINFO > +/* brk is used by startup before TCB is properly set up. */ > +#define IA64_USE_NEW_STUB 0 > #include > diff --git a/sysdeps/unix/sysv/linux/ia64/sysdep.h b/sysdeps/unix/sysv/linux/ia64/sysdep.h > index 193ecee023..14adbdf4ff 100644 > --- a/sysdeps/unix/sysv/linux/ia64/sysdep.h > +++ b/sysdeps/unix/sysv/linux/ia64/sysdep.h > @@ -44,12 +44,15 @@ > #undef SYS_ify > #define SYS_ify(syscall_name) __NR_##syscall_name > > -#if defined USE_DL_SYSINFO \ > - && (IS_IN (libc) \ > - || IS_IN (libpthread) || IS_IN (librt)) > -# define IA64_USE_NEW_STUB > -#else > -# undef IA64_USE_NEW_STUB > +#ifndef IA64_USE_NEW_STUB > +# if defined USE_DL_SYSINFO && IS_IN (libc) > +# define IA64_USE_NEW_STUB 1 > +# else > +# define IA64_USE_NEW_STUB 0 > +# endif > +#endif > +#if IA64_USE_NEW_STUB && !USE_DL_SYSINFO > +# error IA64_USE_NEW_STUB needs USE_DL_SYSINFO > #endif > > #ifdef __ASSEMBLER__ > @@ -101,7 +104,7 @@ > mov r15=num; \ > break __IA64_BREAK_SYSCALL > > -#ifdef IA64_USE_NEW_STUB > +#if IA64_USE_NEW_STUB > # ifdef SHARED > # define DO_CALL(num) \ > .prologue; \ > @@ -185,7 +188,7 @@ > (non-negative) errno on error or the return value on success. > */ > > -#ifdef IA64_USE_NEW_STUB > +#if IA64_USE_NEW_STUB > > # define INTERNAL_SYSCALL_NCS(name, nr, args...) \ > ({ \ > @@ -277,7 +280,7 @@ > #define ASM_OUTARGS_5 ASM_OUTARGS_4, "=r" (_out4) > #define ASM_OUTARGS_6 ASM_OUTARGS_5, "=r" (_out5) > > -#ifdef IA64_USE_NEW_STUB > +#if IA64_USE_NEW_STUB > #define ASM_ARGS_0 > #define ASM_ARGS_1 ASM_ARGS_0, "4" (_out0) > #define ASM_ARGS_2 ASM_ARGS_1, "5" (_out1) > @@ -313,7 +316,7 @@ > /* Branch registers. */ \ > "b6" > > -#ifdef IA64_USE_NEW_STUB > +#if IA64_USE_NEW_STUB > # define ASM_CLOBBERS_6 ASM_CLOBBERS_6_COMMON > #else > # define ASM_CLOBBERS_6 ASM_CLOBBERS_6_COMMON , "b7" > > base-commit: c1b68685d438373efe64e5f076f4215723004dfb