diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5a307ab094c7e3e89be104166cd6c7ef9dff54b9..17792534bc8596fb30092cba4d014f7f44426292 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Sun Feb 22 20:07:32 1998  Jim Wilson  <wilson@cygnus.com>
+
+	* iris5.h (DWARF2_UNWIND_INFO): Define to 0.
+	* iris5gas.h (DWARF2_UNWIND_INFO): Define to 1.
+
 Sun Feb 22 15:29:48 1998  Richard Henderson  <rth@cygnus.com>
 
 	* objc/Object.m (-error): Call objc_verror with our va_list.
diff --git a/gcc/config/mips/iris5.h b/gcc/config/mips/iris5.h
index d7840b45a4a2585435931c9115144ad4b2b58f58..af6868d90ecd8b8eeffb9b439c5da19d1cab5b77 100644
--- a/gcc/config/mips/iris5.h
+++ b/gcc/config/mips/iris5.h
@@ -122,6 +122,9 @@ Boston, MA 02111-1307, USA.  */
 #undef SDB_DEBUGGING_INFO
 #undef MIPS_DEBUGGING_INFO
 
+/* Likewise, the assembler doesn't handle DWARF2 directives.  */
+#define DWARF2_UNWIND_INFO 0
+
 #undef MACHINE_TYPE
 #define MACHINE_TYPE "SGI running IRIX 5.x"
 
diff --git a/gcc/config/mips/iris5gas.h b/gcc/config/mips/iris5gas.h
index e519df72b25285fb085e674194a23e7fcfc8aa08..adc90e83223a55231b80dcd2c21fd360ca6d5c31 100644
--- a/gcc/config/mips/iris5gas.h
+++ b/gcc/config/mips/iris5gas.h
@@ -7,6 +7,10 @@
 #define SDB_DEBUGGING_INFO
 #define MIPS_DEBUGGING_INFO
 
+/* GNU as does handle DWARF2 directives.  */
+#undef DWARF2_UNWIND_INFO
+#define DWARF2_UNWIND_INFO 1
+
 /* Irix 5 does not have some strange restrictions that Irix 3 had.  */
 #undef SET_FILE_NUMBER
 #define SET_FILE_NUMBER() ++num_source_filenames