From 3e5efdbdbef923276f3113a5bc52e0b46aabac57 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 30 Nov 2017 00:30:40 +0000 Subject: Use libm_alias_float for sparc. Continuing the preparation for additional _FloatN / _FloatNx function aliases, this patch makes sparc libm function implementations use libm_alias_float to define function aliases. Tested with build-many-glibcs.py for all its sparc configurations that installed stripped shared libraries are unchanged by the patch. * sysdeps/sparc/sparc32/fpu/s_copysignf.S: Include . (copysignf): Define using libm_alias_float. * sysdeps/sparc/sparc32/fpu/s_fabsf.S: Include . (fabsf): Define using libm_alias_float. * sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysignf.S: Include . (copysignf): Define using libm_alias_float. * sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fabsf.S: Include . (fabsf): Define using libm_alias_float. * sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdimf.c: Include . (fdimf): Define using libm_alias_float. * sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fmaf.c: Include . (fmaf): Define using libm_alias_float. * sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrintf.S: Include . (llrintf): Define using libm_alias_float. * sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_nearbyintf.S: Include . (nearbyintf): Define using libm_alias_float. * sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rintf.S: Include . (rintf): Define using libm_alias_float. * sysdeps/sparc/sparc32/sparcv9/fpu/s_llrintf.S: Include . (llrintf): Define using libm_alias_float. * sysdeps/sparc/sparc32/sparcv9/fpu/s_lrintf.S: Include . (lrintf): Define using libm_alias_float. * sysdeps/sparc/sparc32/sparcv9/fpu/s_nearbyintf.S: Include . (nearbyintf): Define using libm_alias_float. * sysdeps/sparc/sparc32/sparcv9/fpu/s_rintf.S: Include . (rintf): Define using libm_alias_float. * sysdeps/sparc/sparc64/fpu/multiarch/s_ceilf.c: Include . (ceilf): Define using libm_alias_float. * sysdeps/sparc/sparc64/fpu/multiarch/s_floorf.c: Include . (floorf): Define using libm_alias_float. * sysdeps/sparc/sparc64/fpu/multiarch/s_fmaf.c: Include . (fmaf): Define using libm_alias_float. * sysdeps/sparc/sparc64/fpu/multiarch/s_lrintf.c: Include . (lrintf): Define using libm_alias_float. (llrintf): Likewise. * sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf.c: Include . (nearbyintf): Define using libm_alias_float. * sysdeps/sparc/sparc64/fpu/multiarch/s_rintf.c: Include . (rintf): Define using libm_alias_float. * sysdeps/sparc/sparc64/fpu/multiarch/s_truncf.c: Include . (truncf): Define using libm_alias_float. * sysdeps/sparc/sparc64/fpu/s_copysignf.S: Include . (copysignf): Define using libm_alias_float. * sysdeps/sparc/sparc64/fpu/s_fabsf.c: Include . (fabsf): Define using libm_alias_float. * sysdeps/sparc/sparc64/fpu/s_lrintf.S: Include . (lrintf): Define using libm_alias_float. (llrintf): Likewise. * sysdeps/sparc/sparc64/fpu/s_nearbyintf.S: Include . (nearbyintf): Define using libm_alias_float. * sysdeps/sparc/sparc64/fpu/s_rintf.S: Include . (rintf): Define using libm_alias_float. --- sysdeps/sparc/sparc32/fpu/s_copysignf.S | 3 ++- sysdeps/sparc/sparc32/fpu/s_fabsf.S | 3 ++- sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysignf.S | 3 ++- sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fabsf.S | 3 ++- sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdimf.c | 3 ++- sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fmaf.c | 3 ++- sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrintf.S | 3 ++- sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_nearbyintf.S | 3 ++- sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rintf.S | 3 ++- sysdeps/sparc/sparc32/sparcv9/fpu/s_llrintf.S | 3 ++- sysdeps/sparc/sparc32/sparcv9/fpu/s_lrintf.S | 3 ++- sysdeps/sparc/sparc32/sparcv9/fpu/s_nearbyintf.S | 3 ++- sysdeps/sparc/sparc32/sparcv9/fpu/s_rintf.S | 3 ++- 13 files changed, 26 insertions(+), 13 deletions(-) (limited to 'sysdeps/sparc/sparc32') diff --git a/sysdeps/sparc/sparc32/fpu/s_copysignf.S b/sysdeps/sparc/sparc32/fpu/s_copysignf.S index f2e78962a9..895de9a42e 100644 --- a/sysdeps/sparc/sparc32/fpu/s_copysignf.S +++ b/sysdeps/sparc/sparc32/fpu/s_copysignf.S @@ -18,6 +18,7 @@ . */ #include +#include ENTRY (__copysignf) sethi %hi(0x80000000), %g1 @@ -28,4 +29,4 @@ ENTRY (__copysignf) retl ld [%sp + 68], %f0 END (__copysignf) -weak_alias (__copysignf, copysignf) \ No newline at end of file +libm_alias_float (__copysign, copysign) diff --git a/sysdeps/sparc/sparc32/fpu/s_fabsf.S b/sysdeps/sparc/sparc32/fpu/s_fabsf.S index 12ac9de5c8..a6ea8450e6 100644 --- a/sysdeps/sparc/sparc32/fpu/s_fabsf.S +++ b/sysdeps/sparc/sparc32/fpu/s_fabsf.S @@ -18,6 +18,7 @@ . */ #include +#include ENTRY (__fabsf) st %o0, [%sp+68] @@ -25,4 +26,4 @@ ENTRY (__fabsf) retl fabss %f0, %f0 END (__fabsf) -weak_alias (__fabsf, fabsf) +libm_alias_float (__fabs, fabs) diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysignf.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysignf.S index cd409550de..ebb32c7726 100644 --- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysignf.S +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysignf.S @@ -1,8 +1,9 @@ #include +#include SPARC_ASM_VIS3_IFUNC(copysignf) -weak_alias (__copysignf, copysignf) +libm_alias_float (__copysign, copysign) # undef weak_alias # define weak_alias(a, b) diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fabsf.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fabsf.S index 0f2e11e01f..628486a113 100644 --- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fabsf.S +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fabsf.S @@ -1,8 +1,9 @@ #include +#include SPARC_ASM_VIS3_IFUNC(fabsf) -weak_alias (__fabsf, fabsf) +libm_alias_float (__fabs, fabs) # undef weak_alias # define weak_alias(a, b) diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdimf.c b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdimf.c index ced459383b..4bc83706d2 100644 --- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdimf.c +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdimf.c @@ -18,9 +18,10 @@ #include #include +#include extern float __fdimf_vis3 (float, float); extern float __fdimf_generic (float, float); sparc_libm_ifunc(__fdimf, hwcap & HWCAP_SPARC_VIS3 ? __fdimf_vis3 : __fdimf_generic); -weak_alias (__fdimf, fdimf) +libm_alias_float (__fdim, fdim) diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fmaf.c b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fmaf.c index 5357b47a9a..e82c4a4031 100644 --- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fmaf.c +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fmaf.c @@ -1,8 +1,9 @@ #include #include +#include extern float __fmaf_vis3 (float, float, float); extern float __fmaf_generic (float, float, float); sparc_libm_ifunc(__fmaf, hwcap & HWCAP_SPARC_FMAF ? __fmaf_vis3 : __fmaf_generic); -weak_alias (__fmaf, fmaf) +libm_alias_float (__fma, fma) diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrintf.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrintf.S index 8af5244e7e..31b44f3e3f 100644 --- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrintf.S +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_llrintf.S @@ -1,8 +1,9 @@ #include +#include SPARC_ASM_VIS3_IFUNC(llrintf) -weak_alias (__llrintf, llrintf) +libm_alias_float (__llrint, llrint) strong_alias (__llrintf, __lllrintf) weak_alias (__lllrintf, lllrintf) diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_nearbyintf.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_nearbyintf.S index 95100c1bfc..113db1dec4 100644 --- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_nearbyintf.S +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_nearbyintf.S @@ -1,8 +1,9 @@ #include +#include SPARC_ASM_VIS3_IFUNC(nearbyintf) -weak_alias (__nearbyintf, nearbyintf) +libm_alias_float (__nearbyint, nearbyint) # undef weak_alias # define weak_alias(a, b) diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rintf.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rintf.S index 38fd936086..99892806c5 100644 --- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rintf.S +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_rintf.S @@ -1,8 +1,9 @@ #include +#include SPARC_ASM_VIS3_IFUNC(rintf) -weak_alias (__rintf, rintf) +libm_alias_float (__rint, rint) # undef weak_alias # define weak_alias(a, b) diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/s_llrintf.S b/sysdeps/sparc/sparc32/sparcv9/fpu/s_llrintf.S index cda284b124..e3dc97c19d 100644 --- a/sysdeps/sparc/sparc32/sparcv9/fpu/s_llrintf.S +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/s_llrintf.S @@ -18,6 +18,7 @@ . */ #include +#include /* We pop constants into the FPU registers using the incoming argument stack slots, since this avoid having to use any PIC @@ -59,4 +60,4 @@ ENTRY (__llrintf) retl ldd [%sp + 72], %o0 END (__llrintf) -weak_alias (__llrintf, llrintf) +libm_alias_float (__llrint, llrint) diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/s_lrintf.S b/sysdeps/sparc/sparc32/sparcv9/fpu/s_lrintf.S index a242b755d0..c466b6fc8f 100644 --- a/sysdeps/sparc/sparc32/sparcv9/fpu/s_lrintf.S +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/s_lrintf.S @@ -18,6 +18,7 @@ . */ #include +#include /* We pop constants into the FPU registers using the incoming argument stack slots, since this avoid having to use any PIC @@ -59,4 +60,4 @@ ENTRY (__lrintf) retl ld [%sp + 68], %o0 END (__lrintf) -weak_alias (__lrintf, lrintf) +libm_alias_float (__lrint, lrint) diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/s_nearbyintf.S b/sysdeps/sparc/sparc32/sparcv9/fpu/s_nearbyintf.S index 1e65c79ee6..02bb19e09c 100644 --- a/sysdeps/sparc/sparc32/sparcv9/fpu/s_nearbyintf.S +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/s_nearbyintf.S @@ -20,6 +20,7 @@ . */ #include +#include /* We pop constants into the FPU registers using the incoming argument stack slots, since this avoid having to use any PIC @@ -62,4 +63,4 @@ ENTRY (__nearbyintf) retl ld [%sp + 88], %fsr END (__nearbyintf) -weak_alias (__nearbyintf, nearbyintf) +libm_alias_float (__nearbyint, nearbyint) diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/s_rintf.S b/sysdeps/sparc/sparc32/sparcv9/fpu/s_rintf.S index dfdae9dcdd..06caf52e42 100644 --- a/sysdeps/sparc/sparc32/sparcv9/fpu/s_rintf.S +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/s_rintf.S @@ -18,6 +18,7 @@ . */ #include +#include /* We pop constants into the FPU registers using the incoming argument stack slots, since this avoid having to use any PIC @@ -56,4 +57,4 @@ ENTRY (__rintf) retl fors %f0, SIGN_BIT, %f0 END (__rintf) -weak_alias (__rintf, rintf) +libm_alias_float (__rint, rint) -- cgit 1.4.1