Create a header for sparc ifunc expansion and use it for VIS3 ifuncs.

	* sysdeps/sparc/sparc-ifunc.h: New file.
	* sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_ceil.S: Use sparc-ifunc.h
	* sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_ceilf.S: Likewise.
	* sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysign.S: Likewise.
	* sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysignf.S: Likewise.
	* sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fabs.S: Likewise.
	* sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fabsf.S: Likewise.
	* sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_floor.S: Likewise.
	* sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_floorf.S: Likewise.
	* sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fmax.S: Likewise.
	* sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fmaxf.S: Likewise.
	* sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fmin.S: Likewise.
	* sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fminf.S: Likewise.
	* sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrint.S: Likewise.
	* sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrintf.S: Likewise.
	* sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rint.S: Likewise.
	* sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rintf.S: Likewise.
	* sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrt.S: Likewise.
	* sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/w_sqrtf.S: Likewise.
	* sysdeps/sparc/sparc64/fpu/multiarch/s_ceil.S: Likewise.
	* sysdeps/sparc/sparc64/fpu/multiarch/s_ceilf.S: Likewise.
	* sysdeps/sparc/sparc64/fpu/multiarch/s_finite.S: Likewise.
	* sysdeps/sparc/sparc64/fpu/multiarch/s_finitef.S: Likewise.
	* sysdeps/sparc/sparc64/fpu/multiarch/s_floor.S: Likewise.
	* sysdeps/sparc/sparc64/fpu/multiarch/s_floorf.S: Likewise.
	* sysdeps/sparc/sparc64/fpu/multiarch/s_fmax.S: Likewise.
	* sysdeps/sparc/sparc64/fpu/multiarch/s_fmaxf.S: Likewise.
	* sysdeps/sparc/sparc64/fpu/multiarch/s_fmin.S: Likewise.
	* sysdeps/sparc/sparc64/fpu/multiarch/s_fminf.S: Likewise.
	* sysdeps/sparc/sparc64/fpu/multiarch/s_isinf.S: Likewise.
	* sysdeps/sparc/sparc64/fpu/multiarch/s_isinff.S: Likewise.
	* sysdeps/sparc/sparc64/fpu/multiarch/s_isnan.S: Likewise.
	* sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf.S: Likewise.
	* sysdeps/sparc/sparc64/fpu/multiarch/s_lrint.S: Likewise.
	* sysdeps/sparc/sparc64/fpu/multiarch/s_lrintf.S: Likewise.
	* sysdeps/sparc/sparc64/fpu/multiarch/s_rint.S: Likewise.
	* sysdeps/sparc/sparc64/fpu/multiarch/s_rintf.S: Likewise.
	* sysdeps/sparc/sparc64/fpu/multiarch/s_signbit.S: Likewise.
	* sysdeps/sparc/sparc64/fpu/multiarch/s_signbitf.S: Likewise.

20 files changed, 60 insertions, 740 deletions

diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_ceil.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_ceil.S
index f91fda61b9..fa4c7c353f 100644
--- a/sysdeps/sparc/sparc64/fpu/multiarch/s_ceil.S
+++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_ceil.S
@@ -1,41 +1,7 @@
-#include <sysdep.h>
+#include <sparc-ifunc.h>
+
+SPARC_ASM_VIS3_IFUNC(ceil)
 
-	.text
-ENTRY(__ceil)
-	.type	__ceil, @gnu_indirect_function
-# ifdef SHARED
-	SETUP_PIC_REG_LEAF(o3, o5)
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-	set	HWCAP_SPARC_VIS3, %o1
-	andcc	%o0, %o1, %g0
-	be	9f
-	 nop
-#  ifdef SHARED
-	sethi	%gdop_hix22(__ceil_vis3), %o1
-	xor	%o1, %gdop_lox10(__ceil_vis3), %o1
-#  else
-	set	__ceil_vis3, %o1
-#  endif
-	ba	10f
-	 nop
-9:
-# endif
-# ifdef SHARED
-	sethi	%gdop_hix22(__ceil_generic), %o1
-	xor	%o1, %gdop_lox10(__ceil_generic), %o1
-# else
-	set	__ceil_generic, %o1
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-10:
-# endif
-# ifdef SHARED
-	add	%o3, %o1, %o1
-# endif
-	retl
-	 mov	%o1, %o0
-END(__ceil)
 weak_alias (__ceil, ceil)
 
 # undef weak_alias
diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_ceilf.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_ceilf.S
index 048b6195d8..3047dd8faa 100644
--- a/sysdeps/sparc/sparc64/fpu/multiarch/s_ceilf.S
+++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_ceilf.S
@@ -1,41 +1,7 @@
-#include <sysdep.h>
+#include <sparc-ifunc.h>
+
+SPARC_ASM_VIS3_IFUNC(ceilf)
 
-	.text
-ENTRY(__ceilf)
-	.type	__ceilf, @gnu_indirect_function
-# ifdef SHARED
-	SETUP_PIC_REG_LEAF(o3, o5)
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-	set	HWCAP_SPARC_VIS3, %o1
-	andcc	%o0, %o1, %g0
-	be	9f
-	 nop
-#  ifdef SHARED
-	sethi	%gdop_hix22(__ceilf_vis3), %o1
-	xor	%o1, %gdop_lox10(__ceilf_vis3), %o1
-#  else
-	set	__ceilf_vis3, %o1
-#  endif
-	ba	10f
-	 nop
-9:
-# endif
-# ifdef SHARED
-	sethi	%gdop_hix22(__ceilf_generic), %o1
-	xor	%o1, %gdop_lox10(__ceilf_generic), %o1
-# else
-	set	__ceilf_generic, %o1
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-10:
-# endif
-# ifdef SHARED
-	add	%o3, %o1, %o1
-# endif
-	retl
-	 mov	%o1, %o0
-END(__ceilf)
 weak_alias (__ceilf, ceilf)
 
 # undef weak_alias
diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_finite.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_finite.S
index f4bfdcef96..78406a62b1 100644
--- a/sysdeps/sparc/sparc64/fpu/multiarch/s_finite.S
+++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_finite.S
@@ -1,41 +1,7 @@
-#include <sysdep.h>
+#include <sparc-ifunc.h>
+
+SPARC_ASM_VIS3_IFUNC(finite)
 
-	.text
-ENTRY(__finite)
-	.type	__finite, @gnu_indirect_function
-# ifdef SHARED
-	SETUP_PIC_REG_LEAF(o3, o5)
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-	set	HWCAP_SPARC_VIS3, %o1
-	andcc	%o0, %o1, %g0
-	be	9f
-	 nop
-#  ifdef SHARED
-	sethi	%gdop_hix22(__finite_vis3), %o1
-	xor	%o1, %gdop_lox10(__finite_vis3), %o1
-#  else
-	set	__finite_vis3, %o1
-#  endif
-	ba	10f
-	 nop
-9:
-# endif
-# ifdef SHARED
-	sethi	%gdop_hix22(__finite_generic), %o1
-	xor	%o1, %gdop_lox10(__finite_generic), %o1
-# else
-	set	__finite_generic, %o1
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-10:
-# endif
-# ifdef SHARED
-	add	%o3, %o1, %o1
-# endif
-	retl
-	 mov	%o1, %o0
-END(__finite)
 hidden_def (__finite)
 weak_alias (__finite, finite)
 
diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_finitef.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_finitef.S
index 65ca7fd1c6..cafd41fd92 100644
--- a/sysdeps/sparc/sparc64/fpu/multiarch/s_finitef.S
+++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_finitef.S
@@ -1,41 +1,7 @@
-#include <sysdep.h>
+#include <sparc-ifunc.h>
+
+SPARC_ASM_VIS3_IFUNC(finitef)
 
-	.text
-ENTRY(__finitef)
-	.type	__finitef, @gnu_indirect_function
-# ifdef SHARED
-	SETUP_PIC_REG_LEAF(o3, o5)
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-	set	HWCAP_SPARC_VIS3, %o1
-	andcc	%o0, %o1, %g0
-	be	9f
-	 nop
-#  ifdef SHARED
-	sethi	%gdop_hix22(__finitef_vis3), %o1
-	xor	%o1, %gdop_lox10(__finitef_vis3), %o1
-#  else
-	set	__finitef_vis3, %o1
-#  endif
-	ba	10f
-	 nop
-9:
-# endif
-# ifdef SHARED
-	sethi	%gdop_hix22(__finitef_generic), %o1
-	xor	%o1, %gdop_lox10(__finitef_generic), %o1
-# else
-	set	__finitef_generic, %o1
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-10:
-# endif
-# ifdef SHARED
-	add	%o3, %o1, %o1
-# endif
-	retl
-	 mov	%o1, %o0
-END(__finitef)
 hidden_def (__finitef)
 weak_alias (__finitef, finitef)
 
diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_floor.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_floor.S
index 1cdc53fb84..6ae9947a7a 100644
--- a/sysdeps/sparc/sparc64/fpu/multiarch/s_floor.S
+++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_floor.S
@@ -1,41 +1,7 @@
-#include <sysdep.h>
+#include <sparc-ifunc.h>
+
+SPARC_ASM_VIS3_IFUNC(floor)
 
-	.text
-ENTRY(__floor)
-	.type	__floor, @gnu_indirect_function
-# ifdef SHARED
-	SETUP_PIC_REG_LEAF(o3, o5)
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-	set	HWCAP_SPARC_VIS3, %o1
-	andcc	%o0, %o1, %g0
-	be	9f
-	 nop
-#  ifdef SHARED
-	sethi	%gdop_hix22(__floor_vis3), %o1
-	xor	%o1, %gdop_lox10(__floor_vis3), %o1
-#  else
-	set	__floor_vis3, %o1
-#  endif
-	ba	10f
-	 nop
-9:
-# endif
-# ifdef SHARED
-	sethi	%gdop_hix22(__floor_generic), %o1
-	xor	%o1, %gdop_lox10(__floor_generic), %o1
-# else
-	set	__floor_generic, %o1
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-10:
-# endif
-# ifdef SHARED
-	add	%o3, %o1, %o1
-# endif
-	retl
-	 mov	%o1, %o0
-END(__floor)
 weak_alias (__floor, floor)
 
 # undef weak_alias
diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_floorf.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_floorf.S
index 0dcd0e1431..31cda385b7 100644
--- a/sysdeps/sparc/sparc64/fpu/multiarch/s_floorf.S
+++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_floorf.S
@@ -1,41 +1,7 @@
-#include <sysdep.h>
+#include <sparc-ifunc.h>
+
+SPARC_ASM_VIS3_IFUNC(floorf)
 
-	.text
-ENTRY(__floorf)
-	.type	__floorf, @gnu_indirect_function
-# ifdef SHARED
-	SETUP_PIC_REG_LEAF(o3, o5)
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-	set	HWCAP_SPARC_VIS3, %o1
-	andcc	%o0, %o1, %g0
-	be	9f
-	 nop
-#  ifdef SHARED
-	sethi	%gdop_hix22(__floorf_vis3), %o1
-	xor	%o1, %gdop_lox10(__floorf_vis3), %o1
-#  else
-	set	__floorf_vis3, %o1
-#  endif
-	ba	10f
-	 nop
-9:
-# endif
-# ifdef SHARED
-	sethi	%gdop_hix22(__floorf_generic), %o1
-	xor	%o1, %gdop_lox10(__floorf_generic), %o1
-# else
-	set	__floorf_generic, %o1
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-10:
-# endif
-# ifdef SHARED
-	add	%o3, %o1, %o1
-# endif
-	retl
-	 mov	%o1, %o0
-END(__floorf)
 weak_alias (__floorf, floorf)
 
 # undef weak_alias
diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_fmax.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_fmax.S
index f604f5b533..d5e59d8d1e 100644
--- a/sysdeps/sparc/sparc64/fpu/multiarch/s_fmax.S
+++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_fmax.S
@@ -1,41 +1,7 @@
-#include <sysdep.h>
+#include <sparc-ifunc.h>
+
+SPARC_ASM_VIS3_IFUNC(fmax)
 
-	.text
-ENTRY(__fmax)
-	.type	__fmax, @gnu_indirect_function
-# ifdef SHARED
-	SETUP_PIC_REG_LEAF(o3, o5)
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-	set	HWCAP_SPARC_VIS3, %o1
-	andcc	%o0, %o1, %g0
-	be	9f
-	 nop
-#  ifdef SHARED
-	sethi	%gdop_hix22(__fmax_vis3), %o1
-	xor	%o1, %gdop_lox10(__fmax_vis3), %o1
-#  else
-	set	__fmax_vis3, %o1
-#  endif
-	ba	10f
-	 nop
-9:
-# endif
-# ifdef SHARED
-	sethi	%gdop_hix22(__fmax_generic), %o1
-	xor	%o1, %gdop_lox10(__fmax_generic), %o1
-# else
-	set	__fmax_generic, %o1
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-10:
-# endif
-# ifdef SHARED
-	add	%o3, %o1, %o1
-# endif
-	retl
-	 mov	%o1, %o0
-END(__fmax)
 weak_alias (__fmax, fmax)
 
 # undef weak_alias
diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_fmaxf.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_fmaxf.S
index c188f8e568..daa91579c4 100644
--- a/sysdeps/sparc/sparc64/fpu/multiarch/s_fmaxf.S
+++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_fmaxf.S
@@ -1,41 +1,7 @@
-#include <sysdep.h>
+#include <sparc-ifunc.h>
+
+SPARC_ASM_VIS3_IFUNC(fmaxf)
 
-	.text
-ENTRY(__fmaxf)
-	.type	__fmaxf, @gnu_indirect_function
-# ifdef SHARED
-	SETUP_PIC_REG_LEAF(o3, o5)
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-	set	HWCAP_SPARC_VIS3, %o1
-	andcc	%o0, %o1, %g0
-	be	9f
-	 nop
-#  ifdef SHARED
-	sethi	%gdop_hix22(__fmaxf_vis3), %o1
-	xor	%o1, %gdop_lox10(__fmaxf_vis3), %o1
-#  else
-	set	__fmaxf_vis3, %o1
-#  endif
-	ba	10f
-	 nop
-9:
-# endif
-# ifdef SHARED
-	sethi	%gdop_hix22(__fmaxf_generic), %o1
-	xor	%o1, %gdop_lox10(__fmaxf_generic), %o1
-# else
-	set	__fmaxf_generic, %o1
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-10:
-# endif
-# ifdef SHARED
-	add	%o3, %o1, %o1
-# endif
-	retl
-	 mov	%o1, %o0
-END(__fmaxf)
 weak_alias (__fmaxf, fmaxf)
 
 # undef weak_alias
diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_fmin.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_fmin.S
index ed7018b58b..b2aec1bbc0 100644
--- a/sysdeps/sparc/sparc64/fpu/multiarch/s_fmin.S
+++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_fmin.S
@@ -1,41 +1,7 @@
-#include <sysdep.h>
+#include <sparc-ifunc.h>
+
+SPARC_ASM_VIS3_IFUNC(fmin)
 
-	.text
-ENTRY(__fmin)
-	.type	__fmin, @gnu_indirect_function
-# ifdef SHARED
-	SETUP_PIC_REG_LEAF(o3, o5)
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-	set	HWCAP_SPARC_VIS3, %o1
-	andcc	%o0, %o1, %g0
-	be	9f
-	 nop
-#  ifdef SHARED
-	sethi	%gdop_hix22(__fmin_vis3), %o1
-	xor	%o1, %gdop_lox10(__fmin_vis3), %o1
-#  else
-	set	__fmin_vis3, %o1
-#  endif
-	ba	10f
-	 nop
-9:
-# endif
-# ifdef SHARED
-	sethi	%gdop_hix22(__fmin_generic), %o1
-	xor	%o1, %gdop_lox10(__fmin_generic), %o1
-# else
-	set	__fmin_generic, %o1
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-10:
-# endif
-# ifdef SHARED
-	add	%o3, %o1, %o1
-# endif
-	retl
-	 mov	%o1, %o0
-END(__fmin)
 weak_alias (__fmin, fmin)
 
 # undef weak_alias
diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_fminf.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_fminf.S
index 6c7a4928c1..c4690e1df9 100644
--- a/sysdeps/sparc/sparc64/fpu/multiarch/s_fminf.S
+++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_fminf.S
@@ -1,41 +1,7 @@
-#include <sysdep.h>
+#include <sparc-ifunc.h>
+
+SPARC_ASM_VIS3_IFUNC(fminf)
 
-	.text
-ENTRY(__fminf)
-	.type	__fminf, @gnu_indirect_function
-# ifdef SHARED
-	SETUP_PIC_REG_LEAF(o3, o5)
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-	set	HWCAP_SPARC_VIS3, %o1
-	andcc	%o0, %o1, %g0
-	be	9f
-	 nop
-#  ifdef SHARED
-	sethi	%gdop_hix22(__fminf_vis3), %o1
-	xor	%o1, %gdop_lox10(__fminf_vis3), %o1
-#  else
-	set	__fminf_vis3, %o1
-#  endif
-	ba	10f
-	 nop
-9:
-# endif
-# ifdef SHARED
-	sethi	%gdop_hix22(__fminf_generic), %o1
-	xor	%o1, %gdop_lox10(__fminf_generic), %o1
-# else
-	set	__fminf_generic, %o1
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-10:
-# endif
-# ifdef SHARED
-	add	%o3, %o1, %o1
-# endif
-	retl
-	 mov	%o1, %o0
-END(__fminf)
 weak_alias (__fminf, fminf)
 
 # undef weak_alias
diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_isinf.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_isinf.S
index 8b47267f6b..ed9b62640d 100644
--- a/sysdeps/sparc/sparc64/fpu/multiarch/s_isinf.S
+++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_isinf.S
@@ -1,41 +1,7 @@
-#include <sysdep.h>
+#include <sparc-ifunc.h>
+
+SPARC_ASM_VIS3_IFUNC(isinf)
 
-	.text
-ENTRY(__isinf)
-	.type	__isinf, @gnu_indirect_function
-# ifdef SHARED
-	SETUP_PIC_REG_LEAF(o3, o5)
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-	set	HWCAP_SPARC_VIS3, %o1
-	andcc	%o0, %o1, %g0
-	be	9f
-	 nop
-#  ifdef SHARED
-	sethi	%gdop_hix22(__isinf_vis3), %o1
-	xor	%o1, %gdop_lox10(__isinf_vis3), %o1
-#  else
-	set	__isinf_vis3, %o1
-#  endif
-	ba	10f
-	 nop
-9:
-# endif
-# ifdef SHARED
-	sethi	%gdop_hix22(__isinf_generic), %o1
-	xor	%o1, %gdop_lox10(__isinf_generic), %o1
-# else
-	set	__isinf_generic, %o1
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-10:
-# endif
-# ifdef SHARED
-	add	%o3, %o1, %o1
-# endif
-	retl
-	 mov	%o1, %o0
-END(__isinf)
 hidden_def (__isinf)
 weak_alias (__isinf, isinf)
 
diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_isinff.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_isinff.S
index 9a42a01d40..04517398f8 100644
--- a/sysdeps/sparc/sparc64/fpu/multiarch/s_isinff.S
+++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_isinff.S
@@ -1,41 +1,7 @@
-#include <sysdep.h>
+#include <sparc-ifunc.h>
+
+SPARC_ASM_VIS3_IFUNC(isinff)
 
-	.text
-ENTRY(__isinff)
-	.type	__isinff, @gnu_indirect_function
-# ifdef SHARED
-	SETUP_PIC_REG_LEAF(o3, o5)
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-	set	HWCAP_SPARC_VIS3, %o1
-	andcc	%o0, %o1, %g0
-	be	9f
-	 nop
-#  ifdef SHARED
-	sethi	%gdop_hix22(__isinff_vis3), %o1
-	xor	%o1, %gdop_lox10(__isinff_vis3), %o1
-#  else
-	set	__isinff_vis3, %o1
-#  endif
-	ba	10f
-	 nop
-9:
-# endif
-# ifdef SHARED
-	sethi	%gdop_hix22(__isinff_generic), %o1
-	xor	%o1, %gdop_lox10(__isinff_generic), %o1
-# else
-	set	__isinff_generic, %o1
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-10:
-# endif
-# ifdef SHARED
-	add	%o3, %o1, %o1
-# endif
-	retl
-	 mov	%o1, %o0
-END(__isinff)
 hidden_def (__isinff)
 weak_alias (__isinff, isinff)
 
diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_isnan.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_isnan.S
index d75077cfec..40e985a5d4 100644
--- a/sysdeps/sparc/sparc64/fpu/multiarch/s_isnan.S
+++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_isnan.S
@@ -1,41 +1,7 @@
-#include <sysdep.h>
+#include <sparc-ifunc.h>
+
+SPARC_ASM_VIS3_IFUNC(isnan)
 
-	.text
-ENTRY(__isnan)
-	.type	__isnan, @gnu_indirect_function
-# ifdef SHARED
-	SETUP_PIC_REG_LEAF(o3, o5)
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-	set	HWCAP_SPARC_VIS3, %o1
-	andcc	%o0, %o1, %g0
-	be	9f
-	 nop
-#  ifdef SHARED
-	sethi	%gdop_hix22(__isnan_vis3), %o1
-	xor	%o1, %gdop_lox10(__isnan_vis3), %o1
-#  else
-	set	__isnan_vis3, %o1
-#  endif
-	ba	10f
-	 nop
-9:
-# endif
-# ifdef SHARED
-	sethi	%gdop_hix22(__isnan_generic), %o1
-	xor	%o1, %gdop_lox10(__isnan_generic), %o1
-# else
-	set	__isnan_generic, %o1
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-10:
-# endif
-# ifdef SHARED
-	add	%o3, %o1, %o1
-# endif
-	retl
-	 mov	%o1, %o0
-END(__isnan)
 hidden_def (__isnan)
 weak_alias (__isnan, isnan)
 
diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf.S
index 6d11dd4b4e..6b53b69d2e 100644
--- a/sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf.S
+++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_isnanf.S
@@ -1,41 +1,7 @@
-#include <sysdep.h>
+#include <sparc-ifunc.h>
+
+SPARC_ASM_VIS3_IFUNC(isnanf)
 
-	.text
-ENTRY(__isnanf)
-	.type	__isnanf, @gnu_indirect_function
-# ifdef SHARED
-	SETUP_PIC_REG_LEAF(o3, o5)
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-	set	HWCAP_SPARC_VIS3, %o1
-	andcc	%o0, %o1, %g0
-	be	9f
-	 nop
-#  ifdef SHARED
-	sethi	%gdop_hix22(__isnanf_vis3), %o1
-	xor	%o1, %gdop_lox10(__isnanf_vis3), %o1
-#  else
-	set	__isnanf_vis3, %o1
-#  endif
-	ba	10f
-	 nop
-9:
-# endif
-# ifdef SHARED
-	sethi	%gdop_hix22(__isnanf_generic), %o1
-	xor	%o1, %gdop_lox10(__isnanf_generic), %o1
-# else
-	set	__isnanf_generic, %o1
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-10:
-# endif
-# ifdef SHARED
-	add	%o3, %o1, %o1
-# endif
-	retl
-	 mov	%o1, %o0
-END(__isnanf)
 hidden_def (__isnanf)
 weak_alias (__isnanf, isnanf)
 
diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_lrint.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_lrint.S
index e63e83343b..94af8f028c 100644
--- a/sysdeps/sparc/sparc64/fpu/multiarch/s_lrint.S
+++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_lrint.S
@@ -1,41 +1,7 @@
-#include <sysdep.h>
+#include <sparc-ifunc.h>
+
+SPARC_ASM_VIS3_IFUNC(lrint)
 
-	.text
-ENTRY(__lrint)
-	.type	__lrint, @gnu_indirect_function
-# ifdef SHARED
-	SETUP_PIC_REG_LEAF(o3, o5)
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-	set	HWCAP_SPARC_VIS3, %o1
-	andcc	%o0, %o1, %g0
-	be	9f
-	 nop
-#  ifdef SHARED
-	sethi	%gdop_hix22(__lrint_vis3), %o1
-	xor	%o1, %gdop_lox10(__lrint_vis3), %o1
-#  else
-	set	__lrint_vis3, %o1
-#  endif
-	ba	10f
-	 nop
-9:
-# endif
-# ifdef SHARED
-	sethi	%gdop_hix22(__lrint_generic), %o1
-	xor	%o1, %gdop_lox10(__lrint_generic), %o1
-# else
-	set	__lrint_generic, %o1
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-10:
-# endif
-# ifdef SHARED
-	add	%o3, %o1, %o1
-# endif
-	retl
-	 mov	%o1, %o0
-END(__lrint)
 weak_alias (__lrint, lrint)
 
 strong_alias (__lrint, __llrint)
diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_lrintf.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_lrintf.S
index 809aaa8a14..e6ea4061c3 100644
--- a/sysdeps/sparc/sparc64/fpu/multiarch/s_lrintf.S
+++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_lrintf.S
@@ -1,41 +1,7 @@
-#include <sysdep.h>
+#include <sparc-ifunc.h>
+
+SPARC_ASM_VIS3_IFUNC(lrintf)
 
-	.text
-ENTRY(__lrintf)
-	.type	__lrintf, @gnu_indirect_function
-# ifdef SHARED
-	SETUP_PIC_REG_LEAF(o3, o5)
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-	set	HWCAP_SPARC_VIS3, %o1
-	andcc	%o0, %o1, %g0
-	be	9f
-	 nop
-#  ifdef SHARED
-	sethi	%gdop_hix22(__lrintf_vis3), %o1
-	xor	%o1, %gdop_lox10(__lrintf_vis3), %o1
-#  else
-	set	__lrintf_vis3, %o1
-#  endif
-	ba	10f
-	 nop
-9:
-# endif
-# ifdef SHARED
-	sethi	%gdop_hix22(__lrintf_generic), %o1
-	xor	%o1, %gdop_lox10(__lrintf_generic), %o1
-# else
-	set	__lrintf_generic, %o1
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-10:
-# endif
-# ifdef SHARED
-	add	%o3, %o1, %o1
-# endif
-	retl
-	 mov	%o1, %o0
-END(__lrintf)
 weak_alias (__lrintf, lrintf)
 
 strong_alias (__lrintf, __llrintf)
diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_rint.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_rint.S
index 3872ae299e..cc980eb8c7 100644
--- a/sysdeps/sparc/sparc64/fpu/multiarch/s_rint.S
+++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_rint.S
@@ -1,41 +1,7 @@
-#include <sysdep.h>
+#include <sparc-ifunc.h>
+
+SPARC_ASM_VIS3_IFUNC(rint)
 
-	.text
-ENTRY(__rint)
-	.type	__rint, @gnu_indirect_function
-# ifdef SHARED
-	SETUP_PIC_REG_LEAF(o3, o5)
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-	set	HWCAP_SPARC_VIS3, %o1
-	andcc	%o0, %o1, %g0
-	be	9f
-	 nop
-#  ifdef SHARED
-	sethi	%gdop_hix22(__rint_vis3), %o1
-	xor	%o1, %gdop_lox10(__rint_vis3), %o1
-#  else
-	set	__rint_vis3, %o1
-#  endif
-	ba	10f
-	 nop
-9:
-# endif
-# ifdef SHARED
-	sethi	%gdop_hix22(__rint_generic), %o1
-	xor	%o1, %gdop_lox10(__rint_generic), %o1
-# else
-	set	__rint_generic, %o1
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-10:
-# endif
-# ifdef SHARED
-	add	%o3, %o1, %o1
-# endif
-	retl
-	 mov	%o1, %o0
-END(__rint)
 weak_alias (__rint, rint)
 
 # undef weak_alias
diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_rintf.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_rintf.S
index 9918929220..38fd936086 100644
--- a/sysdeps/sparc/sparc64/fpu/multiarch/s_rintf.S
+++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_rintf.S
@@ -1,41 +1,7 @@
-#include <sysdep.h>
+#include <sparc-ifunc.h>
+
+SPARC_ASM_VIS3_IFUNC(rintf)
 
-	.text
-ENTRY(__rintf)
-	.type	__rintf, @gnu_indirect_function
-# ifdef SHARED
-	SETUP_PIC_REG_LEAF(o3, o5)
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-	set	HWCAP_SPARC_VIS3, %o1
-	andcc	%o0, %o1, %g0
-	be	9f
-	 nop
-#  ifdef SHARED
-	sethi	%gdop_hix22(__rintf_vis3), %o1
-	xor	%o1, %gdop_lox10(__rintf_vis3), %o1
-#  else
-	set	__rintf_vis3, %o1
-#  endif
-	ba	10f
-	 nop
-9:
-# endif
-# ifdef SHARED
-	sethi	%gdop_hix22(__rintf_generic), %o1
-	xor	%o1, %gdop_lox10(__rintf_generic), %o1
-# else
-	set	__rintf_generic, %o1
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-10:
-# endif
-# ifdef SHARED
-	add	%o3, %o1, %o1
-# endif
-	retl
-	 mov	%o1, %o0
-END(__rintf)
 weak_alias (__rintf, rintf)
 
 # undef weak_alias
diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_signbit.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_signbit.S
index a8e9728935..e69550c474 100644
--- a/sysdeps/sparc/sparc64/fpu/multiarch/s_signbit.S
+++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_signbit.S
@@ -1,41 +1,7 @@
-#include <sysdep.h>
+#include <sparc-ifunc.h>
+
+SPARC_ASM_VIS3_IFUNC(signbit)
 
-	.text
-ENTRY(__signbit)
-	.type	__signbit, @gnu_indirect_function
-# ifdef SHARED
-	SETUP_PIC_REG_LEAF(o3, o5)
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-	set	HWCAP_SPARC_VIS3, %o1
-	andcc	%o0, %o1, %g0
-	be	9f
-	 nop
-#  ifdef SHARED
-	sethi	%gdop_hix22(__signbit_vis3), %o1
-	xor	%o1, %gdop_lox10(__signbit_vis3), %o1
-#  else
-	set	__signbit_vis3, %o1
-#  endif
-	ba	10f
-	 nop
-9:
-# endif
-# ifdef SHARED
-	sethi	%gdop_hix22(__signbit_generic), %o1
-	xor	%o1, %gdop_lox10(__signbit_generic), %o1
-# else
-	set	__signbit_generic, %o1
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-10:
-# endif
-# ifdef SHARED
-	add	%o3, %o1, %o1
-# endif
-	retl
-	 mov	%o1, %o0
-END(__signbit)
 weak_alias (__signbit, signbit)
 
 /* On 64-bit the double version will also always work for
diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_signbitf.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_signbitf.S
index 721bc7fe4a..c35c79f88a 100644
--- a/sysdeps/sparc/sparc64/fpu/multiarch/s_signbitf.S
+++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_signbitf.S
@@ -1,41 +1,7 @@
-#include <sysdep.h>
+#include <sparc-ifunc.h>
+
+SPARC_ASM_VIS3_IFUNC(signbitf)
 
-	.text
-ENTRY(__signbitf)
-	.type	__signbitf, @gnu_indirect_function
-# ifdef SHARED
-	SETUP_PIC_REG_LEAF(o3, o5)
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-	set	HWCAP_SPARC_VIS3, %o1
-	andcc	%o0, %o1, %g0
-	be	9f
-	 nop
-#  ifdef SHARED
-	sethi	%gdop_hix22(__signbitf_vis3), %o1
-	xor	%o1, %gdop_lox10(__signbitf_vis3), %o1
-#  else
-	set	__signbitf_vis3, %o1
-#  endif
-	ba	10f
-	 nop
-9:
-# endif
-# ifdef SHARED
-	sethi	%gdop_hix22(__signbitf_generic), %o1
-	xor	%o1, %gdop_lox10(__signbitf_generic), %o1
-# else
-	set	__signbitf_generic, %o1
-# endif
-# ifdef HAVE_AS_VIS3_SUPPORT
-10:
-# endif
-# ifdef SHARED
-	add	%o3, %o1, %o1
-# endif
-	retl
-	 mov	%o1, %o0
-END(__signbitf)
 weak_alias (__signbitf, signbitf)
 
 # undef weak_alias