From patchwork Tue Feb 7 13:12:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 64443 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2B25E3858439 for ; Tue, 7 Feb 2023 13:13:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2B25E3858439 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1675775609; bh=3TbeteBkktsjHfYF5DgcHPnOmfeZg1p4O9xBcjLNGCI=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=HW6/hsPHLX1qnj5OApvFmazcQm3lnGjjEe//dVfYqPiiKgxAQePkhqjyEfyxPTN11 E/6Lx6hQQ8YMz/zD5uR1WWN/wwOW7SMP2vZ86VI4KuX2HojUenOQ8L5eK4vPGh/pF5 ekenpMJGb6GynxhbNtdjeo+fMy1InxmXCzuUdR9g= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-ot1-x32f.google.com (mail-ot1-x32f.google.com [IPv6:2607:f8b0:4864:20::32f]) by sourceware.org (Postfix) with ESMTPS id 895583858C50 for ; Tue, 7 Feb 2023 13:13:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 895583858C50 Received: by mail-ot1-x32f.google.com with SMTP id x26-20020a056830115a00b0068bbc0ee3eeso4166076otq.0 for ; Tue, 07 Feb 2023 05:13:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3TbeteBkktsjHfYF5DgcHPnOmfeZg1p4O9xBcjLNGCI=; b=gqjjUzULrlraMWVoNsxSBC82h0BEzQC94ehjyPpfnKSGgpo2du3G3Qfh5oWpqT72FV FQb/CL0UAVqeGZI5FrThMlDKlFuV9m+MAlOmhVZ5sBCkeAfSj5Kn4gg5XMFH4UGQr6tf XxMcp6J3gTqLAWGBGlEl5xTkyftQrkry0U+CqfH+uZ5H03Vqb9YPRxuL6slaY/2OFtiw NphDpAolZ3vGQsaNIGcvCS7c9ncP6GvmHY++UYAMmjftGlys7pRvsa77FRtWFgUE/tkX TRQleboIgoVoK0ZXF1B0wmzJhItLgUKu8OCe5k/iJck/Zq5bB3CnPvMl2eQYPh2JAVaQ SICw== X-Gm-Message-State: AO0yUKWM5aq1sN2v9ycGEdV4XQfxWaLDU/u0NCcBYLj43qUF7ebG8tuO wkSpTPynfvoorqGpMK70RjbqVwId5vw9UnJKYG0= X-Google-Smtp-Source: AK7set+bp5iDNqBNmdMTpLKnX4H4ylrd54IthoeGwaVuf9O/cbkgTJdz5gw2jEJ3GMjOnnmpmKVugw== X-Received: by 2002:a05:6830:e05:b0:68d:92fd:e378 with SMTP id do5-20020a0568300e0500b0068d92fde378mr1625461otb.35.1675775583318; Tue, 07 Feb 2023 05:13:03 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c2:8ced:3d04:3626:cc0e:457c]) by smtp.gmail.com with ESMTPSA id c15-20020a9d75cf000000b0068bbaf7a1b0sm6414113otl.34.2023.02.07.05.13.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Feb 2023 05:13:02 -0800 (PST) To: libc-alpha@sourceware.org, Richard Henderson , Noah Goldstein Subject: [PATCH 2/3] string: Add libc_hidden_proto for memrchr Date: Tue, 7 Feb 2023 10:12:54 -0300 Message-Id: <20230207131255.3396143-3-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230207131255.3396143-1-adhemerval.zanella@linaro.org> References: <20230207131255.3396143-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, KAM_STOCKGEN, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Although static linker can optimize it to local call, it follow the internal scheme to provide hidden proto and definitions. Reviewed-by: Carlos Eduardo Seo --- include/string.h | 1 + string/memrchr.c | 1 + sysdeps/aarch64/memrchr.S | 1 + sysdeps/i386/i686/multiarch/memrchr-sse2.S | 1 + sysdeps/i386/i686/multiarch/memrchr.c | 2 ++ .../powerpc32/power4/multiarch/memrchr-ppc32.c | 10 ++++++++++ .../powerpc32/power4/multiarch/memrchr.c | 12 ++++++------ sysdeps/powerpc/powerpc32/power7/memrchr.S | 1 + sysdeps/powerpc/powerpc64/multiarch/memrchr.c | 18 +++++++++--------- sysdeps/powerpc/powerpc64/power7/memrchr.S | 1 + sysdeps/powerpc/powerpc64/power8/memrchr.S | 1 + sysdeps/s390/memrchr-c.c | 4 ++++ sysdeps/s390/memrchr.c | 8 +++++--- sysdeps/x86_64/memrchr.S | 1 + sysdeps/x86_64/multiarch/memrchr.c | 1 + 15 files changed, 45 insertions(+), 18 deletions(-) diff --git a/include/string.h b/include/string.h index 6e364e8a67..a9120ff37c 100644 --- a/include/string.h +++ b/include/string.h @@ -119,6 +119,7 @@ extern __typeof (memmem) __memmem; libc_hidden_proto (__memmem) libc_hidden_proto (__ffs) libc_hidden_proto (__strerror_l) +libc_hidden_proto (__memrchr) #if IS_IN (libc) /* Avoid hidden reference to IFUNC symbol __explicit_bzero_chk. */ diff --git a/string/memrchr.c b/string/memrchr.c index b37f2a68c8..3de5ec691c 100644 --- a/string/memrchr.c +++ b/string/memrchr.c @@ -75,5 +75,6 @@ __memrchr (const void *s, int c_in, size_t n) return NULL; } #ifndef MEMRCHR +libc_hidden_def (__memrchr) weak_alias (__memrchr, memrchr) #endif diff --git a/sysdeps/aarch64/memrchr.S b/sysdeps/aarch64/memrchr.S index 621fc65109..af7d847dab 100644 --- a/sysdeps/aarch64/memrchr.S +++ b/sysdeps/aarch64/memrchr.S @@ -123,5 +123,6 @@ L(nomatch): ret END (__memrchr) +libc_hidden_def (__memrchr) weak_alias (__memrchr, memrchr) libc_hidden_builtin_def (memrchr) diff --git a/sysdeps/i386/i686/multiarch/memrchr-sse2.S b/sysdeps/i386/i686/multiarch/memrchr-sse2.S index c2c37f7ce1..aa15e7cf24 100644 --- a/sysdeps/i386/i686/multiarch/memrchr-sse2.S +++ b/sysdeps/i386/i686/multiarch/memrchr-sse2.S @@ -720,4 +720,5 @@ L(ret_null): ret END (__memrchr_sse2) +strong_alias (__memrchr_sse2, __GI___memrchr) #endif diff --git a/sysdeps/i386/i686/multiarch/memrchr.c b/sysdeps/i386/i686/multiarch/memrchr.c index c820a9d607..80dca18000 100644 --- a/sysdeps/i386/i686/multiarch/memrchr.c +++ b/sysdeps/i386/i686/multiarch/memrchr.c @@ -20,8 +20,10 @@ /* Define multiple versions only for the definition in libc. */ #if IS_IN (libc) # define memrchr __redirect_memrchr +# define __memrchr __redirect___memrchr # include # undef memrchr +# undef __memrchr # define SYMBOL_NAME memrchr # include "ifunc-sse2-bsf.h" diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr-ppc32.c b/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr-ppc32.c index 62e7a12989..038c5f4532 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr-ppc32.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr-ppc32.c @@ -23,3 +23,13 @@ extern void *__memrchr_ppc (const void *, int, size_t); #endif #include +# if IS_IN (libc) +# undef __memrchr +# ifdef SHARED +__hidden_ver1 (__memrchr_ppc, __GI___memrchr, __memrchr_ppc); +strong_alias (__memrchr_ppc, __memrchr_ppc1); +__hidden_ver1 (__memrchr_ppc1, __memrchr, __memrchr_ppc1); +# else +strong_alias (__memrchr_ppc, __memrchr) +# endif +#endif diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr.c b/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr.c index 8c1385fe6a..fb0d2c0617 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/memrchr.c @@ -17,21 +17,21 @@ . */ #if IS_IN (libc) +# define memrchr __redirect_memrchr # include # include # include "init-arch.h" extern __typeof (__memrchr) __memrchr_ppc attribute_hidden; extern __typeof (__memrchr) __memrchr_power7 attribute_hidden; +# undef memrchr /* Avoid DWARF definition DIE on ifunc symbol so that GDB can handle ifunc symbol properly. */ -libc_ifunc (__memrchr, - (hwcap & PPC_FEATURE_HAS_VSX) - ? __memrchr_power7 - : __memrchr_ppc); - -weak_alias (__memrchr, memrchr) +libc_ifunc_redirected (__redirect_memrchr, memrchr, + (hwcap & PPC_FEATURE_HAS_VSX) + ? __memrchr_power7 + : __memrchr_ppc); #else #include #endif diff --git a/sysdeps/powerpc/powerpc32/power7/memrchr.S b/sysdeps/powerpc/powerpc32/power7/memrchr.S index 9c70517d37..9f0f17fa46 100644 --- a/sysdeps/powerpc/powerpc32/power7/memrchr.S +++ b/sysdeps/powerpc/powerpc32/power7/memrchr.S @@ -191,5 +191,6 @@ L(loop_small): blr END (__memrchr) +libc_hidden_def (__memrchr) weak_alias (__memrchr, memrchr) libc_hidden_builtin_def (memrchr) diff --git a/sysdeps/powerpc/powerpc64/multiarch/memrchr.c b/sysdeps/powerpc/powerpc64/multiarch/memrchr.c index 59527a83eb..5e7c00fdce 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/memrchr.c +++ b/sysdeps/powerpc/powerpc64/multiarch/memrchr.c @@ -17,6 +17,7 @@ . */ #if IS_IN (libc) +# define memrchr __redirect_memrchr # include # include # include "init-arch.h" @@ -24,18 +25,17 @@ extern __typeof (__memrchr) __memrchr_ppc attribute_hidden; extern __typeof (__memrchr) __memrchr_power7 attribute_hidden; extern __typeof (__memrchr) __memrchr_power8 attribute_hidden; +# undef memrchr /* Avoid DWARF definition DIE on ifunc symbol so that GDB can handle ifunc symbol properly. */ -libc_ifunc (__memrchr, - (hwcap2 & PPC_FEATURE2_ARCH_2_07 - && hwcap & PPC_FEATURE_HAS_ALTIVEC) - ? __memrchr_power8 : - (hwcap & PPC_FEATURE_ARCH_2_06) - ? __memrchr_power7 - : __memrchr_ppc); - -weak_alias (__memrchr, memrchr) +libc_ifunc_redirected (__redirect_memrchr, memrchr, + (hwcap2 & PPC_FEATURE2_ARCH_2_07 + && hwcap & PPC_FEATURE_HAS_ALTIVEC) + ? __memrchr_power8 : + (hwcap & PPC_FEATURE_ARCH_2_06) + ? __memrchr_power7 + : __memrchr_ppc); #else #include #endif diff --git a/sysdeps/powerpc/powerpc64/power7/memrchr.S b/sysdeps/powerpc/powerpc64/power7/memrchr.S index 56e79f3cd5..3b0430ccff 100644 --- a/sysdeps/powerpc/powerpc64/power7/memrchr.S +++ b/sysdeps/powerpc/powerpc64/power7/memrchr.S @@ -196,5 +196,6 @@ L(loop_small): blr END (MEMRCHR) +libc_hidden_def (__memrchr) weak_alias (__memrchr, memrchr) libc_hidden_builtin_def (memrchr) diff --git a/sysdeps/powerpc/powerpc64/power8/memrchr.S b/sysdeps/powerpc/powerpc64/power8/memrchr.S index fec76cf586..ebe4017968 100644 --- a/sysdeps/powerpc/powerpc64/power8/memrchr.S +++ b/sysdeps/powerpc/powerpc64/power8/memrchr.S @@ -332,5 +332,6 @@ L(loop_small): blr END (MEMRCHR) +libc_hidden_def (__memrchr) weak_alias (__memrchr, memrchr) libc_hidden_builtin_def (memrchr) diff --git a/sysdeps/s390/memrchr-c.c b/sysdeps/s390/memrchr-c.c index ce97bc6714..bdf3c7bbe0 100644 --- a/sysdeps/s390/memrchr-c.c +++ b/sysdeps/s390/memrchr-c.c @@ -24,4 +24,8 @@ # endif # include + +# if defined SHARED && IS_IN (libc) +__hidden_ver1 (__memrchr_c, __GI___memrchr, __memrchr_c); +# endif #endif diff --git a/sysdeps/s390/memrchr.c b/sysdeps/s390/memrchr.c index 73e75628c1..405990faef 100644 --- a/sysdeps/s390/memrchr.c +++ b/sysdeps/s390/memrchr.c @@ -19,18 +19,20 @@ #include #if HAVE_MEMRCHR_IFUNC +# define __memrchr __redirect_memrchr # include +# undef __memrchr # include # if HAVE_MEMRCHR_C -extern __typeof (__memrchr) MEMRCHR_C attribute_hidden; +extern __typeof (__redirect_memrchr) MEMRCHR_C attribute_hidden; # endif # if HAVE_MEMRCHR_Z13 -extern __typeof (__memrchr) MEMRCHR_Z13 attribute_hidden; +extern __typeof (__redirect_memrchr) MEMRCHR_Z13 attribute_hidden; # endif -s390_libc_ifunc_expr (__memrchr, __memrchr, +s390_libc_ifunc_expr (__redirect_memrchr, __memrchr, (HAVE_MEMRCHR_Z13 && (hwcap & HWCAP_S390_VX)) ? MEMRCHR_Z13 : MEMRCHR_DEFAULT diff --git a/sysdeps/x86_64/memrchr.S b/sysdeps/x86_64/memrchr.S index fe33998111..98a220f3f4 100644 --- a/sysdeps/x86_64/memrchr.S +++ b/sysdeps/x86_64/memrchr.S @@ -25,4 +25,5 @@ #include "isa-default-impl.h" +libc_hidden_def (__memrchr) weak_alias (__memrchr, memrchr) diff --git a/sysdeps/x86_64/multiarch/memrchr.c b/sysdeps/x86_64/multiarch/memrchr.c index f7db8b4708..49026538d4 100644 --- a/sysdeps/x86_64/multiarch/memrchr.c +++ b/sysdeps/x86_64/multiarch/memrchr.c @@ -27,5 +27,6 @@ # include "ifunc-avx2.h" libc_ifunc_redirected (__redirect_memrchr, __memrchr, IFUNC_SELECTOR ()); +libc_hidden_def (__memrchr) weak_alias (__memrchr, memrchr) #endif