--- a/src/s/irix6-0.h	Wed Nov 18 22:44:28 2009 +0900
+++ b/src/s/irix6-0.h	Wed Nov 18 08:49:14 2009 -0700
@@ -1,8 +1,63 @@
 /* Synched up with: FSF 19.31. */
 
-#include "irix5-3.h"
+#include "usg5-4.h"
+
+#define IRIX6
+
+#ifdef LIBS_SYSTEM
+#undef LIBS_SYSTEM
+#endif
+
+#ifdef LIB_STANDARD
+#undef LIB_STANDARD
+#endif
+
+#ifdef SYSTEM_TYPE
+#undef SYSTEM_TYPE
+#endif
+#define SYSTEM_TYPE "irix"
+
+#ifdef SETUP_SLAVE_PTY
+#undef SETUP_SLAVE_PTY
+#endif
+
+/* jpff@maths.bath.ac.uk reports `struct exception' is not defined
+ * on this system, so inhibit use of matherr.  */
+#define NO_MATHERR
+
+/* Tell process_send_signal to use VSUSP instead of VSWTCH.  */
+#define PREFER_VSUSP
 
-/* Irix 6.2 doesn't need -lw */
-#undef NEED_LIBW
+/* use K&R C */
+/* XEmacs change -- use ANSI, not K&R */
+#ifndef __GNUC__
+#define C_SWITCH_SYSTEM "-xansi"
+#endif
 
-#undef memmove /* Use the standard system memmove() */
+/* jackr@engr.sgi.com says that you can't mix different kinds of
+ * signal-handling functions under IRIX 5.3.  I'm going to assume
+ * that that was the reason this got broken.  Now that the
+ * signal routines are fixed up, maybe this will work. --ben */
+/* Nope, it doesn't.  I've tried lots of things; it must be
+ * genuinely broken. */
+/* XEmacs addition: People on IRIX 5.2 and IRIX 5.3 systems have
+ * reported that they can't break out of (while t) using C-g or C-G.
+ * This does not occur on other systems, so let's assume that SIGIO
+ * is broken on these systems. */
+#define BROKEN_SIGIO
+
+/* #### Questionable define. */
+#define IRIX
+
+/* By Tor Arntsen <tor@spacetec.no> for XEmacs.
+ * With the following kludge the above LD_SWITCH_SYSTEM will still work just 
+ * fine even with USE_GCC, and additional tweaking of config.h or ymakefile 
+ * is avoided. */
+#ifdef NOT_C_CODE
+# ifdef USE_GCC
+#  undef LINKER
+#  undef LIB_GCC
+#  define LINKER "ld"
+#  define LIB_GCC "`gcc --print`"
+#  endif
+#endif