about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--sysdeps/mips/math_private.h13
2 files changed, 10 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index ca74dc312b..cae7f85a68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2014-03-11  Joseph Myers  <joseph@codesourcery.com>
 
+	* sysdeps/mips/math_private.h [__mips_hard_float]
+	(libc_feresetround_ctx): Define to libc_feupdateenv_mips_ctx not
+	libc_feresetround_mips_ctx.
+	[__mips_hard_float] (libc_feresetroundf_ctx): Likewise.
+	[__mips_hard_float] (libc_feresetroundl_ctx): Likewise.
+	[__mips_hard_float] (libc_feresetround_mips_ctx): Remove.
+
 	[BZ #16677]
 	* math/s_nextafter.c (__nextafter): Do not return value from
 	overflowing computation.
diff --git a/sysdeps/mips/math_private.h b/sysdeps/mips/math_private.h
index edf604728c..7f2cdf5459 100644
--- a/sysdeps/mips/math_private.h
+++ b/sysdeps/mips/math_private.h
@@ -217,6 +217,9 @@ libc_feupdateenv_mips_ctx (struct rm_ctx *ctx)
 # define libc_feupdateenv_ctx             libc_feupdateenv_mips_ctx
 # define libc_feupdateenvf_ctx            libc_feupdateenv_mips_ctx
 # define libc_feupdateenvl_ctx            libc_feupdateenv_mips_ctx
+# define libc_feresetround_ctx            libc_feupdateenv_mips_ctx
+# define libc_feresetroundf_ctx           libc_feupdateenv_mips_ctx
+# define libc_feresetroundl_ctx           libc_feupdateenv_mips_ctx
 
 static __always_inline void
 libc_feholdsetround_mips_ctx (struct rm_ctx *ctx, int round)
@@ -242,16 +245,6 @@ libc_feholdsetround_mips_ctx (struct rm_ctx *ctx, int round)
 # define libc_feholdsetroundf_ctx         libc_feholdsetround_mips_ctx
 # define libc_feholdsetroundl_ctx         libc_feholdsetround_mips_ctx
 
-static __always_inline void
-libc_feresetround_mips_ctx (struct rm_ctx *ctx)
-{
-  if (__glibc_unlikely (ctx->updated_status))
-    _FPU_SETCW (ctx->env);
-}
-# define libc_feresetround_ctx            libc_feresetround_mips_ctx
-# define libc_feresetroundf_ctx           libc_feresetround_mips_ctx
-# define libc_feresetroundl_ctx           libc_feresetround_mips_ctx
-
 #endif
 
 #include_next <math_private.h>