diff --git a/ld/ChangeLog b/ld/ChangeLog
index 179d229ccf1..c5f14869697 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2017-12-06  Alan Modra  <amodra@gmail.com>
+
+	* testsuite/lib/ld-lib.exp (check_shared_lib_support): Return true
+	for frv, lm32, m32r, microblaze, nds32 and or1k linux targets.
+
 2017-12-05  Jim Wilson  <jimw@sifive.com>
 	    Andrew Waterman  <andrew@sifive.com>
 
diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp
index c2404102703..ecac87f7664 100644
--- a/ld/testsuite/lib/ld-lib.exp
+++ b/ld/testsuite/lib/ld-lib.exp
@@ -1797,30 +1797,30 @@ proc check_shared_lib_support { } {
 	 && ![istarget dlx-*-*]
 	 && ![istarget epiphany-*-*]
 	 && ![istarget fr30-*-*]
-	 && ![istarget frv-*-*]
+	 && ![istarget frv-*-elf]
 	 && ![istarget ft32-*-*]
 	 && ![istarget h8300-*-*]
 	 && ![istarget i860-*-*]
 	 && ![istarget i960-*-*]
 	 && ![istarget ip2k-*-*]
 	 && ![istarget iq2000-*-*]
-	 && ![istarget lm32-*-*]
+	 && ![istarget lm32-*-elf]
 	 && ![istarget m32c-*-*]
-	 && ![istarget m32r-*-*]
+	 && ![istarget m32r-*-elf]
 	 && ![istarget m6811-*-*]
 	 && ![istarget m6812-*-*]
 	 && ![istarget m68hc1*-*-*]
 	 && ![istarget mcore*-*-*]
 	 && ![istarget mep-*-*]
-	 && ![istarget microblaze-*-*]
+	 && ![istarget microblaze-*-elf]
 	 && ![istarget mips*-*-elf]
 	 && ![istarget mn10200-*-*]
 	 && ![istarget moxie-*-*]
 	 && ![istarget msp430-*-*]
 	 && ![istarget mt-*-*]
-	 && ![istarget nds32*-*-*]
+	 && ![istarget nds32*-*-elf]
 	 && ![istarget nios2-*-elf]
-	 && ![istarget or1k*-*-*]
+	 && ![istarget or1k*-*-elf]
 	 && ![istarget pj-*-*]
 	 && ![istarget pru-*-*]
 	 && ![istarget rl78-*-*]