diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f951d80c9c..8a7e668466 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-17  Michael Snyder  <msnyder@redhat.com>
+
+	* mips-stub.c (restore_and_return): Postpone restoring of PSW.
+	RTE will take care of it.
+
 2002-09-17  Andrew Cagney  <ac131313@redhat.com>
 
 	* arch-utils.c (legacy_virtual_frame_pointer): If FP_REGNUM is
diff --git a/gdb/m32r-stub.c b/gdb/m32r-stub.c
index cb956264d6..a691a657a2 100644
--- a/gdb/m32r-stub.c
+++ b/gdb/m32r-stub.c
@@ -1288,8 +1288,7 @@ restore_and_return:
 	ld r13, @r0+	; restore r13
 	ld r14, @r0+	; restore r14
 	ld r15, @r0+	; restore r15
-	ld r1, @r0+	; restore cr0 == PSW
-	mvtc r1, cr0
+	addi r0, #4	; don't restore PSW (rte will do it)
 	ld r1, @r0+	; restore cr1 == CBR (no-op, because it's read only)
 	mvtc r1, cr1
 	ld r1, @r0+	; restore cr2 == SPI