diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog
index 150a9e656..0ecd49d34 100644
--- a/libgloss/ChangeLog
+++ b/libgloss/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-05  Adam Nemet  <anemet@caviumnetworks.com>
+
+	* mips/idt64.ld: Set arch to mips:isa64r2 from mips:isa64.  Update
+	comment.
+
 2008-11-20  Ken Werner  <ken.werner@de.ibm.com>
             Patrick Mansfield  <patmans@us.ibm.com>
             Joel Schopp   <jschopp@austin.ibm.com>
diff --git a/libgloss/mips/idt64.ld b/libgloss/mips/idt64.ld
index 10e9b1bcc..4a958202f 100644
--- a/libgloss/mips/idt64.ld
+++ b/libgloss/mips/idt64.ld
@@ -1,9 +1,11 @@
 /* The following TEXT start address leaves space for the monitor
-   workspace.  This linker script links isa32 programs for use with the
-   simulator.  */
+   workspace.  This linker script links ISA64r2 programs for use with the
+   simulator.  We set the ISA explicitly so that we can link objects of
+   different ISAs that are subsets of ISA64r2 but are not extensions of
+   each other (e.g., MIPS32r2 and MIPS64).  */
 
 ENTRY(_start)
-OUTPUT_ARCH("mips:isa64")
+OUTPUT_ARCH("mips:isa64r2")
 OUTPUT_FORMAT("elf32-littlemips", "elf32-bigmips", "elf32-littlemips")
 GROUP(-lc -lidt -lgcc)
 SEARCH_DIR(.)