From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oa1-x36.google.com (mail-oa1-x36.google.com [IPv6:2001:4860:4864:20::36]) by sourceware.org (Postfix) with ESMTPS id 5EBB838582BE for ; Mon, 24 Jul 2023 17:15:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5EBB838582BE Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-oa1-x36.google.com with SMTP id 586e51a60fabf-1bb575a6ed3so1229073fac.2 for ; Mon, 24 Jul 2023 10:15:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1690218935; x=1690823735; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=gU74aJaFwi5jx/sP8p6G2Xs176/qZHHwq/MHjJ+EVUI=; b=t+aNywOKiDp2sjGawUJzzsYmmDE8TlWh2nwEjdxkbUUvkADoB2RJ6RoxFDo6DEN+xM +PduAljI/GaSA6ohKRBkffocsDyN900x6ZRgjnIfaBQ8s/45PADSqoglNDf0fRo4/yYH /Yp0vSYfnVZjjxZqf13NqmDOuJ41L9C2awsLppOA4PNb3bsEves070AKe8yM7+VX6EL+ 1Y+qWzY1WLZP7kuSJQWRmMJ76JZ9l7SzR10HP+KmnbZ05E5pMWxsocEpdXNdzkOJlYyC YPQDZ29E4OppCyRReigN5PS/BHhm5DGmlmzxut0tEJZ8DPxzZMmKtxzGFK87CIIndXRO B7UQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690218935; x=1690823735; 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=gU74aJaFwi5jx/sP8p6G2Xs176/qZHHwq/MHjJ+EVUI=; b=Y6LdW3Sre1JzNYuBnda4WAF9bzXZEAlWbDPJb03DpVimRiMcQAQ6k06ZA6UW7FdMQn kpch9+1IaJ52nnK54ZpeWrU035Ul6bT8spI/mhavf7YWwxJk2hbPourqTGE9kc4N9i3y bToqQCYOT7vclMYLxwC5rpGr+sCcmvIcTErVwGe5d3/38UwPHIB313POD+dr4KBDjGwF BOOfGP7HcwctVsM/V3Z8Pj/jtXiC+zhz4XFAI5IlU67B+sPyTnDZ9iQxn+XzxHEXc0a8 NBOWI5VszMcg5/0T5PyaMWySb2PROYJRom47stBbrFNDWYg3opgOmPApvUubGlcP9BVW MO+Q== X-Gm-Message-State: ABy/qLb43JV66MTvH4MZxBAQBnA/bdQ2vJYSjMCl5Lf1LN+srBzm0FTi X+jOObvhGqGSM+PlfGX4YN/0cqDJjcTNlK+kwnYtbQ== X-Google-Smtp-Source: APBJJlGix7z0tHPkzi7R62a5cxAXhx8+y/u7qF2KQt/werJza7pnOgTWC96DMpTX1KvQV5gosvPzdg== X-Received: by 2002:a05:6870:1691:b0:1bb:7bab:d4 with SMTP id j17-20020a056870169100b001bb7bab00d4mr3113466oae.15.1690218935335; Mon, 24 Jul 2023 10:15:35 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c0:d4d2:46e0:428c:6669:da90]) by smtp.gmail.com with ESMTPSA id x140-20020a4a4192000000b0055e489a7fdasm4602286ooa.0.2023.07.24.10.15.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jul 2023 10:15:34 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 3/3] powerpc: Fix powerpc64 strchrnul build with old gcc Date: Mon, 24 Jul 2023 14:15:24 -0300 Message-Id: <20230724171524.2687112-4-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230724171524.2687112-1-adhemerval.zanella@linaro.org> References: <20230724171524.2687112-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_FILL_THIS_FORM_SHORT,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: The compiler might not see that internal definition is an alias due the libc_ifunc macro, which redefines __strchrnul. With gcc 6 it fails with: In file included from :0:0: ./../include/libc-symbols.h:472:33: error: ‘__EI___strchrnul’ aliased to undefined symbol ‘__GI___strchrnul’ extern thread __typeof (name) __EI_##name \ ^ ./../include/libc-symbols.h:468:3: note: in expansion of macro ‘__hidden_ver2’ __hidden_ver2 (, local, internal, name) ^~~~~~~~~~~~~ ./../include/libc-symbols.h:476:29: note: in expansion of macro ‘__hidden_ver1’ # define hidden_def(name) __hidden_ver1(__GI_##name, name, name); ^~~~~~~~~~~~~ ./../include/libc-symbols.h:557:32: note: in expansion of macro ‘hidden_def’ # define libc_hidden_def(name) hidden_def (name) ^~~~~~~~~~ ../sysdeps/powerpc/powerpc64/multiarch/strchrnul.c:38:1: note: in expansion of macro ‘libc_hidden_def’ libc_hidden_def (__strchrnul) ^~~~~~~~~~~~~~~ Use libc_ifunc_hidden as stpcpy. Checked on powerpc64 with gcc 6 and gcc 13. --- sysdeps/powerpc/powerpc64/multiarch/strchrnul.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sysdeps/powerpc/powerpc64/multiarch/strchrnul.c b/sysdeps/powerpc/powerpc64/multiarch/strchrnul.c index 94873507a6..87dd41f72d 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strchrnul.c +++ b/sysdeps/powerpc/powerpc64/multiarch/strchrnul.c @@ -27,13 +27,13 @@ extern __typeof (__strchrnul) __strchrnul_power8 attribute_hidden; /* Avoid DWARF definition DIE on ifunc symbol so that GDB can handle ifunc symbol properly. */ -libc_ifunc (__strchrnul, - (hwcap2 & PPC_FEATURE2_ARCH_2_07 - && hwcap & PPC_FEATURE_HAS_ALTIVEC) - ? __strchrnul_power8 : - (hwcap & PPC_FEATURE_ARCH_2_06) - ? __strchrnul_power7 - : __strchrnul_ppc); +libc_ifunc_hidden (__strchrnul, __strchrnul, + (hwcap2 & PPC_FEATURE2_ARCH_2_07 + && hwcap & PPC_FEATURE_HAS_ALTIVEC) + ? __strchrnul_power8 : + (hwcap & PPC_FEATURE_ARCH_2_06) + ? __strchrnul_power7 + : __strchrnul_ppc); libc_hidden_def (__strchrnul) weak_alias (__strchrnul, strchrnul) -- 2.34.1