diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d933c9733b011279ab404675fd4a0615aec3f5ff..097888b3fec2c380885a00f0fb6a0a3ec56e3812 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-10  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* config/mips/t-iris6 (SHLIB_SLIBDIR_SUFFIXES): Use mabi=64 and
+	. as N64/N32 libgcc_s.so subdirs.
+
 2002-05-10  David S. Miller  <davem@redhat.com>
 
 	* config/sparc/sparc.md: Use define_constants for unspec numbers.
diff --git a/gcc/config/mips/t-iris6 b/gcc/config/mips/t-iris6
index 1ade6fd4a932b44f9df3d2684786716857c3a45b..4a8d6be3cd1b7e285e9763af73bb5fca167a078e 100644
--- a/gcc/config/mips/t-iris6
+++ b/gcc/config/mips/t-iris6
@@ -22,7 +22,7 @@ SHLIB_NAME = @shlib_dir@@shlib_so_name@.so.1
 SHLIB_MAP = @shlib_map_file@
 SHLIB_OBJS = @shlib_objs@
 SHLIB_SLIBDIR_QUAL = @shlib_slibdir_qual@
-SHLIB_SLIBDIR_SUFFIXES = mabi=64:64 mabi=n32:32
+SHLIB_SLIBDIR_SUFFIXES = mabi=64:/mabi=64 mabi=n32:
 
 SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
         -Wl,-soname,$(SHLIB_SONAME) \