diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index e98ec43e9b..62a2108090 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2005-02-02  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* ld-mips-elf/eh-frame3.d, ld-mips-elf/eh-frame4.d: Move comments
+	after test commands.
+	* ld-mips-elf/mips-elf.exp: Skip multi-got-1 on non-GNU/Linux
+	systems.
+
 2005-02-01  Alan Modra  <amodra@bigpond.net.au>
 
 	* ld-powerpc/tlsso.r: Update.
diff --git a/ld/testsuite/ld-mips-elf/eh-frame3.d b/ld/testsuite/ld-mips-elf/eh-frame3.d
index 16a3bd41d2..4c91d2c6dc 100644
--- a/ld/testsuite/ld-mips-elf/eh-frame3.d
+++ b/ld/testsuite/ld-mips-elf/eh-frame3.d
@@ -1,12 +1,13 @@
-# This test is for the official LP64 version of EABI64, which uses a
-# combination of 32-bit objects and 64-bit FDE addresses.
-#
 #name: MIPS eh-frame 3
 #source: eh-frame1.s
 #source: eh-frame1.s
 #as: -EB -mips3 -mabi=eabi --defsym alignment=3 --defsym fill=0 --defsym foo=0x1020304050607080
 #readelf: -wf
-#ld: -melf32ebmip -Teh-frame1.ld
+#ld: -EB -Teh-frame1.ld
+#
+# This test is for the official LP64 version of EABI64, which uses a
+# combination of 32-bit objects and 64-bit FDE addresses.
+#
 
 The section \.eh_frame contains:
 
diff --git a/ld/testsuite/ld-mips-elf/eh-frame4.d b/ld/testsuite/ld-mips-elf/eh-frame4.d
index 0be85aae0d..e04d5fc8b8 100644
--- a/ld/testsuite/ld-mips-elf/eh-frame4.d
+++ b/ld/testsuite/ld-mips-elf/eh-frame4.d
@@ -1,11 +1,12 @@
-# This test is for the semi-official ILP32 variation of EABI64.
-#
 #name: MIPS eh-frame 4
 #source: eh-frame1.s
 #source: eh-frame1.s
 #as: -EB -mips3 -mabi=eabi --defsym alignment=2 --defsym fill=0 --defsym foo=0x50607080
 #readelf: -wf
-#ld: -melf32ebmip -Teh-frame1.ld
+#ld: -EB -Teh-frame1.ld
+#
+# This test is for the semi-official ILP32 variation of EABI64.
+#
 
 The section \.eh_frame contains:
 
diff --git a/ld/testsuite/ld-mips-elf/mips-elf.exp b/ld/testsuite/ld-mips-elf/mips-elf.exp
index ed942b104a..33159000db 100644
--- a/ld/testsuite/ld-mips-elf/mips-elf.exp
+++ b/ld/testsuite/ld-mips-elf/mips-elf.exp
@@ -31,8 +31,11 @@ run_dump_test "mips16-1"
 # MIPS branch offset final link checking.
 run_dump_test "branch-misc-1"
 
-# Test multi-got link.
-run_dump_test "multi-got-1"
+# Test multi-got link.  We only do this on GNU/Linux because it requires
+# the "traditional" emulations.
+if { $linux_gnu } {
+    run_dump_test "multi-got-1"
+}
 
 if $has_newabi {
     run_dump_test "elf-rel-got-n32"