diff --git a/ld/ChangeLog b/ld/ChangeLog
index e42df38337..7d99c757ae 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2017-03-21  Sandra Loosemore  <sandra@codesourcery.com>
+
+	* testsuite/lib/ld-lib.exp (check_shared_lib_support): Return
+	false for nios2-*-elf.
+
 2017-03-21  gingold  <gingold@gingold-Precision-7510>
 
 	* ldlang.c (lang_check_section_addresses): Check only for
diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp
index 42cfe1c824..bdce739b66 100644
--- a/ld/testsuite/lib/ld-lib.exp
+++ b/ld/testsuite/lib/ld-lib.exp
@@ -1820,6 +1820,7 @@ proc check_shared_lib_support { } {
 	 && ![istarget msp430-*-*]
 	 && ![istarget mt-*-*]
 	 && ![istarget nds32*-*-*]
+	 && ![istarget nios2-*-elf]
 	 && ![istarget or1k*-*-*]
 	 && ![istarget pj-*-*]
 	 && ![istarget pru-*-*]