From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oa1-x32.google.com (mail-oa1-x32.google.com [IPv6:2001:4860:4864:20::32]) by sourceware.org (Postfix) with ESMTPS id 11AD63857831 for ; Wed, 4 May 2022 16:54:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 11AD63857831 Received: by mail-oa1-x32.google.com with SMTP id 586e51a60fabf-edf3b6b0f2so1384437fac.9 for ; Wed, 04 May 2022 09:54:51 -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=CbVRR9RVcU6kFP1jlPl0LmzLR9vomKQXdUumNL4+n2U=; b=X0u63JDHP4kfJuwXiXhpTSZJLBRI90r457obEfJnvb7C/yzoPQNSoCbJPPWdJc/ycK 61dIrsUyu7tmIYq7jaXr6ka/ggvOGB5a6xdkyqAIBQYctvS5ggfBzUIdzVg3kimXfFgI SAMsYUI1DhwtcAI5x3jevka7rVPFI8vqNbaRHkG8Pkvoa5xIUbG9nfv4njm2sxdjlwOS yOLzn0Qc7PZrnCQmwg/OCgB4zLFp3v6axkTe/xtfTfUool4U7CRIOd2RujrlyiOHu1bX 5h6eE/aOq0LmmtuejJhYo+zosGKFBb8Ar8gqevkstP1el41/41Q2p9WzWXTJ1EcNIodW CFZA== X-Gm-Message-State: AOAM533pE3jjLH2VYcmxQvVFuIc6AXEccQWEUQ3mIRjhtMwB2cFIRy14 DjHkOifLFTYJZQRC7PwwQLAw85pSlIwSFw== X-Google-Smtp-Source: ABdhPJzFdkzF7rQddkfkrmKOw/bPtzw1Tlob2zgjOwH7uSvR/oY5KoTnD3S0zVSdZfIQNDOZLhWEgA== X-Received: by 2002:a05:6870:390c:b0:ec:76fb:93c5 with SMTP id b12-20020a056870390c00b000ec76fb93c5mr211608oap.64.1651683290296; Wed, 04 May 2022 09:54:50 -0700 (PDT) Received: from ?IPV6:2804:431:c7cb:726:3ae8:3076:1dad:37? ([2804:431:c7cb:726:3ae8:3076:1dad:37]) by smtp.gmail.com with ESMTPSA id s139-20020acaa991000000b00325cda1ff9fsm4522425oie.30.2022.05.04.09.54.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 04 May 2022 09:54:49 -0700 (PDT) Message-ID: <49a7f4d3-81db-eee6-bd40-ef5ad225d63c@linaro.org> Date: Wed, 4 May 2022 13:54:47 -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 v2 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: 7bit X-Spam-Status: No, score=-13.5 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: Wed, 04 May 2022 16:54:52 -0000 On 04/05/2022 13:47, Florian Weimer wrote: > And keep the previous definition if it exists. This allows > disabling IA64_USE_NEW_STUB while keeping USE_DL_SYSINFO defined. > --- > v2: New patch. > sysdeps/unix/sysv/linux/ia64/brk.c | 3 +-- > sysdeps/unix/sysv/linux/ia64/sysdep.h | 21 +++++++++++++-------- > 2 files changed, 14 insertions(+), 10 deletions(-) > > diff --git a/sysdeps/unix/sysv/linux/ia64/brk.c b/sysdeps/unix/sysv/linux/ia64/brk.c > index 65142aeae9..e1fa88f9b0 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 > +#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..72b72acb6f 100644 > --- a/sysdeps/unix/sysv/linux/ia64/sysdep.h > +++ b/sysdeps/unix/sysv/linux/ia64/sysdep.h > @@ -44,12 +44,17 @@ > #undef SYS_ify > #define SYS_ify(syscall_name) __NR_##syscall_name > > -#if defined USE_DL_SYSINFO \ > +#ifndef IA64_USE_NEW_STUB > +# if defined USE_DL_SYSINFO \ > && (IS_IN (libc) \ > || IS_IN (libpthread) || IS_IN (librt)) I think you can drop libpthread and librt here. > -# define IA64_USE_NEW_STUB > -#else > -# undef IA64_USE_NEW_STUB > +# 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 +106,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 +190,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 +282,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 +318,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 Rest look ok.