diff --git a/ChangeLog b/ChangeLog
index 3c953452c2..920c69254b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-09-15  Andreas Jaeger  <aj@suse.de>
+
+	* sysdeps/mips/fpu/fesetenv.c (__fesetenv): Handle FE_NOMASK_ENV.
+
+	* sysdeps/mips/bits/fenv.h (FE_NOMASK_ENV): Define.
+
 2000-09-15  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/unix/alpha/sysdep.h (inline_syscall_clobbers): Add memory
diff --git a/sysdeps/mips/bits/fenv.h b/sysdeps/mips/bits/fenv.h
index 72dd281b9d..4e740365b9 100644
--- a/sysdeps/mips/bits/fenv.h
+++ b/sysdeps/mips/bits/fenv.h
@@ -70,3 +70,8 @@ fenv_t;
 
 /* If the default argument is used we use this value.  */
 #define FE_DFL_ENV	((__const fenv_t *) -1)
+
+#ifdef __USE_GNU
+/* Floating-point environment where none of the exception is masked.  */
+# define FE_NOMASK_ENV  ((__const fenv_t *) -2)
+#endif