diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4793d031e4e2..76154f254451 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2011-08-22  Matthias Klose <doko@debian.org>
+
+	Revert:
+	2011-07-11  Arthur Loiret  <aloiret@debian.org>
+		    Matthias Klose <doko@debian.org>
+	* config/mips/t-linux64 (MULTILIB_DIRNAMES): Set to 'n32 . 64' if
+	tm_defines contains MIPS_ABI_DEFAULT ABI_32, to follow the glibc
+	convention.
+	* config.gcc (tm_defines): Add MIPS_ABI_DEFAULT=ABI_32.
+
 2011-08-22  Mikael Pettersson  <mikpe@it.uu.se>
 
 	PR bootstrap/50146
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 7f29213b74d3..e8e0eebf2047 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1854,7 +1854,6 @@ mips*-*-linux*)				# Linux MIPS, either endian.
 	if test x$enable_targets = xall; then
 		tm_file="${tm_file} mips/gnu-user64.h mips/linux64.h"
 		tmake_file="${tmake_file} mips/t-linux64"
-		tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_32"
 	fi
 	case ${target} in
         mipsisa32r2*)
diff --git a/gcc/config/mips/t-linux64 b/gcc/config/mips/t-linux64
index e23743d3cb0a..0e695172f55a 100644
--- a/gcc/config/mips/t-linux64
+++ b/gcc/config/mips/t-linux64
@@ -17,11 +17,7 @@
 # <http://www.gnu.org/licenses/>.
 
 MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
-ifneq ($(filter MIPS_ABI_DEFAULT=ABI_32,$(tm_defines)),)
-MULTILIB_DIRNAMES = n32 . 64
-else
 MULTILIB_DIRNAMES = n32 32 64
-endif
 MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
 
 EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o