From patchwork Thu Oct 26 19:06:47 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: 23886 Received: (qmail 100215 invoked by alias); 26 Oct 2017 19:07:34 -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 99911 invoked by uid 89); 26 Oct 2017 19:07:31 -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-qt0-f193.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=KWzMuD5Wklm1AGHOpDMCWDD79K2I/WIPDAkjdyROcj0=; b=LAFSEJjEdX/sazNyVo0d4FRjUixDWp/1gsrMr2SlANagnp7qaMVhV2S4AaGMAGd2MY qLKKPuRw8wQ0RiTTSl/Sm/i/+OoEoCZZH1LNezvPxjEbCBtcAkDJ4xIOkLVyImwsBG5Z fOstwncmk24xH6DUHewt5Y4LbwrOCuc7oNluBsO5qDMqpQ5o58RdXd8Es/g+IE2QAS2l N2sB+Lu/hdGTW8wtecYrTF2fzoaGUiBk6bEZ8aTjoh1PwHFoayCxsI5Ko3HvGyOZEOKP bxIAIWb3un0lNiAqrIzsEHa0ckj3J7RuqWiWD/OdK4uyf+ebXdjlSaAUlduckuhtAUXa PKPA== X-Gm-Message-State: AMCzsaVMN2ZUHJ6QPMDfe2r9XMzKbO0Edj2VrRW7edMm3Xi136ZVvDvB sAk68d5yEAZP5F0cYTvMBzjmGy5GJTI= X-Google-Smtp-Source: ABhQp+QPyNNO0aTPrNHLXgaLyeyW+8rw0V86Poh6+WHO1sLKiR6o+tGmA6lwg7kxLb8/pHK+YTfO9Q== X-Received: by 10.200.4.130 with SMTP id s2mr37311141qtg.338.1509044847484; Thu, 26 Oct 2017 12:07:27 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 19/25] sparc: refactor sparc32 fabs{f} selector to C Date: Thu, 26 Oct 2017 17:06:47 -0200 Message-Id: <1509044813-9951-20-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_fabs{f}-generic.S). Checked on sparc64-linux-gnu and sparcv9-linux-gnu. * sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile (libm-sysdep_routines): Add s_fabsf-generic and s_fabs-generic. * sysdeps/sparc/sparcv9/fpu/multiarch/s_fabs-generic.S: New file. * sysdeps/sparc32/sparcv9/fpu/multiarch/s_fabs.c: Likewise. * sysdeps/sparc32/sparcv9/fpu/multiarch/s_fabsf-generic.S: Likewise. * sysdeps/sparc32/sparcv9/fpu/multiarch/s_fabsf.c: Likewise. * sysdeps/sparc32/sparcv9/fpu/multiarch/s_fabs.S: Remove file. * sysdeps/sparc32/sparcv9/fpu/multiarch/s_fabsf.S: Likewise. Signed-off-by: Adhemerval Zanella --- ChangeLog | 11 +++++++ .../sparc/sparc32/sparcv9/fpu/multiarch/Makefile | 3 +- .../sparc32/sparcv9/fpu/multiarch/s_fabs-generic.S | 8 +++++ .../sparc/sparc32/sparcv9/fpu/multiarch/s_fabs.S | 18 ----------- .../sparc/sparc32/sparcv9/fpu/multiarch/s_fabs.c | 35 ++++++++++++++++++++++ .../sparcv9/fpu/multiarch/s_fabsf-generic.S | 4 +++ .../sparc/sparc32/sparcv9/fpu/multiarch/s_fabsf.S | 12 -------- .../sparc/sparc32/sparcv9/fpu/multiarch/s_fabsf.c | 29 ++++++++++++++++++ 8 files changed, 89 insertions(+), 31 deletions(-) create mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fabs-generic.S delete mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fabs.S create mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fabs.c create mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fabsf-generic.S delete mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fabsf.S create mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fabsf.c diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile index b8d1126..bd8e341 100644 --- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile @@ -7,7 +7,8 @@ sysdep_calls := s_copysignf-vis3 s_copysign-vis3 s_copysignf-generic \ s_copysign-generic sysdep_routines += $(sysdep_calls) -libm-sysdep_routines += s_fabs-vis3 s_fabsf-vis3 s_llrintf-vis3 s_llrint-vis3 \ +libm-sysdep_routines += s_fabs-vis3 s_fabsf-vis3 s_fabs-generic \ + s_fabsf-generic s_llrintf-vis3 s_llrint-vis3 \ s_rintf-vis3 s_rint-vis3 \ s_fmaf-vis3 s_fma-vis3 s_fma-generic s_fmaf-generic \ s_nearbyint-vis3 s_nearbyintf-vis3 \ diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fabs-generic.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fabs-generic.S new file mode 100644 index 0000000..ddfdf4b --- /dev/null +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fabs-generic.S @@ -0,0 +1,8 @@ +#include + +#define __fabs __fabs_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_fabs.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fabs.S deleted file mode 100644 index 72cc08f..0000000 --- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fabs.S +++ /dev/null @@ -1,18 +0,0 @@ -#include -#include - -SPARC_ASM_VIS3_IFUNC(fabs) - -weak_alias (__fabs, fabs) -#if LONG_DOUBLE_COMPAT (libm, GLIBC_2_0) -compat_symbol (libm, __fabs, fabsl, GLIBC_2_0); -#endif - -# undef weak_alias -# define weak_alias(a, b) -# undef compat_symbol -# define compat_symbol(a, b, c, d) - -#define __fabs __fabs_generic - -#include "../s_fabs.S" diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fabs.c b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fabs.c new file mode 100644 index 0000000..58b0192 --- /dev/null +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fabs.c @@ -0,0 +1,35 @@ +/* fabs 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 __fabs __redirect_fabs +#include +#undef __fabs +#include +#include + +extern __typeof (__redirect_fabs) __fabs_vis3 attribute_hidden; +extern __typeof (__redirect_fabs) __fabs_generic attribute_hidden; + +sparc_libm_ifunc_redirected (__redirect_fabs, __fabs, + hwcap & HWCAP_SPARC_VIS3 + ? __fabs_vis3 + : __fabs_generic); +weak_alias (__fabs, fabs) +#if LONG_DOUBLE_COMPAT (libm, GLIBC_2_0) +compat_symbol (libm, __fabs, fabsl, GLIBC_2_0); +#endif diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fabsf-generic.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fabsf-generic.S new file mode 100644 index 0000000..1d55c95 --- /dev/null +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fabsf-generic.S @@ -0,0 +1,4 @@ +#define __fabsf __fabsf_generic +#undef weak_alias +#define weak_alias(a, b) +#include diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fabsf.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fabsf.S deleted file mode 100644 index 0f2e11e..0000000 --- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fabsf.S +++ /dev/null @@ -1,12 +0,0 @@ -#include - -SPARC_ASM_VIS3_IFUNC(fabsf) - -weak_alias (__fabsf, fabsf) - -# undef weak_alias -# define weak_alias(a, b) - -#define __fabsf __fabsf_generic - -#include "../../../fpu/s_fabsf.S" diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fabsf.c b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fabsf.c new file mode 100644 index 0000000..76711b9 --- /dev/null +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fabsf.c @@ -0,0 +1,29 @@ +/* fabsf 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 (fabsf) __fabsf_vis3 attribute_hidden; +extern __typeof (fabsf) __fabsf_generic attribute_hidden; + +sparc_libm_ifunc (__fabsf, + hwcap & HWCAP_SPARC_VIS3 + ? __fabsf_vis3 + : __fabsf_generic); +weak_alias (__fabsf, fabsf)