diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | sysdeps/sparc/sparc64/multiarch/Makefile | 3 | ||||
| -rw-r--r-- | sysdeps/sparc/sparc64/multiarch/mul_1-generic.S | 2 | ||||
| -rw-r--r-- | sysdeps/sparc/sparc64/multiarch/mul_1.S | 56 | ||||
| -rw-r--r-- | sysdeps/sparc/sparc64/multiarch/mul_1.c | 28 |
5 files changed, 40 insertions, 57 deletions
@@ -1,3 +1,11 @@ +2017-11-30 Adhemerval Zanella <adhemerval.zanella@linaro.org> + + * sysdeps/sparc/sparc64/multiarch/Makefile (sysdep_routines): + Add mul_1-generic. + * sysdeps/sparc/sparc64/multiarch/mul_1-generic.S: New file. + * sysdeps/sparc/sparc64/multiarch/mul_1.c: Likewise. + * sysdeps/sparc/sparc64/multiarch/mul_1.S: Remove file. + 2017-11-30 Mike FABIAN <mfabian@redhat.com> According to CLDR, collation rules for Serbian and Bosnian diff --git a/sysdeps/sparc/sparc64/multiarch/Makefile b/sysdeps/sparc/sparc64/multiarch/Makefile index 6e90cba..2338213 100644 --- a/sysdeps/sparc/sparc64/multiarch/Makefile +++ b/sysdeps/sparc/sparc64/multiarch/Makefile @@ -13,7 +13,8 @@ sysdep_routines += memcpy-ultra3 memcpy-niagara1 memcpy-niagara2 \ endif ifeq ($(subdir),stdlib) -sysdep_routines += mul_1-vis3 addmul_1-vis3 submul_1-vis3 add_n-vis3 sub_n-vis3 +sysdep_routines += mul_1-vis3 mul_1-generic addmul_1-vis3 submul_1-vis3 \ + add_n-vis3 sub_n-vis3 endif ifeq ($(subdir),math) diff --git a/sysdeps/sparc/sparc64/multiarch/mul_1-generic.S b/sysdeps/sparc/sparc64/multiarch/mul_1-generic.S new file mode 100644 index 0000000..f1b7e60 --- /dev/null +++ b/sysdeps/sparc/sparc64/multiarch/mul_1-generic.S @@ -0,0 +1,2 @@ +#define __mpn_mul_1 __mpn_mul_1_generic +#include <sysdeps/sparc/sparc64/mul_1.S> diff --git a/sysdeps/sparc/sparc64/multiarch/mul_1.S b/sysdeps/sparc/sparc64/multiarch/mul_1.S deleted file mode 100644 index 75fca93..0000000 --- a/sysdeps/sparc/sparc64/multiarch/mul_1.S +++ /dev/null @@ -1,56 +0,0 @@ -/* Multiple versions of mul_1 - - Copyright (C) 2013-2017 Free Software Foundation, Inc. - Contributed by David S. Miller (davem@davemloft.net) - 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 - <http://www.gnu.org/licenses/>. */ - -#include <sysdep.h> - -ENTRY(__mpn_mul_1) - .type __mpn_mul_1, @gnu_indirect_function -# ifdef SHARED - SETUP_PIC_REG_LEAF(o3, o5) -# endif - set HWCAP_SPARC_VIS3, %o1 - andcc %o0, %o1, %g0 - be 1f - nop -# ifdef SHARED - sethi %gdop_hix22(__mpn_mul_1_vis3), %o1 - xor %o1, %gdop_lox10(__mpn_mul_1_vis3), %o1 -# else - set __mpn_mul_1_vis3, %o1 -# endif - ba 10f - nop -1: -# ifdef SHARED - sethi %gdop_hix22(__mpn_mul_1_generic), %o1 - xor %o1, %gdop_lox10(__mpn_mul_1_generic), %o1 -# else - set __mpn_mul_1_generic, %o1 -# endif -10: -# ifdef SHARED - add %o3, %o1, %o1 -# endif - retl - mov %o1, %o0 -END(__mpn_mul_1) - -#define __mpn_mul_1 __mpn_mul_1_generic -#include "../mul_1.S" diff --git a/sysdeps/sparc/sparc64/multiarch/mul_1.c b/sysdeps/sparc/sparc64/multiarch/mul_1.c new file mode 100644 index 0000000..6f5571e --- /dev/null +++ b/sysdeps/sparc/sparc64/multiarch/mul_1.c @@ -0,0 +1,28 @@ +/* __mpn_mul_1 ifunc resolver, Linux/sparc64 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 + <http://www.gnu.org/licenses/>. */ + +#include <gmp.h> +#include <sparc-ifunc.h> + +extern __typeof (mpn_mul_1) __mpn_mul_1_vis3 attribute_hidden; +extern __typeof (mpn_mul_1) __mpn_mul_1_generic attribute_hidden; + +sparc_libm_ifunc (__mpn_mul_1, + hwcap & HWCAP_SPARC_VIS3 + ? __mpn_mul_1_vis3 + : __mpn_mul_1_generic) |