From patchwork Thu Oct 26 19:06:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 117273 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp1127864qgn; Thu, 26 Oct 2017 12:11:32 -0700 (PDT) X-Google-Smtp-Source: ABhQp+QxwnZ9WQMWJMV6kV59ndSSPGMhNUc+ep9IyOBzZIuIJZRWdLXzU8v9Ps0Xyj1PAVbj3T3h X-Received: by 10.99.97.67 with SMTP id v64mr5780898pgb.89.1509045091984; Thu, 26 Oct 2017 12:11:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509045091; cv=none; d=google.com; s=arc-20160816; b=pT7SQPHSq7Q3BeKyF6TZ/uBxUaqNs8YEaeYEEjUYOEhARlDC1FMQ3t/Uu9XhtQQMGx 35Z1hyfdvpjn+P/OZ3dzHr3n42F1Fau1Jk4voQeT+mOgQHfrITZCTx3BIOkBhEIqeOgJ Dgnzfj80QD+nRTMTXotVB1dym9AI2zJEhqfXIcVTgDav3BrKDqk80NuYKaFdmUQBPkw1 +uJneNetnJxH9xI2amLje5GZNhKFr+lxFn8J0dmyiRrSySV0VOcKBigxpQy0zHFQ1t4g KgcDsOxvbfDnXnl7uhTriIBEHZmpntPfzGlIZudJD0y4Enr3tep7jyzStfzSsgWZaoum a+nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from:delivered-to :sender:list-help:list-post:list-archive:list-subscribe :list-unsubscribe:list-id:precedence:mailing-list:dkim-signature :domainkey-signature:arc-authentication-results; bh=G/57Zxy5K1EMUEIcU/LEJIxb3C5RgmzGfrMQQa059PU=; b=qH6ZRIyk0JShKAR1OEGmR4wy2kutBVskcICJfdCJoIcI2SBEIsWgYsUXRlFP57jZLI ZA8BXfzaadmmyQhzfvWg9RZdxRtov7jXIp7x2orlHNXJTUOQ7IffUoD9vvcEIEMGVOyV 1rXOd+dkYbkUSG1k6fGPqfBOirYFAD0f7vimF1dYb2ClFC9U+qErEtWHbf6UtLCLiz+J PcgC88J4Q8IPQWcHTl3QCsT87POC1vcae3yeie9LADKbgY+k0LHpxP8q+3SSaoKRvveO VjrUgyTOtyEYzYa10kyveM83lQ+oXcpdkbYNnfIoZR+Si7uKwQxymZEmsyfoDJdHjD/x n+KQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=eDtP+L2F; spf=pass (google.com: domain of libc-alpha-return-86423-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-86423-patch=linaro.org@sourceware.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id x11si3752152pgq.460.2017.10.26.12.11.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Oct 2017 12:11:31 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-86423-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=eDtP+L2F; spf=pass (google.com: domain of libc-alpha-return-86423-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-86423-patch=linaro.org@sourceware.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=OOxWnk/dwN4Zb+UT1wgk0Z0In9Ld1WB z7OFZ+MbH8EmDmMulbRBYTsxmUfTflX0e3NYMplkYXCgASa8f2sn8n8L2FacX2UC x/WJzDKN5fEwxKCmHZURftdbf/qBm98WMYUEIXUDej9otWZ68IvZw67mn/qJKBZP P4Gpla/btDJw= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=gvLRjyCVo2Nd/OjIASQo/4t+miM=; b=eDtP+ L2FzkgUJWEDnU6VYWaBs6W+KB7GK7GZAJjcW43WW7I0wC3/pYZ7JKruoCSbV7boi EoKQK6BSEn+4Y5RUUgTYpjeAVranektQj6eqJAyzJ+7zOWhBDSo421YkSEEJq1t/ HE/PFXnIght8DC7KH9hT/0ZblLb0HOG6+9bW8w= Received: (qmail 100331 invoked by alias); 26 Oct 2017 19:07:35 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 100243 invoked by uid 89); 26 Oct 2017 19:07:34 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-qk0-f194.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=G/57Zxy5K1EMUEIcU/LEJIxb3C5RgmzGfrMQQa059PU=; b=f1hU8t7Pgp/eWDYE699xt7W+PSAJgofG8ZRd0c/RuT77DT8tFA0jILNjVeHo3IWPRT 5D2THpgLRownmhYgbzBrqOjOarZOcne8fDDT7GIqdaP6adCnaBPFmsQZ+hTZf+UfPq9N 3ZPhgvmeH8xNUypGr64+CiTstws1wmDZeFqnOCrRfIJzFMyCWQfZMBaK14WLKHi18D8R gAG4L0fSpEVGz7/3ZRDCVK455j4qqAF5MiUH96cwgnnprHGm2gUuddD0B98SBdeCE0Vl CxMpsmKaV5D9mCUZnoQEUbYYl/7oZpQj3aunzkcoStOqTEwXNaGs8W4gurtekKd9eY/e hsWw== X-Gm-Message-State: AMCzsaUkx4dkmQ7y9mgUef9xmDX+nLkMTQhB+Rll3TYIqhqK+TRm66if 2mlWa/KXZoi8Fr5pZfjH6F6/3h384F0= X-Received: by 10.55.190.193 with SMTP id o184mr9349516qkf.88.1509044850257; Thu, 26 Oct 2017 12:07:30 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 21/25] sparc: refactor sparc32 rint{f} selector to C Date: Thu, 26 Oct 2017 17:06:49 -0200 Message-Id: <1509044813-9951-22-git-send-email-adhemerval.zanella@linaro.org> In-Reply-To: <1509044813-9951-1-git-send-email-adhemerval.zanella@linaro.org> References: <1509044813-9951-1-git-send-email-adhemerval.zanella@linaro.org> This patch refactors the sparc32 ifunc selector to a C implementation. Also, the generic symbol is moved to its own implementation file s_rint{f}-generic.S). Checked on sparc64-linux-gnu and sparcv9-linux-gnu. * sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile (libm-sysdep_routines): Add s_rintf-generic and s_rint-generic. * sysdeps/sparc/sparcv9/fpu/multiarch/s_rint-generic.S: New file. * sysdeps/sparc32/sparcv9/fpu/multiarch/s_rint.c: Likewise. * sysdeps/sparc32/sparcv9/fpu/multiarch/s_rintf-generic.S: Likewise. * sysdeps/sparc32/sparcv9/fpu/multiarch/s_rintf.c: Likewise. * sysdeps/sparc32/sparcv9/fpu/multiarch/s_rint.S: Remove file. * sysdeps/sparc32/sparcv9/fpu/multiarch/s_rintf.S: Likewise. Signed-off-by: Adhemerval Zanella --- ChangeLog | 11 +++++++ .../sparc/sparc32/sparcv9/fpu/multiarch/Makefile | 3 +- .../sparc32/sparcv9/fpu/multiarch/s_rint-generic.S | 8 +++++ .../sparc/sparc32/sparcv9/fpu/multiarch/s_rint.S | 19 ------------ .../sparc/sparc32/sparcv9/fpu/multiarch/s_rint.c | 35 ++++++++++++++++++++++ .../sparcv9/fpu/multiarch/s_rintf-generic.S | 4 +++ .../sparc/sparc32/sparcv9/fpu/multiarch/s_rintf.S | 12 -------- .../sparc/sparc32/sparcv9/fpu/multiarch/s_rintf.c | 29 ++++++++++++++++++ 8 files changed, 89 insertions(+), 32 deletions(-) create mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rint-generic.S delete mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rint.S create mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rint.c create mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rintf-generic.S delete mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rintf.S create mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rintf.c -- 2.7.4 diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile index 5b6e2a6..459c0e5 100644 --- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile @@ -10,7 +10,8 @@ sysdep_routines += $(sysdep_calls) libm-sysdep_routines += s_fabs-vis3 s_fabsf-vis3 s_fabs-generic \ s_fabsf-generic s_llrintf-vis3 s_llrint-vis3 \ s_llrintf-generic s_llrint-generic \ - s_rintf-vis3 s_rint-vis3 \ + s_rintf-vis3 s_rint-vis3 s_rintf-generic \ + s_rint-generic \ s_fmaf-vis3 s_fma-vis3 s_fma-generic s_fmaf-generic \ s_nearbyint-vis3 s_nearbyintf-vis3 \ s_fdimf-vis3 s_fdim-vis3 s_fdim-generic \ diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rint-generic.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rint-generic.S new file mode 100644 index 0000000..9709b1e --- /dev/null +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rint-generic.S @@ -0,0 +1,8 @@ +#include + +#define __rint __rint_generic +#undef weak_alias +#define weak_alias(a, b) +#undef compat_symbol +#define compat_symbol(a, b, c, d) +#include diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rint.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rint.S deleted file mode 100644 index de893fa..0000000 --- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rint.S +++ /dev/null @@ -1,19 +0,0 @@ -#include -#include - -SPARC_ASM_VIS3_IFUNC(rint) - -weak_alias (__rint, rint) - -#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0) -compat_symbol (libm, __rint, rintl, GLIBC_2_0) -#endif - -# undef weak_alias -# define weak_alias(a, b) -# undef compat_symbol -# define compat_symbol(a, b, c, d) - -#define __rint __rint_generic - -#include "../s_rint.S" diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rint.c b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rint.c new file mode 100644 index 0000000..b6714e6 --- /dev/null +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rint.c @@ -0,0 +1,35 @@ +/* rint ifunc resolver, Linux/sparc32 version. + Copyright (C) 2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#define __rint __redirect_rint +#include +#undef __rint +#include +#include + +extern __typeof (__redirect_rint) __rint_vis3 attribute_hidden; +extern __typeof (__redirect_rint) __rint_generic attribute_hidden; + +sparc_libm_ifunc_redirected (__redirect_rint, __rint, + hwcap & HWCAP_SPARC_VIS3 + ? __rint_vis3 + : __rint_generic); +weak_alias (__rint, rint) +#if LONG_DOUBLE_COMPAT (libm, GLIBC_2_0) +compat_symbol (libm, __rint, rintl, GLIBC_2_0); +#endif diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rintf-generic.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rintf-generic.S new file mode 100644 index 0000000..185ba6b --- /dev/null +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rintf-generic.S @@ -0,0 +1,4 @@ +#define __rintf __rintf_generic +#undef weak_alias +#define weak_alias(a, b) +#include diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rintf.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rintf.S deleted file mode 100644 index 38fd936..0000000 --- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rintf.S +++ /dev/null @@ -1,12 +0,0 @@ -#include - -SPARC_ASM_VIS3_IFUNC(rintf) - -weak_alias (__rintf, rintf) - -# undef weak_alias -# define weak_alias(a, b) - -#define __rintf __rintf_generic - -#include "../s_rintf.S" diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rintf.c b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rintf.c new file mode 100644 index 0000000..bfe35d5 --- /dev/null +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rintf.c @@ -0,0 +1,29 @@ +/* rintf ifunc resolver, Linux/sparc32 version. + Copyright (C) 2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include + +extern __typeof (rintf) __rintf_vis3 attribute_hidden; +extern __typeof (rintf) __rintf_generic attribute_hidden; + +sparc_libm_ifunc (__rintf, + hwcap & HWCAP_SPARC_VIS3 + ? __rintf_vis3 + : __rintf_generic); +weak_alias (__rintf, rintf)