diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2ab4fa966e64..988ec23d8abd 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Wed Apr  1 14:38:10 1998  Jim Wilson  <wilson@cygnus.com>
+
+	* config/mips/iris6.h (MD_EXEC_PREFIX): Set to /usr/bin/.
+	(MD_STARTFILE_PREFIX): Unset.
+
 1998-04-01  Mark Mitchell  <mmitchell@usa.net>
 
 	* varasm.c (make_decl_rtl): Update the DECL_ASSEMBLER_NAME for a
diff --git a/gcc/config/mips/iris6.h b/gcc/config/mips/iris6.h
index fb4276fd467f..55d42c7fc50f 100644
--- a/gcc/config/mips/iris6.h
+++ b/gcc/config/mips/iris6.h
@@ -101,6 +101,18 @@ Boston, MA 02111-1307, USA.  */
    specification.  The SGI/MIPS ABI defines it to be the same as PTR_SIZE.  */
 #define DWARF_OFFSET_SIZE PTR_SIZE
 
+/* There is no GNU as port for Irix6 yet, so we set MD_EXEC_PREFIX so that
+   gcc will automatically find SGI as instead of searching the user's path.
+   The latter can fail when building a cross compiler if the user has . in
+   the path before /usr/bin, since then gcc will find and try to use the link
+   to the cross assembler which can't possibly work.  */
+
+#undef MD_EXEC_PREFIX
+#define MD_EXEC_PREFIX "/usr/bin/"
+
+/* We have no need for MD_STARTFILE_PREFIX.  */
+#undef MD_STARTFILE_PREFIX
+
 #undef MACHINE_TYPE
 #define MACHINE_TYPE "SGI running IRIX 6.x"