3 files changed, 46 insertions, 36 deletions
diff --git a/sysdeps/i386/fpu/libm-test-ulps b/sysdeps/i386/fpu/libm-test-ulps
index 2c823ef..538a549 100644
--- a/sysdeps/i386/fpu/libm-test-ulps
+++ b/sysdeps/i386/fpu/libm-test-ulps
@@ -283,6 +283,10 @@ ifloat: 2
 ildouble: 2
 ldouble: 2
 
+Function: "carg":
+ildouble: 1
+ldouble: 1
+
 Function: "carg_downward":
 double: 1
 float: 1
@@ -827,9 +831,9 @@ ldouble: 1
 
 Function: Real part of "clog_upward":
 double: 1
-float: 1
+float: 2
 idouble: 1
-ifloat: 1
+ifloat: 2
 ildouble: 2
 ldouble: 2
 
diff --git a/sysdeps/ieee754/dbl-64/e_atan2.c b/sysdeps/ieee754/dbl-64/e_atan2.c
index a03ce3e..0c29028 100644
--- a/sysdeps/ieee754/dbl-64/e_atan2.c
+++ b/sysdeps/ieee754/dbl-64/e_atan2.c
@@ -41,6 +41,7 @@
 #include "MathLib.h"
 #include "uatan.tbl"
 #include "atnat2.h"
+#include <fenv.h>
 #include <float.h>
 #include <math.h>
 #include <math_private.h>
@@ -192,6 +193,7 @@ __ieee754_atan2 (double y, double x)
 	return mhpi.d;
     }
 
+  SET_RESTORE_ROUND (FE_TONEAREST);
   /* either x/y or y/x is very close to zero */
   ax = (x < 0) ? -x : x;
   ay = (y < 0) ? -y : y;
diff --git a/sysdeps/x86_64/fpu/libm-test-ulps b/sysdeps/x86_64/fpu/libm-test-ulps
index abeeaf9..d0aea07 100644
--- a/sysdeps/x86_64/fpu/libm-test-ulps
+++ b/sysdeps/x86_64/fpu/libm-test-ulps
@@ -228,9 +228,9 @@ ildouble: 2
 ldouble: 2
 
 Function: Real part of "cacos_downward":
-double: 1
+double: 2
 float: 2
-idouble: 1
+idouble: 2
 ifloat: 2
 ildouble: 2
 ldouble: 2
@@ -244,9 +244,9 @@ ildouble: 5
 ldouble: 5
 
 Function: Real part of "cacos_towardzero":
-double: 1
+double: 2
 float: 2
-idouble: 1
+idouble: 2
 ifloat: 2
 ildouble: 2
 ldouble: 2
@@ -300,9 +300,9 @@ ildouble: 5
 ldouble: 5
 
 Function: Imaginary part of "cacosh_downward":
-double: 1
+double: 2
 float: 2
-idouble: 1
+idouble: 2
 ifloat: 2
 ildouble: 2
 ldouble: 2
@@ -316,9 +316,9 @@ ildouble: 5
 ldouble: 5
 
 Function: Imaginary part of "cacosh_towardzero":
-double: 1
+double: 2
 float: 2
-idouble: 1
+idouble: 2
 ifloat: 2
 ildouble: 2
 ldouble: 2
@@ -339,6 +339,12 @@ ifloat: 2
 ildouble: 2
 ldouble: 2
 
+Function: "carg":
+float: 1
+ifloat: 1
+ildouble: 1
+ldouble: 1
+
 Function: "carg_downward":
 double: 1
 float: 2
@@ -348,8 +354,10 @@ ildouble: 1
 ldouble: 1
 
 Function: "carg_towardzero":
-float: 1
-ifloat: 1
+double: 1
+float: 2
+idouble: 1
+ifloat: 2
 ildouble: 1
 ldouble: 1
 
@@ -410,9 +418,9 @@ ildouble: 5
 ldouble: 5
 
 Function: Real part of "casin_upward":
-double: 1
+double: 2
 float: 1
-idouble: 1
+idouble: 2
 ifloat: 1
 ildouble: 2
 ldouble: 2
@@ -482,9 +490,9 @@ ildouble: 5
 ldouble: 5
 
 Function: Imaginary part of "casinh_upward":
-double: 1
+double: 2
 float: 2
-idouble: 1
+idouble: 2
 ifloat: 2
 ildouble: 2
 ldouble: 2
@@ -534,9 +542,7 @@ ildouble: 4
 ldouble: 4
 
 Function: Real part of "catan_upward":
-double: 1
 float: 1
-idouble: 1
 ifloat: 1
 ildouble: 1
 ldouble: 1
@@ -602,9 +608,7 @@ ildouble: 4
 ldouble: 4
 
 Function: Imaginary part of "catanh_upward":
-double: 1
 float: 1
-idouble: 1
 ifloat: 1
 ildouble: 1
 ldouble: 1
@@ -820,9 +824,9 @@ ildouble: 4
 ldouble: 4
 
 Function: Imaginary part of "clog10_downward":
-double: 3
+double: 1
 float: 2
-idouble: 3
+idouble: 1
 ifloat: 2
 ildouble: 2
 ldouble: 2
@@ -836,9 +840,9 @@ ildouble: 4
 ldouble: 4
 
 Function: Imaginary part of "clog10_towardzero":
-double: 3
+double: 1
 float: 2
-idouble: 3
+idouble: 1
 ifloat: 2
 ildouble: 2
 ldouble: 2
@@ -852,10 +856,10 @@ ildouble: 4
 ldouble: 4
 
 Function: Imaginary part of "clog10_upward":
-double: 2
-float: 2
-idouble: 2
-ifloat: 2
+double: 1
+float: 3
+idouble: 1
+ifloat: 3
 ildouble: 2
 ldouble: 2
 
@@ -893,16 +897,16 @@ ldouble: 1
 
 Function: Real part of "clog_upward":
 double: 2
-float: 1
+float: 2
 idouble: 2
-ifloat: 1
+ifloat: 2
 ildouble: 2
 ldouble: 2
 
 Function: Imaginary part of "clog_upward":
-double: 2
+double: 1
 float: 2
-idouble: 2
+idouble: 1
 ifloat: 2
 ildouble: 1
 ldouble: 1
@@ -984,9 +988,9 @@ ildouble: 7
 ldouble: 7
 
 Function: Imaginary part of "cpow_downward":
-double: 2
+double: 1
 float: 2
-idouble: 2
+idouble: 1
 ifloat: 2
 ildouble: 2
 ldouble: 2
@@ -1000,9 +1004,9 @@ ildouble: 7
 ldouble: 7
 
 Function: Imaginary part of "cpow_towardzero":
-double: 2
+double: 1
 float: 2
-idouble: 2
+idouble: 1
 ifloat: 2
 ildouble: 1
 ldouble: 1