math: Remove the SVID error handling wrapper from yn/jn

Tested on x86_64-linux-gnu and i686-linux-gnu.

Reviewed-by: Wilco Dijkstra  <Wilco.Dijkstra@arm.com>

math/Versions

@@ -695,8 +695,10 @@ libm {
     coshf;
     j0f;
     j1f;
+    jnf;
     log10f;
     y0f;
     y1f;
+    ynf;
   }
 }

math/w_jnf_compat.c

@@ -22,10 +22,10 @@
 #include <libm-alias-float.h>
 
 
-#if LIBM_SVID_COMPAT
+#if LIBM_SVID_COMPAT && SHLIB_COMPAT (libm, GLIBC_2_0, GLIBC_2_43)
 /* wrapper jnf */
 float
-__jnf (int n, float x)
+__jnf_svid (int n, float x)
 {
   if (__builtin_expect (isgreater (fabsf (x),
 				   AS_FLOAT_CONSTANT (X_TLOSS)), 0)
@@ -35,12 +35,12 @@ __jnf (int n, float x)
 
   return __ieee754_jnf (n, x);
 }
-libm_alias_float (__jn, jn)
+compat_symbol (libm, __jnf_svid, jnf, GLIBC_2_0);
 
 
 /* wrapper ynf */
 float
-__ynf (int n, float x)
+__ynf_svid (int n, float x)
 {
   if (__builtin_expect (islessequal (x, 0.0f)
 			|| isgreater (x, AS_FLOAT_CONSTANT (X_TLOSS)), 0)
@@ -65,5 +65,5 @@ __ynf (int n, float x)
 
   return __ieee754_ynf (n, x);
 }
-libm_alias_float (__yn, yn)
+compat_symbol (libm, __ynf_svid, ynf, GLIBC_2_0);
 #endif

sysdeps/ieee754/flt-32/e_jnf.c

@@ -20,6 +20,9 @@
 #include <fenv_private.h>
 #include <math-underflow.h>
 #include <libm-alias-finite.h>
+#include <libm-alias-float.h>
+#include <math-svid-compat.h>
+#include "math_config.h"
 
 static const float
 two   =  2.0000000000e+00, /* 0x40000000 */
@@ -28,7 +31,7 @@ one   =  1.0000000000e+00; /* 0x3F800000 */
 static const float zero  =  0.0000000000e+00;
 
 float
-__ieee754_jnf(int n, float x)
+__jnf(int n, float x)
 {
     float ret;
     {
@@ -182,10 +185,17 @@ __ieee754_jnf(int n, float x)
 	math_check_force_underflow (ret);
     return ret;
 }
+strong_alias (__jnf, __ieee754_jnf)
+#if LIBM_SVID_COMPAT
+versioned_symbol (libm, __jnf, jnf, GLIBC_2_43);
+libm_alias_float_other (__jn, jn)
+#else
+libm_alias_float (__jn, jn)
+#endif
 libm_alias_finite (__ieee754_jnf, __jnf)
 
 float
-__ieee754_ynf(int n, float x)
+__ynf(int n, float x)
 {
     float ret;
     {
@@ -197,16 +207,21 @@ __ieee754_ynf(int n, float x)
 	GET_FLOAT_WORD(hx,x);
 	ix = 0x7fffffff&hx;
     /* if Y(n,NaN) is NaN */
-	if(__builtin_expect(ix>0x7f800000, 0)) return x+x;
+	if(ix>=0x7f800000)
+	  {
+	    if (hx==0xFF800000)
+	      return __math_invalidf (1);
+	    return one/(x+x*x);
+	  }
 	sign = 1;
 	if(n<0){
 		n = -n;
 		sign = 1 - ((n&1)<<1);
 	}
 	if(n==0) return(__ieee754_y0f(x));
-	if(__builtin_expect(ix==0, 0))
+	if(ix==0)
-		return -sign/zero;
+		return __math_divzerof (sign == 1 ? 1 : 0);
-	if(__builtin_expect(hx<0, 0)) return zero/(zero*x);
+	if(hx<0) return __math_invalidf (x);
 	SET_RESTORE_ROUNDF (FE_TONEAREST);
 	if(n==1) {
 	    ret = sign*__ieee754_y1f(x);
@@ -235,4 +250,11 @@ __ieee754_ynf(int n, float x)
 	ret = copysignf (FLT_MAX, ret) * FLT_MAX;
     return ret;
 }
+strong_alias (__ynf, __ieee754_ynf)
+#if LIBM_SVID_COMPAT
+versioned_symbol (libm, __ynf, ynf, GLIBC_2_43);
+libm_alias_float_other (__yn, yn)
+#else
+libm_alias_float (__yn, yn)
+#endif
 libm_alias_finite (__ieee754_ynf, __ynf)

sysdeps/ieee754/flt-32/w_jnf.c

@@ -0,0 +1 @@
+/* Not needed */

sysdeps/mach/hurd/i386/libm.abilist

@@ -1326,6 +1326,8 @@ GLIBC_2.43 fmod F
 GLIBC_2.43 fmodf F
 GLIBC_2.43 j0f F
 GLIBC_2.43 j1f F
+GLIBC_2.43 jnf F
 GLIBC_2.43 log10f F
 GLIBC_2.43 y0f F
 GLIBC_2.43 y1f F
+GLIBC_2.43 ynf F

sysdeps/unix/sysv/linux/aarch64/libm.abilist

@@ -1292,6 +1292,8 @@ GLIBC_2.43 atanhf F
 GLIBC_2.43 coshf F
 GLIBC_2.43 j0f F
 GLIBC_2.43 j1f F
+GLIBC_2.43 jnf F
 GLIBC_2.43 log10f F
 GLIBC_2.43 y0f F
 GLIBC_2.43 y1f F
+GLIBC_2.43 ynf F

sysdeps/unix/sysv/linux/alpha/libm.abilist

@@ -1451,6 +1451,8 @@ GLIBC_2.43 atanhf F
 GLIBC_2.43 coshf F
 GLIBC_2.43 j0f F
 GLIBC_2.43 j1f F
+GLIBC_2.43 jnf F
 GLIBC_2.43 log10f F
 GLIBC_2.43 y0f F
 GLIBC_2.43 y1f F
+GLIBC_2.43 ynf F

sysdeps/unix/sysv/linux/arm/be/libm.abilist

@@ -957,6 +957,8 @@ GLIBC_2.43 atanhf F
 GLIBC_2.43 coshf F
 GLIBC_2.43 j0f F
 GLIBC_2.43 j1f F
+GLIBC_2.43 jnf F
 GLIBC_2.43 log10f F
 GLIBC_2.43 y0f F
 GLIBC_2.43 y1f F
+GLIBC_2.43 ynf F

sysdeps/unix/sysv/linux/arm/le/libm.abilist

@@ -957,6 +957,8 @@ GLIBC_2.43 atanhf F
 GLIBC_2.43 coshf F
 GLIBC_2.43 j0f F
 GLIBC_2.43 j1f F
+GLIBC_2.43 jnf F
 GLIBC_2.43 log10f F
 GLIBC_2.43 y0f F
 GLIBC_2.43 y1f F
+GLIBC_2.43 ynf F

sysdeps/unix/sysv/linux/hppa/libm.abilist

@@ -957,6 +957,8 @@ GLIBC_2.43 atanhf F
 GLIBC_2.43 coshf F
 GLIBC_2.43 j0f F
 GLIBC_2.43 j1f F
+GLIBC_2.43 jnf F
 GLIBC_2.43 log10f F
 GLIBC_2.43 y0f F
 GLIBC_2.43 y1f F
+GLIBC_2.43 ynf F

sysdeps/unix/sysv/linux/i386/libm.abilist

@@ -1333,6 +1333,8 @@ GLIBC_2.43 fmod F
 GLIBC_2.43 fmodf F
 GLIBC_2.43 j0f F
 GLIBC_2.43 j1f F
+GLIBC_2.43 jnf F
 GLIBC_2.43 log10f F
 GLIBC_2.43 y0f F
 GLIBC_2.43 y1f F
+GLIBC_2.43 ynf F

sysdeps/unix/sysv/linux/m68k/coldfire/libm.abilist

@@ -957,6 +957,8 @@ GLIBC_2.43 atanhf F
 GLIBC_2.43 coshf F
 GLIBC_2.43 j0f F
 GLIBC_2.43 j1f F
+GLIBC_2.43 jnf F
 GLIBC_2.43 log10f F
 GLIBC_2.43 y0f F
 GLIBC_2.43 y1f F
+GLIBC_2.43 ynf F

sysdeps/unix/sysv/linux/m68k/m680x0/libm.abilist

@@ -991,5 +991,7 @@ GLIBC_2.43 fmod F
 GLIBC_2.43 fmodf F
 GLIBC_2.43 j0f F
 GLIBC_2.43 j1f F
+GLIBC_2.43 jnf F
 GLIBC_2.43 y0f F
 GLIBC_2.43 y1f F
+GLIBC_2.43 ynf F

sysdeps/unix/sysv/linux/microblaze/be/libm.abilist

@@ -957,6 +957,8 @@ GLIBC_2.43 atanhf F
 GLIBC_2.43 coshf F
 GLIBC_2.43 j0f F
 GLIBC_2.43 j1f F
+GLIBC_2.43 jnf F
 GLIBC_2.43 log10f F
 GLIBC_2.43 y0f F
 GLIBC_2.43 y1f F
+GLIBC_2.43 ynf F

sysdeps/unix/sysv/linux/microblaze/le/libm.abilist

@@ -957,6 +957,8 @@ GLIBC_2.43 atanhf F
 GLIBC_2.43 coshf F
 GLIBC_2.43 j0f F
 GLIBC_2.43 j1f F
+GLIBC_2.43 jnf F
 GLIBC_2.43 log10f F
 GLIBC_2.43 y0f F
 GLIBC_2.43 y1f F
+GLIBC_2.43 ynf F

sysdeps/unix/sysv/linux/mips/mips32/libm.abilist

@@ -957,6 +957,8 @@ GLIBC_2.43 atanhf F
 GLIBC_2.43 coshf F
 GLIBC_2.43 j0f F
 GLIBC_2.43 j1f F
+GLIBC_2.43 jnf F
 GLIBC_2.43 log10f F
 GLIBC_2.43 y0f F
 GLIBC_2.43 y1f F
+GLIBC_2.43 ynf F

sysdeps/unix/sysv/linux/mips/mips64/libm.abilist

@@ -1292,6 +1292,8 @@ GLIBC_2.43 atanhf F
 GLIBC_2.43 coshf F
 GLIBC_2.43 j0f F
 GLIBC_2.43 j1f F
+GLIBC_2.43 jnf F
 GLIBC_2.43 log10f F
 GLIBC_2.43 y0f F
 GLIBC_2.43 y1f F
+GLIBC_2.43 ynf F

sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libm.abilist

@@ -1104,6 +1104,8 @@ GLIBC_2.43 atanhf F
 GLIBC_2.43 coshf F
 GLIBC_2.43 j0f F
 GLIBC_2.43 j1f F
+GLIBC_2.43 jnf F
 GLIBC_2.43 log10f F
 GLIBC_2.43 y0f F
 GLIBC_2.43 y1f F
+GLIBC_2.43 ynf F

sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libm.abilist

@@ -1103,6 +1103,8 @@ GLIBC_2.43 atanhf F
 GLIBC_2.43 coshf F
 GLIBC_2.43 j0f F
 GLIBC_2.43 j1f F
+GLIBC_2.43 jnf F
 GLIBC_2.43 log10f F
 GLIBC_2.43 y0f F
 GLIBC_2.43 y1f F
+GLIBC_2.43 ynf F

sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libm.abilist

@@ -1097,6 +1097,8 @@ GLIBC_2.43 atanhf F
 GLIBC_2.43 coshf F
 GLIBC_2.43 j0f F
 GLIBC_2.43 j1f F
+GLIBC_2.43 jnf F
 GLIBC_2.43 log10f F
 GLIBC_2.43 y0f F
 GLIBC_2.43 y1f F
+GLIBC_2.43 ynf F

sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libm.abilist

@@ -1481,6 +1481,8 @@ GLIBC_2.43 atanhf F
 GLIBC_2.43 coshf F
 GLIBC_2.43 j0f F
 GLIBC_2.43 j1f F
+GLIBC_2.43 jnf F
 GLIBC_2.43 log10f F
 GLIBC_2.43 y0f F
 GLIBC_2.43 y1f F
+GLIBC_2.43 ynf F

sysdeps/unix/sysv/linux/s390/s390-32/libm.abilist

@@ -1395,6 +1395,8 @@ GLIBC_2.43 atanhf F
 GLIBC_2.43 coshf F
 GLIBC_2.43 j0f F
 GLIBC_2.43 j1f F
+GLIBC_2.43 jnf F
 GLIBC_2.43 log10f F
 GLIBC_2.43 y0f F
 GLIBC_2.43 y1f F
+GLIBC_2.43 ynf F

sysdeps/unix/sysv/linux/s390/s390-64/libm.abilist

@@ -1395,6 +1395,8 @@ GLIBC_2.43 atanhf F
 GLIBC_2.43 coshf F
 GLIBC_2.43 j0f F
 GLIBC_2.43 j1f F
+GLIBC_2.43 jnf F
 GLIBC_2.43 log10f F
 GLIBC_2.43 y0f F
 GLIBC_2.43 y1f F
+GLIBC_2.43 ynf F

sysdeps/unix/sysv/linux/sh/be/libm.abilist

@@ -957,6 +957,8 @@ GLIBC_2.43 atanhf F
 GLIBC_2.43 coshf F
 GLIBC_2.43 j0f F
 GLIBC_2.43 j1f F
+GLIBC_2.43 jnf F
 GLIBC_2.43 log10f F
 GLIBC_2.43 y0f F
 GLIBC_2.43 y1f F
+GLIBC_2.43 ynf F

sysdeps/unix/sysv/linux/sh/le/libm.abilist

@@ -957,6 +957,8 @@ GLIBC_2.43 atanhf F
 GLIBC_2.43 coshf F
 GLIBC_2.43 j0f F
 GLIBC_2.43 j1f F
+GLIBC_2.43 jnf F
 GLIBC_2.43 log10f F
 GLIBC_2.43 y0f F
 GLIBC_2.43 y1f F
+GLIBC_2.43 ynf F

sysdeps/unix/sysv/linux/sparc/sparc32/libm.abilist

@@ -1402,6 +1402,8 @@ GLIBC_2.43 atanhf F
 GLIBC_2.43 coshf F
 GLIBC_2.43 j0f F
 GLIBC_2.43 j1f F
+GLIBC_2.43 jnf F
 GLIBC_2.43 log10f F
 GLIBC_2.43 y0f F
 GLIBC_2.43 y1f F
+GLIBC_2.43 ynf F

sysdeps/unix/sysv/linux/sparc/sparc64/libm.abilist

@@ -1292,6 +1292,8 @@ GLIBC_2.43 atanhf F
 GLIBC_2.43 coshf F
 GLIBC_2.43 j0f F
 GLIBC_2.43 j1f F
+GLIBC_2.43 jnf F
 GLIBC_2.43 log10f F
 GLIBC_2.43 y0f F
 GLIBC_2.43 y1f F
+GLIBC_2.43 ynf F

sysdeps/unix/sysv/linux/x86_64/64/libm.abilist

@@ -1325,6 +1325,8 @@ GLIBC_2.43 atanhf F
 GLIBC_2.43 coshf F
 GLIBC_2.43 j0f F
 GLIBC_2.43 j1f F
+GLIBC_2.43 jnf F
 GLIBC_2.43 log10f F
 GLIBC_2.43 y0f F
 GLIBC_2.43 y1f F
+GLIBC_2.43 ynf F

sysdeps/unix/sysv/linux/x86_64/x32/libm.abilist

@@ -1325,6 +1325,8 @@ GLIBC_2.43 atanhf F
 GLIBC_2.43 coshf F
 GLIBC_2.43 j0f F
 GLIBC_2.43 j1f F
+GLIBC_2.43 jnf F
 GLIBC_2.43 log10f F
 GLIBC_2.43 y0f F
 GLIBC_2.43 y1f F
+GLIBC_2.43 ynf F