diff --git a/ld/ChangeLog b/ld/ChangeLog
index f16654c6412..52b24672b2a 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-09  Chris Demetriou  <cgd@broadcom.com>
+
+	* ldmain.c (get_emulation): Sort -mipsNN checks in the usual
+	order, and handle (ignore) -mips32r2.
+
 2003-01-09  Daniel Jacobowitz  <drow@mvista.com>
 
 	* ldmain.c (main): Make sure ld_sysroot is initialized.
diff --git a/ld/ldmain.c b/ld/ldmain.c
index d442738cfe3..9be371198f8 100644
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -578,10 +578,11 @@ get_emulation (argc, argv)
 	  else if (strcmp (argv[i], "-mips1") == 0
 		   || strcmp (argv[i], "-mips2") == 0
 		   || strcmp (argv[i], "-mips3") == 0
-		   || strcmp (argv[i], "-mips32") == 0
-		   || strcmp (argv[i], "-mips64") == 0
 		   || strcmp (argv[i], "-mips4") == 0
-		   || strcmp (argv[i], "-mips5") == 0)
+		   || strcmp (argv[i], "-mips5") == 0
+		   || strcmp (argv[i], "-mips32") == 0
+		   || strcmp (argv[i], "-mips32r2") == 0
+		   || strcmp (argv[i], "-mips64") == 0)
 	    {
 	      /* FIXME: The arguments -mips1, -mips2, -mips3, etc. are
 		 passed to the linker by some MIPS compilers.  They