diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dbb8057f6e7..4510a07e64e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-17  Richard Sandiford  <rsandifo@redhat.com>
+
+	* config/mips/t-coff, config/mips/t-elf, config/mips/t-isa3264,
+	config/mips/t-r3900 (MULTILIB_MATCHES): Define.
+	* config/mips/mips.h (ASM_SPEC): Use %(endian_spec).
+
 2002-08-16  Stan Shebs  <shebs@apple.com>
 
 	* c-common.c (cb_register_builds): Define __NEXT_RUNTIME__
diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
index 01a42f4acb5..c5fa4b2f4cd 100644
--- a/gcc/config/mips/mips.h
+++ b/gcc/config/mips/mips.h
@@ -1006,7 +1006,7 @@ extern int mips_abi;
 
 #undef ASM_SPEC
 #define ASM_SPEC "\
-%{G*} %{EB} %{EL} %{mips1} %{mips2} %{mips3} %{mips4} %{mips32} %{mips64}\
+%{G*} %(endian_spec) %{mips1} %{mips2} %{mips3} %{mips4} %{mips32} %{mips64}\
 %{mips16:%{!mno-mips16:-mips16}} %{mno-mips16:-no-mips16} \
 %(subtarget_asm_optimizing_spec) \
 %(subtarget_asm_debugging_spec) \
diff --git a/gcc/config/mips/t-ecoff b/gcc/config/mips/t-ecoff
index 89e9bcf86c3..f5e3805375d 100644
--- a/gcc/config/mips/t-ecoff
+++ b/gcc/config/mips/t-ecoff
@@ -21,6 +21,7 @@ TARGET_LIBGCC2_CFLAGS = -G 0
 
 MULTILIB_OPTIONS = msoft-float/msingle-float EL/EB mips1/mips3
 MULTILIB_DIRNAMES = soft-float single el eb mips1 mips3
+MULTILIB_MATCHES = EL=mel EB=meb
 MULTILIB_MATCHES = msingle-float=m4650
 
 LIBGCC = stmp-multilib
diff --git a/gcc/config/mips/t-elf b/gcc/config/mips/t-elf
index 13ddcc3d22a..22bf2b371ec 100644
--- a/gcc/config/mips/t-elf
+++ b/gcc/config/mips/t-elf
@@ -33,6 +33,7 @@ TARGET_LIBGCC2_CFLAGS = -G 0
 
 MULTILIB_OPTIONS = msoft-float EL/EB
 MULTILIB_DIRNAMES = soft-float el eb
+MULTILIB_MATCHES = EL=mel EB=meb
 #MULTILIB_MATCHES = msingle-float=m4650
 EXTRA_MULTILIB_PARTS = crtbegin.o crtend.o crti.o crtn.o
 
diff --git a/gcc/config/mips/t-isa3264 b/gcc/config/mips/t-isa3264
index 02c9d272ea0..9202a8e25a7 100644
--- a/gcc/config/mips/t-isa3264
+++ b/gcc/config/mips/t-isa3264
@@ -35,6 +35,7 @@ TARGET_LIBGCC2_CFLAGS = -G 0
 
 MULTILIB_OPTIONS = msoft-float EL/EB mips32/mips64
 MULTILIB_DIRNAMES = soft-float el eb mips32 mips64
+MULTILIB_MATCHES = EL=mel EB=meb
 EXTRA_MULTILIB_PARTS = crtbegin.o crtend.o crti.o crtn.o
 
 LIBGCC = stmp-multilib
diff --git a/gcc/config/mips/t-r3900 b/gcc/config/mips/t-r3900
index f8778cd158d..6ea9e748ec7 100644
--- a/gcc/config/mips/t-r3900
+++ b/gcc/config/mips/t-r3900
@@ -25,6 +25,7 @@ CRTSTUFF_T_CFLAGS = -G 0
 
 MULTILIB_OPTIONS = msoft-float EL/EB
 MULTILIB_DIRNAMES = soft-float el eb
+MULTILIB_MATCHES = EL=mel EB=meb
 
 LIBGCC = stmp-multilib
 INSTALL_LIBGCC = install-multilib