diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1c6866fa0d..fa086c63ee 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
 Thu Jan 13 10:32:38 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
+	* remote-vx.c (vx_wait): Only call i960_fault_to_signal if I80960
+	is defined.  Otherwise just report TARGET_SIGNAL_UNKNOWN.
+
+	* mips-tdep.c (mips_push_arguments): Byteswap struct_addr before
+	writing it.
+
 	Add search to target vector (#if 0'd until after 4.12):
 	* target.h (to_search, target_search): Add.
 	* gdbcore.h, core.c (generic_search): Add.
diff --git a/gdb/remote-vx.c b/gdb/remote-vx.c
index 3bcb680748..bc67664a1f 100644
--- a/gdb/remote-vx.c
+++ b/gdb/remote-vx.c
@@ -950,7 +950,16 @@ vx_wait (pid_to_wait_for, status)
       break;
 
     case EVENT_SIGNAL:
+#ifdef I80960
       status->value.sig = i960_fault_to_signal (rdbEvent.sigType);
+#else
+      /* Back in the old days, before enum target_signal, this code used
+	 to add NSIG to the signal number and claim that PRINT_RANDOM_SIGNAL
+	 would take care of it.  But PRINT_RANDOM_SIGNAL has never been
+	 defined except on the i960, so I don't really know what we are
+	 supposed to do on other architectures.  */
+      status->value.sig = TARGET_SIGNAL_UNKNOWN;
+#endif
       break;
     } /* switch */
   return pid;