diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 01cfd967d788..316c0505340d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-26  Richard Sandiford  <rsandifo@redhat.com>
+
+	* config/mips/iris6.h (ENDFILE_SPEC): Don't link in irix-csr.o if
+	either -ffast-math or -funsafe-math-optimizations is in use.
+
 2005-01-26  Marek Michalkiewicz  <marekm@amelek.gda.pl>
 
 	PR target/19293
diff --git a/gcc/config/mips/iris6.h b/gcc/config/mips/iris6.h
index bf3bbc39b28f..a37ff2478294 100644
--- a/gcc/config/mips/iris6.h
+++ b/gcc/config/mips/iris6.h
@@ -97,7 +97,8 @@ Boston, MA 02111-1307, USA.  */
 
 #undef ENDFILE_SPEC
 #define ENDFILE_SPEC \
-  "%{!shared:%{mabi=n32|mabi=64:irix-csr.o%s}} \
+  "%{!shared:%{!ffast-math:%{!funsafe-math-optimizations: \
+     %{mabi=n32|mabi=64:irix-csr.o%s}}}} \
    crtend.o%s irix-crtn.o%s \
    %{!shared: \
      %{mabi=32:crtn.o%s}\