diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog
index 44790b28f..2034b876b 100644
--- a/libgloss/ChangeLog
+++ b/libgloss/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-11  Michael Meissner  <meissner@redhat.com>
+
+	* mips/crt0.S (_start): If -mfp32, don't enable 64-bit floating
+	point registers, even if we are compiling for a mips3 or greater.
+
 2001-09-10  Jim Blandy  <jimb@redhat.com>
 
 	Add support for GDB monitor-style I/O.
diff --git a/libgloss/mips/crt0.S b/libgloss/mips/crt0.S
index 00a398c25..8bd46ebf0 100644
--- a/libgloss/mips/crt0.S
+++ b/libgloss/mips/crt0.S
@@ -1,7 +1,7 @@
 /*
  * crt0.S -- startup file for MIPS.
  *
- * Copyright (c) 1995, 1996, 1997 Cygnus Support
+ * Copyright (c) 1995, 1996, 1997, 2001 Cygnus Support
  *
  * The authors hereby grant permission to use, copy, modify, distribute,
  * and license this software and its documentation for any purpose, provided
@@ -64,7 +64,7 @@ _start:
 	nop
 	move	s0,$31
 #endif
-#if __mips < 3
+#if (__mips < 3) || (__mips_fpr==32)
 #define STATUS_MASK (SR_CU1|SR_PE)
 #else
 # For mips3 or mips4, turn on 64-bit addressing and additional float regs