diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ac0f2839525a..4401ef38eb25 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2012-08-29  Chung-Lin Tang  <cltang@codesourcery.com>
+
+	Revert:
+	* config/mips/t-linux64 (MULTILIB_OSDIRNAMES): Change to use
+	mapping style, add ../lib/mips16.
+	(MULTILIB_OPTIONS,MULTILIB_DIRNAMES): Add mips16.
+	(MULTILIB_EXCLUSIONS): Exclude mips16 when not -mabi=32.
+
 2012-08-29  Richard Sandiford  <rdsandiford@googlemail.com>
 
 	* config/mips/mips.h (TARGET_CPU_CPP_BUILTINS): Define __mips_synci
diff --git a/gcc/config/mips/t-linux64 b/gcc/config/mips/t-linux64
index 420ee6826907..5197e5ee2092 100644
--- a/gcc/config/mips/t-linux64
+++ b/gcc/config/mips/t-linux64
@@ -18,12 +18,4 @@
 
 MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
 MULTILIB_DIRNAMES = n32 32 64
-MULTILIB_OSDIRNAMES  = mabi.n32=../lib32
-MULTILIB_OSDIRNAMES += mabi.32=../lib
-MULTILIB_OSDIRNAMES += mabi.64=../lib64
-
-# MIPS16 is currently only supported under O32
-MULTILIB_OPTIONS += mips16
-MULTILIB_DIRNAMES += mips16
-MULTILIB_OSDIRNAMES += mabi.32/mips16=../lib/mips16
-MULTILIB_EXCLUSIONS = !mabi=32/mips16
+MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64