diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 040a00e0c..3adb3e0c1 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-12  Aldy Hernandez  <aldyh@redhat.com>
+
+        * libc/machine/mips/setjmp.S: Allow mips16 and mips64 to coexist.
+
 2001-06-27  Nick Clifton  <nickc@cambridge.redhat.com>
 
 	* libc/include/machine/ieeefp.h (__IEEE_BYTES_LITTLE_ENDIAN):
diff --git a/newlib/libc/machine/mips/setjmp.S b/newlib/libc/machine/mips/setjmp.S
index 9532e7a38..9778394ac 100644
--- a/newlib/libc/machine/mips/setjmp.S
+++ b/newlib/libc/machine/mips/setjmp.S
@@ -9,12 +9,10 @@
    The MIPS 64 version saves registers fp20 to fp31.  23 registers
    are saved in all.  */
 
-#ifndef __mips64
 #ifdef __mips16
 /* This file contains 32 bit assembly code.  */
 	.set nomips16
 #endif
-#endif
 
 /* int setjmp (jmp_buf);  */
 	.globl	setjmp