diff --git a/ChangeLog b/ChangeLog
index 489495b..dddb0ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-15  David S. Miller  <davem@davemloft.net>
+
+	* sysdeps/sparc/fpu/libm-test-ulps: Regenerate from scratch.
+
 2015-04-13  Stefan Liebler  <stli@linux.vnet.ibm.com>
 
 	[BZ #18206]
diff --git a/sysdeps/sparc/fpu/libm-test-ulps b/sysdeps/sparc/fpu/libm-test-ulps
index 5e555b1..08f6ec7 100644
--- a/sysdeps/sparc/fpu/libm-test-ulps
+++ b/sysdeps/sparc/fpu/libm-test-ulps
@@ -75,10 +75,6 @@ ifloat: 1
 ildouble: 1
 ldouble: 1
 
-Function: "asin_tonearest":
-ildouble: 1
-ldouble: 1
-
 Function: "asin_towardzero":
 double: 1
 float: 1
@@ -92,8 +88,8 @@ double: 1
 float: 1
 idouble: 1
 ifloat: 1
-ildouble: 2
-ldouble: 2
+ildouble: 1
+ldouble: 1
 
 Function: "asinh":
 double: 1
@@ -568,9 +564,7 @@ ildouble: 3
 ldouble: 3
 
 Function: Real part of "catan_upward":
-double: 1
 float: 1
-idouble: 1
 ifloat: 1
 ildouble: 1
 ldouble: 1
@@ -638,9 +632,7 @@ ildouble: 4
 ldouble: 4
 
 Function: Imaginary part of "catanh_upward":
-double: 1
 float: 1
-idouble: 1
 ifloat: 1
 ildouble: 1
 ldouble: 1
@@ -822,12 +814,12 @@ ildouble: 1
 ldouble: 1
 
 Function: Real part of "clog":
-double: 1
-float: 1
-idouble: 1
-ifloat: 1
-ildouble: 1
-ldouble: 1
+double: 2
+float: 2
+idouble: 2
+ifloat: 2
+ildouble: 2
+ldouble: 2
 
 Function: Imaginary part of "clog":
 float: 1
@@ -836,58 +828,58 @@ ildouble: 1
 ldouble: 1
 
 Function: Real part of "clog10":
-double: 2
+double: 3
 float: 2
-idouble: 2
+idouble: 3
 ifloat: 2
 ildouble: 2
 ldouble: 2
 
 Function: Imaginary part of "clog10":
-double: 1
-float: 1
-idouble: 1
-ifloat: 1
+double: 2
+float: 2
+idouble: 2
+ifloat: 2
 ildouble: 2
 ldouble: 2
 
 Function: Real part of "clog10_downward":
-double: 3
+double: 6
+float: 5
+idouble: 6
+ifloat: 5
+ildouble: 5
+ldouble: 5
+
+Function: Imaginary part of "clog10_downward":
+double: 2
 float: 3
-idouble: 3
+idouble: 2
 ifloat: 3
 ildouble: 3
 ldouble: 3
 
-Function: Imaginary part of "clog10_downward":
-double: 3
-float: 2
-idouble: 3
-ifloat: 2
-ildouble: 2
-ldouble: 2
-
 Function: Real part of "clog10_towardzero":
-double: 3
-float: 2
-idouble: 3
-ifloat: 2
-ildouble: 2
-ldouble: 2
+double: 4
+float: 3
+idouble: 4
+ifloat: 3
+ildouble: 5
+ldouble: 5
 
 Function: Imaginary part of "clog10_towardzero":
-double: 3
-float: 2
-idouble: 3
-ifloat: 2
+double: 2
+float: 4
+idouble: 2
+ifloat: 4
 ildouble: 3
 ldouble: 3
 
 Function: Real part of "clog10_upward":
-double: 4
-float: 3
-idouble: 4
-ifloat: 3
+double: 6
+float: 5
+idouble: 6
+ifloat: 5
 ildouble: 4
 ldouble: 4
 
@@ -900,12 +892,12 @@ ildouble: 3
 ldouble: 3
 
 Function: Real part of "clog_downward":
-double: 2
-float: 2
-idouble: 2
-ifloat: 2
-ildouble: 2
-ldouble: 2
+double: 4
+float: 5
+idouble: 4
+ifloat: 5
+ildouble: 5
+ldouble: 5
 
 Function: Imaginary part of "clog_downward":
 double: 1
@@ -916,12 +908,12 @@ ildouble: 2
 ldouble: 2
 
 Function: Real part of "clog_towardzero":
-double: 2
-float: 2
-idouble: 2
-ifloat: 2
-ildouble: 2
-ldouble: 2
+double: 7
+float: 5
+idouble: 7
+ifloat: 5
+ildouble: 5
+ldouble: 5
 
 Function: Imaginary part of "clog_towardzero":
 double: 1
@@ -932,17 +924,17 @@ ildouble: 2
 ldouble: 2
 
 Function: Real part of "clog_upward":
-double: 2
-float: 2
-idouble: 2
-ifloat: 2
-ildouble: 2
-ldouble: 2
+double: 5
+float: 5
+idouble: 5
+ifloat: 5
+ildouble: 4
+ldouble: 4
 
 Function: Imaginary part of "clog_upward":
-double: 2
+double: 1
 float: 2
-idouble: 2
+idouble: 1
 ifloat: 2
 ildouble: 2
 ldouble: 2
@@ -961,12 +953,6 @@ ifloat: 2
 ildouble: 2
 ldouble: 2
 
-Function: "cos_tonearest":
-float: 1
-ifloat: 1
-ildouble: 1
-ldouble: 1
-
 Function: "cos_towardzero":
 double: 1
 float: 1
@@ -999,14 +985,6 @@ ifloat: 1
 ildouble: 1
 ldouble: 2
 
-Function: "cosh_tonearest":
-double: 1
-float: 1
-idouble: 1
-ifloat: 1
-ildouble: 1
-ldouble: 1
-
 Function: "cosh_towardzero":
 double: 1
 float: 1
@@ -1046,9 +1024,9 @@ ildouble: 6
 ldouble: 6
 
 Function: Imaginary part of "cpow_downward":
-double: 2
+double: 1
 float: 2
-idouble: 2
+idouble: 1
 ifloat: 2
 ildouble: 2
 ldouble: 2
@@ -1062,9 +1040,9 @@ ildouble: 6
 ldouble: 6
 
 Function: Imaginary part of "cpow_towardzero":
-double: 2
+double: 1
 float: 2
-idouble: 2
+idouble: 1
 ifloat: 2
 ildouble: 2
 ldouble: 2
@@ -1303,22 +1281,6 @@ ifloat: 1
 ildouble: 5
 ldouble: 5
 
-Function: Real part of "ctan_tonearest":
-double: 1
-float: 1
-idouble: 1
-ifloat: 1
-ildouble: 3
-ldouble: 3
-
-Function: Imaginary part of "ctan_tonearest":
-double: 2
-float: 1
-idouble: 2
-ifloat: 1
-ildouble: 3
-ldouble: 3
-
 Function: Real part of "ctan_towardzero":
 double: 5
 float: 3
@@ -1383,22 +1345,6 @@ ifloat: 5
 ildouble: 4
 ldouble: 4
 
-Function: Real part of "ctanh_tonearest":
-double: 2
-float: 1
-idouble: 2
-ifloat: 1
-ildouble: 3
-ldouble: 3
-
-Function: Imaginary part of "ctanh_tonearest":
-double: 2
-float: 2
-idouble: 2
-ifloat: 2
-ildouble: 3
-ldouble: 3
-
 Function: Real part of "ctanh_towardzero":
 double: 2
 float: 2
@@ -1501,12 +1447,6 @@ ifloat: 1
 ildouble: 2
 ldouble: 2
 
-Function: "exp10_tonearest":
-double: 1
-idouble: 1
-ildouble: 1
-ldouble: 1
-
 Function: "exp10_towardzero":
 double: 1
 float: 1
@@ -1538,8 +1478,6 @@ idouble: 1
 Function: "exp_upward":
 double: 1
 idouble: 1
-ildouble: 1
-ldouble: 1
 
 Function: "expm1":
 double: 1
@@ -1557,14 +1495,6 @@ ifloat: 1
 ildouble: 2
 ldouble: 2
 
-Function: "expm1_tonearest":
-double: 1
-float: 1
-idouble: 1
-ifloat: 1
-ildouble: 1
-ldouble: 1
-
 Function: "expm1_towardzero":
 double: 1
 float: 1
@@ -1895,12 +1825,6 @@ ifloat: 1
 ildouble: 1
 ldouble: 1
 
-Function: "pow_tonearest":
-float: 1
-ifloat: 1
-ildouble: 1
-ldouble: 1
-
 Function: "pow_towardzero":
 double: 1
 float: 1
@@ -1931,12 +1855,6 @@ ifloat: 2
 ildouble: 1
 ldouble: 1
 
-Function: "sin_tonearest":
-float: 1
-ifloat: 1
-ildouble: 1
-ldouble: 1
-
 Function: "sin_towardzero":
 double: 1
 float: 1
@@ -1950,8 +1868,8 @@ double: 1
 float: 2
 idouble: 1
 ifloat: 2
-ildouble: 3
-ldouble: 3
+ildouble: 2
+ldouble: 2
 
 Function: "sincos":
 float: 1
@@ -2015,10 +1933,6 @@ ifloat: 3
 ildouble: 2
 ldouble: 2
 
-Function: "tan":
-ildouble: 1
-ldouble: 1
-
 Function: "tan_downward":
 double: 1
 float: 2
@@ -2027,10 +1941,6 @@ ifloat: 2
 ildouble: 1
 ldouble: 1
 
-Function: "tan_tonearest":
-ildouble: 1
-ldouble: 1
-
 Function: "tan_towardzero":
 double: 1
 float: 1
@@ -2044,8 +1954,8 @@ double: 1
 float: 1
 idouble: 1
 ifloat: 1
-ildouble: 2
-ldouble: 2
+ildouble: 1
+ldouble: 1
 
 Function: "tanh":
 ildouble: 1
@@ -2125,25 +2035,25 @@ ldouble: 2
 
 Function: "y1_downward":
 double: 3
-float: 7
+float: 2
 idouble: 3
-ifloat: 7
+ifloat: 2
 ildouble: 4
 ldouble: 4
 
 Function: "y1_towardzero":
 double: 3
-float: 3
+float: 2
 idouble: 3
-ifloat: 3
-ildouble: 6
-ldouble: 6
+ifloat: 2
+ildouble: 2
+ldouble: 2
 
 Function: "y1_upward":
 double: 7
-float: 5
+float: 2
 idouble: 7
-ifloat: 5
+ifloat: 2
 ildouble: 5
 ldouble: 5
 
